gentoo resync : 31.05.2021

3 files changed, 78 insertions, 3 deletions

diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index f57088a4908f..f144fd65a54b 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -3,5 +3,7 @@ AUX libappindicator-12.10.0-lp1867996-fix-g-signal-emit.patch 2937 BLAKE2B f5782
 AUX libappindicator-12.10.0-lp1867996-fix-iterate-search-path.patch 483 BLAKE2B f81ffe5960196ebf683f9f52b5cba097843727086f4e836f7d27788e1cfbcb7d54196f19bf0035910aeb087b8896b54f7d91e318781fed05c74571a0a000d63a SHA512 a9ece0e95155a83a26fa070381edd3e46bf6c0346e5b5adbe6dde84e9a5792fb6d92b40dc98f7309f2776efcbeb0cd8ff7da1c0091f399b1e00eef809d930a3d
 AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326b79a65f9ac7110c9d82a61efb993051d691d5cc728075bdd5ac904e9986cb0e41780d3e36e1637e5bd58532781934587b8c1bdf458e SHA512 b021bc0ec7fc1b311add7d6f8a9018fa6f5e807168055c95440e5f5d3d6d5b48375e11542b906058a0786194b1911c8bdcab9632573c1f128772ff6d54aa9173
 DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
-EBUILD libappindicator-12.10.0-r301.ebuild 2107 BLAKE2B 08669f52456439e1ed2e79e621c05124ce7411905c4edae741ea56db68f9fb4f6b0ba96d0a62ce0ed0dc469fee47807111854c3182eaa5a0c06d56c1046a1d04 SHA512 eb6e2de2779cf909eea82a208dd02659a32559968040fe07804de7cf739570cdd466a08b3956771aaacc608d700b8dd9b3299bd6b7ecb4a6373dedba7790fda1
+DIST libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz 75204 BLAKE2B ccc7909f25946413cf39275d8565afca253b3a2676272e4d3833f030a114e7be695fe958d2d99868a20d03a2b9c4a1fcd7fdfba07325b7a9f7f39879851e0366 SHA512 cc60875b1c4ab06348eece442a59a4057d7e13f25605435902242558e8dd5e66aeeee6725b9bd2662ef89052d3614dc4577ed8c233e9b84236a75e771aa67352
+EBUILD libappindicator-12.10.0-r301.ebuild 2120 BLAKE2B 1463512cb7bc35e86a3aaa486f85637aee8269931b2385d2a6006743be5f7055b16308137631c7f867d5b7b3c7986b94c5736ec2ad7aece1b3f8b8f0d90f67db SHA512 a7aa23d5998bbf8e8e8c8d278fa0ab6acd3ddfe3e4f9a5513f2cec1e14cc2cdee062d76990d248add697f5dc01dd178fc53e0f0a18d16d5623f0a07293f5171f
+EBUILD libappindicator-12.10.1_p20200706.ebuild 1934 BLAKE2B 24d791c45d2680996ecd499bc99dd4588d9e0d0b8815acd1440fffee94701b4a24862af9733d29b70c699a8c38229696b64e2600cecacd718a4ed1d0f9eb7935 SHA512 4280bba256963d0dd64b799e40d28481f28d8e3269b7b251ea7fe89a724dceb7441753eda9eaec2eb5bbd8dba5114c31bebceed5e84e93c47c2927b82dec3a49
 MISC metadata.xml 250 BLAKE2B 8bd202d452582a51ddf3c4bc92840531d0fee0262d112e5fc1173c8fb95a0776efe14ff15613373fd4acab6082ad6f672e278a9b942e072a643b351e8af4d467 SHA512 161da1b732e0f23b06e0732db24f27cb486e7c673e8585d2f6403dc23147b56b5a64dd09978e3dd2db20e9e6a462daf50fe8bc73774d52445d1f6549d82104e0
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
index 32b93d812d6b..21db99eac660 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r301.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools ltprune multilib-minimal vala xdg-utils
+inherit autotools multilib-minimal vala xdg-utils
 
 DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
 HOMEPAGE="https://launchpad.net/libappindicator"
@@ -72,5 +72,5 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
new file mode 100644
index 000000000000..c963bba5ce2d
--- /dev/null
+++ b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools multilib-minimal vala
+
+DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
+HOMEPAGE="https://launchpad.net/libappindicator"
+
+MY_PV="${PV%_p*}"
+PATCH_VERSION="${PV#*_p}"
+SRC_URI="mirror://ubuntu/pool/main/liba/${PN}/${PN}_${MY_PV}+20.10.${PATCH_VERSION}.1.orig.tar.gz"
+
+LICENSE="LGPL-2.1 LGPL-3"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+IUSE="+introspection test"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.98[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.35.4:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libdbusmenu-0.6.2[gtk3,${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+"
+DEPEND="${RDEPEND}"
+# dev-util/gtk-doc needed for eautoreconf
+BDEPEND="
+	introspection? ( $(vala_depend) )
+	>=dev-util/gtk-doc-1.14
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+	test? ( dev-util/dbus-test-runner )
+"
+
+S="${WORKDIR}"
+
+# FIXME: tests keep trying to access dirs they don't have access, feel free
+# to report a bug about how to avoid that
+RESTRICT="test"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# Disable MONO for now because of https://bugs.gentoo.org/382491
+	sed -i -e '/^MONO_REQUIRED_VERSION/s:=.*:=9999:' configure || die
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi; then
+		local -x VALAC VALA_API_GEN VAPIGEN_VAPIDIR PKG_CONFIG_PATH
+		use introspection && vala_src_prepare && export VALA_API_GEN="${VAPIGEN}"
+	fi
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-static \
+		--with-gtk=3 \
+		$(multilib_native_use_enable introspection)
+}
+
+multilib_src_test() {
+	# Prevent tests from trying to write on /dev/fuse
+	GVFS_DISABLE_FUSE=1 dbus-run-session emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}