Dropped old, fix for wrong EAPI version, #361919

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 19 insertions, 110 deletions

diff --git a/sci-biology/emboss/ChangeLog b/sci-biology/emboss/ChangeLog
index 90f2d98ec775..e8760bce2b44 100644
--- a/sci-biology/emboss/ChangeLog
+++ b/sci-biology/emboss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/emboss
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/ChangeLog,v 1.63 2011/03/11 07:05:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/ChangeLog,v 1.64 2011/04/04 16:01:13 jlec Exp $
+
+  04 Apr 2011; Justin Lecher <jlec@gentoo.org> -emboss-4.0.0.ebuild,
+  emboss-6.0.1.ebuild, emboss-6.1.0.ebuild:
+  Dropped old, fix for wrong EAPI version, #361919
 
   11 Mar 2011; Justin Lecher <jlec@gentoo.org> emboss-6.3.1_p4.ebuild,
   metadata.xml:
diff --git a/sci-biology/emboss/Manifest b/sci-biology/emboss/Manifest
index 6b7541371fbd..e918b0019614 100644
--- a/sci-biology/emboss/Manifest
+++ b/sci-biology/emboss/Manifest
@@ -7,22 +7,20 @@ AUX README.Gentoo 1326 RMD160 bfaa4d7d1218d3bd4ea58d54d000da7f58b6bca6 SHA1 8cf1
 AUX emboss-5.0.0-as-needed.patch 1751 RMD160 f43faab31a3d5afb4b73704ba597de578668ae48 SHA1 a108e5f68af9c14363bc56c849c9143fcb7675ba SHA256 e57a60d911e32f1aea16c079e2fd0910a5f7ed43752ea71094d3f3b7575617d3
 AUX emboss-README.Gentoo-1 1474 RMD160 a116b4516cd0d8e0b28734bf1e51f1e0833737c4 SHA1 ec23610137ebddc3fc15976757d2cdebd741f9ec SHA256 e97558bbc8296f2e9395080061e494b282303ed69e1d6eb45554846617b47abd
 AUX emboss-README.Gentoo-2 1516 RMD160 bf7727ddf6fbf53fc797dba12181332c9e8e93a0 SHA1 1c531f0c1f52569b1d742ec67cc928cb22970f72 SHA256 47f78101b0759f5c629ebee630c14871f1c579c40336a0666647680bc549914e
-DIST EMBOSS-4.0.0.tar.gz 17651607 RMD160 5b29ac2946a1315928581bf0e40a0f6b5023c599 SHA1 784c729f2d2e746339a90048277c9e4f052e036a SHA256 bbfd127adc064a5211542f3b5400cbb13c7f74d9171fd16b8531cee9fd11b231
 DIST EMBOSS-6.0.1.tar.gz 20204153 RMD160 c97673670a110b51a6c1d1a0305451c44cd7b504 SHA1 ea6fa6e1e4222bc57e748a4d674d72d9b03475dd SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d
 DIST EMBOSS-6.1.0.tar.gz 21968220 RMD160 2eb01da419464ccbc53a95407df0243d00be8720 SHA1 2f2a48d7aa66a8852c1dd531cfe061b024521c33 SHA256 033d205c108e10e314b1ca61ec026a4a7fec2780e8781da67b0e16825b63af41
 DIST EMBOSS-6.3.1.tar.gz 23572243 RMD160 5c1e7b82e50a183d6ccb323f6a619f10efb0da1a SHA1 efb2e9c1c9b038432ce6bd81ee4692d5f1dc2f72 SHA256 4f3290600a970c2a23a7e47f884d1fc8156ec40538f7191a6e83e23680d27a8d
 DIST emboss-6.3.1_p4.patch.gz 4070 RMD160 cdfc45a39d33a78453a3f7a18913e18862b2d117 SHA1 5ce862eeaf5be628d64d44179aa37102faf53c85 SHA256 61d1b62e3148541d496103711db6526ba76488a0899af2c98264b03bf8d6e24c
-EBUILD emboss-4.0.0.ebuild 2943 RMD160 e94ec339e02049bc7ae895e1a586765fb8ae9a96 SHA1 733b050cdf146a8809ec0cb00371752039855d95 SHA256 0da713ee6684d1e52c052062d47b73b98680bd0dde93ce87b65325133d27c152
-EBUILD emboss-6.0.1.ebuild 3459 RMD160 52a809bfb149f18a305bcbbf746a7c428ca8f596 SHA1 586eb30b145c454f8f307b03151db7094a7b6e23 SHA256 c0f40eb3ee342fb2d3e32bd50d0d1ea521c6bcfbb13873ea1c13f5e1d7254e98
+EBUILD emboss-6.0.1.ebuild 3453 RMD160 c5722b9a763338bc748955f447559d7d51579bb6 SHA1 b9788703e41ae7ae7f5be72b659840bf54af82e2 SHA256 b0dddc1126e1c27615a0cbf8565d9a9724ff229392de15679983f86daafd2b07
 EBUILD emboss-6.1.0-r1.ebuild 3693 RMD160 68fb935b14ee489955bfb1dcdda8eab94380194e SHA1 71c9e486fa7830c15d73317fcd45fc2c7f9f9ec0 SHA256 0cbfb11175d4836140ba4ff045046ba64637f623d2d25275bc70835fa8185d48
-EBUILD emboss-6.1.0.ebuild 3683 RMD160 0b4a09bdcab9b32a8cb7bd63fcfc11319d732acf SHA1 98d1e1c30ecff93ec73c26d0499416fa7087f54a SHA256 a9b5e8993201a7a4019cc7c4bb3dfff73a0e11168242a05969298220c23c8b9c
+EBUILD emboss-6.1.0.ebuild 3560 RMD160 382351e780c06e6530136506d6469a6e865545e1 SHA1 8326c13e05f76de7099e475dc5cc3a746c5bb3c9 SHA256 ab66dea1b10e46c70eb55d08abb3311c77c26dd1c979db424f023ddb3aa73c50
 EBUILD emboss-6.3.1_p4.ebuild 3498 RMD160 deabfb1c06f2b11e2b53b0417cf3921bace9bc46 SHA1 d4eba199ea0f02f5491d7f55dc8ce56b7309e764 SHA256 910c57dbaf873904611f2d9d1deb0da706d16b7e95628fce23c7627a15b69513
-MISC ChangeLog 10934 RMD160 48117a820a4b96d4a119ef05ebf489b26dc67119 SHA1 a40d8f3cb3a441aac98ce09116f319f3b0150ece SHA256 20d1c1001b5b1867a6784f3a704e0c9aed5845088fd932f8acb54990eb22db89
+MISC ChangeLog 11099 RMD160 93410ad72092284b07d03831e24a1f78febc9e29 SHA1 69c47415c53729f99b6b6f96b16726493292a948 SHA256 3169764a39a1b54edbe5a0fe4d0641e993ca0091235ab96468ed5b010e6d94c2
 MISC metadata.xml 924 RMD160 0012a7f8446b6e3ade6b18e2b015bfb80c546712 SHA1 3d47f955e2c7e10fe71ba427c19cc51000990caf SHA256 9a25a29f9ad98792903c439ad7dd4ec485e44e60e23beaf1fa4c209ea89be49b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk15ydMACgkQgAnW8HDreRbvrQCdG3WrmZf2oCvV8fkxiDTqH5M7
-z3QAn38qejLgjpYTuJTKJnp+wflzI2R0
-=euCX
+iEYEARECAAYFAk2Z608ACgkQgAnW8HDreRaU4gCguu6H4z+hd/CVMjIFM7Nw5w0P
+WnAAnAhtECzDH5osP/enVg6h983Ki7q7
+=4ggk
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/emboss/emboss-4.0.0.ebuild b/sci-biology/emboss/emboss-4.0.0.ebuild
deleted file mode 100644
index 7297831d5ffb..000000000000
--- a/sci-biology/emboss/emboss-4.0.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/emboss-4.0.0.ebuild,v 1.15 2011/03/09 19:50:38 armin76 Exp $
-
-EAPI=1
-
-DESCRIPTION="The European Molecular Biology Open Software Suite - A sequence analysis package"
-HOMEPAGE="http://emboss.sourceforge.net/"
-SRC_URI="ftp://${PN}.open-bio.org/pub/EMBOSS/EMBOSS-${PV}.tar.gz"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="X png minimal"
-
-DEPEND="
-	X? ( x11-libs/libXt )
-	png? (
-		sys-libs/zlib
-		media-libs/libpng
-		media-libs/gd
-		)
-	!minimal? (
-		sci-biology/primer3
-		sci-biology/clustalw:1
-	)
-	!<dev-util/pscan-20000721-r1"
-
-RDEPEND="${DEPEND}
-	!sys-devel/cons"
-
-PDEPEND="
-	!minimal? (
-		sci-biology/aaindex
-		sci-biology/cutg
-		sci-biology/prints
-		sci-biology/prosite
-		sci-biology/rebase
-		sci-biology/transfac
-	)"
-
-S="${WORKDIR}/EMBOSS-${PV}"
-
-src_compile() {
-	local myconf
-	myconf="--includedir=${D}/usr/include/emboss"
-	use X || myconf="${EXTRA_CONF} --without-x"
-	use png || myconf="${EXTRA_CONF} --without-pngdriver"
-
-	econf ${myconf}
-	# Do not install the JEMBOSS component (the --without-java configure option
-	# does not work). JEMBOSS will eventually be available as a separate package.
-	sed -i -e 's/SUBDIRS = plplot ajax nucleus emboss test doc jemboss/SUBDIRS = plplot ajax nucleus emboss test doc/' \
-			Makefile || die
-	emake || die
-}
-
-src_install() {
-	einstall || die "Failed to install program files."
-
-	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS "${FILESDIR}"/README.Gentoo \
-			|| die "Failed to install documentation."
-
-	# Install env file for setting libplplot and acd files path.
-	doenvd "${FILESDIR}"/22emboss || die "Failed to install environment file."
-
-	# Symlink preinstalled docs to /usr/share/doc.
-	dosym /usr/share/EMBOSS/doc/manuals /usr/share/doc/${PF}/manuals || die
-	dosym /usr/share/EMBOSS/doc/programs /usr/share/doc/${PF}/programs || die
-	dosym /usr/share/EMBOSS/doc/tutorials /usr/share/doc/${PF}/tutorials || die
-	dosym /usr/share/EMBOSS/doc/html /usr/share/doc/${PF}/html || die
-
-	# Clashes #330507
-	mv "${ED}"/usr/bin/{digest,pepdigest} || die
-
-	# Remove useless dummy files from the image.
-	find emboss/data -name dummyfile -delete || die "Failed to remove dummy files."
-
-	# Move the provided codon files to a different directory. This will avoid
-	# user confusion and file collisions on case-insensitive file systems (see
-	# bug #115446). This change is documented in "README.Gentoo".
-	mv "${ED}"/usr/share/EMBOSS/data/CODONS{,.orig} || \
-			die "Failed to move CODON directory."
-
-	# Move the provided restriction enzyme prototypes file to a different name.
-	# This will avoid file collisions with future versions of rebase that will
-	# install their own enzyme prototypes file (see bug #118832).
-	mv "${ED}"/usr/share/EMBOSS/data/embossre.equ{,.orig} || \
-			die "Failed to move enzyme equivalence file."
-}
diff --git a/sci-biology/emboss/emboss-6.0.1.ebuild b/sci-biology/emboss/emboss-6.0.1.ebuild
index be91a23e12db..f36924bc3f82 100644
--- a/sci-biology/emboss/emboss-6.0.1.ebuild
+++ b/sci-biology/emboss/emboss-6.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/emboss-6.0.1.ebuild,v 1.8 2011/03/09 19:50:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/emboss-6.0.1.ebuild,v 1.9 2011/04/04 16:01:13 jlec Exp $
 
 EAPI=1
 
@@ -93,7 +93,7 @@ src_install() {
 	dosym /usr/share/EMBOSS/doc/html /usr/share/doc/${PF}/html || die
 
 	# Clashes #330507
-	mv "${ED}"/usr/bin/{digest,pepdigest} || die
+	mv "${D}"/usr/bin/{digest,pepdigest} || die
 
 	# Remove useless dummy files from the image.
 	find emboss/data -name dummyfile -delete || die "Failed to remove dummy files."
@@ -101,12 +101,12 @@ src_install() {
 	# Move the provided codon files to a different directory. This will avoid
 	# user confusion and file collisions on case-insensitive file systems (see
 	# bug #115446). This change is documented in "README.Gentoo".
-	mv "${ED}"/usr/share/EMBOSS/data/CODONS{,.orig} || \
+	mv "${D}"/usr/share/EMBOSS/data/CODONS{,.orig} || \
 			die "Failed to move CODON directory."
 
 	# Move the provided restriction enzyme prototypes file to a different name.
 	# This avoids file collisions with versions of rebase that install their
 	# own enzyme prototypes file (see bug #118832).
-	mv "${ED}"/usr/share/EMBOSS/data/embossre.equ{,.orig} || \
+	mv "${D}"/usr/share/EMBOSS/data/embossre.equ{,.orig} || \
 			die "Failed to move enzyme equivalence file."
 }
diff --git a/sci-biology/emboss/emboss-6.1.0.ebuild b/sci-biology/emboss/emboss-6.1.0.ebuild
index 9777fe2b24b7..a19181c548d8 100644
--- a/sci-biology/emboss/emboss-6.1.0.ebuild
+++ b/sci-biology/emboss/emboss-6.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/emboss-6.1.0.ebuild,v 1.4 2011/03/09 19:50:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/emboss-6.1.0.ebuild,v 1.5 2011/04/04 16:01:13 jlec Exp $
 
 inherit eutils
 
@@ -93,20 +93,17 @@ src_install() {
 			die "Failed to remove duplicated documentation."
 
 	# Remove useless dummy files from the image.
-	rm "${D}"/usr/share/EMBOSS/data/{AAINDEX,PRINTS,PROSITE,REBASE}/dummyfile \
-			|| die "Failed to remove dummy files."
+	find emboss/data -name dummyfile -delete || die "Failed to remove dummy files."
 
 	# Move the provided codon files to a different directory. This will avoid
 	# user confusion and file collisions on case-insensitive file systems (see
 	# bug #115446). This change is documented in "README.Gentoo".
-	mv "${D}"/usr/share/EMBOSS/data/CODONS \
-			"${D}"/usr/share/EMBOSS/data/CODONS.orig || \
+	mv "${D}"/usr/share/EMBOSS/data/CODONS{,.orig} || \
 			die "Failed to move CODON directory."
 
 	# Move the provided restriction enzyme prototypes file to a different name.
 	# This avoids file collisions with versions of rebase that install their
 	# own enzyme prototypes file (see bug #118832).
-	mv "${D}"/usr/share/EMBOSS/data/embossre.equ \
-			"${D}"/usr/share/EMBOSS/data/embossre.equ.orig || \
+	mv "${D}"/usr/share/EMBOSS/data/embossre.equ{,.orig} || \
 			die "Failed to move enzyme equivalence file."
 }