Cleanup due #22900

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

8 files changed, 12 insertions, 170 deletions

diff --git a/dev-cpp/gtest/ChangeLog b/dev-cpp/gtest/ChangeLog
index 2ae115895c44..5ae9291a64c3 100644
--- a/dev-cpp/gtest/ChangeLog
+++ b/dev-cpp/gtest/ChangeLog
@@ -1,5 +1,10 @@
 # ChangeLog for dev-cpp/gtest
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.16 2012/11/02 05:32:01 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.17 2013/02/03 12:09:47 pacho Exp $
+
+  03 Feb 2013; Pacho Ramos <pacho@gentoo.org> -files/gtest-1.4.0-asneeded.patch,
+  -files/gtest-1.4.0-gcc-4.7.patch, -files/gtest-1.5.0-asneeded.patch,
+  -gtest-1.4.0.ebuild, -gtest-1.5.0.ebuild, metadata.xml:
+  Cleanup due #22900
 
   02 Nov 2012; Justin Bronder <jsbronder@gentoo.org> gtest-1.6.0-r1.ebuild:
   Resolve #361703 by enabling threads unconditionally.
@@ -110,4 +115,3 @@
   01 Mar 2010; MATSUU Takuto <matsuu@gentoo.org> +gtest-1.4.0.ebuild,
   +files/gtest-1.4.0-asneeded.patch, +metadata.xml:
   Initial import.
-
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 6218d0615f95..c5196f76a602 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -2,22 +2,15 @@
 Hash: SHA256
 
 AUX configure-fix-pthread-linking.patch 3142 SHA256 501f42dd4f4f4412fcb18fc4eb5f1100f5c5a6b19610f6548bccc84989c6f83e SHA512 4347570606853c75e43d3d1abe449cd562538e531136658e6742f8e2dddcc1767932b427a063f711b868467ca85ff947f24c4ed3e328319bd0a739bb66093016 WHIRLPOOL 5ab7be10a9bd675398884f2a4ad8c30fef17412ff3fbaae5d14cf290ebf723ccc005d2ea1dd7ad68c8bd8db57d06cc0fadd79d7f9f2ab46ea5ed0a87df8201fb
-AUX gtest-1.4.0-asneeded.patch 570 SHA256 f0ea8562468d24a9a624c7bdb9b98253d69f98ccada6a9ab628c6e8ff3b39811 SHA512 878bfaada9837c79515e7e452ce74eeffac8e36587a7fb54cc51c993a649c9d3652a3af777b381de6ded4e45c58a4cf92fd67f69b93e73313ed51e1a794ec082 WHIRLPOOL 47f9c22facdcc735d1b8439eed41f9041ad4742c006e070d7fe4cc07ffcf037b1546071aba8973610f6c3df545c2d023e9f23ecdca527ec115cf6c4325b94721
-AUX gtest-1.4.0-gcc-4.7.patch 1181 SHA256 fb5eb6bf2d0ca074dc39dbef1ca1361e369ed713716b0d1012d8e2cf69467ab0 SHA512 d9b2237f8de84ecb950c27b4637c3cab02a5aa0eb69e8ed1e3673a1db8d8ef3fd75c5f1bf285d3b15ee25c49393128cd681170e4460ab7d671f6c8806c845efe WHIRLPOOL a22d42c9a80e24f65955fb0bc54ad0e4e83e0c49cd1635a1f05861d526fadd126574d8f19cde3987dbb9fbc534c4472f7f27541f17664799205f4845f3245e6f
-AUX gtest-1.5.0-asneeded.patch 512 SHA256 6ee8931ecc204d233e28dd3b601c6160502e99970d6171040f9433541647cda7 SHA512 e72ce03c79c9424fb3c6824d92d0db15c740469dd149eac29c036877954989a408cf3751d0438b15e23f0d5f20ffed63792bc22b3138530e6ddb6e401fda1391 WHIRLPOOL c5858e8cab7748682484a7a35704de137790ec611826b864736d587cb93d66c55752c20375446f47fd940415736de413aa87983eddf250fff7fe2dfef29344e0
-DIST gtest-1.4.0.tar.bz2 525425 SHA256 c848158f1fca599d6339b9f00e3fdee6153dc518a23c793ccf757f8aa4ad17e9 SHA512 2087dc726517dc77b89a46c95821c3ad3abf245af1be8a66ff8218eb84885991734d3c10f420939ffc04f05ff184e50f7d67a5e1dafbb41d479aebcfb02b323f WHIRLPOOL aa92cbecefe231693e9f53b827639d61f178a47cb854e44415cfa9a4d153005a81212ac379462c241a32208ce9666fc36c1d056c11d98087905f5ec4bd24f0a0
-DIST gtest-1.5.0.tar.bz2 653338 SHA256 1bf9ee2e49037f908796980ac7df7ac45393563e1e721ce68879a81f4013f9c0 SHA512 07fdea28edbdfcf43c62ff2b23152adf97b7ae88d8f8e69f47d1d6be2ced81c36dcf52db5cd1dc001e4beaaec21dd5c97552094211fcb4da7ba50e2c617bf1cb WHIRLPOOL 7b965de30b4054828c30d1fe21b43af91910aceca719f9ce5473221642f16a1641ec97e6d6b0450b70029258ab0cedcf4efd8007f8be97d17d5f6a59df504ccf
 DIST gtest-1.6.0.zip 1121697 SHA256 5ec97df8e75b4ee796604e74716d1b50582beba22c5502edd055a7e67a3965d8 SHA512 f4718dfbfa3339bb9449c3f14e5b44ae405ea7df64c10a0957a6300985b71c4642981d069a1382e27ae041a4e2873527a9e442aff978447e795a190f99fac115 WHIRLPOOL 745a49020d4353ed2fa38adfc80bbd777358c831719bbe3b7c90d243f84256615222ba5f04d48d98b9e1a803bb40766799b3aedd575024c19d853d9239a12f8a
-EBUILD gtest-1.4.0.ebuild 1027 SHA256 94d91b72952f4621829c1af80136aa0e17c92067b9e431dd4ef967ce1fa520fb SHA512 31e091cceedee72cd069914bcc2b3317d41eb23638bd86661c2ec9745fb6d45d2429d0656b3a33431209f1f4d11a4da9aaeda2e0c131fa16985fb665b7db0d35 WHIRLPOOL d2d2f0df39b63dfb321379dda423e5a008fa3c8ce14a284589873c06453eab5a3ffa9b5d6fa1eba765ba7d8336320f30c4f49128a8b29cd14efa8df8e13998e3
-EBUILD gtest-1.5.0.ebuild 1272 SHA256 b89c4bec1bf1169d7b5519e72eb0bffa5e32309e1c728ecdff642357853aa507 SHA512 a83df9ce78269994f995e3c00ce9d3827e2034a196845955459d14c356bdd9b19cc8f3e451c031007ae1a3567a51c85fd7a9d12bdc70d85ef1eeade56c3fecfc WHIRLPOOL f3c62c07cc67761517592bbebcd88cd139273cb02515219cdbc3b08330df512042f9cc24bd941423940beae6e4e7182074be50bc087d101dcb278747292de54e
 EBUILD gtest-1.6.0-r1.ebuild 1335 SHA256 2c0da30a5429255cca38d35419581122956605f8fc75016e983a343815387839 SHA512 af4bfcfabbd648f6e3473377f92058a74483e706e98c77ada621014e1639c2f14fdf272b00cafd9ac0c7fefafb8820289d7dd51bf63856efb9f69da5a92ba768 WHIRLPOOL b131898b1ca6e2219ab49900a419406201d0b5f123cfa9549464b1303771f566f989c513d38f384d8aa0b7c58f764b34b8c215563ccdf7cb0852c7064c8c1b1b
 EBUILD gtest-1.6.0.ebuild 1281 SHA256 9bccd7abfa3d8fafeeb786e975fe3183fa41e2b2428e8887b4b68413e7fc7aad SHA512 8246b7bb2dc68657bda9e7a0fa32f29a6f5b475f127a6450b92467ea3b641fff240282a28e9c2678d9900dc576cd8eca353aaea7a943aebe921e8d6ccd2025d7 WHIRLPOOL 63b2b736ccced1a0bb86b016229fcb58bb9287c54979412a0271dc81de2110f1cf1a9ba5aaeff4bc79dc70882d3379514b84cbf289a93ed9a2c1e2aa46b21632
-MISC ChangeLog 3947 SHA256 6b464bd0d92a52ccc5f4deec6491533cebc50ac8e48bb6ed306b19e164901017 SHA512 55d26a20e1753f8fb62c685150988678747345fb63b6039d2341d536dd4de855cea91f9b82b27fb4490031d470b06a520164c4f52ce540aac677b0ee5ea37fc9 WHIRLPOOL 791f1f80655583f3ffe16cf4aa95b9e16c818827700d1dd9f6b83d473e5001dd65618d204291a3752a059d5f993648e345192e90f2c37bc6b0c52f218ffecfb4
-MISC metadata.xml 349 SHA256 39469da99f5e4d999180ee553d4c4a585dbb09089ee0fb550a297119b8251707 SHA512 677149a77daa6e9e46184ba951a8751c11a8c01e013f926752983df6314cd9437e0c3d8500c22a134155641c3c521e1516590b7f965de5f1ead20b60474f3b84 WHIRLPOOL eb2cd45f2c571b45b6c46253156856f2a058332f68c4814ab78c763fa632242939a83d786ac4050e421aae94e1823e34bcce8e837acbe8611277d8eaad5c35e7
+MISC ChangeLog 4174 SHA256 acc44460912ac6b2fe79611acf812f4accbed8bc942738cf98708e67147bec45 SHA512 5213bb5827d46d0a96364f35721fb94a3871691b6ea9fcbaa7d230769be4e3ba8b530a98337f18dee886568557d095e34ec027d185b5ad7696224ee9263f994c WHIRLPOOL eacd05e4a17639c7a7d6604f16bdb4bf7182d021772dd3ee02d70ff2c1a3b64df3e1b3eb5df95dd6a48825b6c7591fe6d95d27e5900f75f279a766011cffe638
+MISC metadata.xml 359 SHA256 3ab9011d4581de4e59fa640f9e34ea8cb43eace708c629a62888fd6fc5fd6491 SHA512 ebc0223b160c96e3f17a22e971626877b4836e49e6043a3907e42748878d62eea283168e29ea78ffb12d14c4a269b2c283e22ccb352b08cb3a83266c6315fe1c WHIRLPOOL 27d61d66b556b0f0c9ce98c5160851bed238c5ad6d4443856055cb715fee447fb648e567db43704f97cb9acadba6e9d026b90f83fdbb2fff4cda56b0f2ad68d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCTWtIACgkQ4MrvBE1wQ8l+1wCdH48xg/B3jELnk5PiQuAJ1S1/
-oXgAoKC0YVLMKbfwybA9k01Du7Ao/kNG
-=rsa9
+iEYEAREIAAYFAlEOU4wACgkQCaWpQKGI+9TYHACffhOvqjRB0rVnJFICa3xxGp+Z
+WNIAn24B0v39DVDCTQoDopVbkBNxsoyj
+=vap2
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gtest/files/gtest-1.4.0-asneeded.patch b/dev-cpp/gtest/files/gtest-1.4.0-asneeded.patch
deleted file mode 100644
index f8e7d004d735..000000000000
--- a/dev-cpp/gtest/files/gtest-1.4.0-asneeded.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gtest-1.4.0.orig/Makefile.am gtest-1.4.0/Makefile.am
---- gtest-1.4.0.orig/Makefile.am	2009-10-02 16:04:30.000000000 +0900
-+++ gtest-1.4.0/Makefile.am	2010-01-20 16:52:34.000000000 +0900
-@@ -305,7 +305,7 @@
- TESTS += test/gtest-unittest-api_test
- check_PROGRAMS += test/gtest-unittest-api_test
- test_gtest_unittest_api_test_SOURCES = test/gtest-unittest-api_test.cc
--test_gtest_unittest_api_test_LDADD = lib/libgtest_main.la
-+test_gtest_unittest_api_test_LDADD = lib/libgtest.la
- 
- TESTS += test/gtest-listener_test
- check_PROGRAMS += test/gtest-listener_test
diff --git a/dev-cpp/gtest/files/gtest-1.4.0-gcc-4.7.patch b/dev-cpp/gtest/files/gtest-1.4.0-gcc-4.7.patch
deleted file mode 100644
index 05c270004866..000000000000
--- a/dev-cpp/gtest/files/gtest-1.4.0-gcc-4.7.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-fix for upstream for building with newer gcc versions
-
-r339 | zhanyong.wan | 2009-11-12 21:54:23 -0500 (Thu, 12 Nov 2009) | 2 lines
-
-...; makes gtest-param-util-generated.h conform to the C++ standard (by Zhanyong Wan).
-
-Index: include/gtest/internal/gtest-param-util-generated.h
-===================================================================
---- include/gtest/internal/gtest-param-util-generated.h	(revision 338)
-+++ include/gtest/internal/gtest-param-util-generated.h	(revision 339)
-@@ -53,6 +53,21 @@
- #if GTEST_HAS_PARAM_TEST
- 
- namespace testing {
-+
-+// Forward declarations of ValuesIn(), which is implemented in
-+// include/gtest/gtest-param-test.h.
-+template <typename ForwardIterator>
-+internal::ParamGenerator<
-+    typename ::std::iterator_traits<ForwardIterator>::value_type> ValuesIn(
-+        ForwardIterator begin, ForwardIterator end);
-+
-+template <typename T, size_t N>
-+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]);
-+
-+template <class Container>
-+internal::ParamGenerator<typename Container::value_type> ValuesIn(
-+    const Container& container);
-+
- namespace internal {
- 
- // Used in the Values() function to provide polymorphic capabilities.
diff --git a/dev-cpp/gtest/files/gtest-1.5.0-asneeded.patch b/dev-cpp/gtest/files/gtest-1.5.0-asneeded.patch
deleted file mode 100644
index d831bc4f02c0..000000000000
--- a/dev-cpp/gtest/files/gtest-1.5.0-asneeded.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gtest-1.5.0.orig//Makefile.am gtest-1.5.0//Makefile.am
---- gtest-1.5.0.orig//Makefile.am	2010-04-16 07:02:08.000000000 +0900
-+++ gtest-1.5.0//Makefile.am	2010-05-18 17:27:48.000000000 +0900
-@@ -247,7 +247,7 @@
- TESTS += test/gtest_all_test
- check_PROGRAMS += test/gtest_all_test
- test_gtest_all_test_SOURCES = test/gtest_all_test.cc
--test_gtest_all_test_LDADD = lib/libgtest_main.la
-+test_gtest_all_test_LDADD = lib/libgtest.la
- 
- # Tests that fused gtest files compile and work.
- FUSED_GTEST_SRC = \
diff --git a/dev-cpp/gtest/gtest-1.4.0.ebuild b/dev-cpp/gtest/gtest-1.4.0.ebuild
deleted file mode 100644
index b7d39218c1e4..000000000000
--- a/dev-cpp/gtest/gtest-1.4.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.4.0.ebuild,v 1.3 2012/05/22 23:43:06 vapier Exp $
-
-EAPI="2"
-inherit autotools eutils
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="http://code.google.com/p/googletest/"
-SRC_URI="http://googletest.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="examples static-libs"
-
-DEPEND="dev-lang/python"
-RDEPEND=""
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die "sed failed"
-
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGES CONTRIBUTORS README
-
-	use static-libs || rm "${D}"/usr/lib*/*.la
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins samples/*.{cc,h}
-	fi
-}
diff --git a/dev-cpp/gtest/gtest-1.5.0.ebuild b/dev-cpp/gtest/gtest-1.5.0.ebuild
deleted file mode 100644
index bd46ec1df9c8..000000000000
--- a/dev-cpp/gtest/gtest-1.5.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.5.0.ebuild,v 1.2 2011/12/09 12:29:08 naota Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit autotools eutils python
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="http://code.google.com/p/googletest/"
-SRC_URI="http://googletest.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos"
-IUSE="examples threads static-libs"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die "sed failed"
-
-	python_convert_shebangs -r 2 .
-
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with threads pthreads) || die
-}
-
-src_test() {
-	# explicitly use parallel make
-	emake check || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGES CONTRIBUTORS README || die
-
-	if ! use static-libs ; then
-		rm "${ED}"/usr/lib*/*.la || die
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins samples/*.{cc,h} || die
-	fi
-}
diff --git a/dev-cpp/gtest/metadata.xml b/dev-cpp/gtest/metadata.xml
index e966576d9b89..795184ef1bc5 100644
--- a/dev-cpp/gtest/metadata.xml
+++ b/dev-cpp/gtest/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>matsuu@gentoo.org</email>
+	<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<doc lang="en">http://code.google.com/p/googletest/w/list</doc>