gentoo auto-resync : 02:09:2022 - 10:16:01

3 files changed, 2 insertions, 149 deletions

diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index dc4c4529275f..a9a7c23951df 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,6 +1,5 @@
 AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd
 AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
-EBUILD libdbusmenu-16.04.0-r1.ebuild 3881 BLAKE2B a98ac44ba760b367bfb0473ece2d77419d6ba659700e412a8b6a6d335e7cb9d3e680a496621c2ac2ff0df2cb4d90345484a17b3f81feba56a549db6e3a1cc9a3 SHA512 23ff195bf5c1eb0e37f7dc7de5adf6e242b287c843d192544fca5234978c093bfea4a5159dd0dfe1db34d9c0aa91f86375e18baea1b9254a2d1678c677dd4e39
-EBUILD libdbusmenu-16.04.0-r2.ebuild 3861 BLAKE2B 29473238e37be9625b16ea2e343e0a6febc5290c813790fa0e960ede6c0937dcf1b185f17e9ed73b590def7f90e10c0d7f7ff502f3ec3f35388f0668c200bad7 SHA512 19a384132b510e15a3e665d5fe77c6362c96935bee47c54597b23a62cca72e2708ab1376a7f62d050057a9dcd2a5a85f4f3666bb0b47c26bf999f950490a83f2
+EBUILD libdbusmenu-16.04.0-r2.ebuild 3860 BLAKE2B 7e4a512b6ca30bddfa7016cf02efafaecb8bccbcf355e440d031a45a671cae03fb64fcf28d0728cad091293a97d0f072e209196034905c641b4c938f556e05a9 SHA512 e1472915d5c4e665fb94f8fdb87ea4735f31c594cc89de4c40b3098b051c1ac58e5284b0cc7b5610f576b1bc2921c5c85fed94e27b6b7dd4776338fa0944b987
 MISC metadata.xml 362 BLAKE2B 30fac8611210ba6263d5a91f9975741f1c799d5b841d278ccdf440e67f7dc3040f9937a79bbf6028b1ff6d1f2389eea6746e0772048b7c9b71978cc75fbac20f SHA512 80dff178352278089470bd2465f750e336056cba3321719b18dce1188c5dfde302c6bc0efcaa84fcc049840616a9949fd1a39e143ca2c61e7a8eaeb317b74c4d
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
deleted file mode 100644
index a179f387ee24..000000000000
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION=0.16
-VALA_USE_DEPEND=vapigen
-VIRTUALX_REQUIRED=manual
-
-inherit autotools flag-o-matic multilib-minimal vala virtualx xdg-utils
-
-DESCRIPTION="Library to pass menu structure across DBus"
-HOMEPAGE="https://launchpad.net/libdbusmenu"
-SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="debug gtk gtk3 +introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.35.4[${MULTILIB_USEDEP}]
-	dev-libs/libxml2[${MULTILIB_USEDEP}]
-	gtk? ( x11-libs/gtk+:2[introspection?,${MULTILIB_USEDEP}] )
-	gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1 )"
-# tests also have optional dep on valgrind which we do not enforce
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	introspection? ( $(vala_depend) )
-	test? (
-		>=dev-libs/json-glib-0.13.4[${MULTILIB_USEDEP}]
-		>=dev-util/dbus-test-runner-15.04.0_p100
-		gtk? ( ${VIRTUALX_DEPEND} )
-		gtk3? ( ${VIRTUALX_DEPEND} )
-	)"
-
-pkg_setup() {
-	xdg_environment_reset
-}
-
-src_prepare() {
-	if use introspection; then
-		vala_src_prepare
-		export VALA_API_GEN="${VAPIGEN}"
-	fi
-
-	eapply "${FILESDIR}/${P}-configure-fix.patch"
-	eapply "${FILESDIR}/${P}-werror.patch"
-	eapply_user
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-flags -Wno-error #414323
-
-	local myconf=(
-		--cache-file="${BUILD_DIR}"/config.cache
-		--disable-gtk
-		--disable-static
-		# dumper extra tool is only for GTK+-2.x
-		--disable-dumper
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable introspection vala)
-		$(use_enable debug massivedebugging)
-		$(use_enable test tests)
-	)
-	local ECONF_SOURCE=${S}
-	econf "${myconf[@]}"
-
-	GTK_VARIANTS=( $(usex gtk 2 '') $(usex gtk3 3 '') )
-	local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" )
-	local top_builddir=${BUILD_DIR}
-
-	gtk_configure() {
-		local gtkconf=(
-			"${myconf[@]}"
-			--enable-gtk
-			--with-gtk="${MULTIBUILD_VARIANT}"
-		)
-		mkdir -p "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-		econf "${gtkconf[@]}"
-
-		rm -r libdbusmenu-glib || die
-		ln -s "${top_builddir}"/libdbusmenu-glib libdbusmenu-glib || die
-	}
-	[[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant gtk_configure
-}
-
-gtk_emake() {
-	emake -C "${BUILD_DIR}"/libdbusmenu-gtk "${@}"
-	multilib_is_native_abi && \
-		emake -C "${BUILD_DIR}"/docs/libdbusmenu-gtk "${@}"
-}
-
-multilib_src_compile() {
-	emake
-
-	local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" )
-	[[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \
-		gtk_emake
-}
-
-multilib_src_test() {
-	emake check
-
-	gtk_test() {
-		# please keep the list of GTK+ tests up-to-date
-		emake -C "${BUILD_DIR}"/tests check \
-			TESTS="test-gtk-objects-test test-gtk-label
-				test-gtk-shortcut test-gtk-reorder test-gtk-remove"
-	}
-	local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" )
-	[[ ${GTK_VARIANTS[@]} ]] && virtx multibuild_foreach_variant \
-		gtk_test
-}
-
-multilib_src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" )
-	[[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \
-		gtk_emake -j1 install DESTDIR="${D}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	# kill old symlinks that Portage will preserve and break install
-	if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib ]]; then
-		rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib" || die
-	fi
-	if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk ]]; then
-		rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk" || die
-	fi
-}
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
index ca19cfd70185..bf62532534ef 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="debug gtk gtk3 +introspection test"
 RESTRICT="!test? ( test )"