Merge branch 'next'

6 files changed, 0 insertions, 96 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 7e96e89812cb..759d12f2f833 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index 5707a960f503..bff61aa05416 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -5,9 +5,7 @@ AUX glog-0.4.0-errnos.patch 4580 BLAKE2B 9a7f86fb2dbcab68948914dcef74e1e08750462
 AUX glog-0.4.0-fix-test-on-ports.patch 804 BLAKE2B a06a45c977ab55f086e707ad2ea113d93dedb2710fc1cf12fafc700702eb8be5812b73ea4b941355ec948d4659963e1bc7829df12a4da9ba7b80caa3d6ca20e7 SHA512 dd787c363a08810abec89f64b5aa0f77206a0963af1a0fcf5b91549528df875e83cf736cfc2d9eff63007c2d25d0ba71092368272bb5588525cf9af6300ea9a0
 AUX glog-0.4.0-fix-x32-build.patch 913 BLAKE2B fc7d4e452580b8ca073439782204da8d04fd36dfc6f06e19426d980127b505a68fc8044b62b04fee5a9b218167a2e119307ea4ec1915807ee6a3ebf89aea83a9 SHA512 2c0bd65824e0ed9923c328554a6dad25d9a02b776e465044a8197416a14da5d986ea9b9394e2da2e6981a1d4149ad67d22b753566177da8c13c0e481432f4e54
 DIST glog-0.3.4.tar.gz 522508 BLAKE2B 4a188d5998005b29afc52f2ea548f33e06a68da993bb74960e5aedb214ec52ef9e9fc39efb1a34f38f217b92df7db064ff01d58df36c3e4ad789becc97335ec2 SHA512 139525b546a9eccacc9bebf7cc3053ba52229e9488485ad45344c3d3134ca819d3b571250c0e3a6d84097009c8be89b0f4fa16ef5ec838ffcc237ae11c3a034c
-DIST glog-0.3.5.tar.gz 532275 BLAKE2B a455f3ff8fc7cf2861a4351a0305db9455bb79977e57c49b6269b3fa2c147cd9627bfaf4c7aaa04fe4a49158d79abeb5b985813fe8c473d6005e915335c0d693 SHA512 a54a3b8b4b7660d7558ba5168c659bc3c8323c30908a4f6a4bbc6f9cd899350f3243aabc720daebfdeb799b276b51ba1eaa1a0f83149c4e1a038d552ada1ed72
 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
 EBUILD glog-0.3.4-r1.ebuild 1204 BLAKE2B 9d42deb4393209103cfe12326f38ed5b43fb5ba7237716b92b011846686512ba83c6e703993dee40307ea6a66406467d90eaf199ac8d271c83ea775c0e2ded30 SHA512 184fb374d97f3b0ce68fd2eac0c39fc60e35b774f200eb38f91be810ccf7b4adc2bc2f33e3fc77949ed1134f32648dcdd52f49602976a9e80ea6edeb39e8f232
-EBUILD glog-0.3.5.ebuild 1211 BLAKE2B c76e952b0489c8bfc94312add2d7ba4bed10f88417113cad09584da561cc3bf64d19af57f56a586fc839f9df92704bf0fe0d65d629d2ccc3a8b434f21bdad42d SHA512 696272905be2648db792d8b74d43b6a36e2a5ba2b1848f301b78a45dc1e3c2921687fc748a7704ae23b7b8962c7ce9b50a81fdf37711f00dafa9ef10321cf1ca
 EBUILD glog-0.4.0.ebuild 1026 BLAKE2B fa3e86848379b11f6e5b150546eca725117e8f1aa831612c9ec8a04fbb6c77df47c78eefe570d8e19c4cb1831e87065adbbc81a9600f50a5146f340bd302309f SHA512 a5daf1580a22396713804053736893290fa0fc5784074719ebd1b4b1fd270253427f59e3e00120c33706a9142d8530b8bf67a7e815b6321628c9e605d1aa748c
 MISC metadata.xml 527 BLAKE2B a0ed7bafa31a61313d12431237947a4a1871df9bd13a6c95eee61d638d79a0ac5695a3fd4cdf22b696ccf632c1fa1d25c64b834649747fdd0b869cb2ba836b8d SHA512 37ba0ce628370098503c572a1af684a262872f4af72418ea7f8d3311fc46ce5a81940c762a1cc81ed779e2919b32d10d1c0eaaccb8025fdbb171f0e6c5300d53
diff --git a/dev-cpp/glog/glog-0.3.5.ebuild b/dev-cpp/glog/glog-0.3.5.ebuild
deleted file mode 100644
index 945371f45537..000000000000
--- a/dev-cpp/glog/glog-0.3.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Google's C++ logging library"
-HOMEPAGE="https://github.com/google/glog"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="gflags static-libs test unwind"
-RESTRICT="test"
-
-RDEPEND="
-	gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
-	"${FILESDIR}"/${PN}-0.3.4-fix-build-system.patch
-	"${FILESDIR}"/${PN}-0.3.4-fix-gcc5-demangling.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable gflags) \
-		$(use_enable static-libs static) \
-		$(use_enable test gtest-config) \
-		$(use_enable unwind)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-cpp/sparsehash/Manifest b/dev-cpp/sparsehash/Manifest
index ca9af6353664..ea9622ae7661 100644
--- a/dev-cpp/sparsehash/Manifest
+++ b/dev-cpp/sparsehash/Manifest
@@ -1,7 +1,4 @@
-AUX 1.10-gcc46.patch 344 BLAKE2B 1fc47b87541612868ec90f9460f191938660a54bfcae7ebd894140b54d979700359def84c62627e53560524c84e5ca17f809eb79d103aac91939243ad7ccbd63 SHA512 10ba18dd4d102c92c467846d46288080f712f7d82b9a786daab13e74b9cbd0dd9923075d7e12288adaac68e31b96c8eb0a7d010e5d2fe3a2d2321413f2dd51a8
 AUX sparsehash-2.0.3-fix-buildsystem.patch 2649 BLAKE2B d7a5e7d4343279af069e0b8eb00ad2b8fc33e26840ee0a9ca63c73ea37aa99548d3c741d70647078424f27906946f261b07d764be9adaf47c1d13bc4bf6d302f SHA512 6732a3197550f75ce7a83d61882938d841694f41e9daec51ef36206306fdabdd33dd46eaec106a8877826098b8227368c1ed0962d36aa220abd0336713667bd4
-DIST sparsehash-1.10.tar.gz 289819 BLAKE2B fb66d945a52862465a870931b83846619fb7034b2acae053d75d859b359d866257a779d522d9267ab729d19aeac1365fc699e4a541b446f874c323f7c8ceaa0b SHA512 ecc01e755885b8da5927f4f56c95c02ce9a43e5c0280cdc1cdfa812f787396646925c0f602a35decdf94144e8d2f3ac31b80f5ed98b70ccca607a29bb11f8a35
 DIST sparsehash-2.0.3.tar.gz 322046 BLAKE2B 3749875bfbfa0ec9b92cfe68496a318208539745ca1b76910193879cb9ac790952b390cfbd941ff6e9714bd61546844e8f2d958d9b24845efeb54743facac136 SHA512 bb00d0acb8eba65f7da8015ea4f6bebf8bba36ed6777881960ee215f22b7be17b069c59838d210551ce67a34baccfc7b2fed603677ec53c0c32714d8e76f5d6c
-EBUILD sparsehash-1.10.ebuild 532 BLAKE2B f217f5ff5252e8516fc6e6817e073de8d500df0dbe296d78b3ddc8f63c1c020f83a4294e146d2328ff0a249b24c2a3863478d671da23cf61d89e00d61317d5a9 SHA512 768f1ff2c47d97ff663774a86b9540005810826dd7bf1ff5867452ef00f7f22f11dffabddc78389b09d00cdbfd27f2b5d765f90e030c32bbead6368747405184
 EBUILD sparsehash-2.0.3-r1.ebuild 520 BLAKE2B 13fdb6d8404479aa367344b2f5c49bb12074856d164123793240577aa3133214246549485cbfcf064aaf25045f2e3085ba5a1a696976b5d8a39d68ada4ffe273 SHA512 805380e93b7ef20ed633ac1971b76c0d1dba9a27687772cb1bfb067d63a575a8c59d95ffb9658a9b550b14d04927685d66dbaec00a93426c64c18dea1ff9b284
 MISC metadata.xml 253 BLAKE2B 66113301c8da953a7e3d95c7ab09c131d69d22e983dee362829ee45535b85317f752be7094a7aead5026613dbef089a39bf3ea245746c6296feea6c251508219 SHA512 35cf1768d75e03240940117dbdbc97f4e7713013af6c728eadd621576233da89dc9134e4163b41619fbd42b76fcb31707786d643fe3b09c78f26c0698b9fd427
diff --git a/dev-cpp/sparsehash/files/1.10-gcc46.patch b/dev-cpp/sparsehash/files/1.10-gcc46.patch
deleted file mode 100644
index 4339b487eca0..000000000000
--- a/dev-cpp/sparsehash/files/1.10-gcc46.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/google/sparsetable |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/google/sparsetable b/src/google/sparsetable
-index 0eeb22e..e8580b9 100644
---- a/src/google/sparsetable
-+++ b/src/google/sparsetable
-@@ -83,6 +83,8 @@
- #endif
- #endif
- 
-+#include <cstddef>
-+
- _START_GOOGLE_NAMESPACE_
- 
- #ifndef HAVE_U_INT16_T
diff --git a/dev-cpp/sparsehash/sparsehash-1.10.ebuild b/dev-cpp/sparsehash/sparsehash-1.10.ebuild
deleted file mode 100644
index b3855b668231..000000000000
--- a/dev-cpp/sparsehash/sparsehash-1.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="An extremely memory-efficient hash_map implementation"
-HOMEPAGE="https://github.com/google/sparsehash"
-SRC_URI="https://google-sparsehash.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gcc46.patch
-}
-
-src_install() {
-	default
-
-	# Installs just every piece
-	rm -rf "${D}/usr/share/doc"
-	dohtml doc/*
-}