Minor improvements related to sci-libs/fox.

5 files changed, 21 insertions, 119 deletions

diff --git a/sci-libs/fox/ChangeLog b/sci-libs/fox/ChangeLog
index 5ab07b16a..7a9085fd2 100644
--- a/sci-libs/fox/ChangeLog
+++ b/sci-libs/fox/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz> fox-4.1.2.ebuild:
+  Modular download enabled, FoX-config improved.
+
 *fox-4.1.2 (19 Apr 2012)
 
   19 Apr 2012; Honza Macháček <Hloupy.Honza@centrum.cz> +fox-4.1.2.ebuild,
diff --git a/sci-libs/fox/Manifest b/sci-libs/fox/Manifest
index 8900de148..4141f2f85 100644
--- a/sci-libs/fox/Manifest
+++ b/sci-libs/fox/Manifest
@@ -1,3 +1,7 @@
-DIST FoX-4.0.4-full.tar.gz 503516 SHA256 219db37dcda0b11fa602170d76da086fe140cbfcbd9f8620a00482398c48836e SHA512 b2b6cd97118799df99013114de725e045ecc642f361e2871b269bc987e3a18aa84c47c54227ac8b1741f0f06d1965bcc8ce0123da31f69777f25f01ad9ccbf22 WHIRLPOOL b480840e0eb70336f235ea4825399b3d1a8fbdc6c3795cd1e8e92921528231197b25448d433b4df92150aa0a7bc51a3d39f0806256e15f26587fb40dec5404ed
-DIST FoX-4.1.0-full.tar.gz 1018847 SHA256 8e7992ae6391178768bb58c230424a430ed57693a3cc7c4c22001ddc682910ff SHA512 80f0675d1e5940fd36f24499f0a2ce2d9e6ce229abcd0b8ea18de83a38ca099d01d8f29cbeec441363da50909433e492a6049379510ae5bcf9e16bc6969fb9dd WHIRLPOOL a3f20bef681b24664703892d926401ce266ea96a17d3f9290dd997a903da462c0d63dcb374da01911d0f670d29bf232f3831fa38fd1d6078525d212d8f6ccc10
+DIST FoX-4.1.2-dom.tar.gz 225371 SHA256 12ff57bf6de41d23f06bf8f4f02969118d0fced2feab257dcc7204394cbfcb06 SHA512 de846d40ad442d2fff33dda17793f7334a87065d760920f17605926d4f91624cb134515b6c77392aa77a17532275e256301bdefa157eecbb0c13887bcaa7fe4c WHIRLPOOL 516270138eed8a165955ee8f47e0e5e5f34bcace7d604bc26e00d903494135597d0815bc7262ab500dcf33fe2a1cf6f02e05bf6864bc8a062d222e978b06fba7
 DIST FoX-4.1.2-full.tar.gz 1025375 SHA256 99f660a3d3cf9b9eb50e36d67dac3b80cfac92473462c3d6f3b340ba8d7c9b24 SHA512 bfd994768f4b8067cf2859949d51723c851521c444ba6a342901ae5e6ae86ed2832d59eac5f29048e1c2e5b27af6d1be4e7f026062832d650d894a865f1827c1 WHIRLPOOL 4f665380ae0e3c69efa5b9448d32d866efda6fa6e853bf1016088c45f704cafaa389cf0342041d0e07461ea32622fe967f3626668e153b316f2b162e08f0195d
+DIST FoX-4.1.2-sax.tar.gz 164451 SHA256 7d247b11971b0025973d658c708b56acff8b51d1ff1a8503a9a2c64d4449fe26 SHA512 7391ed23c70b52cd4155da0fbef60fda8a628e682b93b9340478d0a7bef0e9bd0016610fb45141b54063c001a5031baeb8ec66239e5b763cdc226fb5680f3de2 WHIRLPOOL 4cbd518c128c512fdb24f9024420240fbc133c50a82c1cb4cc570186403ec4343652662d3595e57602dfcc1bd477b82b851135524669dfcf7b18fe2df5ce2abf
+DIST FoX-4.1.2-wcml.tar.gz 163504 SHA256 cb98d41ee71cff7581321fb8b35324dd066bfdbf853a1dc83803366766f68d35 SHA512 32a1bea6e52926958ec7ca24256dd824bf97f84ae1ce691d01d607b4f7fc4e1c811ead36a9f1260aa4696aeba964d9b3db1673a011b5a8f1d1b9c96590be8ffb WHIRLPOOL bda5dc3b187d4f52a86ef3d2cb4e2f96aafababaa94ce862747e5fd42d31e67e7e67ba941fdbdaeb02ba2628e156070986451f423f9988817643ef5af604773b
+DIST FoX-4.1.2-wkml.tar.gz 207539 SHA256 920a9996c79886ea8bc872ed445992ee075e64eee7db97989af56e66958046c7 SHA512 1f3e0f2750e8a500e4c8c1d6f03f8a52615cea1448c69d35750ea8bd06bdcb02ac136a34ba1af07a363dfe018cf6bf28e54f7ce19e6d06cc554391219525f1f3 WHIRLPOOL 97a808e4efd44c23dd8063a36ce8c04c7047271a6d49f17c0e9a50da2aa20e7adcb5e00d6d58578a056c7fca51c718022ebefac60a03674c68dcbfb3491753dc
+DIST FoX-4.1.2-wxml.tar.gz 149964 SHA256 37d0d509e092725dddc0488ff4ba77d24b56ea11ed220dccc6d1a3cc8f008194 SHA512 3b69e42dc2e627477b96750d267d24365da69515036c508979b3cde74de63e3567ee1a6335a4113d5c69abb0eb8c248da290270faf01ad42f849016c3c31438d WHIRLPOOL 29f4316e58d0bca02d318371e08af2aa28d6dd7c39e599dac17a9a9116ff4326e035671e6a554bc931ca1140aacd408a71bd1e9c98a7b18c67f2f364cc215cb4
+DIST FoX-4.1.2.tar.gz 296666 SHA256 3b749138229e7808d0009a97e2ac47815ad5278df6879a9cc64351a7921ba06f SHA512 a0ce79599118a04c19e87fc7ed0097520b4acf9e60a63038e8f9da9cb5ba94ba2bddb5c51c967c02037ba9e7ef41924ac173e73d5598a6654717e31c642c9d61 WHIRLPOOL 0abe0da4f0925e74d528ff0925099b6563cdeafe84a8444698a7c041901776cb35c2b2ba1d274455bec0cf3ed6da4e04467a6a009fe8bded7791f9c2085ac953
diff --git a/sci-libs/fox/fox-4.0.4.ebuild b/sci-libs/fox/fox-4.0.4.ebuild
deleted file mode 100644
index 105d67bb9..000000000
--- a/sci-libs/fox/fox-4.0.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils
-
-MY_PN="FoX"
-MY_P="${MY_PN}-${PV}"
-DIRV="${PV/%[0-9]/X}"
-
-DESCRIPTION="A library designed to allow the easy use of XML from Fortran"
-HOMEPAGE="http://www1.gly.bris.ac.uk/~walker/FoX/"
-SRC_URI="http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_PN}-${DIRV}/${MY_P}-full.tar.gz"
-
-LICENSE="BSD ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc dom fast sax wcml wxml"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/4.0.4-install-customizations.patch
-}
-
-src_configure() {
-		econf --prefix=/usr \
-		$(use_enable debug) \
-		$(use_enable dom) \
-		$(use_enable fast) \
-		$(use_enable sax) \
-		$(use_enable wcml) \
-		$(use_enable wxml) \
-		FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}"
-}
-
-src_compile() {
-	emake -j1 || die "make failed"
-}
-
-src_test() {
-	emake -j1 check || die "make check failed"
-	einfo "Please look at the last few RESULT lines for a summary."
-}
-
-src_install() {
-	sed -i -e's%^comp_prefix=.*$%comp_prefix=/usr%' \
-		-e's%comp_prefix/finclude%comp_prefix/lib/finclude%' \
-		FoX-config
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-	dodoc README.FoX.txt Changelog || die "dodoc failed"
-	if use doc; then
-		dohtml -r DoX/ || die "installing the HTML docs failed"
-	fi
-}
diff --git a/sci-libs/fox/fox-4.1.0.ebuild b/sci-libs/fox/fox-4.1.0.ebuild
deleted file mode 100644
index c57b61449..000000000
--- a/sci-libs/fox/fox-4.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils
-
-MY_PN="FoX"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library designed to allow the easy use of XML from Fortran"
-HOMEPAGE="http://www1.gly.bris.ac.uk/~walker/FoX/"
-SRC_URI="http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-full.tar.gz"
-
-LICENSE="BSD ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc dom fast sax wcml wxml"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/4.0.4-install-customizations.patch
-}
-
-src_configure() {
-		econf --prefix=/usr \
-		$(use_enable debug) \
-		$(use_enable dom) \
-		$(use_enable fast) \
-		$(use_enable sax) \
-		$(use_enable wcml) \
-		$(use_enable wxml) \
-		FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}}"
-}
-
-src_compile() {
-	emake -j1 || die "make failed"
-}
-
-src_test() {
-	emake -j1 check || die "make check failed"
-	einfo "Please look at the last few RESULT lines for a summary."
-}
-
-src_install() {
-	sed -i -e's%^comp_prefix=.*$%comp_prefix=/usr%' \
-		-e's%comp_prefix/finclude%comp_prefix/lib/finclude%' \
-		FoX-config
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-	dodoc README.FoX.txt Changelog || die "dodoc failed"
-	if use doc; then
-		dohtml -r DoX/ || die "installing the HTML docs failed"
-	fi
-}
diff --git a/sci-libs/fox/fox-4.1.2.ebuild b/sci-libs/fox/fox-4.1.2.ebuild
index de3ba9f7b..631af3676 100644
--- a/sci-libs/fox/fox-4.1.2.ebuild
+++ b/sci-libs/fox/fox-4.1.2.ebuild
@@ -11,16 +11,21 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A library designed to allow the easy use of XML from Fortran"
 HOMEPAGE="http://www1.gly.bris.ac.uk/~walker/FoX/"
-SRC_URI="http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-full.tar.gz"
 
 LICENSE="BSD ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc +dom +fast +sax +wcml +wkml +wxml"
 
-S="${WORKDIR}/${MY_P}"
+SRC_URI=" doc? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-full.tar.gz )
+	!doc? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}.tar.gz
+		dom? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-dom.tar.gz )
+		sax? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-sax.tar.gz )
+		wcml? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-wcml.tar.gz )
+		wkml? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-wkml.tar.gz )
+		wxml? ( http://www1.gly.bris.ac.uk/~walker/FoX/source/${MY_P}-wxml.tar.gz ) )"
 
-DOCS=( README.FoX.txt Changelog )
+S="${WORKDIR}/${MY_P}"
 
 FORTRAN_STANDARD=90
 
@@ -52,10 +57,13 @@ src_test() {
 src_install() {
 	sed -i -e's%^comp_prefix=.*$%comp_prefix=/usr%' \
 		-e's%comp_prefix/finclude%comp_prefix/lib/finclude%' \
+		-e's%\$libdir/lib\([^ ]\+\)\.a\>%-l\1%g' \
+		-e's%\(echo\( -I"$moddir"\)\?\) \$LIBS%\1 -L"$libdir" $LIBS%' \
 		FoX-config
 	emake -j1 DESTDIR="${D}" install || die "make install failed"
-	dodoc README.FoX.txt Changelog || die "dodoc failed"
+	dodoc README.FoX.txt || die "dodoc failed"
 	if use doc; then
+		dodoc Changelog
 		dohtml -r DoX/ || die "installing the HTML docs failed"
 	fi
 }