Added patch to use default Python version installed. bug #174189

Package-Manager: portage-2.1.3_rc6

4 files changed, 43 insertions, 11 deletions

diff --git a/dev-libs/zziplib/ChangeLog b/dev-libs/zziplib/ChangeLog
index 286bbcaba407..ee46a1166b71 100644
--- a/dev-libs/zziplib/ChangeLog
+++ b/dev-libs/zziplib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/zziplib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.45 2007/03/26 19:38:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.46 2007/07/07 15:23:09 pythonhead Exp $
+
+  07 Jul 2007; Rob Cakebread <pythonhead@gentoo.org>
+  +files/zziplib-0.13.49-python.patch, zziplib-0.13.49.ebuild:
+  Added patch to use default Python version installed. bug #174189
 
   26 Mar 2007; Michael Sterrett <mr_bones_@gentoo.org>
   -files/zziplib-0.13.45-manpages.patch,
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index c84b346ca3ee..0554b5368b85 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,16 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX zziplib-0.13.49-SDL-test.patch 392 RMD160 07322bd7d56a58f3aa603d728e2f41a34dd5e43d SHA1 acdb46dc6146c870dcf3b1e7d6088c7fc9cb380e SHA256 88554ed81a8d07677ac27caddb4b622b00ac0bfe199e42d82ccfc6ca83815078
 MD5 0534eedcb25570d23993652e42244f83 files/zziplib-0.13.49-SDL-test.patch 392
 RMD160 07322bd7d56a58f3aa603d728e2f41a34dd5e43d files/zziplib-0.13.49-SDL-test.patch 392
 SHA256 88554ed81a8d07677ac27caddb4b622b00ac0bfe199e42d82ccfc6ca83815078 files/zziplib-0.13.49-SDL-test.patch 392
+AUX zziplib-0.13.49-python.patch 514 RMD160 0f00eb8349836ae59a359850aa71db34e0971d36 SHA1 77aba563cff2f9badf521fa96b9fb6e7e613a8dc SHA256 07dd99bfc5f356fdad6d487576fd6919c63d6c3a6e14e78abe327a02d9d8be29
+MD5 c4b57923c95a603f93b20f987776c536 files/zziplib-0.13.49-python.patch 514
+RMD160 0f00eb8349836ae59a359850aa71db34e0971d36 files/zziplib-0.13.49-python.patch 514
+SHA256 07dd99bfc5f356fdad6d487576fd6919c63d6c3a6e14e78abe327a02d9d8be29 files/zziplib-0.13.49-python.patch 514
 DIST zziplib-0.13.49.tar.bz2 654842 RMD160 3ba64880298edaf192a9a773262810ff08d710e4 SHA1 72825fcbab93377d7866a8e6a9dfdef53f0343fa SHA256 f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
-EBUILD zziplib-0.13.49.ebuild 1170 RMD160 cc3d7b473eda292d3fc8019834dcd1784afb50e2 SHA1 d8102903f09c8c24bfaf3086c2196961e9148ff6 SHA256 e1c5e746a41cc81266c88b384b9e0a955c8faf6970561921f26e0d2ea5981908
-MD5 3ae3f33a4c83e9540f0a42c770617650 zziplib-0.13.49.ebuild 1170
-RMD160 cc3d7b473eda292d3fc8019834dcd1784afb50e2 zziplib-0.13.49.ebuild 1170
-SHA256 e1c5e746a41cc81266c88b384b9e0a955c8faf6970561921f26e0d2ea5981908 zziplib-0.13.49.ebuild 1170
-MISC ChangeLog 5751 RMD160 64bcc38472a7214fb17313dca46d2c34afddf60d SHA1 e25da228b7707e01e57cfe647e28e27fea6ccf08 SHA256 06bb1049e8f9a95abcbd04c48e95c926791962750b55bc760b0682b20cbb8b08
-MD5 d72a79cf6c7cd3e09f5d1bf72be7d074 ChangeLog 5751
-RMD160 64bcc38472a7214fb17313dca46d2c34afddf60d ChangeLog 5751
-SHA256 06bb1049e8f9a95abcbd04c48e95c926791962750b55bc760b0682b20cbb8b08 ChangeLog 5751
+EBUILD zziplib-0.13.49.ebuild 1284 RMD160 c271d0d690ea1a39636b224482f626025b364ded SHA1 6fbf5d40fe519fd2088f0674a243e9613161b2c5 SHA256 4e5c1d9a3ba89e1688b1029f83b3fb43a5caa44f0ad10501b387609bd2f77a81
+MD5 61c258bd181eeab5e2ac81695912eb40 zziplib-0.13.49.ebuild 1284
+RMD160 c271d0d690ea1a39636b224482f626025b364ded zziplib-0.13.49.ebuild 1284
+SHA256 4e5c1d9a3ba89e1688b1029f83b3fb43a5caa44f0ad10501b387609bd2f77a81 zziplib-0.13.49.ebuild 1284
+MISC ChangeLog 5936 RMD160 4bb437f8aadb76a56f802bb4fe1b691696a76be2 SHA1 65ce189c40de0a7be631fd5518f58dcc77173e3e SHA256 ea78ac7920e9f635daf2f9e7665f007c288ff9c20a3f2c1c5a9345fa2e7caab8
+MD5 5283a1cbd361a959c3d722baf35267d4 ChangeLog 5936
+RMD160 4bb437f8aadb76a56f802bb4fe1b691696a76be2 ChangeLog 5936
+SHA256 ea78ac7920e9f635daf2f9e7665f007c288ff9c20a3f2c1c5a9345fa2e7caab8 ChangeLog 5936
 MISC metadata.xml 285 RMD160 3faddc79f99fd2e176331b7691ab303d68afff1f SHA1 bf0a1e4c233011a630921773d4968d1e5fe96265 SHA256 aabbb33ddce6a4c9c25c0e405250095050964ba66593fdeef74ac0023bdb301c
 MD5 86d067c70c3a362f7761faf2776050bd metadata.xml 285
 RMD160 3faddc79f99fd2e176331b7691ab303d68afff1f metadata.xml 285
@@ -18,3 +25,10 @@ SHA256 aabbb33ddce6a4c9c25c0e405250095050964ba66593fdeef74ac0023bdb301c metadata
 MD5 1353cdb39b261deb0c8e50c91c020bc5 files/digest-zziplib-0.13.49 250
 RMD160 b969e4c50c50190875b819a68a1a49659ab4761d files/digest-zziplib-0.13.49 250
 SHA256 6e27d3b19af82aec25fcc4f074821dd1b68f9fd5d87c23afd0a6866fbd8b4c11 files/digest-zziplib-0.13.49 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGj7AR96cFzIajWwkRAjUaAJ9BQZtSHI/FdJxHod9S03w7y18FyQCeKsEO
+ttUH0coeVT8KpBrUal91Jm4=
+=WYZg
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/zziplib/files/zziplib-0.13.49-python.patch b/dev-libs/zziplib/files/zziplib-0.13.49-python.patch
new file mode 100644
index 000000000000..93c7adc1f8a1
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.49-python.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2007-04-11 16:37:45.000000000 -0700
++++ configure.ac	2007-04-11 16:38:07.000000000 -0700
+@@ -84,7 +84,7 @@
+ [zzip/zziplib.pc], [zzip-zlib-config],[-lzzip])
+ # -----------------------------------------------------------------------
+ AC_PATH_PROGS(PERL, perl5 perl, echo no perl found for)
+-AC_PATH_PROGS(PYTHON, python2.2 python2.3 python, echo no python found for)
++AC_PATH_PROGS(PYTHON, python, echo no python found for)
+ AC_PATH_PROGS(MKZIP, zip pkzip, :)
+ AC_PATH_PROGS(XMLTO, xmlto, :)
+ 
diff --git a/dev-libs/zziplib/zziplib-0.13.49.ebuild b/dev-libs/zziplib/zziplib-0.13.49.ebuild
index 9b72a2326d30..4a75433f58fc 100644
--- a/dev-libs/zziplib/zziplib-0.13.49.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.49.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/zziplib-0.13.49.ebuild,v 1.10 2007/03/26 19:38:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/zziplib-0.13.49.ebuild,v 1.11 2007/07/07 15:23:09 pythonhead Exp $
 
 inherit libtool fixheadtails eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh -sparc x86 ~x86-fbsd"
 IUSE="sdl"
 
-RDEPEND="sys-libs/zlib
+RDEPEND=">=dev-lang/python-2.3
+	sys-libs/zlib
 	sdl? ( >=media-libs/libsdl-1.2.6 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -21,6 +22,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	#Make it find correct Python version bug #174189
+	epatch "${FILESDIR}"/${P}-python.patch
 	epatch "${FILESDIR}"/${P}-SDL-test.patch
 	ht_fix_file configure docs/Makefile.in uses/depcomp
 	elibtoolize