Bump to latest upstream patches

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

4 files changed, 24 insertions, 11 deletions

diff --git a/sci-biology/emboss/ChangeLog b/sci-biology/emboss/ChangeLog
index 3b0859c74147..8bbed2e361c4 100644
--- a/sci-biology/emboss/ChangeLog
+++ b/sci-biology/emboss/ChangeLog
@@ -1,6 +1,13 @@
 # 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.59 2011/03/09 12:00:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/ChangeLog,v 1.60 2011/03/09 13:09:22 jlec Exp $
+
+*emboss-6.3.1_p4 (09 Mar 2011)
+
+  09 Mar 2011; Justin Lecher <jlec@gentoo.org>
+  +files/6.3.1_p4-unbundle-libs.patch, -files/6.3.1-unbundle-libs.patch,
+  -emboss-6.3.1.ebuild, +emboss-6.3.1_p4.ebuild:
+  Bump to latest upstream patches
 
 *emboss-6.3.1 (09 Mar 2011)
 
diff --git a/sci-biology/emboss/Manifest b/sci-biology/emboss/Manifest
index 2ec47466ce30..bfe6285167aa 100644
--- a/sci-biology/emboss/Manifest
+++ b/sci-biology/emboss/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 AUX 22emboss 110 RMD160 aa416dbfca66cc7822ed162122addadde2756c66 SHA1 c77b477bfdf0e77de4f29794e4fb2e7592557e48 SHA256 cf3bd3b8d2638a0cd14e57839033d63c855114a0e12883bbc7a5106b0cfc01ad
-AUX 6.3.1-unbundle-libs.patch 18988 RMD160 0ecaec78052d8c302717113f4883316db84ba49c SHA1 8d10d947492eea2f338313f3e4c8faabfac747c7 SHA256 1f6170a8f4182792d145fd21b6b23d817ea9f5ea39ba77721947ae67a6b6927d
+AUX 6.3.1_p4-unbundle-libs.patch 18988 RMD160 0ecaec78052d8c302717113f4883316db84ba49c SHA1 8d10d947492eea2f338313f3e4c8faabfac747c7 SHA256 1f6170a8f4182792d145fd21b6b23d817ea9f5ea39ba77721947ae67a6b6927d
 AUX README.Gentoo 1326 RMD160 bfaa4d7d1218d3bd4ea58d54d000da7f58b6bca6 SHA1 8cf13b8aa23c11f0af2aae06916970bf9d8a441f SHA256 33b517b977cc85824847bd6cf4113489a5554fb014f1a6b1d22d6f80c3487e9f
 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
@@ -11,17 +11,18 @@ DIST EMBOSS-4.0.0.tar.gz 17651607 RMD160 5b29ac2946a1315928581bf0e40a0f6b5023c59
 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 2947 RMD160 8e3bbc8ba2c9cefb3be4c05a4d312dd74faa2663 SHA1 daf9fe4f48cfb630d6a69458c0f3fcc98dd835a5 SHA256 530886491daaac13c8e666abcef254e24c035c96b08a46ae2740bee7f958a50f
 EBUILD emboss-6.0.1.ebuild 3463 RMD160 1af6ab9addb475b9ce46910d052de805008fd715 SHA1 3df3f1533a221b4be59624f5e6524b8313a57276 SHA256 4ce83cb04a28fe3e47cf7b58573abeddd0d9013f1ba73ef9d43c3e7f4a0df862
 EBUILD emboss-6.1.0-r1.ebuild 3697 RMD160 468569e7a9c36c140c2612c4c5a238baf311143f SHA1 cf4e0b24cf12fcbb0b5fd5d4873db2005b0de3e5 SHA256 769b157cb2f31b5f3cde923e4095c9a60bfd9f0094050d2931f3b95977d1589f
 EBUILD emboss-6.1.0.ebuild 3687 RMD160 699d51ab33cea2b5b5d33605146cc18c8e214f27 SHA1 2c2aee3dc1012ea7c36497b08e5e9bae18278bc0 SHA256 4d2416d208de7f3c9223854ad9c801556ec3bc53892b2dd5ffbea8611d9ba1d8
-EBUILD emboss-6.3.1.ebuild 3590 RMD160 1a2b22d033a123b20029ed961274fd19fafd5fb8 SHA1 3e6d957eb262c5e9d18eba890dffdb0d519ce5d6 SHA256 03aacfc484b0a69d2f717887465f714bfe9d35950689046c9e75adab2af2f733
-MISC ChangeLog 10259 RMD160 881391210152b02e618abcb819971b0204e7460f SHA1 2b6b092158a103193e10982186bb3c7fe4ee3e74 SHA256 b33aed1f1adf7332affba6a6d32b99b486930101532ccb994dbd32d2280a324e
+EBUILD emboss-6.3.1_p4.ebuild 3760 RMD160 da0c7554c7e1a52d4b8c68aec8f8fc243171de38 SHA1 a6a2d40bfacaf03524a46ada5cd51f6439a56383 SHA256 947faf3a2cd0001e5b7f19153f746cce493c58cb63912518fcaccdf5e653f1ef
+MISC ChangeLog 10495 RMD160 bdd4d8b3416ca9807cf04add8fdd58dabf7b4ed0 SHA1 86660572f456c04905627033cccda05e445cc0a8 SHA256 98509a5136c1742940e4966f81fb5246f1f3afb62d5f702f663d8ed9474783b3
 MISC metadata.xml 993 RMD160 3204ba9b28338878f0068a8ab5ca7ac6134ce154 SHA1 1bff78caf4aedfc122f0fb01cea4681cf7f3f62e SHA256 1d85e05e979f1657baffabec8dd148786a0cb2eb6b3c0948068290ff877cee2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk13a+wACgkQgAnW8HDreRagYACgmYieg06N1OVN2wVsfwWGn0Ne
-tTIAoL8d6iLnSySma+cfJe14OpLl5Ozj
-=Izz6
+iEYEARECAAYFAk13fAcACgkQgAnW8HDreRaVOACfYz2ZjsNopMqB8RSUGbZ/ZU1v
+RX0AoJEz38NDZ1mgvQDLtvWcJHFDsg5d
+=RZPO
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/emboss/emboss-6.3.1.ebuild b/sci-biology/emboss/emboss-6.3.1_p4.ebuild
index e7f52c4dbb4e..40cd20b4ed8e 100644
--- a/sci-biology/emboss/emboss-6.3.1.ebuild
+++ b/sci-biology/emboss/emboss-6.3.1_p4.ebuild
@@ -1,16 +1,20 @@
 # 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.3.1.ebuild,v 1.1 2011/03/09 12:00:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/emboss-6.3.1_p4.ebuild,v 1.1 2011/03/09 13:09:22 jlec Exp $
 
 EAPI="4"
 
 inherit autotools eutils
 
+MY_PATCH="4"
+
 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"
+SRC_URI="
+	ftp://${PN}.open-bio.org/pub/EMBOSS/EMBOSS-${PV/_p${MY_PATCH}}.tar.gz
+	ftp://${PN}.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-${MY_PATCH}.gz -> ${P}.patch.gz"
 
+LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc +largefile minimal mysql pdf png postgres static-libs X"
@@ -45,9 +49,10 @@ PDEPEND="
 		sci-biology/transfac
 		)"
 
-S="${WORKDIR}/EMBOSS-${PV}"
+S="${WORKDIR}/EMBOSS-${PV/_p${MY_PATCH}}"
 
 src_prepare() {
+	epatch "${WORKDIR}"/${P}.patch
 	epatch \
 		"${FILESDIR}"/${PV}-unbundle-libs.patch
 	eautoreconf
diff --git a/sci-biology/emboss/files/6.3.1-unbundle-libs.patch b/sci-biology/emboss/files/6.3.1_p4-unbundle-libs.patch
index 5e463744a739..5e463744a739 100644
--- a/sci-biology/emboss/files/6.3.1-unbundle-libs.patch
+++ b/sci-biology/emboss/files/6.3.1_p4-unbundle-libs.patch