aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-libs/matio/Manifest8
-rw-r--r--sci-libs/matio/matio-1.3.1.ebuild28
2 files changed, 17 insertions, 19 deletions
diff --git a/sci-libs/matio/Manifest b/sci-libs/matio/Manifest
index 73ffac69a..a925472bc 100644
--- a/sci-libs/matio/Manifest
+++ b/sci-libs/matio/Manifest
@@ -1,8 +1,8 @@
DIST matio-1.3.1.tar.gz 938713 RMD160 64e12e1774db3054ce11f6efd15686c8432a3197 SHA1 70af161a788f7f5e171f27e2655763454ec33839 SHA256 5c8e5df8500c4e444865f65e94ba2b1084a0a370733195655099f5c6f2069eb0
-EBUILD matio-1.3.1.ebuild 934 RMD160 d016ca4368ae273ce318c0ccd760e753984ccb28 SHA1 9f3f8337ab21adcdbe7609ff1a86e1e025eefdd8 SHA256 b50c30d51e690368a8ce71592d9da3eda96fe1ae96288bf5a551f54fea85da1d
-MD5 b51e9d74d6ce5ae231baf6ceef54a048 matio-1.3.1.ebuild 934
-RMD160 d016ca4368ae273ce318c0ccd760e753984ccb28 matio-1.3.1.ebuild 934
-SHA256 b50c30d51e690368a8ce71592d9da3eda96fe1ae96288bf5a551f54fea85da1d matio-1.3.1.ebuild 934
+EBUILD matio-1.3.1.ebuild 907 RMD160 302e7dba00190e51d6df912feb44eb98db97df2b SHA1 7a8ade8aeb47e6f5e0eb5ff653d95d560a93b069 SHA256 80bee26362313e92f82c206176fcf771e1c82ebb5c944db387e65d9ac1a1f263
+MD5 2bac4ffa4421eda2b861cb36d6309f74 matio-1.3.1.ebuild 907
+RMD160 302e7dba00190e51d6df912feb44eb98db97df2b matio-1.3.1.ebuild 907
+SHA256 80bee26362313e92f82c206176fcf771e1c82ebb5c944db387e65d9ac1a1f263 matio-1.3.1.ebuild 907
MISC ChangeLog 614 RMD160 4f8e87a9ab63a5a191d44506e709bb6b12b4053f SHA1 02008a45278e5c147425e2878c2edb14bb4c6b1a SHA256 b484aadb1ab72c5b263ba70a319a48e95afaff6f5e580a5c09a5d44abdc00847
MD5 d4dd43f5bcc59a6c6044b2e19d906fb1 ChangeLog 614
RMD160 4f8e87a9ab63a5a191d44506e709bb6b12b4053f ChangeLog 614
diff --git a/sci-libs/matio/matio-1.3.1.ebuild b/sci-libs/matio/matio-1.3.1.ebuild
index baf1f2d49..1bc753a1f 100644
--- a/sci-libs/matio/matio-1.3.1.ebuild
+++ b/sci-libs/matio/matio-1.3.1.ebuild
@@ -2,39 +2,37 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit eutils
+inherit eutils fortran
DESCRIPTION="Library for reading and writing matlab .mat files"
HOMEPAGE="http://sourceforge.net/projects/matio/"
SLOT="0"
-LICENSE="LGPL"
+LICENSE="LGPL-2"
KEYWORDS="~x86"
IUSE="doc fortran"
-RESTRICT="nomirror"
SRC_URI="mirror://sourceforge/matio/${P}.tar.gz"
-DEPEND="doc? ( app-doc/doxygen virtual/tetex )
- fortran? ( >=gcc-4.1 )"
+DEPEND="doc? ( app-doc/doxygen virtual/tetex )"
+FORTRAN="gfortran"
+
+#### Remove the following line when moving this ebuild to the main tree!
+RESTRICT="nomirror"
pkg_setup() {
- if use fortran ; then
- if ! built_with_use gcc fortran ; then
- einfo "Please re-emerge gcc with the USE flag fortran and try again"
- die
- fi
- fi
+ use fortran && fortran_pkg_setup
}
src_compile() {
addwrite /var/cache/fonts
addwrite /usr/share/texmf
- aclocal -I config
- automake
- econf --enable-shared --disable-test $(use_enable fortran ) $(use_enable doc docs ) \
+ econf --enable-shared \
+ --disable-test \
+ $(use_enable fortran ) \
+ $(use_enable doc docs ) \
|| die "econf failed"
emake || die "emake failed"
}
src_install() {
- make DESTDIR="${D}" install
+ make DESTDIR="${D}" install || die "make install failed"
dodoc README ChangeLog
}