gentoo resync : 14.12.2020

3 files changed, 19 insertions, 27 deletions

diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index 6cb0082e3f0c..19d4d7533c56 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -1,6 +1,5 @@
-AUX gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch 218 BLAKE2B d44cf86a76c0a5a0596db9b49f96b1105a05493b2d39b13c6934c4410c8f1c997053b7d36ac20f1e7815ddbd0e536715da7e8be794ee941dc3333e4c08dc7986 SHA512 cb72680ab9ee09d1cf47b104dcb98749633ebeda2e8aaf2d7757387600287ed0846dd3cc4851df65d0aa61c5c434fccdf3ee9a41356da5287ae11f9ffd22afa0
-DIST gnome-shell-extension-bluetooth-quick-connect-10.tar.gz 18214 BLAKE2B 6ca20071041605c5b0a34198562b0d913d4527b2521a0f219e7533730fece41607b2270f0349f0511a6270a9f5b4f5d936247be740a6813aa9901adf3cc0fdba SHA512 5d2dab53b5377cba00743de6501259691c519dd404922bab0e500ca54bcf8942731795aff122c1669471fd3d6a51521ecea966cd2df843777ef1aa871a548772
 DIST gnome-shell-extension-bluetooth-quick-connect-13.tar.gz 19937 BLAKE2B 3b5c70d5302d8508d0a6165b06e41db9d256805c35ab4de095b7d97ce9bb24ee58185b6a7afec15a2fbe22ce9dc7859229670d4e00646c5353825dab1d1b4b5b SHA512 494827fa61e02bb3df0a054c7274fd61bf7d42aa4f8ece8c2b30a29a459b6fceba110b4016bd069f3cf5504561aee06fce3260cf9496b3d41516f077e8f99563
-EBUILD gnome-shell-extension-bluetooth-quick-connect-10.ebuild 1185 BLAKE2B 5c2b96964368d4fd74251f9eb8bad7b84f247eae4dc0b8768e5bb53c4bcdc71d8cedeb71182bffcfec5eec066afc53fcbcee0c4f5197c833f8d9217b3afcacf0 SHA512 5fabfe97d49fcfc2f873b50757b26aabdbfe0ad1923e13d8922d41c5dfd0bd7c030b56832bcd7a82b71c40de64667172cfc4147fd3851e15717711b6900c7849
+DIST gnome-shell-extension-bluetooth-quick-connect-16.tar.gz 20053 BLAKE2B 37cf71c319a3715a7c5acb9835f1a480eb8b383e6dca48b3852ab949233137f963ee583d01e16d558bec02a9c7b604883c62e7c1b606624aecc82f7e83bbf297 SHA512 e9052d2199b8339e86b69dc317c26f23086131a6ecd8286d8058dddd185fb5cea4215fa3fb11e8b214f0a07a86cac2c45cdab1d83a529df3ab1991143b6cf53c
 EBUILD gnome-shell-extension-bluetooth-quick-connect-13.ebuild 1139 BLAKE2B 44b974fdb78c81f5215d7124220dcc4109c775af99a55f34b82bda63c736e41041bc639f70ec134bcf971563c06c411470883bb372ce1447d4c0ec5a09641604 SHA512 9e75dfa7a8448960c0c5dcab2e346a5a741332c0d577a51499f85cd0443dd55a69eaf948ca7863ac9fff3a663a6812737e7418af206d79472ac7f570c90179e2
+EBUILD gnome-shell-extension-bluetooth-quick-connect-16-r1.ebuild 1226 BLAKE2B 1bb797384ffe848a663ddc4eea0fb546b2a4fa99a36c86dab06f69f37ff74db2c00cf47f089feae50085059233d5562fcf5de5611171b424055415444c1f710e SHA512 03b2240d9522c6b00604e2aa799e5f7b329829fc68112671a8a81ccdaf9e2d711a7dc14f664d3ccda5475e2ae447a71fe85c41129e595e657ee3045bb5d13f13
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/files/gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/files/gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch
deleted file mode 100644
index abde8a8ccba5..000000000000
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/files/gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/metadata.json.old	2020-03-15 18:17:50.474579697 +0100
-+++ b/metadata.json	2020-03-15 18:17:57.704750038 +0100
-@@ -9,6 +9,7 @@
-     "3.26.2",
-     "3.28",
-     "3.30",
--    "3.32"
-+    "3.32",
-+    "3.24"
-   ]
- }
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-16-r1.ebuild
index 281272309a72..8263fc21dbab 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-16-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit gnome2-utils
 
 DESCRIPTION="Allow to connect bluetooth paired devices from gnome control panel"
 HOMEPAGE="https://github.com/bjarosze/gnome-bluetooth-quick-connect"
@@ -9,37 +10,40 @@ SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# glib for glib-compile-schemas at build time, needed at runtime anyways
-COMMON_DEPEND="
-	dev-libs/glib:2
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
 	net-wireless/bluez
 	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.26.2
+	>=gnome-base/gnome-shell-3.38
 "
 DEPEND="${COMMON_DEPEND}"
 BDEPEND=""
 
 S="${WORKDIR}/${P/shell-extension-}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-3.34.patch
-)
-
 src_install() {
 	einstalldocs
-	rm -f README.md LICENSE Makefile || die
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf README.md LICENSE Makefile schemas || die
 	insinto /usr/share/gnome-shell/extensions/bluetooth-quick-connect@bjarosze.gmail.com
 	doins -r *
-	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/bluetooth-quick-connect@bjarosze.gmail.com/schemas || die
+	dosym ../../../../../usr/share/glib-2.0/schemas /usr/share/gnome-shell/extensions/bluetooth-quick-connect@bjarosze.gmail.com/schemas
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
 }
 
 pkg_postinst() {
+	gnome2_schemas_update
 	ebegin "Updating list of installed extensions"
 	eselect gnome-shell-extensions update
 	eend $?
 }
+
+pkg_postrm() {
+	gnome2_schemas_update
+}