Fix LDFLAG bleeding into pkg config files #235511 by Alexis Ballier. Fix python patch to apply to configure. Do install bogus dead lib symlinks.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64

4 files changed, 83 insertions, 14 deletions

diff --git a/dev-libs/zziplib/ChangeLog b/dev-libs/zziplib/ChangeLog
index ee46a1166b71..9c38139c9b6f 100644
--- a/dev-libs/zziplib/ChangeLog
+++ b/dev-libs/zziplib/ChangeLog
@@ -1,6 +1,13 @@
 # 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.46 2007/07/07 15:23:09 pythonhead Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.47 2008/08/29 18:24:43 vapier Exp $
+
+*zziplib-0.13.49-r1 (29 Aug 2008)
+
+  29 Aug 2008; Mike Frysinger <vapier@gentoo.org>
+  files/zziplib-0.13.49-python.patch, +zziplib-0.13.49-r1.ebuild:
+  Fix LDFLAG bleeding into pkg config files #235511 by Alexis Ballier. Fix
+  python patch to apply to configure. Do install bogus dead lib symlinks.
 
   07 Jul 2007; Rob Cakebread <pythonhead@gentoo.org>
   +files/zziplib-0.13.49-python.patch, zziplib-0.13.49.ebuild:
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 62593b0bbeeb..7c2b88c8648b 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX zziplib-0.13.49-SDL-test.patch 392 RMD160 07322bd7d56a58f3aa603d728e2f41a34dd5e43d SHA1 acdb46dc6146c870dcf3b1e7d6088c7fc9cb380e SHA256 88554ed81a8d07677ac27caddb4b622b00ac0bfe199e42d82ccfc6ca83815078
-AUX zziplib-0.13.49-python.patch 514 RMD160 0f00eb8349836ae59a359850aa71db34e0971d36 SHA1 77aba563cff2f9badf521fa96b9fb6e7e613a8dc SHA256 07dd99bfc5f356fdad6d487576fd6919c63d6c3a6e14e78abe327a02d9d8be29
+AUX zziplib-0.13.49-python.patch 366 RMD160 329f98dd9a40ed1f8976b56a1eca7f815c924a3b SHA1 5653de26626bb3752a22e2f69b078f410c87f68e SHA256 ce5acf47b2186c59f8080892542bd00034770297160ba00a0d30af47795e3a2b
 DIST zziplib-0.13.49.tar.bz2 654842 RMD160 3ba64880298edaf192a9a773262810ff08d710e4 SHA1 72825fcbab93377d7866a8e6a9dfdef53f0343fa SHA256 f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
+EBUILD zziplib-0.13.49-r1.ebuild 1364 RMD160 d9450419c6cd2d21d0c3b5088a4f81eb4b3d08e4 SHA1 ec8e5155f9ae683e430e5662e7a0d18bced82a3f SHA256 bc9aeb81e5afde346525de7263eb2544cb4b2ccf321ced8d11ecce88c5779b51
 EBUILD zziplib-0.13.49.ebuild 1284 RMD160 c271d0d690ea1a39636b224482f626025b364ded SHA1 6fbf5d40fe519fd2088f0674a243e9613161b2c5 SHA256 4e5c1d9a3ba89e1688b1029f83b3fb43a5caa44f0ad10501b387609bd2f77a81
-MISC ChangeLog 5936 RMD160 4bb437f8aadb76a56f802bb4fe1b691696a76be2 SHA1 65ce189c40de0a7be631fd5518f58dcc77173e3e SHA256 ea78ac7920e9f635daf2f9e7665f007c288ff9c20a3f2c1c5a9345fa2e7caab8
+MISC ChangeLog 6233 RMD160 034506abd77c6fd612d6dc3f86adeb522ce9eb21 SHA1 e6a3122854f0d92e33d2d31ee09de530a9cfce29 SHA256 d740a64e05c4b35116edeadd73dc4ba26aa782ca099a0dcb2fe8cb5d8f75ce7f
 MISC metadata.xml 285 RMD160 3faddc79f99fd2e176331b7691ab303d68afff1f SHA1 bf0a1e4c233011a630921773d4968d1e5fe96265 SHA256 aabbb33ddce6a4c9c25c0e405250095050964ba66593fdeef74ac0023bdb301c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAki4PvMACgkQ67wieSYcaxdBpwCg5DjPyAD6UaUQR3zUU0iGpEd+
+asMAoIoJ0T5VrKBpCDkCMIiCGve+Np+3
+=E5DB
+-----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
index 93c7adc1f8a1..f1cfae16a195 100644
--- a/dev-libs/zziplib/files/zziplib-0.13.49-python.patch
+++ b/dev-libs/zziplib/files/zziplib-0.13.49-python.patch
@@ -1,11 +1,15 @@
---- 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, :)
+Make it find correct Python version bug
+
+http://bugs.gentoo.org/174189
+
+--- configure
++++ configure
+@@ -21037,7 +21037,7 @@
+ done
+ test -n "$PERL" || PERL="echo no perl found for"
  
+-for ac_prog in python2.2 python2.3 python
++for ac_prog in python
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
diff --git a/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild
new file mode 100644
index 000000000000..b361e47be9b5
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/08/29 18:24:43 vapier Exp $
+
+inherit libtool fixheadtails eutils
+
+DESCRIPTION="Lightweight library used to easily extract data from files archived in a single zip file"
+HOMEPAGE="http://zziplib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zziplib/${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh -sparc ~x86 ~x86-fbsd"
+IUSE="sdl"
+
+RDEPEND=">=dev-lang/python-2.3
+	sys-libs/zlib
+	sdl? ( >=media-libs/libsdl-1.2.6 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-python.patch
+	epatch "${FILESDIR}"/${P}-SDL-test.patch
+	sed -i '/^Libs:/s:@LDFLAGS@::' configure || die #235511
+	sed -i '/^zzip-postinstall:/s:^:disabled-:' Makefile.in || die
+	ht_fix_file configure docs/Makefile.in uses/depcomp
+	elibtoolize
+}
+
+src_compile() {
+	econf $(use_enable sdl) || die
+	emake || die "emake failed"
+}
+
+src_test() {
+	# need this because `make test` will always return true
+	emake check || die "make check failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-man3 || die "make install failed"
+	dodoc ChangeLog README TODO
+	dohtml docs/*
+}