version bump; clean old

Package-Manager: portage-2.1.6.11/cvs/Linux i686

6 files changed, 95 insertions, 17 deletions

diff --git a/dev-libs/zziplib/ChangeLog b/dev-libs/zziplib/ChangeLog
index 358cf6efda60..9f18778fe43b 100644
--- a/dev-libs/zziplib/ChangeLog
+++ b/dev-libs/zziplib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/zziplib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.61 2009/01/07 17:48:46 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.62 2009/05/23 04:51:54 mr_bones_ Exp $
+
+*zziplib-0.13.52 (23 May 2009)
+
+  23 May 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/zziplib-0.13.52-SDL-test.patch,
+  +files/zziplib-0.13.52-python.patch,
+  +files/zziplib-0.13.52-sparc-aligned-access.patch,
+  -zziplib-0.13.49.ebuild, +zziplib-0.13.52.ebuild:
+  version bump; clean old
 
   07 Jan 2009; Kenneth Prugh <ken69267@gentoo.org>
   zziplib-0.13.49-r1.ebuild:
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 4f36f56387c6..51397bd41b6c 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -5,10 +5,14 @@ AUX zziplib-0.13.49-python.patch 366 RMD160 329f98dd9a40ed1f8976b56a1eca7f815c92
 AUX zziplib-0.13.49-sparc-aligned-access.patch 1919 RMD160 3e85143e4f2362dc5384bcd13ac689050d072b0d SHA1 f7b18aaff02b275895c191719abe9a6bf63c5aef SHA256 31e229f13d95321c8792f2c08906fb7c473b8c14996be76c8a39744df20f658a
 AUX zziplib-0.13.50-configure-sed.patch 544 RMD160 86a912a3e58beddfad5c729a0f850ac7acbf24de SHA1 5040b4448189554de50fb2db665f88a3cf47d4bc SHA256 3e721a4ccd67d4a69805c6e5c73e6ab651d68bc98b96a40aacd83877b8ce5bea
 AUX zziplib-0.13.50-sparc-aligned-access.patch 1382 RMD160 e0e94327461e819fe29dd76c2f44f4bad305d16b SHA1 cbf4368c23ab9ec78d8265622fb7753ab65dbce6 SHA256 c2277fc6a7ee392b8756f3fd52a62eed03b9c61b85811054182d8993339539a2
+AUX zziplib-0.13.52-SDL-test.patch 392 RMD160 07322bd7d56a58f3aa603d728e2f41a34dd5e43d SHA1 acdb46dc6146c870dcf3b1e7d6088c7fc9cb380e SHA256 88554ed81a8d07677ac27caddb4b622b00ac0bfe199e42d82ccfc6ca83815078
+AUX zziplib-0.13.52-python.patch 366 RMD160 329f98dd9a40ed1f8976b56a1eca7f815c924a3b SHA1 5653de26626bb3752a22e2f69b078f410c87f68e SHA256 ce5acf47b2186c59f8080892542bd00034770297160ba00a0d30af47795e3a2b
+AUX zziplib-0.13.52-sparc-aligned-access.patch 1382 RMD160 e0e94327461e819fe29dd76c2f44f4bad305d16b SHA1 cbf4368c23ab9ec78d8265622fb7753ab65dbce6 SHA256 c2277fc6a7ee392b8756f3fd52a62eed03b9c61b85811054182d8993339539a2
 DIST zziplib-0.13.49.tar.bz2 654842 RMD160 3ba64880298edaf192a9a773262810ff08d710e4 SHA1 72825fcbab93377d7866a8e6a9dfdef53f0343fa SHA256 f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
 DIST zziplib-0.13.50.tar.bz2 656096 RMD160 611efb85a26eedbd93ad38c84ca9b44f6407357f SHA1 7abfac621ab5af48225ed686da817520c09188af SHA256 7d30352e1c3f78e005fea742e6d6ef8c5576d7b956160301621114c0d58d4ee9
+DIST zziplib-0.13.52.tar.bz2 697146 RMD160 7015b9bf15f34c4c76a2aeba62367842fc464fd2 SHA1 7472dec35301292e031909e800b929b7ca4bf84a SHA256 7b92758a4441f85c9a719c92bb42a7fb0ae6af936d2010a4981e49f46955056b
 EBUILD zziplib-0.13.49-r1.ebuild 1601 RMD160 af3d56fe4be58a7ae5170c1e8d44c810a10cae7a SHA1 ec4466c1ad15d46967f4722ee384a58bcc8dd712 SHA256 edd19f5b6997f416885cc3a4396b88b4b2416aa5dc8ccd69e140a5338ba16347
-EBUILD zziplib-0.13.49.ebuild 1284 RMD160 c271d0d690ea1a39636b224482f626025b364ded SHA1 6fbf5d40fe519fd2088f0674a243e9613161b2c5 SHA256 4e5c1d9a3ba89e1688b1029f83b3fb43a5caa44f0ad10501b387609bd2f77a81
 EBUILD zziplib-0.13.50.ebuild 1727 RMD160 9d2e541389b43193ba9675084db20bcce4176b65 SHA1 c04b10730268dfedbd2c865a8daa7e1ac92a44b6 SHA256 39495304d63302b9041a6939df08612b4d5490e8b71acad0c1a914891591458b
-MISC ChangeLog 8252 RMD160 71c163750267c6ab8dbd48d591ad37f4b8c8ce6d SHA1 fe3147d521a2b369ca444b5c3b4fbbb274a5bf79 SHA256 e36beabaad858aad31b58808185410d735fde70e622de9453deb91d0e398acbe
+EBUILD zziplib-0.13.52.ebuild 1531 RMD160 ebfb4d8a80d75fea33584f9f71028e532c368090 SHA1 10b16c04b48d37271aae950274a1ef7dc2000aea SHA256 d98de4f0300ce0fd33d616de6497b9fe01dccfee77ba97d591154d0f01e97728
+MISC ChangeLog 8552 RMD160 f29ce96dc37a732f4e273b1199f86b614d503ab6 SHA1 27381369d083e88383825855737ed204dc285889 SHA256 27e0d0faad86829464f0dcd22dbeef79b6c9cf4f6facac38edca52da9d5ec019
 MISC metadata.xml 285 RMD160 3faddc79f99fd2e176331b7691ab303d68afff1f SHA1 bf0a1e4c233011a630921773d4968d1e5fe96265 SHA256 aabbb33ddce6a4c9c25c0e405250095050964ba66593fdeef74ac0023bdb301c
diff --git a/dev-libs/zziplib/files/zziplib-0.13.52-SDL-test.patch b/dev-libs/zziplib/files/zziplib-0.13.52-SDL-test.patch
new file mode 100644
index 000000000000..410a2c746c95
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.52-SDL-test.patch
@@ -0,0 +1,14 @@
+this test isnt even run automatically and the dependencies are all broken,
+so just disable it and be done
+
+--- SDL/Makefile.in
++++ SDL/Makefile.in
+@@ -38,7 +38,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-check_PROGRAMS = zzcatsdl$(EXEEXT)
++check_PROGRAMS =
+ subdir = SDL
+ DIST_COMMON = $(pkgconfig_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in
diff --git a/dev-libs/zziplib/files/zziplib-0.13.52-python.patch b/dev-libs/zziplib/files/zziplib-0.13.52-python.patch
new file mode 100644
index 000000000000..f1cfae16a195
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.52-python.patch
@@ -0,0 +1,15 @@
+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/files/zziplib-0.13.52-sparc-aligned-access.patch b/dev-libs/zziplib/files/zziplib-0.13.52-sparc-aligned-access.patch
new file mode 100644
index 000000000000..87ee790465a4
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.52-sparc-aligned-access.patch
@@ -0,0 +1,33 @@
+This patch for zziplib (0.13.50) fixes a bus error on Linux/SPARC.
+
+Since SPARC machines are big endian and zip files are stored in little endian,
+zziplib needs to do byte swapping. On GNU/Linux this is usually done using
+glibc's bswap_{16,32,64} functions but in this case calling one of these
+functions triggers a bus error. This patch completes upstreams work to
+implement ZZIP_HAVE_ALIGNED_ACCESS_REQUIRED for machines which required aligned
+access.
+After applying the patch zziplib needs to be compiled with
+-DZZIP_HAVE_ALIGNED_ACCESS_REQUIRED
+
+To reproduce it run (in the src dir):
+	cd Linux_*_sparc64.d && ./bins/zzcat test/test/README
+or
+	make check
+
+Problem found by: Ferris McCormick <fmccor@gentoo.org>
+Patch written by: Friedrich Oslage <bluebird@gentoo.org>
+	with advice from: Mike Frysinger <vapier@gentoo.org>
+
+http://bugs.gentoo.org/239472
+
+--- zzip/fetch.c
++++ zzip/fetch.c
+@@ -17,7 +17,7 @@
+ #include <zzip/fetch.h>
+ 
+ #if defined ZZIP_WORDS_BIGENDIAN && \
+-   defined bswap_16 && defined bswap_32 && defined bswap_64
++   defined bswap_16 && defined bswap_32 && defined bswap_64 && !defined(ZZIP_HAVE_ALIGNED_ACCESS_REQUIRED)
+ # define __ZZIP_GET16(__p)                        bswap_16(*(uint16_t*)(__p))
+ # define __ZZIP_GET32(__p)                        bswap_32(*(uint32_t*)(__p))
+ # define __ZZIP_SET16(__p,__x) (*(uint16_t*)(__p) = bswap_16((uint16_t)(__x)))
diff --git a/dev-libs/zziplib/zziplib-0.13.49.ebuild b/dev-libs/zziplib/zziplib-0.13.52.ebuild
index 4a75433f58fc..0dc59cdea860 100644
--- a/dev-libs/zziplib/zziplib-0.13.49.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.52.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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.11 2007/07/07 15:23:09 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/zziplib-0.13.52.ebuild,v 1.1 2009/05/23 04:51:54 mr_bones_ Exp $
 
-inherit libtool fixheadtails eutils
+EAPI=2
+inherit libtool fixheadtails eutils flag-o-matic
 
 DESCRIPTION="Lightweight library used to easily extract data from files archived in a single zip file"
 HOMEPAGE="http://zziplib.sourceforge.net/"
@@ -10,33 +11,35 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="sdl test"
 
 RDEPEND=">=dev-lang/python-2.3
 	sys-libs/zlib
 	sdl? ( >=media-libs/libsdl-1.2.6 )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	test? ( app-arch/zip )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#Make it find correct Python version bug #174189
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-python.patch
 	epatch "${FILESDIR}"/${P}-SDL-test.patch
+	epatch "${FILESDIR}"/${P}-sparc-aligned-access.patch #239472
+	sed -i -e '/^Libs:/s:@LDFLAGS@::' configure || die #235511
+	sed -i -e '/^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_configure() {
+	use sparc && append-flags -DZZIP_HAVE_ALIGNED_ACCESS_REQUIRED
+	econf $(use_enable sdl)
 }
 
 src_test() {
 	# need this because `make test` will always return true
-	make check || die "make check failed"
+	# tests fail with -j > 1 (bug #241186)
+	emake -j1 check || die "make check failed"
 }
 
 src_install() {