diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-12-22 22:10:40 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-12-22 22:10:40 +0000 |
| commit | 881dd6c6fc2c2d8ebeed987fc19febf399c5e28e (patch) | |
| tree | 71797374d94bf6e57463916a129d64981b9aa225 /dev-util/open-vcdiff | |
| parent | Drop old. (diff) | |
| download | gentoo-2-881dd6c6fc2c2d8ebeed987fc19febf399c5e28e.tar.gz gentoo-2-881dd6c6fc2c2d8ebeed987fc19febf399c5e28e.tar.bz2 gentoo-2-881dd6c6fc2c2d8ebeed987fc19febf399c5e28e.zip | |
Unbundle zlib.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-util/open-vcdiff')
| -rw-r--r-- | dev-util/open-vcdiff/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/open-vcdiff/files/open-vcdiff-0.8.3-system-zlib.patch | 30 | ||||
| -rw-r--r-- | dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild | 9 |
3 files changed, 43 insertions, 2 deletions
diff --git a/dev-util/open-vcdiff/ChangeLog b/dev-util/open-vcdiff/ChangeLog index 6fce9bd31ee7..5f37f33fa47b 100644 --- a/dev-util/open-vcdiff/ChangeLog +++ b/dev-util/open-vcdiff/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/open-vcdiff # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/open-vcdiff/ChangeLog,v 1.2 2012/12/22 19:37:04 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/open-vcdiff/ChangeLog,v 1.3 2012/12/22 22:10:40 floppym Exp $ + + 22 Dec 2012; Mike Gilbert <floppym@gentoo.org> + +files/open-vcdiff-0.8.3-system-zlib.patch, open-vcdiff-0.8.3.ebuild: + Unbundle zlib. 22 Dec 2012; Mike Gilbert <floppym@gentoo.org> open-vcdiff-0.8.3.ebuild: Keyword ~x86. diff --git a/dev-util/open-vcdiff/files/open-vcdiff-0.8.3-system-zlib.patch b/dev-util/open-vcdiff/files/open-vcdiff-0.8.3-system-zlib.patch new file mode 100644 index 000000000000..9b954339373b --- /dev/null +++ b/dev-util/open-vcdiff/files/open-vcdiff-0.8.3-system-zlib.patch @@ -0,0 +1,30 @@ +--- Makefile.am ++++ Makefile.am +@@ -112,9 +112,6 @@ + src/logging.h \ + src/varint_bigendian.h \ + src/vcdiff_defs.h \ +- src/zlib/zlib.h \ +- src/zlib/zconf.h \ +- src/zlib/adler32.c \ + src/addrcache.cc \ + src/codetable.cc \ + src/logging.cc \ +@@ -128,7 +125,7 @@ + src/decodetable.cc \ + src/headerparser.cc \ + src/vcdecoder.cc +-libvcddec_la_LIBADD = libvcdcom.la ++libvcddec_la_LIBADD = libvcdcom.la -lz + + # libvcdenc: The open-vcdiff *encoder* library + lib_LTLIBRARIES += libvcdenc.la +@@ -147,7 +144,7 @@ + src/jsonwriter.cc \ + src/vcdiffengine.cc \ + src/vcencoder.cc +-libvcdenc_la_LIBADD = libvcdcom.la ++libvcdenc_la_LIBADD = libvcdcom.la -lz + + bin_PROGRAMS += vcdiff + vcdiff_SOURCES = src/vcdiff_main.cc diff --git a/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild b/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild index 8fd697e7eaea..e0c967b6a027 100644 --- a/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild +++ b/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild,v 1.2 2012/12/22 19:37:04 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild,v 1.3 2012/12/22 22:10:40 floppym Exp $ EAPI=5 +AUTOTOOLS_AUTORECONF=1 inherit autotools-utils @@ -15,6 +16,12 @@ SLOT="0/0" KEYWORDS="~amd64 ~x86" IUSE="" +src_prepare() { + rm -r src/zlib || die + local PATCHES=( "${FILESDIR}/open-vcdiff-0.8.3-system-zlib.patch" ) + autotools-utils_src_prepare +} + src_configure() { local myeconfargs=( --enable-shared |