Unbundle gflags and gtest.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 237 insertions, 43 deletions

diff --git a/dev-util/open-vcdiff/ChangeLog b/dev-util/open-vcdiff/ChangeLog
index 6732ad0c2b71..cfc5460a45b2 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.4 2012/12/22 22:11:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/open-vcdiff/ChangeLog,v 1.5 2012/12/22 23:57:14 floppym Exp $
+
+  22 Dec 2012; Mike Gilbert <floppym@gentoo.org> +files/0.8.3-system-libs.patch,
+  -files/open-vcdiff-0.8.3-system-zlib.patch, open-vcdiff-0.8.3.ebuild:
+  Unbundle gflags and gtest.
 
   22 Dec 2012; Mike Gilbert <floppym@gentoo.org> open-vcdiff-0.8.3.ebuild:
   Depend on zlib.
diff --git a/dev-util/open-vcdiff/Manifest b/dev-util/open-vcdiff/Manifest
index 85fe4a1b9ac0..9d9a00a12371 100644
--- a/dev-util/open-vcdiff/Manifest
+++ b/dev-util/open-vcdiff/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX open-vcdiff-0.8.3-system-zlib.patch 847 SHA256 ce50df0b640a4cb05339eaf49df48d6cab11c57ff25485facb60725724b56b9e SHA512 f112bf43850cdf3c7b0729a77bc690fea077f0b1ad6cbfd6fcb889fd5ac4eafb133041442980ba3ee1ee12d2fa306286ac8fdeb2012fb587a03025cb81e6438a WHIRLPOOL 6638b06f285384c57fe41e128b79362c0f2e1982cddfb1714d9e13e5a3d2f1d587a31de0c59e70dba3a0baf267f95441e80a5817b361775bc5f41cff9c57b766
+AUX 0.8.3-system-libs.patch 8778 SHA256 e393653b326daf17bb6bc92ded56daa6c11a4afec6d2600ef8b7ed1043a0dfbc SHA512 82af2a16f83fd03a4afc731a50e222178888f0c8a78313835d7ec4bd367c32d0dc1bee486f344aa511394532e56cd03a400771008596d90bb4ce01b1baae2471 WHIRLPOOL 616ecc1c6f48bd03ae48a18685e065ce0f1411449e2054b5c248f45a85e098b58d2795613ed88b70d94e0b4c7066fecaccccdc651dbdba08f5ada5dff2cd5ed6
 DIST open-vcdiff-0.8.3.tar.gz 757271 SHA256 b7e47db78866082e9e8b5782f5491092c8414f0acc0440aea03b14c7d1d3c371 SHA512 7f0712aa9f08b19658fbc77f28e6dde9f4a45a4be8f97fb00db1ca78f5ee4e7b9f333dc3208e9ba85b5696a24fa30865397c096be1687d73048809cd30e12a55 WHIRLPOOL 90d75d62c7eceae74639c2105cae98bd148b02c7c83d169a71f094d8f30829ed736b8d8fb43ecef06657ce8b10b8dfaf0f98b439dd170a4a0259e9dd4f035977
-EBUILD open-vcdiff-0.8.3.ebuild 816 SHA256 281eaa718c366357b126de21905ac4f2c70fba0253677cb0320aa57e2456ae32 SHA512 491aa4527c507eab12a538dd3dd7011110bba1dd15fd25f3b548c7701ef37282434eb2a78802d585053b1bceef704dfe9e25c667051101d21bc304b96d48dba5 WHIRLPOOL a82277e0f7402394ca0d9fc80c54c43132b80b90e8f587c93811a01efd448df34e416f027322f931f372b3dff03cdd34382c5aa3f89128cbe0c77832983acd08
-MISC ChangeLog 681 SHA256 6bde9d221e2672a1f9f54683deb0cc05ac072a3ac93a6d42722b6660bae364b9 SHA512 2f1694a2095d24afc7d08ba5cffe9898841a54de82de5b8da0c5c5eb04a0f8c96fbd6d1d51f71b92ab1c516d5e4e904766b711b7c962af3f56a42b7eab274ca0 WHIRLPOOL 6367db8bb7a11fb013ec7c31ce31cfa94de0c55c8633f1edf3e0a495ea7ff88574ce28bd45c83df14a3889df4cd3412cbb6906f23e99a8660ffad3f7831ae874
+EBUILD open-vcdiff-0.8.3.ebuild 871 SHA256 65256589d30922526fa4b81e7d5a4a337e50c0a91d8131e5a62c27f49c63e0ea SHA512 f05a232518239ddd105a9dd967ba87a69a2820548b8c9e0fb011dcb24b998b94e7e2e8a38fed92a95767da59930970943cc28921bb5a88051f414c4feda811fc WHIRLPOOL a52f07eb44d1a9f821a94febcf358fa61fe8efdabc9cb5828a9efe963c503c0b826be11dafc80601c92606bc7341f66845712ef1d1869498c1d56e282858bb19
+MISC ChangeLog 864 SHA256 1ec7228d5e35c74663dff31908f9b90c676da853615dedcec9063254d728f54e SHA512 d6fcd407af6a35bbca33db5e5db87751ee824587f930df166384cd5a4f56305d3b4d601a58c1d50880a54f04d1b23c87b99aa33db0f3fac26e03427b95068c54 WHIRLPOOL f8dfd21e3c37341378695343ec610f9854cbe6fae80f81c50b9fc1dc0d9d01df75fc5949da97d0c5544945fbf963c479f2b1fe05ff97a70bd0527c2a2aba5e8d
 MISC metadata.xml 313 SHA256 0a6a7aca14baca831db8c03f56755a97301845bba9b3afa88e619f7bce6529ff SHA512 694d4f17627fa226c3c4c49314b1cd863af1ecfd08d44b0b0012bd18dacddf0ac5f6a3ab6a8291a43a4ffdb5e87e49cca28a28e527a6d7be6744630aaed90ce5 WHIRLPOOL 26aab9604529e2b746650b50ae1c511908056b1e2b068a658bb5b5d28b65049e9af63f6433fe6265f316813c22019045cf4d304d0c97e06acca1deb34abd6093
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDWMAsACgkQC77qH+pIQ6QjBgD+I6Cf2rkecmNAY00Ci2frQP5s
-U2lfDkkMTRgBTNl2MyYA/0VrpFDBsOfMfbFHMwvmZ5FYJ6U0rY4y691Vf/WjN4j5
-=yYIR
+iF4EAREIAAYFAlDWSNsACgkQC77qH+pIQ6TBfAEAi+PGP6Q1ru+By2CLnR0EKaIx
+v0uHYqlnL8UQJC3UPtoBAJjgWXf8wvgbOEY6ez1G74QiHl2Fyg2upA8yNQmKmRDZ
+=d33X
 -----END PGP SIGNATURE-----
diff --git a/dev-util/open-vcdiff/files/0.8.3-system-libs.patch b/dev-util/open-vcdiff/files/0.8.3-system-libs.patch
new file mode 100644
index 000000000000..508f30379b2c
--- /dev/null
+++ b/dev-util/open-vcdiff/files/0.8.3-system-libs.patch
@@ -0,0 +1,215 @@
+Unbundle the following libraries:
+gflags
+gtest
+zlib
+
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 42)
++++ configure.ac	(working copy)
+@@ -111,7 +111,5 @@
+ fi
+ AC_SUBST(LIBSTDCXX_LA_LINKER_FLAG)
+ 
+-AC_CONFIG_FILES([Makefile
+-                 gflags/src/gflags/gflags.h
+-                 gflags/src/gflags/gflags_completions.h])
++AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(revision 42)
++++ Makefile.am	(working copy)
+@@ -5,11 +5,7 @@
+                   -I gflags/m4
+ 
+ # This is so we can #include <google/vcencoder.h> or <gtest/gtest.h>
+-AM_CPPFLAGS = -I$(top_srcdir)/src \
+-              -I$(top_srcdir)/src/zlib \
+-              -I$(top_srcdir)/gflags/src \
+-              -I$(top_srcdir)/gtest \
+-              -I$(top_srcdir)/gtest/include
++AM_CPPFLAGS = -I$(top_srcdir)/src
+ 
+ # For a non-optimized (debug) build, change "-DNDEBUG" to "-DDEBUG".
+ AM_CXXFLAGS = -DNDEBUG -DNO_THREADS
+@@ -46,6 +42,7 @@
+ ## Tests are added one by one to these lists in the RULES sections.
+ check_PROGRAMS =
+ check_SCRIPTS =
++check_LTLIBRARIES =
+ 
+ ## Other binaries, scripts, and libraries that are built but not automatically
+ ## installed.
+@@ -55,52 +52,11 @@
+ 
+ ## vvvv RULES TO MAKE THE LIBRARIES, BINARIES, AND UNITTESTS
+ 
+-# google-gflags: Used for command-line client
+-#     Please refer to http://code.google.com/p/google-gflags/ for details
+-noinst_LTLIBRARIES += libgflags.la
+-libgflags_la_SOURCES = gflags/src/gflags/gflags.h \
+-                       gflags/src/gflags/gflags_completions.h \
+-                       gflags/src/mutex.h \
+-                       gflags/src/gflags.cc \
+-                       gflags/src/gflags_completions.cc \
+-                       gflags/src/gflags_reporting.cc
+-
+-# gtest (Google Test): Used for unit tests only
+-#     Please refer to http://code.google.com/p/googletest/ for details
+-noinst_LTLIBRARIES += libgtest_main.la
+-libgtest_main_la_SOURCES = gtest/include/gtest/gtest.h \
+-                           gtest/include/gtest/gtest-death-test.h \
+-                           gtest/include/gtest/gtest-message.h \
+-                           gtest/include/gtest/gtest-param-test.h \
+-                           gtest/include/gtest/gtest_pred_impl.h \
+-                           gtest/include/gtest/gtest_prod.h \
+-                           gtest/include/gtest/gtest-spi.h \
+-                           gtest/include/gtest/gtest-test-part.h \
+-                           gtest/include/gtest/gtest-typed-test.h \
+-                           gtest/include/gtest/internal/gtest-death-test-internal.h \
+-                           gtest/include/gtest/internal/gtest-filepath.h \
+-                           gtest/include/gtest/internal/gtest-internal.h \
+-                           gtest/include/gtest/internal/gtest-linked_ptr.h \
+-                           gtest/include/gtest/internal/gtest-param-util.h \
+-                           gtest/include/gtest/internal/gtest-param-util-generated.h \
+-                           gtest/include/gtest/internal/gtest-port.h \
+-                           gtest/include/gtest/internal/gtest-string.h \
+-                           gtest/include/gtest/internal/gtest-tuple.h \
+-                           gtest/include/gtest/internal/gtest-type-util.h \
+-                           gtest/src/gtest-internal-inl.h \
+-                           gtest/src/gtest.cc \
+-                           gtest/src/gtest-death-test.cc \
+-                           gtest/src/gtest-filepath.cc \
+-                           gtest/src/gtest-port.cc \
+-                           gtest/src/gtest-test-part.cc \
+-                           gtest/src/gtest-typed-test.cc \
+-                           gtest/src/gtest_main.cc \
+-                           src/testing.h
+-
+-noinst_LTLIBRARIES += libvcdecoder_test_common.la
++check_LTLIBRARIES += libvcdecoder_test_common.la
+ libvcdecoder_test_common_la_SOURCES = src/vcdecoder_test.h \
+ 				      src/vcdecoder_test.cc
+-libvcdecoder_test_common_la_LIBADD = libvcddec.la libgtest_main.la
++libvcdecoder_test_common_la_LIBADD = libvcddec.la -lgtest_main
++libvcdecoder_test_common_la_LDFLAGS = -pthread
+ 
+ # libvcdcom: The open-vcdiff *common* library
+ lib_LTLIBRARIES += libvcdcom.la
+@@ -112,9 +68,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 +81,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,52 +100,62 @@
+ 		       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
+-vcdiff_LDADD = libvcddec.la libvcdenc.la libgflags.la
++vcdiff_LDADD = libvcddec.la libvcdenc.la -lgflags
+ 
+ check_PROGRAMS += addrcache_test
+ addrcache_test_SOURCES = src/addrcache_test.cc
+-addrcache_test_LDADD = libvcdcom.la libgtest_main.la
++addrcache_test_LDADD = libvcdcom.la -lgtest_main
++addrcache_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += blockhash_test
+ blockhash_test_SOURCES = src/blockhash_test.cc
+-blockhash_test_LDADD = libvcdenc.la libgtest_main.la
++blockhash_test_LDADD = libvcdenc.la -lgtest_main
++blockhash_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += codetable_test
+ codetable_test_SOURCES = src/codetable_test.cc
+-codetable_test_LDADD = libvcdcom.la libgtest_main.la
++codetable_test_LDADD = libvcdcom.la -lgtest_main
++codetable_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += decodetable_test
+ decodetable_test_SOURCES = src/decodetable_test.cc
+-decodetable_test_LDADD = libvcddec.la libvcdcom.la libgtest_main.la
++decodetable_test_LDADD = libvcddec.la libvcdcom.la -lgtest_main
++decodetable_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += encodetable_test
+ encodetable_test_SOURCES = src/encodetable_test.cc
+-encodetable_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la
++encodetable_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main
++encodetable_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += headerparser_test
+ headerparser_test_SOURCES = src/headerparser_test.cc
+-headerparser_test_LDADD = libvcddec.la libvcdcom.la libgtest_main.la
++headerparser_test_LDADD = libvcddec.la libvcdcom.la -lgtest_main
++headerparser_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += instruction_map_test
+ instruction_map_test_SOURCES = src/instruction_map_test.cc
+-instruction_map_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la
++instruction_map_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main
++instruction_map_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += output_string_test
+ output_string_test_SOURCES = src/output_string_crope.h \
+ 			     src/output_string_test.cc
+-output_string_test_LDADD = libgtest_main.la
++output_string_test_LDADD = -lgtest_main
++output_string_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += rolling_hash_test
+ rolling_hash_test_SOURCES = src/rolling_hash_test.cc
+-rolling_hash_test_LDADD = libvcdcom.la libgtest_main.la
++rolling_hash_test_LDADD = libvcdcom.la -lgtest_main
++rolling_hash_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += varint_bigendian_test
+ varint_bigendian_test_SOURCES = src/varint_bigendian_test.cc
+-varint_bigendian_test_LDADD = libvcdcom.la libgtest_main.la
++varint_bigendian_test_LDADD = libvcdcom.la -lgtest_main
++varint_bigendian_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += vcdecoder1_test
+ vcdecoder1_test_SOURCES = src/vcdecoder1_test.cc
+@@ -216,15 +179,18 @@
+ 
+ check_PROGRAMS += vcdiffengine_test
+ vcdiffengine_test_SOURCES = src/vcdiffengine_test.cc
+-vcdiffengine_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la
++vcdiffengine_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main
++vcdiffengine_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += vcencoder_test
+ vcencoder_test_SOURCES = src/vcencoder_test.cc
+-vcencoder_test_LDADD = libvcddec.la libvcdenc.la libvcdcom.la libgtest_main.la
++vcencoder_test_LDADD = libvcddec.la libvcdenc.la libvcdcom.la -lgtest_main
++vcencoder_test_LDFLAGS = -pthread
+ 
+ check_PROGRAMS += jsonwriter_test
+ jsonwriter_test_SOURCES = src/jsonwriter_test.cc
+-jsonwriter_test_LDADD = libvcdenc.la libvcdcom.la libgtest_main.la
++jsonwriter_test_LDADD = libvcdenc.la libvcdcom.la -lgtest_main
++jsonwriter_test_LDFLAGS = -pthread
+ 
+ check_SCRIPTS += src/vcdiff_test.sh
+ dist_noinst_DATA = testdata/configure.ac.v0.1 \
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
deleted file mode 100644
index 9b954339373b..000000000000
--- a/dev-util/open-vcdiff/files/open-vcdiff-0.8.3-system-zlib.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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 99b52c1b1e84..a519810f497b 100644
--- a/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild
+++ b/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2012/12/22 22:11:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/open-vcdiff/open-vcdiff-0.8.3.ebuild,v 1.5 2012/12/22 23:57:14 floppym Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -14,14 +14,19 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0/0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	dev-cpp/gflags
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
 
 src_prepare() {
-	rm -r src/zlib || die
-	local PATCHES=( "${FILESDIR}/open-vcdiff-0.8.3-system-zlib.patch" )
+	rm -r gflags/src gtest src/zlib || die
+	local PATCHES=( "${FILESDIR}/0.8.3-system-libs.patch" )
 	autotools-utils_src_prepare
 }