gentoo resync : 22.01.2019

12 files changed, 149 insertions, 121 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 5b2aea4aeb3c..562bb2d512ae 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
index 3e4f267208f7..0896b97b4e84 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-extensions-topicons-plus-21.tar.gz 2756641 BLAKE2B 39414711365a9c68fa2b0172859e9969a7f71eae5e7498abee9ff05e4c215df09419cdad99192c60892b1bd6e8b27724c81c5d3da9a3d8ca3072d984824cb950 SHA512 f85db46f20c24f0b11ce2c79c0548b88262faf059d674073e328917dc8497de0e07ccd6f3613f45aa9e49109468d78293f3a8f0f4fea5a24a7c5254666cda5df
+DIST gnome-shell-extensions-topicons-plus-22.tar.gz 2757811 BLAKE2B 8bfe719d4a0e4d58db9b21d354e841ea69b88d82c69ba6aa4ebc8db65acde9330553487d0a0d3b623d5a6a2a18ff67e6ad4e45133c6e7b8a77e07bd90c589e63 SHA512 f0589bd8ed6697d616772ab374e9aa80779512d38c50f82c375820c02c06ef26a50b2a8c78c4e5fab5dc8588ed5fdcf0b7e73e7868af0855545528e741aa280d
 EBUILD gnome-shell-extensions-topicons-plus-21.ebuild 1327 BLAKE2B b8d030527a7364996f2258e5543344930ec64e2d4ff62d826f6e983c718521556f04789d9db36e121868e7227f983a473b9c53d700231470a71d9322c48b30ff SHA512 f18583531b6721b92fed2ac2b81c3ca3137331464196a05c4fad7ff02c21f33dbade7ecc657a1ed7274c5b231253f549f80b16013b8ece623773b06a3b14409e
+EBUILD gnome-shell-extensions-topicons-plus-22.ebuild 1326 BLAKE2B 71981852375df8dcfe755fd9581c645234bb16f73d4007b48a4ccbc8befe7e01e7c3fb8fc0f79be1a3f145dad783da0c1a214d22bd158cbf572d3a5c3ce72382 SHA512 cdcb523a4f7a03a280ab9791da36b722e661253ba5fb315d92498b9ee6b117c36084951235d31b6fb6964696b94c04aa8245fba5492416b7eca1ce29305a395f
 MISC metadata.xml 339 BLAKE2B 0fff96ce59c258cfb52c0616844df2bad11bf14fa283831d608ab862d2ac4fc26af0c4445d906d174290f0abee98149f12b24c85de79adfe2b959c17f14c3b42 SHA512 6bd54fe410561f215eba59872c742b9a11016cede62ddaf0aa8f899bf2c2abffde29cb63c9b819486a750be66b3dadd72257f6e26dcd87798aece31e0a752b40
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22.ebuild
new file mode 100644
index 000000000000..fb983644952d
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vcs-snapshot
+
+DESCRIPTION="Moves legacy tray icons to top panel"
+HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
+SRC_URI="https://github.com/phocean/TopIcons-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+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}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.16
+"
+DEPEND="${COMMON_DEPEND}"
+
+#src_compile() {
+	# It redoes this with "make install" later due to a dumb Makefile, so don't bother
+	#make build
+#}
+
+src_install() {
+	# TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
+	make install INSTALL_PATH="${ED}usr/share/gnome-shell/extensions/"
+	rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
+	# Assuming it needs only compiled gettext catalogs at runtime
+	rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/locale"/*/LC_MESSAGES/*.po || die
+	dodoc README.md
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gnome-tweak-tool/Manifest b/gnome-extra/gnome-tweak-tool/Manifest
index 57cb4ed46ff3..275f5d8396a5 100644
--- a/gnome-extra/gnome-tweak-tool/Manifest
+++ b/gnome-extra/gnome-tweak-tool/Manifest
@@ -1,6 +1,7 @@
+AUX 3.26.4-gentoo-cursor-themes.patch 1053 BLAKE2B 76d30c61ed588e00f27fb4019766501efad115c32a0a886278c7cceea1605ad1c4b8815becc4537d6b1dad95823b00f42297a56c49c04d7b478348d631b07179 SHA512 deac240ed8330199eee9ca44d1a5e5d46f293caa37ac41656820d7ecceeafbb6706eaf6af3f534e14c581b5a003b9004920c17615180e89519efc3c8bb077db8
 AUX gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch 1029 BLAKE2B 8b97e43a73f9ebb05d9f771db16e3b96e21f377047847e2aed69015a99ad1126bab659c979979d91ec5af006040d1bfa44f85fd781333352d34008d9d48c2b84 SHA512 55bfacefeef6581dd42e1e3f8474196cd29d4eea8ad83c7b33bac5757854e0f946927ccf25cd09e0f93b971361c6ff3896772e0aa18f4dfec9c77c11a73cf147
-DIST gnome-tweak-tool-3.22.0.tar.xz 260132 BLAKE2B fe3e8810fa3fc209707ca5b2fa16d75114038243ff3930065b44ea34c1030a435a2aec70b108134ae238d8ed4d3ec70cc51c0c1f69c1d41bea162211765fb690 SHA512 c63c2c61787c78e2e25077cc83b28ae49bffd9e7c39aa78ebd93587ba9640275083f46273cb55986bcc46842449a31f38b77f0e9be69cea551218fd160f6d769
 DIST gnome-tweak-tool-3.24.1.tar.xz 261872 BLAKE2B ce62ad4357d8f8660bbbdcd81a1190f21cf7a832853aba404bc087b8150bff8f6451902102dfe030a6eec5ce658d31f176e0d32055f25e69203fda65ce092120 SHA512 b76e9a46de07d12b586fb7326fcd51fff1565b831fe8f4d1ab4bbefe36450b5d2cb7c7a168922960894ba57ac9bd412afa61973c034bd1b5f2b45c52eb34adcd
-EBUILD gnome-tweak-tool-3.22.0.ebuild 1649 BLAKE2B d4f0202d18e68d2f8427970155aadb5f69d4c19b1065e0598427b387a0532a59637f522f3a22c2919c4e23232a86236a7482834728673e86fa9893404eb1ffcb SHA512 50154ce71b3504ea9aff6797031cf9dec2209def242a701d8a05215a1dc80cf5fc8508456641776ab409da984a8af0e931d7ef2f0319d53ee51bca63d6126a8a
-EBUILD gnome-tweak-tool-3.24.1.ebuild 1582 BLAKE2B 9949f10799534331b7bacb75159ee55f5f555d96f55a9abc440c9363b4bb1b227c18660b601b14180c66f35c889e7a7f69580a2bbd17a531a6a726c442c7a996 SHA512 3ce39b7ebc3bfdcac542c28b0b64834936a0701874dd3b4fb93973667142caa31197e2ec4e4a1bc063709d4acfdc2eb0d8d3e0741857f908b6984228facc9bed
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+DIST gnome-tweak-tool-3.26.4.tar.xz 253036 BLAKE2B a63d6977e7b4fb9d7e26752a95e123794daa5412ccc2f4ac1572ee1bf06730b29e5a2bd0d547dc3f8bfc1ab2c4a2d9bd72c42f9c0ff10d9bc9a23d377883562d SHA512 42828720213cf366534eabf46fa4c3e4c3f15f2310adad96a5297300c781abe62e3f59ec305e077cdd6bb5538dae3ec3487e5accecd2ce6221c388c28092c2d0
+EBUILD gnome-tweak-tool-3.24.1.ebuild 1603 BLAKE2B c466ed9487ccbc49937c65930ab8d1664bcf5450d5110c27630e195f68ef66e48f612b2e1d7d70c36b8371a82a3ec0f66ad0b22937a8cc49e4482b145813cf5e SHA512 87e65ad787208f16e3b5bf30d30f99e2b296ce688e24e96aef86a8ed3583ef7e15f34ffc382acf86bff067f38b91e130aa984c08de4a74d0643e4f350dfc50a8
+EBUILD gnome-tweak-tool-3.26.4-r1.ebuild 1373 BLAKE2B d02b724f41d813e7c15cd28344e93192f074dbf61c5e79a51af4e939c251fb56f1ff0f7e4945a461f0c46b94877c47a7d8dad5c2c26ac90a9b3a9dba12f3488c SHA512 cd7014899dedf14744ccb6c98ad230c4b20c75d982ce3d975c4eaec59a5a24061c39463bbc7c930c40d22586b4311f97f633e0a816b9d6f3448c503df49c9a13
+MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweak-tool/files/3.26.4-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweak-tool/files/3.26.4-gentoo-cursor-themes.patch
new file mode 100644
index 000000000000..e7eafc8be8ab
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/files/3.26.4-gentoo-cursor-themes.patch
@@ -0,0 +1,26 @@
+From 52dc5f832bbb249896f114439d7d1562e26b5e47 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 16 Jan 2019 04:04:16 +0200
+Subject: [PATCH] appearance: Look for cursors in Gentoo location too
+
+---
+ gtweak/tweaks/tweak_group_appearance.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py
+index 1a56287..83159c9 100644
+--- a/gtweak/tweaks/tweak_group_appearance.py
++++ b/gtweak/tweaks/tweak_group_appearance.py
+@@ -87,7 +87,8 @@ class CursorThemeSwitcher(GSettingsComboTweak):
+             **options)
+ 
+     def _get_valid_cursor_themes(self):
+-        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
++        dirs = ( os.path.join(gtweak.DATA_DIR, "cursors", "xorg-x11"),
++                 os.path.join(gtweak.DATA_DIR, "icons"),
+                  os.path.join(GLib.get_user_data_dir(), "icons"),
+                  os.path.join(os.path.expanduser("~"), ".icons"))
+         valid = walk_directories(dirs, lambda d:
+-- 
+2.17.0
+
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild
deleted file mode 100644
index 91fd458f0e89..000000000000
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-
-# Newer pygobject needed due upstream bug #723951
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/glib:2[dbus]
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
-	>=x11-libs/gtk+-3.12:3[introspection]
-
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gnome-settings-daemon-3
-	gnome-base/gnome-shell
-	>=gnome-base/nautilus-3
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Add contents of Gentoo's cursor theme directory to cursor theme list
-	eapply "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
-
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	install_python() {
-		gnome2_src_install
-		python_doscript gnome-tweak-tool || die
-	}
-	python_foreach_impl run_in_build_dir install_python
-}
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
index e53ec44d1f8f..203e99cb776e 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 ~ia64 x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.26.4-r1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.26.4-r1.ebuild
new file mode 100644
index 000000000000..333a7e3d562d
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.26.4-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit gnome.org meson gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="Customize advanced GNOME 3 options"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+"
+# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
+	>=gnome-base/gnome-settings-daemon-3
+
+	dev-libs/glib:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
+	net-libs/libsoup:2.4[introspection]
+	x11-libs/libnotify[introspection]
+
+	>=gnome-base/gsettings-desktop-schemas-3.24
+	>=gnome-base/gnome-shell-3.24
+	x11-wm/mutter
+	>=gnome-base/nautilus-3
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
+)
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/gnome-extra/gnome-tweak-tool/metadata.xml b/gnome-extra/gnome-tweak-tool/metadata.xml
index 39980802b1da..2a9d3352ab49 100644
--- a/gnome-extra/gnome-tweak-tool/metadata.xml
+++ b/gnome-extra/gnome-tweak-tool/metadata.xml
@@ -5,4 +5,10 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<longdescription lang="en">
+GNOME Tweaks allows adjusting advanced configuration
+settings in GNOME 3. This includes things like the fonts used in user
+interface elements, alternative user interface themes, changes in window
+management behavior, GNOME Shell appearance and extension, etc.
+</longdescription>
 </pkgmetadata>
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 8e868b0c59a0..477f0ad0222d 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,5 +1,3 @@
-DIST libgsf-1.14.41.tar.xz 616944 BLAKE2B 300da197dcbd5568758da21ea25b25636fcd7b16483a5b526e1c9e0242145208580f6edd41ac1028b7b51fe159eab506a32947ef81beb47883cf133bf2ea9cb7 SHA512 e3892500288e5d1d9e46cdd3940d872ae2504fe54babe2dc085218c3e1a5aff5a7220c88bde730239af4a56c340a22f47337280b8892f0ab31e1e751adea9bc3
 DIST libgsf-1.14.43.tar.xz 618272 BLAKE2B a381125ce75d06ae4bf1c9dbe9b2e207534ff7c3310e40984e482bc5120eae45a7e3ed4cfd878890037f31ee540c700dea3120119b9a533fa79cab317a0c83a8 SHA512 bb487de9358c057fc73f3414c9515726315be9b6d78456253daaca1cbd58281de8766e0b72914532d63fab04d3ae2cf90f711f436c7b4f70620d77e8a7802ac9
-EBUILD libgsf-1.14.41-r1.ebuild 1004 BLAKE2B be7fb620de1def1bcb5a3431c5d8d8416db4ee10ab67d033201ab9c83b11340e96c58f640c61877407d22b81f5abf020597f07d07219ba08c618be44e7b70e90 SHA512 852c7872d67ac45243fb75986064db62e2022bacd714cecbb9613d5f7fc0fd961ffef89c13ad4f57de89791d9df12db1f76e030d9536262edaaae2b8fb13db0c
-EBUILD libgsf-1.14.43.ebuild 1005 BLAKE2B 9eaf6b7b19bc908bd901be7cb0c12edfad4b2efad49ae40fb6d9295ab1fd81221df6bc54958044f57311c2c08ed4166f0d6e13929cec7bbe4907f9adf86c1031 SHA512 799f7bcc275d74c5ba739e31b60cca301649b06ba3ffe0a86c0fba5138a2a883db2fea3a3b81122cced6b5c3d862f7bd42da8c7e6bb3ccc0c18e5bdcc6a91486
+EBUILD libgsf-1.14.43.ebuild 1001 BLAKE2B 983e97127fd0c089be9314b4a4e6af68dd8f2c2e151adc7d9ca309deb03356349ca7c3af196cb23b3bf17d5214397341c6551898da7971003a23a950243f6d2a SHA512 c2abbc8d22377b1a7a4a3a3eab9975e28626ade46e55705372d467cfa59b7e0efcaff9f075d23c35b917af92e32ae01940cf131a940af3b94f64a63078e7fa90
 MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild b/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild
deleted file mode 100644
index 24145aa1ebba..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="https://developer.gnome.org/gsf/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libxml2-2.4.16:2
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	gtk? (
-		x11-libs/gdk-pixbuf:2
-		virtual/imagemagick-tools
-		)
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35.0
-	dev-libs/gobject-introspection-common
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with bzip2 bz2) \
-		$(use_enable introspection) \
-		$(use_with gtk gdk-pixbuf)
-}
diff --git a/gnome-extra/libgsf/libgsf-1.14.43.ebuild b/gnome-extra/libgsf/libgsf-1.14.43.ebuild
index b0aa05ab0d02..73972e54497c 100644
--- a/gnome-extra/libgsf/libgsf-1.14.43.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="