summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Cakebread <pythonhead@gentoo.org>2007-07-07 15:23:09 +0000
committerRob Cakebread <pythonhead@gentoo.org>2007-07-07 15:23:09 +0000
commitd93c62b4ddc57b8e7b71167a631f28220c19f010 (patch)
treeeb1816e9b65b9b3786d5b1788501304b3b95292a /dev-libs/zziplib
parentalpha stable wrt #175532 (diff)
downloadgentoo-2-d93c62b4ddc57b8e7b71167a631f28220c19f010.tar.gz
gentoo-2-d93c62b4ddc57b8e7b71167a631f28220c19f010.tar.bz2
gentoo-2-d93c62b4ddc57b8e7b71167a631f28220c19f010.zip
Added patch to use default Python version installed. bug #174189
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'dev-libs/zziplib')
-rw-r--r--dev-libs/zziplib/ChangeLog6
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.49-python.patch11
-rw-r--r--dev-libs/zziplib/zziplib-0.13.49.ebuild7
3 files changed, 21 insertions, 3 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/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