Remove relative path from patch and add zlib dependency (bug #380753).

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

4 files changed, 28 insertions, 9 deletions

diff --git a/app-crypt/mcrypt/ChangeLog b/app-crypt/mcrypt/ChangeLog
index 406391c34e73..8b2965ccc32f 100644
--- a/app-crypt/mcrypt/ChangeLog
+++ b/app-crypt/mcrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/mcrypt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/ChangeLog,v 1.33 2010/10/15 21:02:20 arfrever Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/ChangeLog,v 1.34 2012/02/18 08:34:38 radhermit Exp $
+
+  18 Feb 2012; Tim Harder <radhermit@gentoo.org> mcrypt-2.6.8-r1.ebuild,
+  files/mcrypt-2.6.8-stdlib.h.patch:
+  Remove relative path from patch and add zlib dependency (bug #380753).
 
   15 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -mcrypt-2.6.7.ebuild, -mcrypt-2.6.8.ebuild:
diff --git a/app-crypt/mcrypt/Manifest b/app-crypt/mcrypt/Manifest
index f2a50619e665..b0ce8bcd6450 100644
--- a/app-crypt/mcrypt/Manifest
+++ b/app-crypt/mcrypt/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX mcrypt-2.6.7-qa.patch 736 RMD160 de0f4b32c3041fcbce0c30bbb70a6b2b928ba3ee SHA1 121fe762d6d43f3847c9a8f65ec6d7d7cc38c36e SHA256 8cf4a65124e6354797e7c37f54a182758d3b24f1789c04948ab71dde6309c643
-AUX mcrypt-2.6.8-stdlib.h.patch 278 RMD160 8109aaddadf5dc86bd08e86d0e4c6d49cb5308a0 SHA1 99910ae2483cc69ed65056009a48927493ee1c48 SHA256 6eaa02ee63c8bf9fc4d5e9307896ed829ce23c01a34de2b2293fc36b1f6ddf26
+AUX mcrypt-2.6.8-stdlib.h.patch 258 RMD160 fd33e87bff94fe88d0606600b12b8f1f4e42e6f2 SHA1 2d00515121aa04c468d361e26b28b31a52eddc4f SHA256 367c47727919f3142893eef897b66b9d38e81d20a49de11b421dc40965683b6f
 DIST mcrypt-2.6.8.tar.gz 471915 RMD160 5115c679ee5d34b9fb9e976c12240c48370df514 SHA1 8ae0e866714fbbb96a0a6fa9f099089dc93f1d86 SHA256 5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098
-EBUILD mcrypt-2.6.8-r1.ebuild 821 RMD160 66f5cebc36bcc762c5fd79cdb00083cdba57215e SHA1 310c408b96cc824b305af5bd498b5d32c5adb5d7 SHA256 fe7262474c1e6c810fabf6d09afad7bee613f18cbb42de915df7489b3a68effe
-MISC ChangeLog 3925 RMD160 681830aa27ebd1d7e0b7293569904f0a3d9886c5 SHA1 086fb931951005ca88c5cf93289270abace6b6d7 SHA256 df69310ba655c49208d69614a8a60e1449035a737c4add5c094fe1a437de6c9f
+EBUILD mcrypt-2.6.8-r1.ebuild 838 RMD160 d7774205c0a3b82ba14bbd1677dd9ae458109e4c SHA1 6952ffd8810e4f0f25f26419163428bc2396befe SHA256 338451edde89983166cc7cb613b313c92a11273161b0317f7da8166a1f7b0503
+MISC ChangeLog 4110 RMD160 eee8718bde39cc945ce9f1dfe5bd7652b644cb4e SHA1 42f855d7c7ba9ad3d679c122b872176e2e878198 SHA256 11e61436a51446648a754f17ba9ae509d2347ef2b2cc8710b6bfcd2c82132492
 MISC metadata.xml 278 RMD160 a7f296a5304f80db941e44613607bcc3b6c8fc0a SHA1 e92b5ba90ebad3046c7459e88a5be4a5c8563c2d SHA256 cdf12b5eab3aa2d9fc1e9fc4bb81ad42131e7d5e25483b7672a03fc3e486cda6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJPP2KkAAoJEEqz6FtPBkyjMfoIALXsrXX5V2Z71wfdxk5poV3l
+H6oQocSDbuTh8F0fVY+BNGAMtDPWhZ/aN4j2PPVSxwhra9eeGb/z+EU9bItEI3cH
+Z/a23qbVKNovUBemgSArKCJIibJo693omKQN7z5z38hKpfnkt3eWa50KP9fV9pvm
+8em899X8W1C9hqcPpU6M9lid1qf22FpkrSqBxhJLK8RRleQCHLkMIXBVjB2pwLeS
+H54SyMbVNoYDbBVNn7XOVWH9va3fPENuy4S0FC8Z1fhr2ppCyWUQ3JnJrmawoFSp
+emTxnCw5gwygDnHUYIE6s4rrTZdnDLNZu8FVLLzVgDyz9fx9VZeFtw7p/xkA7Ek=
+=KW3J
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch b/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
index 39e6ab8bec85..7cfae9815207 100644
--- a/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
+++ b/app-crypt/mcrypt/files/mcrypt-2.6.8-stdlib.h.patch
@@ -1,4 +1,4 @@
---- ../mcrypt-2.6.8_old/src/rfc2440.c	2008-11-17 06:50:01.000000000 +1100
+--- src/rfc2440.c	2008-11-17 06:50:01.000000000 +1100
 +++ src/rfc2440.c	2010-08-10 13:48:28.000000000 +1000
 @@ -23,7 +23,7 @@
  #include <zlib.h>
diff --git a/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild b/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild
index a087884786a8..3907c7bbd304 100644
--- a/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild
+++ b/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild,v 1.5 2010/10/12 12:01:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild,v 1.6 2012/02/18 08:34:38 radhermit Exp $
 
 EAPI="2"
 
@@ -16,7 +16,8 @@ KEYWORDS="amd64 ppc sparc x86 ~x86-macos"
 IUSE="nls"
 
 DEPEND=">=dev-libs/libmcrypt-2.5.8
-	>=app-crypt/mhash-0.9.9"
+	>=app-crypt/mhash-0.9.9
+	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
 src_prepare() {