summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-12-22 22:10:42 +0000
committerMike Gilbert <floppym@gentoo.org>2012-12-22 22:10:42 +0000
commit228d1a19e052f0c8d8cbd1b34237c98369e02502 (patch)
treeead652eea1dd353f1c73056c928a2d84601879c2 /dev-util/open-vcdiff
parentDrop old. (diff)
downloadhistorical-228d1a19e052f0c8d8cbd1b34237c98369e02502.tar.gz
historical-228d1a19e052f0c8d8cbd1b34237c98369e02502.tar.bz2
historical-228d1a19e052f0c8d8cbd1b34237c98369e02502.zip
Unbundle zlib.
Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'dev-util/open-vcdiff')
-rw-r--r--dev-util/open-vcdiff/ChangeLog6
-rw-r--r--dev-util/open-vcdiff/Manifest11
-rw-r--r--dev-util/open-vcdiff/files/open-vcdiff-0.8.3-system-zlib.patch30
-rw-r--r--dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild9
4 files changed, 49 insertions, 7 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/Manifest b/dev-util/open-vcdiff/Manifest
index b5d157b26a25..2f8820cc1769 100644
--- a/dev-util/open-vcdiff/Manifest
+++ b/dev-util/open-vcdiff/Manifest
@@ -1,14 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX open-vcdiff-0.8.3-system-zlib.patch 847 SHA256 ce50df0b640a4cb05339eaf49df48d6cab11c57ff25485facb60725724b56b9e SHA512 f112bf43850cdf3c7b0729a77bc690fea077f0b1ad6cbfd6fcb889fd5ac4eafb133041442980ba3ee1ee12d2fa306286ac8fdeb2012fb587a03025cb81e6438a WHIRLPOOL 6638b06f285384c57fe41e128b79362c0f2e1982cddfb1714d9e13e5a3d2f1d587a31de0c59e70dba3a0baf267f95441e80a5817b361775bc5f41cff9c57b766
DIST open-vcdiff-0.8.3.tar.gz 757271 SHA256 b7e47db78866082e9e8b5782f5491092c8414f0acc0440aea03b14c7d1d3c371 SHA512 7f0712aa9f08b19658fbc77f28e6dde9f4a45a4be8f97fb00db1ca78f5ee4e7b9f333dc3208e9ba85b5696a24fa30865397c096be1687d73048809cd30e12a55 WHIRLPOOL 90d75d62c7eceae74639c2105cae98bd148b02c7c83d169a71f094d8f30829ed736b8d8fb43ecef06657ce8b10b8dfaf0f98b439dd170a4a0259e9dd4f035977
-EBUILD open-vcdiff-0.8.3.ebuild 609 SHA256 3d68e1ff5f4807709bf321d1ae0e7a3b7296faa8db4d0ced409308832e78dbef SHA512 ed85c59ba9e7daa2dde349dd790027eed778889a47876d6fb15ebb1c4ce5274e5ec4df56d54e941331c0d5af09b8b4f7a6114e4a6e442a24ce42d4ac3e4c6861 WHIRLPOOL 352e92d327e1ff04c1d712f0e023f53191aa97da3ae3e16c4f101352f4bc56df4aa5a9d9b03683f10b58d3fff7429034175792fa18b2d76ee544cc2eb354d0cd
-MISC ChangeLog 448 SHA256 5c148737d4b73f8fb6283b1ced99faad98e4163659b9e80f545e374b59342bf7 SHA512 3680587e7b31a350723bfe1f4673f1b67cd9651539d574e17437d19fcfb192457e9b4f9df0eec7b8c31797110daa1f4ad186421ea6d65c2539b8261432eee1ee WHIRLPOOL f283d907d7dedda0c80f1a6dbc15831dd8330e96c20241992b2f4428bf6b399c93f04ac64f3cced05df34816f365c95c03057370f3f5fe666dd9c9a968ea081e
+EBUILD open-vcdiff-0.8.3.ebuild 772 SHA256 340c9a3325e13120302511987f0cd4ed23c749bdab966ac0ec77b9582f518200 SHA512 a72203cbd9e59f4f574ee21f804ed29ce18b6cbb4690ed8a63390591edc017958b46e59592e6475fafaea24a914e732d1362ad00999058484cb13579e23c910b WHIRLPOOL f2e5df218efdd475f08bb2154c6526f6c2c31c4e336944b391cbdc2346735a0671c55aa8d9dc281f91bef707c6a067a23098407b1b7187cae89c364ff5681e57
+MISC ChangeLog 587 SHA256 a73f543269ae9b36debf955d502f0d75251102b699233a02ca10f46e877ffe38 SHA512 75fdf4d9b01f9ac463ff2003b8ffcbe75d78e237cee16bca6710fb90c95eed082b0b3812b81e09efd2fd695fbe37082b346e5e54377403b6df3db903dd98560d WHIRLPOOL 7be6d11ee09040ea9851816e41ab8f208a06f845808e9341224a6b5e114c18eeaefce396e67072841e24643f8cf25681a3b5ead9c1289a64adcbeeebb481969e
MISC metadata.xml 313 SHA256 0a6a7aca14baca831db8c03f56755a97301845bba9b3afa88e619f7bce6529ff SHA512 694d4f17627fa226c3c4c49314b1cd863af1ecfd08d44b0b0012bd18dacddf0ac5f6a3ab6a8291a43a4ffdb5e87e49cca28a28e527a6d7be6744630aaed90ce5 WHIRLPOOL 26aab9604529e2b746650b50ae1c511908056b1e2b068a658bb5b5d28b65049e9af63f6433fe6265f316813c22019045cf4d304d0c97e06acca1deb34abd6093
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlDWC+EACgkQC77qH+pIQ6Sd9AD9F73LsWQ4WyxcTVqFAi41Uon/
-YjMNt+O2HJNP/PUtmaYA/3n8F1mvEkXyHn6A+mIibCGAW3gLlizWhQyV6Lxepp51
-=tSXN
+iF4EAREIAAYFAlDWL+EACgkQC77qH+pIQ6RJYAD/fIgYrbuJaeQy5nAN5wrbOx+I
+M2TrKmiPINv/vcqwG1gA+wR6yU8wAvahmMKEhCnJH3WEROoVgRlYAgvqQsZZk/4p
+=L90e
-----END PGP SIGNATURE-----
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