gentoo resync : 18.11.2018

4 files changed, 3 insertions, 181 deletions

diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index 0c2112d7afdf..973fbb9946ac 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,7 +1,3 @@
-DIST dbus-glib-0.102.tar.gz 783792 BLAKE2B 5dca4d1d4c9d281e46ad9b15307a738698d6588b064fe07ddeae63d7fbbca0b1338d655ebcdb2b4259ce8979c5ec2888c05f8578d73f04c6c7037bd80e6692d7 SHA512 9bf4b33dd264eaed9ade0e35f0ad47986c31bd5e3de4d3e2fcee66a9be87000b6121bc810b9a5a24eca53190d98323b871dc78f341df8e05bd0247b096cf778f
-DIST dbus-glib-0.108.tar.gz 812488 BLAKE2B e958c4054c09ec98d7bff659917a9c162dc4338aabcc5c6ec6d7ec34304867dd65d373eeb8871cd188424a36dafa337bb713fb2aaa87e47d1ed4f91a4e7ecd7f SHA512 9fa7cd1c22bf6ee1e345dd6fe48aa725abc01b3b180ba430efea9996403ad99636b2c40f682956978ae5049c110c3298fa199470a4cc05907e11773d034ea5b1
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
-EBUILD dbus-glib-0.102.ebuild 2004 BLAKE2B 96ae72736aa5720e4a977014e4ddf8ea50296d1a769201864f19f36b1a910c8489a894b983a6106970a2407efea6d1c56510f78f2b5a27d6dff62972ac4e9de7 SHA512 abfa6ade67b9dfbbba290cf4bf5af1224763ec6ffb7b5bd5e1a420cef6117325dfa292f5916f905656348487346b041fff0fe98ea120229c5aecaf4ba1e92f54
-EBUILD dbus-glib-0.108.ebuild 1957 BLAKE2B 97f1a627cb0d1f45cb9668483e2ab90cd56c633759f0286a3ab87016fbcfc8126f890f5095275ab1ceae109783b2be1cf8d587e970f10798e48cf15edc4fc707 SHA512 3b419676f6a1b24181b61dcc20becb6f25df57ce61322f9f186e89f67a084efa8f86b69a282ae48f4ef451011238d7744e49df8f23f332d1a33297b934319325
-EBUILD dbus-glib-0.110.ebuild 1894 BLAKE2B bb1612ef3b213d954453594e7f6a7c276f6ba2984e2497cc285405f43e6f23db5f5e30c66cde71584d7b0ec44ec09d99f5f7e1cf74771d83d30665204a07ad31 SHA512 5cc1121a6983b01c9bc245f08dbbb33e40d0d25e4d8a7b371c47b4bd5caa34ef303ce7a5db4edad693e74cff0dfddfe21b01e5b434c23c816d9b4cc2650928a9
+EBUILD dbus-glib-0.110.ebuild 1921 BLAKE2B 256787694e509b15df07840a49c05b58d60e9778b67236583c703b9940c292b0be40ada2c070d04d1221be9a35f80dbfad82d5417c1875b383e0a753c228d991 SHA512 7f9251d9cd0b7195671e2e20cfc1f9b105bead433161147790844574f5fe71795d80ac31e1cdca3cbdcef85ec232b5d604495f1f45d5fb42cc74b30e767cab8a
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.102.ebuild b/dev-libs/dbus-glib/dbus-glib-0.102.ebuild
deleted file mode 100644
index 9abc12ab03ad..000000000000
--- a/dev-libs/dbus-glib/dbus-glib-0.102.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit bash-completion-r1 eutils multilib-minimal
-
-DESCRIPTION="D-Bus bindings for glib"
-HOMEPAGE="https://dbus.freedesktop.org/"
-SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
-IUSE="debug doc static-libs test"
-
-CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}]"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-set_TBD() {
-	# out of sources build dir for make check
-	export TBD="${BUILD_DIR}-tests"
-}
-
-src_prepare() {
-	epatch_user
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-bash-completion
-		$(use_enable debug asserts)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable doc gtk-doc)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	use doc || ln -s "${S}"/doc/reference/html doc/reference/html #460042
-
-	if use test; then
-		set_TBD
-		mkdir "${TBD}"
-		cd "${TBD}"
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf \
-			"${myconf[@]}" \
-			$(use_enable test checks) \
-			$(use_enable test tests) \
-			$(use_enable test asserts) \
-			$(use_with test test-socket-dir "${T}"/dbus-test-socket)
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use test; then
-		set_TBD
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake
-	fi
-}
-
-multilib_src_test() {
-	set_TBD
-	cd "${TBD}"
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send
-	rm -rf "${ED}"/etc/bash_completion.d || die
-
-	prune_libtool_files
-}
diff --git a/dev-libs/dbus-glib/dbus-glib-0.108.ebuild b/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
deleted file mode 100644
index bf3855c09031..000000000000
--- a/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit bash-completion-r1 eutils multilib-minimal
-
-DESCRIPTION="D-Bus bindings for glib"
-HOMEPAGE="https://dbus.freedesktop.org/"
-SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
-IUSE="debug static-libs test"
-
-CDEPEND="
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.8[${MULTILIB_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-set_TBD() {
-	# out of sources build dir for make check
-	export TBD="${BUILD_DIR}-tests"
-}
-
-src_prepare() {
-	epatch_user
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}"/var
-		--enable-bash-completion
-		--disable-gtk-doc
-		$(use_enable debug asserts)
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	ln -s "${S}"/doc/reference/html doc/reference/html #460042
-
-	if use test; then
-		set_TBD
-		mkdir "${TBD}"
-		cd "${TBD}"
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf \
-			"${myconf[@]}" \
-			$(use_enable test checks) \
-			$(use_enable test tests) \
-			$(use_enable test asserts) \
-			$(use_with test test-socket-dir "${T}"/dbus-test-socket)
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use test; then
-		set_TBD
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake
-	fi
-}
-
-multilib_src_test() {
-	set_TBD
-	cd "${TBD}"
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send
-	rm -rf "${ED}"/etc/bash_completion.d || die
-
-	prune_libtool_files
-}
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index 2b44b1c57053..b71e62e1ff0c 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"
 
 CDEPEND="
@@ -19,6 +19,7 @@ CDEPEND="
 	>=sys-apps/dbus-1.8[${MULTILIB_USEDEP}]
 "
 DEPEND="${CDEPEND}
+	>=dev-util/glib-utils-2.40
 	>=dev-util/gtk-doc-am-1.14
 	virtual/pkgconfig
 "