gentoo resync : 03.03.2021

3 files changed, 2 insertions, 67 deletions

diff --git a/dev-libs/dbus-c++/Manifest b/dev-libs/dbus-c++/Manifest
index 43430b8b80cc..a63b196f829d 100644
--- a/dev-libs/dbus-c++/Manifest
+++ b/dev-libs/dbus-c++/Manifest
@@ -1,6 +1,5 @@
 AUX dbus-c++-0.9.0-gcc-4.7.patch 1073 BLAKE2B 2cc43e4d23c14646adfffae77bc1168b69d4e3e2049ae8d3b5283d41f8214fd6884500fc014b66dfbc86dc1928c7e5c33024833e4b2bb28ddad6d17e443db2d1 SHA512 3625f7473db8ee069009655f5c8b68bd7290d622be56ace8e1472bd93b0a946a000bf0d728839cd6309414cbcb925247bfee888bb58fda8316e906fe5a8e25b2
 AUX dbus-c++-gcc7.patch 891 BLAKE2B e3f1c902b52cbec776849c86d2d4c7a13acbc907355c380cad7eabdfe670d9058a1ddd3687af9bcbbd4d815affea21728d8296f5a87122bc6b5fc99396ea0428 SHA512 b8c67af11620c2414d482cb3d77784f7c9831e64e0bc9cb9b946e13b0ad13135f06cfb894667fb9b184e6fc7e750df0769a2d4c09df4f430c2189c2c3804fbae
 DIST libdbus-c++-0.9.0.tar.gz 466362 BLAKE2B 401e266286fef383754c945f3adcf8e68a1169e55d33614f1e11227c324fe1219db7043674b5894d548f827d0b673ab4f012babbb4a395c212f6e17ef6d0e281 SHA512 7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319
-EBUILD dbus-c++-0.9.0-r3.ebuild 1716 BLAKE2B af521bfc1a4162a3b34405815d3ba69fc625ceb4af960812f8a21b84f1c06cd36c4775028e32608a0e6555e105b6d989778701a7b59c6b2e3051cbfa71ba5187 SHA512 c090408d04caf9bedcbd71f392a88552f63621b727e01be8b26edd0adb73854479672fb1f93420b4b9b676aa67477d476bb98ee6326fd15745e695854cf073f2
-EBUILD dbus-c++-0.9.0-r4.ebuild 1613 BLAKE2B aa91bed053176d5a2812d7404fcce52118e03ceac25ec65b79a5d52f3b054a01e9eda212de6ed933cd0d560b5f2713580213f37dd686c4a4a9f74da0324abb81 SHA512 c8346b94cf2fd4cba79194a662b4a84579fc4c350c5b4f857ef8d173927c3788af11be4f4455608e1fbc26bfc73704cc50b0dbc5a4b7a862c3bb48b06b4733ea
+EBUILD dbus-c++-0.9.0-r4.ebuild 1612 BLAKE2B 28e37d9c1b7fafba46f71ad1c21fe4aa74a0ad04b86457be87d2a579b01270ca9bc273e8590d1093a7e1c18b7f8ba017ba6bf384157d45be4cea028939f5d7ff SHA512 4a9facb08cfc44d8c59820c9086e6112fdc24a2ff264db93bf76399b49fd5cc4d5913f9aca987c2f0a3ecd9a56cae3a33ebe7f00ccc9c2ea35bf68e9547839f5
 MISC metadata.xml 364 BLAKE2B 12695ecb75cc83a5aff33d9d6a0cb001b3d37d8d567806d1d76c79246e94f0796ca65a19799e18c06ef4f22fa19cb434521f1f7c02b0234ac5a7f8fddd2f1edc SHA512 9b4bcacc042091d3d5c058f2cd98d48ba3fea02b4687d137d95dd6219808dcdaf964793a6d6761c29a52eb31e55afa17bb45717d85c8904312a66f6c5ce03d9e
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild
deleted file mode 100644
index afa3caaaab8a..000000000000
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
-
-inherit autotools-multilib eutils
-
-DESCRIPTION="Provides a C++ API for D-BUS"
-HOMEPAGE="https://sourceforge.net/projects/dbus-cplusplus/ https://sourceforge.net/apps/mediawiki/dbus-cplusplus/index.php?title=Main_Page"
-SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="doc ecore glib static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/dbus[${MULTILIB_USEDEP}]
-	ecore? ( dev-libs/efl )
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/cppunit[${MULTILIB_USEDEP}]
-	virtual/pkgconfig"
-
-S=${WORKDIR}/lib${P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-4.7.patch #424707
-	"${FILESDIR}"/${PN}-gcc7.patch #622790
-)
-
-multilib_src_configure() {
-	# not just using autotools-multilib_src_configure because of multilib_native... logic
-
-	# TODO : add ecore multilib support if/when it is multilibified
-	ECONF_SOURCE="${S}" econf \
-		--disable-examples \
-		$(multilib_native_use_enable doc doxygen-docs) \
-		$(multilib_native_use_enable ecore) \
-		$(use_enable glib) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		PTHREAD_LIBS=-lpthread
-	# ACX_PTHREAD sets PTHREAD_CFLAGS but not PTHREAD_LIBS for some reason...
-
-	if multilib_is_native_abi; then
-		# docs don't like out-of-source builds
-		local d
-		for d in img html; do
-			ln -s "${S}"/doc/${d} "${BUILD_DIR}"/doc/${d} || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use doc; then
-		dohtml -r "${S}"/doc/html/*
-	fi
-}
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
index ea5c32b3c3d2..5da1267c21ac 100644
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc ecore glib test"
 RESTRICT="!test? ( test )"