sci-chemistry/pointless: Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the updated fortran-2.eclass

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

7 files changed, 34 insertions, 216 deletions

diff --git a/sci-chemistry/pointless/ChangeLog b/sci-chemistry/pointless/ChangeLog
index f52b4c0fb7a5..a6419907183d 100644
--- a/sci-chemistry/pointless/ChangeLog
+++ b/sci-chemistry/pointless/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/pointless
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/ChangeLog,v 1.32 2012/04/14 09:46:56 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/ChangeLog,v 1.33 2012/10/19 10:18:34 jlec Exp $
+
+*pointless-1.6.15 (19 Oct 2012)
+
+  19 Oct 2012; Justin Lecher <jlec@gentoo.org> pointless-1.6.2.ebuild,
+  -pointless-1.6.4.ebuild, -pointless-1.6.5.ebuild, -pointless-1.6.11.ebuild,
+  -pointless-1.6.14.ebuild, +pointless-1.6.15.ebuild:
+  Remove virtual/fortran and always call fortran-2_pkg_setup as intend by the
+  updated fortran-2.eclass
 
   14 Apr 2012; Andreas Schuerch <nativemad@gentoo.org> pointless-1.6.2.ebuild:
   x86 stable, see bug 375917, thanks all.
diff --git a/sci-chemistry/pointless/Manifest b/sci-chemistry/pointless/Manifest
index 96fdfee2f527..265468fe1515 100644
--- a/sci-chemistry/pointless/Manifest
+++ b/sci-chemistry/pointless/Manifest
@@ -1,23 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 1.5.1-gcc4.4.patch 290 RMD160 02088f424953afbc8ceddb87f47d801cfddc919a SHA1 8e0296d09524997cead1f36b22c0957158d30397 SHA256 6f6f4435d4ec3248b06adfa16bf2ee635a993f9d4670667d80505dea5f0b7a95
-DIST pointless-1.6.11.tar.gz 419412 RMD160 e5f43ef930daba21bb79fbbc7614cc0ee8d2884f SHA1 3d9a65d5b91d87b614812bd0b18c12cb0bacac46 SHA256 da61e936f2713c1d2ffaaa87a9855405e6ade4c2ff207faff5d395870e377ad8
-DIST pointless-1.6.14.tar.gz 423657 RMD160 889f2d85b23bc1e55f9dfeb9670135d995a0379d SHA1 27d1b20fa2fc82e76ae6db5c87c877844962f57e SHA256 68f0c1f65239b1451310fe885c2b9d51fc558de7b43af1e584750e05dc5635d8
-DIST pointless-1.6.2.tar.gz 412244 RMD160 ebd3ba3f4691919d36d82b70c040349935ccfc91 SHA1 3aecaf514f421fa8f3559faa1f89d7a5faa60179 SHA256 5e09ca592ea565e8ace142fc0edff39d0ab723f4ac6e2cadd6ba571d667c80f6
-DIST pointless-1.6.4.tar.gz 417820 RMD160 c2231dc30bd70fa3bcfe8ada2d3fa435d8d771b9 SHA1 2a3a9cc6060e743ee2ff390204889d6dc4c0ad7c SHA256 56b7f2d46409612722184af045bfebf8cbc7449946bb763f22569d53545b72aa
-DIST pointless-1.6.5.tar.gz 418283 RMD160 282df592cb09256bb78a95c20d59521a6ee6b081 SHA1 15df98a9dd5170998c7ade16befd3bcceefa758a SHA256 7f055bdef8a8fb3d7c252242083ae8defea85bfec3cdfb65276b04d2d60a7552
-EBUILD pointless-1.6.11.ebuild 1457 RMD160 4de708a9a5be1660ada18f01dc167402a9545829 SHA1 1e19ca3da58b84ce03c1013b46ba6dd3ed65d9e1 SHA256 291aff4446d2f22375a77b53972bc70aca0d8dfada6f3dd288410ed7787c7f30
-EBUILD pointless-1.6.14.ebuild 1457 RMD160 5873c9733572f81e957baa52692497c499844dd1 SHA1 71edabeb207a38ae1616738090bc6265867781a5 SHA256 c10ae71281c2d1702ab1c7e376b4bea351fec00e38cba4d9dda31fe306490969
-EBUILD pointless-1.6.2.ebuild 1459 RMD160 f3bfe3dc04cf28b56f538ce89b0f681f86012f6a SHA1 fa8c36ee351467a6dbf035f1c1bc678bc9076ad2 SHA256 f2b7a3cef72347c6d72d107597ea714b30a3c370c9b28ed0756950e6569737ed
-EBUILD pointless-1.6.4.ebuild 1456 RMD160 141e6d9b42d2cc56ecf52b5bff2c017877c362ff SHA1 a47cda2d1b27ab03b9a7d7a91a5f55e4ca473ad0 SHA256 3ecf94c51385d1cbf6b86884216d55cf80c7d830966905d6051a0de0f18d41c7
-EBUILD pointless-1.6.5.ebuild 1456 RMD160 07f7025199850e845e67fe8ecb2638a2ddb9d77b SHA1 d006c3f9a5259b54def1e5d12787679d8ce13d45 SHA256 aa2cad84f538903580dd7f312ebc68755108051bb904be0ef625cc043cb963f9
-MISC ChangeLog 4927 RMD160 26e697708f731971770cfa280fef824a59f2fdf3 SHA1 512b85e2144ec5675516f6bbf4935a2cf4cacbd3 SHA256 63e5d0edc608cf0fd3c68246ebd69935f2eb7aa0204833988f70dc305c805e52
-MISC metadata.xml 219 RMD160 e9da2d4271f89b9dbac478d145a519318f0f3314 SHA1 6d4a101013d6a40cd61cb2d8c6b517c443013bc7 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8
+AUX 1.5.1-gcc4.4.patch 290 SHA256 6f6f4435d4ec3248b06adfa16bf2ee635a993f9d4670667d80505dea5f0b7a95 SHA512 b8933598afe2497979856cdf03ed5bd9b34d7ef30821cd0ef2be7b42898193259da2162edd3fac57c29ce45569b6e4c1578cd3d8c2f9afaab06d3606bd202c43 WHIRLPOOL 740c004dbcc423e50cb4873b3b8f9c052c3ec93ea0c2dcb54ce467721007e417200724fbc4a9fcdd821c8e6b32a745178fbdacff1c89a9c24a92d886fc74a10e
+DIST pointless-1.6.15.tar.gz 423612 SHA256 992c739ff911655111fd9c15865ffefbc9155c49acf87b54496c91995952cd39
+DIST pointless-1.6.2.tar.gz 412244 SHA256 5e09ca592ea565e8ace142fc0edff39d0ab723f4ac6e2cadd6ba571d667c80f6
+EBUILD pointless-1.6.15.ebuild 1438 SHA256 75188f185908739f2c4b37938792e770be50f7f7d3059b1a0bda7d798b605fca SHA512 01e5fd3a2d70367539dd800941158938883eaf34ee086eeb6e794401a5e5c21029078ef5a50074c3feb04eafa8f816842b7d3322b0ad2f841146b339bd12f170 WHIRLPOOL bf94317755b8ae59cfb889cbfd9f6942f83511a8f82f36c4722e9d585b27808bf0c5a68c4edd8db5c1a3e8c8be69e679b752c58233f5095c74d9fe9ef12e1552
+EBUILD pointless-1.6.2.ebuild 1435 SHA256 6d6f5a144308f8a6c85df3dd451f598560f7c4f97266e45ac1143a9658fb727f SHA512 b0e8080742932c75985b4565bf1222436c90d5067108a9bb00fb12d37617e4fe0d89d0ad2244b92c82b95ab63d0949ec31998d03c788b47ee75c35529c39e29a WHIRLPOOL 66ab004c6f416e259b3e045d8f7baa40a75ae3e66cc96cf29ee91cf9dbb66f2f4c27f51ff8b5a5f86facf978931ee595d9ad59ca456e5f9f31471606db2cc3d5
+MISC ChangeLog 5264 SHA256 60b947f69282116a69402263817e7f0677ca450bd7b16204c7e48aae763eefaf SHA512 4c75c9a433d9095726af186244fb112219c15b8b06ca2b46ce96d02b6ed66ab884f9ded7374abf157832f8b27618b7a5d04145a0ce140e6b5dd493aa30b9a3e8 WHIRLPOOL a2a036735140d7730853a55980f896dc2e857d0f56d86d28d1ec003aa52790b8d2339479983aae4d7cf9872ab832614d064c142744429138fac67128998b20c8
+MISC metadata.xml 219 SHA256 0be94b46df4c9a73494034f33b1371769951f52890e5c857ebe1dc9bc729d0a8 SHA512 8e1fa48bb6533db28b30f09f61673779d75cebd0ba8058abb411cb62595788272998bb9d3e1be8a0f6f95ca42722efc6af7e4d5741e15fe72df4ad8c872383c1 WHIRLPOOL 12f73f93602d45fe69385989b4e8e91507665e0d7deb148365fce2c41d9a85e9bcaaa940ce039a554770f4f4b2207e33a2cea5ad784561b3c3a92be8584f4478
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk+JR3gACgkQakKUmsHeVLKRKACghozT32M42JeiiQlHgeMxTq5H
-k6IAniWDUe+/ycL1kcVC657XlF8pYG6F
-=FL5z
+iEYEAREIAAYFAlCBKPsACgkQgAnW8HDreRaRnACgxBPAMS4/Au5i7AiYpYgmE8VK
+nYkAn0WxAbRhuVkc3Wk/2QeqiGXhVgfE
+=ZJzY
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pointless/pointless-1.6.11.ebuild b/sci-chemistry/pointless/pointless-1.6.11.ebuild
deleted file mode 100644
index a79cc3851283..000000000000
--- a/sci-chemistry/pointless/pointless-1.6.11.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.6.11.ebuild,v 1.1 2011/12/27 12:06:24 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit eutils fortran-2 multilib python toolchain-funcs
-
-DESCRIPTION="Scores crystallographic Laue and space groups"
-HOMEPAGE="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/pointless.html"
-SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	sci-chemistry/ccp4-apps
-	>=sci-libs/ccp4-libs-6.1.3-r10
-	sci-libs/clipper
-	sci-libs/fftw:2.1
-	sci-libs/mmdb
-	>=sci-libs/cctbx-2010.03.29.2334-r3
-	virtual/fortran"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/1.5.1-gcc4.4.patch
-}
-
-src_compile() {
-	emake  \
-		-f Makefile.make \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LFLAGS="${LDFLAGS}" \
-		CLIB="${EPREFIX}/usr/$(get_libdir)" \
-		CCTBX_VERSION=2010 \
-		ICCP4=-I"${EPREFIX}/usr/include/ccp4" \
-		ITBX="-I${EPREFIX}/usr/include" \
-		ICLPR="-I${EPREFIX}/$(python_get_sitedir)/" \
-		LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \
-		SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran" \
-		|| die
-}
-
-src_install() {
-	dobin pointless othercell || die
-}
diff --git a/sci-chemistry/pointless/pointless-1.6.14.ebuild b/sci-chemistry/pointless/pointless-1.6.15.ebuild
index 7761bf5f28a9..4dd1e8bd5cdc 100644
--- a/sci-chemistry/pointless/pointless-1.6.14.ebuild
+++ b/sci-chemistry/pointless/pointless-1.6.15.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.6.14.ebuild,v 1.1 2012/02/28 20:52:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.6.15.ebuild,v 1.1 2012/10/19 10:18:34 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 PYTHON_DEPEND="2"
 
@@ -23,14 +23,14 @@ DEPEND="
 	sci-libs/clipper
 	sci-libs/fftw:2.1
 	sci-libs/mmdb
-	>=sci-libs/cctbx-2010.03.29.2334-r3
-	virtual/fortran"
+	>=sci-libs/cctbx-2010.03.29.2334-r3"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
+	python_pkg_setup
 	python_set_active_version 2
 }
 
@@ -52,10 +52,9 @@ src_compile() {
 		ITBX="-I${EPREFIX}/usr/include" \
 		ICLPR="-I${EPREFIX}/$(python_get_sitedir)/" \
 		LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \
-		SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran" \
-		|| die
+		SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran"
 }
 
 src_install() {
-	dobin pointless othercell || die
+	dobin pointless othercell
 }
diff --git a/sci-chemistry/pointless/pointless-1.6.2.ebuild b/sci-chemistry/pointless/pointless-1.6.2.ebuild
index fb450087c627..34620202ac02 100644
--- a/sci-chemistry/pointless/pointless-1.6.2.ebuild
+++ b/sci-chemistry/pointless/pointless-1.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.6.2.ebuild,v 1.8 2012/04/14 09:46:56 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.6.2.ebuild,v 1.9 2012/10/19 10:18:34 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 PYTHON_DEPEND="2"
 
@@ -23,14 +23,14 @@ DEPEND="
 	sci-libs/clipper
 	sci-libs/fftw:2.1
 	sci-libs/mmdb
-	>=sci-libs/cctbx-2010.03.29.2334-r3
-	virtual/fortran"
+	>=sci-libs/cctbx-2010.03.29.2334-r3"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"
 
 pkg_setup() {
 	fortran-2_pkg_setup
+	python_pkg_setup
 	python_set_active_version 2
 }
 
@@ -52,10 +52,9 @@ src_compile() {
 		ITBX="-I${EPREFIX}/usr/include" \
 		ICLPR="-I${EPREFIX}/$(python_get_sitedir)/" \
 		LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \
-		SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran" \
-		|| die
+		SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran"
 }
 
 src_install() {
-	dobin pointless othercell || die
+	dobin pointless othercell
 }
diff --git a/sci-chemistry/pointless/pointless-1.6.4.ebuild b/sci-chemistry/pointless/pointless-1.6.4.ebuild
deleted file mode 100644
index 78f787486fa3..000000000000
--- a/sci-chemistry/pointless/pointless-1.6.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.6.4.ebuild,v 1.1 2011/08/31 09:53:47 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit eutils fortran-2 multilib python toolchain-funcs
-
-DESCRIPTION="Scores crystallographic Laue and space groups"
-HOMEPAGE="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/pointless.html"
-SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	sci-chemistry/ccp4-apps
-	>=sci-libs/ccp4-libs-6.1.3-r10
-	sci-libs/clipper
-	sci-libs/fftw:2.1
-	sci-libs/mmdb
-	>=sci-libs/cctbx-2010.03.29.2334-r3
-	virtual/fortran"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/1.5.1-gcc4.4.patch
-}
-
-src_compile() {
-	emake  \
-		-f Makefile.make \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LFLAGS="${LDFLAGS}" \
-		CLIB="${EPREFIX}/usr/$(get_libdir)" \
-		CCTBX_VERSION=2010 \
-		ICCP4=-I"${EPREFIX}/usr/include/ccp4" \
-		ITBX="-I${EPREFIX}/usr/include" \
-		ICLPR="-I${EPREFIX}/$(python_get_sitedir)/" \
-		LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \
-		SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran" \
-		|| die
-}
-
-src_install() {
-	dobin pointless othercell || die
-}
diff --git a/sci-chemistry/pointless/pointless-1.6.5.ebuild b/sci-chemistry/pointless/pointless-1.6.5.ebuild
deleted file mode 100644
index 21b0bdfcb3dc..000000000000
--- a/sci-chemistry/pointless/pointless-1.6.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.6.5.ebuild,v 1.1 2011/10/04 15:44:17 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit eutils fortran-2 multilib python toolchain-funcs
-
-DESCRIPTION="Scores crystallographic Laue and space groups"
-HOMEPAGE="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/pointless.html"
-SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="ccp4"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	sci-chemistry/ccp4-apps
-	>=sci-libs/ccp4-libs-6.1.3-r10
-	sci-libs/clipper
-	sci-libs/fftw:2.1
-	sci-libs/mmdb
-	>=sci-libs/cctbx-2010.03.29.2334-r3
-	virtual/fortran"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/1.5.1-gcc4.4.patch
-}
-
-src_compile() {
-	emake  \
-		-f Makefile.make \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LFLAGS="${LDFLAGS}" \
-		CLIB="${EPREFIX}/usr/$(get_libdir)" \
-		CCTBX_VERSION=2010 \
-		ICCP4=-I"${EPREFIX}/usr/include/ccp4" \
-		ITBX="-I${EPREFIX}/usr/include" \
-		ICLPR="-I${EPREFIX}/$(python_get_sitedir)/" \
-		LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \
-		SLIB="-L${EPREFIX}/usr/$(get_libdir) -lgfortran" \
-		|| die
-}
-
-src_install() {
-	dobin pointless othercell || die
-}