summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-06-07 10:19:52 +0000
committerMike Frysinger <vapier@gentoo.org>2010-06-07 10:19:52 +0000
commit269ecfa155843022d1c15534c2e78c9749516159 (patch)
treebfb036ea20c0329750ed7f572fe62536dd38afcb /dev-libs/zziplib
parentamd64 stable (bug #305659) (diff)
downloadgentoo-2-269ecfa155843022d1c15534c2e78c9749516159.tar.gz
gentoo-2-269ecfa155843022d1c15534c2e78c9749516159.tar.bz2
gentoo-2-269ecfa155843022d1c15534c2e78c9749516159.zip
old
Diffstat (limited to 'dev-libs/zziplib')
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.49-configure-sed.patch16
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.49-parallel-docs.patch35
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.49-python.patch15
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.49-sparc-aligned-access.patch41
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.50-configure-sed.patch16
-rw-r--r--dev-libs/zziplib/files/zziplib-0.13.50-sparc-aligned-access.patch34
-rw-r--r--dev-libs/zziplib/zziplib-0.13.49-r1.ebuild52
7 files changed, 0 insertions, 209 deletions
diff --git a/dev-libs/zziplib/files/zziplib-0.13.49-configure-sed.patch b/dev-libs/zziplib/files/zziplib-0.13.49-configure-sed.patch
deleted file mode 100644
index ff48f3c3d4ec..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.49-configure-sed.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-@@ -24686,7 +24686,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; 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.49-parallel-docs.patch b/dev-libs/zziplib/files/zziplib-0.13.49-parallel-docs.patch
deleted file mode 100644
index 5582985f5086..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.49-parallel-docs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-fix parallel build with docs
-
-http://bugs.gentoo.org/249153
-http://sourceforge.net/tracker/index.php?func=detail&aid=2405440&group_id=6389&atid=306389
-
---- zziplib-0.13.49/docs/Makefile.in
-+++ zziplib-0.13.49/docs/Makefile.in
-@@ -447,21 +447,24 @@ docu :
- - rm zziplib2.html zzipmmapped.html zzipfseeko.html
- $(MAKE) manpages.ar htmpages.ar DELETE=exit
-
--zziplib.html zziplib.xml : zziplib.spec $(srcdir)/Makefile.am \
-+zziplib.xml: zziplib.html
-+zziplib.html: zziplib.spec $(srcdir)/Makefile.am \
- $(srcdir)/zzipdoc/*.py \
- $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c
- $(PYRUN) $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c $(zziplib) \
- "--package=$(PACKAGE)" "--version=$(VERSION)" \
- "--onlymainheader=zzip/lib.h" "--output=zziplib"
- test -s zziplib.docbook && mv zziplib.docbook zziplib.xml
--zzipmmapped.html zzipmmapped.xml : zziplib.spec $(srcdir)/Makefile.am \
-+zzipmmapped.xml: zzipmmapped.html
-+zzipmmapped.html: zziplib.spec $(srcdir)/Makefile.am \
- $(srcdir)/zzipdoc/*.py \
- $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c
- $(PYRUN) $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c $(zziplib) \
- "--package=$(PACKAGE)" "--version=$(VERSION)" \
- "--onlymainheader=zzip/mmapped.h" "--output=zzipmmapped"
- test -s zzipmmapped.docbook && mv zzipmmapped.docbook zzipmmapped.xml
--zzipfseeko.html zzipfseeko.xml : zziplib.spec $(srcdir)/Makefile.am \
-+zzipfseeko.xml: zzipfseeko.html
-+zzipfseeko.html: zziplib.spec $(srcdir)/Makefile.am \
- $(srcdir)/zzipdoc/*.py \
- $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c
- $(PYRUN) $(srcdir)/makedocs.py @top_srcdir@/zzip/*.c $(zziplib) \
diff --git a/dev-libs/zziplib/files/zziplib-0.13.49-python.patch b/dev-libs/zziplib/files/zziplib-0.13.49-python.patch
deleted file mode 100644
index f1cfae16a195..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.49-python.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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.49-sparc-aligned-access.patch b/dev-libs/zziplib/files/zziplib-0.13.49-sparc-aligned-access.patch
deleted file mode 100644
index 5e0ac50d19f7..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.49-sparc-aligned-access.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-This patch for zziplib (0.13.49) 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>
-
-External references: https://bugs.gentoo.org/show_bug.cgi?id=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 */
- # define ZZIP_GET16(__p) bswap_16(*(uint16_t*)(__p))
- # define ZZIP_GET32(__p) bswap_32(*(uint32_t*)(__p))
- # define ZZIP_GET64(__p) bswap_64(*(uint64_t*)(__p))
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
deleted file mode 100644
index 75cbb2a25d60..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.50-configure-sed.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 3331b8efcde7..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.50-sparc-aligned-access.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
-https://sourceforge.net/tracker/?func=detail&aid=2479788&group_id=6389&atid=306389
-
---- 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-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild
deleted file mode 100644
index 43fc3ee5e44b..000000000000
--- a/dev-libs/zziplib/zziplib-0.13.49-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 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.15 2010/03/14 20:22:33 reavertm 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}"/${P}-parallel-docs.patch #249153
- epatch "${FILESDIR}"/${P}-python.patch
- epatch "${FILESDIR}"/${P}-configure-sed.patch #240556
- epatch "${FILESDIR}"/${P}-SDL-test.patch
- epatch "${FILESDIR}"/${P}-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 -r docs/*
-}