Version bump.

Package-Manager: portage-2.2_rc18/cvs/Linux 2.6.28 x86_64

5 files changed, 128 insertions, 5 deletions

diff --git a/dev-libs/zziplib/ChangeLog b/dev-libs/zziplib/ChangeLog
index 8bf72de7c026..42764c7a6b7c 100644
--- a/dev-libs/zziplib/ChangeLog
+++ b/dev-libs/zziplib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/zziplib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.52 2008/12/08 05:24:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zziplib/ChangeLog,v 1.53 2008/12/27 19:44:00 vapier Exp $
+
+*zziplib-0.13.50 (27 Dec 2008)
+
+  27 Dec 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/zziplib-0.13.50-configure-sed.patch,
+  +files/zziplib-0.13.50-sparc-aligned-access.patch,
+  +zziplib-0.13.50.ebuild:
+  Version bump.
 
   08 Dec 2008; Mike Frysinger <vapier@gentoo.org>
   +files/zziplib-0.13.49-parallel-docs.patch, zziplib-0.13.49-r1.ebuild:
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 366e871a07fe..86d291026098 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -6,15 +6,19 @@ AUX zziplib-0.13.49-configure-sed.patch 533 RMD160 cd6f0f54198ef9cb84ef857ab141c
 AUX zziplib-0.13.49-parallel-docs.patch 1757 RMD160 ab782781fc97039cb6800a8aeddbb3dc4a0c9017 SHA1 c0eec0c1262eb2b66d189dab0b62dc72b88fd461 SHA256 c6c647c99a4dcff0a21dc94dd52a8f6a7a636ea99136fcce71e837f5274528e0
 AUX zziplib-0.13.49-python.patch 366 RMD160 329f98dd9a40ed1f8976b56a1eca7f815c924a3b SHA1 5653de26626bb3752a22e2f69b078f410c87f68e SHA256 ce5acf47b2186c59f8080892542bd00034770297160ba00a0d30af47795e3a2b
 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 1788 RMD160 d9a0985b7b989e2ac8e607a2771b2adf13a9ed82 SHA1 2d23d6a0a4e8e50994a97472b44af57c7f6002af SHA256 05e0bbb4814521a1af9f2ea40c447cf1f6b90a874bd15857a9f12e5ee8340ecd
 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
 EBUILD zziplib-0.13.49-r1.ebuild 1609 RMD160 9922e95f265e0f9a4408cb4767859f233f692f79 SHA1 1a16b703c26861b92f2e9b7c9a920577f6064c52 SHA256 2fd88db9981d6abd96c678de9f0a496ea6da92062da108f68e08e2860fa9269c
 EBUILD zziplib-0.13.49.ebuild 1284 RMD160 c271d0d690ea1a39636b224482f626025b364ded SHA1 6fbf5d40fe519fd2088f0674a243e9613161b2c5 SHA256 4e5c1d9a3ba89e1688b1029f83b3fb43a5caa44f0ad10501b387609bd2f77a81
-MISC ChangeLog 7070 RMD160 4909c53c8900449a902830ebb728e66cb78b6742 SHA1 8ab75b334283e47d6778cc111c835c296fd339a7 SHA256 b35898f4f7e87215e4f4c6799d02aafe08ae59afc7fd3d41ea1dc890ab70a05d
+EBUILD zziplib-0.13.50.ebuild 1651 RMD160 daedec5b082fc525b554fca3428b5caaaf8d0f99 SHA1 667e941f0d9adef043bf654858a48bb9129f7571 SHA256 7756140cc7095c0c40008440e7ffa27fd7acfbef4caaf13f8ca120d24979487f
+MISC ChangeLog 7295 RMD160 b09b2cbfb5cc4b23ec02e5498afbaf17930e02be SHA1 6e30a099485c20dabda3741e2ed0b81cf279ee6d SHA256 b183ada805585b1132ffe02dd2d9c0abddf9d3920bf45403175572863fa75aa1
 MISC metadata.xml 285 RMD160 3faddc79f99fd2e176331b7691ab303d68afff1f SHA1 bf0a1e4c233011a630921773d4968d1e5fe96265 SHA256 aabbb33ddce6a4c9c25c0e405250095050964ba66593fdeef74ac0023bdb301c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk8r6YACgkQ67wieSYcaxelgACfbp5d6JX3NSrjrU4vfaSfdBYE
-M+8An24dwRKEqjWrGyAD0P4iqRbDtS1a
-=lTJN
+iEYEARECAAYFAklWhYcACgkQn/5bYzqsSmE41ACgpbIp2f3UiPUEvSui6orDPN+1
+L78AoJ7dbz3fkrYj7gooKZZgLBGd/YxB
+=4n7V
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/zziplib/files/zziplib-0.13.50-configure-sed.patch b/dev-libs/zziplib/files/zziplib-0.13.50-configure-sed.patch
new file mode 100644
index 000000000000..75cbb2a25d60
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.50-configure-sed.patch
@@ -0,0 +1,16 @@
+fix by Elias Pipping
+
+http://bugs.gentoo.org/240556
+https://sourceforge.net/tracker/index.php?func=detail&aid=2155649&group_id=6389&atid=306389
+
+--- configure
++++ configure
+@@ -24160,7 +24160,7 @@
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  ac_cv_cflags_no_writable_strings=`echo $ac_arg | -e 's,.*% *,,'` ; break
++  ac_cv_cflags_no_writable_strings=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
diff --git a/dev-libs/zziplib/files/zziplib-0.13.50-sparc-aligned-access.patch b/dev-libs/zziplib/files/zziplib-0.13.50-sparc-aligned-access.patch
new file mode 100644
index 000000000000..b3ffb6962c35
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.50-sparc-aligned-access.patch
@@ -0,0 +1,43 @@
+XXX: should investigate ZZIP_HAVE_ALIGNED_ACCESS_REQUIRED
+
+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 makes zziplib use it's own byte
+swapping functions (which do work) on Linux/SPARC instead of glibc's.
+
+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(__sparc__)
+ # 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)))
+--- zzip/fetch.h
++++ zzip/fetch.h
+@@ -24,7 +24,7 @@ extern uint64_t __zzip_get64(zzip_byte_t * s) __zzip_attribute__((const));
+ extern void     __zzip_set64(zzip_byte_t * s, uint64_t v);
+ 
+ #ifdef ZZIP_WORDS_BIGENDIAN
+-# if defined bswap_16 && defined bswap_32 && defined bswap_64 /* i.e. linux */
++# if defined bswap_16 && defined bswap_32 && defined bswap_64 && !defined(__sparc__) /* i.e. linux */
+ # ifndef ZZIP_HAVE_ALIGNED_ACCESS_REQUIRED
+ # define _ZZIP_USE_BSWAP
+ # endif
diff --git a/dev-libs/zziplib/zziplib-0.13.50.ebuild b/dev-libs/zziplib/zziplib-0.13.50.ebuild
new file mode 100644
index 000000000000..2da45d96632f
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.50.ebuild
@@ -0,0 +1,52 @@
+# 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.50.ebuild,v 1.1 2008/12/27 19:44:00 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 test"
+
+RDEPEND=">=dev-lang/python-2.3
+	sys-libs/zlib
+	sdl? ( >=media-libs/libsdl-1.2.6 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	test? ( app-arch/zip )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.13.49-parallel-docs.patch #249153
+	epatch "${FILESDIR}"/${PN}-0.13.49-python.patch
+	epatch "${FILESDIR}"/${PN}-0.13.50-configure-sed.patch #240556
+	epatch "${FILESDIR}"/${PN}-0.13.49-SDL-test.patch
+	epatch "${FILESDIR}"/${PN}-0.13.50-sparc-aligned-access.patch #239472
+	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
+	# tests fail with -j > 1 (bug #241186)
+	emake -j1 check || die "make check failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-man3 || die "make install failed"
+	dodoc ChangeLog README TODO
+	dohtml docs/*
+}