3 files changed, 11 insertions, 75 deletions
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 )"
 
diff --git a/dev-libs/dbus-c++/metadata.xml b/dev-libs/dbus-c++/metadata.xml
index 142f634f0e53..b3ee3d587a64 100644
--- a/dev-libs/dbus-c++/metadata.xml
+++ b/dev-libs/dbus-c++/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="ecore">Use Ecore integration</flag>
-		<flag name="glib">Use glib integration</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">dbus-cplusplus</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">dbus-cplusplus</remote-id>
+ </upstream>
+ <use>
+  <flag name="ecore">Use Ecore integration</flag>
+  <flag name="glib">Use glib integration</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file