7 files changed, 6 insertions, 102 deletions
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 4d2b57a3da18..13d735cad723 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/amtk/Manifest b/gui-libs/amtk/Manifest
index ec65b4a84530..f703dcefb1f6 100644
--- a/gui-libs/amtk/Manifest
+++ b/gui-libs/amtk/Manifest
@@ -1,5 +1,3 @@
-DIST amtk-5.0.1.tar.xz 369192 BLAKE2B b31b60045ea122c814a719877ada69fba3753d33c30ad28b5d0c97cd358ae15d98c8f88c038b95aa64e8d5d9b23e3143b75d571f1dc32dc4178af49b0ecf8faf SHA512 21c581b9ea44bc6e9c13d5c9e6298b55a0f28b1943fab1943d2a8b53a9b82f8c29a983f73e5a4a66a16912645ff8c29023490380d6e6c3de157b9c35f56a4e00
 DIST amtk-5.0.2.tar.xz 368440 BLAKE2B d13498079714612ac775a20032c0684b77c8a2238dad055dba6b87e81c009da22b53cb93df185a10278eedab2857321ee59230488f738064a4fb305345eba345 SHA512 71876430c4e7c19c49170ef6ff8d4c5324f871fd1e02162f33a9249b87f693fa4f4f748ac73d901135d331fee662e5000851e86a00d921da6669319728526136
-EBUILD amtk-5.0.1.ebuild 742 BLAKE2B 9093d129319edfd58f1536b170376cba0219c6b0f198c179263e3a00907259f0e26de663060ad16235d6801f9f6131920ca2f4494719d0a2afe5a9ce5f3c0d50 SHA512 537fa0e30f36410ded96f61afb12a31218c8ade4cdcc7bd635d2913a16170f45903fe5e23e8a2c88fdd50e490a74e7c1b95ef5ebe634329cfcc5e4e939d2c3e4
 EBUILD amtk-5.0.2.ebuild 742 BLAKE2B 5b5f0f13a882bcbda6586a5758f4adffed5c01417fd4934405e0dd89d60de233fe8c09cb219f0ae9a25843a9b2f860b5876b1b422277b4bdd352b8dca4201077 SHA512 603db580eb621321c544a297d3091cb12283ce093f547611f1c0665c42d736c5bae781f92ad2ce499202dcf0477c4d4540fc49f2835e2a91417ee336828ccac5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gui-libs/amtk/amtk-5.0.1.ebuild b/gui-libs/amtk/amtk-5.0.1.ebuild
deleted file mode 100644
index 5177ff590462..000000000000
--- a/gui-libs/amtk/amtk-5.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Actions, Menus and Toolbars Kit for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/Amtk"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gtk+-3.22:3
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-DEPEND="${DEPEND}
-	>=sys-devel/gettext-0.19.6
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-gtk-doc \
-		--disable-installed-tests \
-		$(use_enable introspection) \
-		--disable-valgrind
-}
diff --git a/gui-libs/gtk-layer-shell/Manifest b/gui-libs/gtk-layer-shell/Manifest
index 344de970af65..f03d90489b07 100644
--- a/gui-libs/gtk-layer-shell/Manifest
+++ b/gui-libs/gtk-layer-shell/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-layer-shell-0.1.0.tar.xz 34580 BLAKE2B db815d711e53485e00de2e0b7d238f6c66ddac9ca790d5f31c44eed965ad01ee07392d27552ae21bb1eab4905cc1d5f7dad9c10fd059afb43ba85c7ea1af2aa5 SHA512 3788559405a495d43279b20b9d64e1fb0fb9be4125eb3011a623565938246310c2e81cb6d52db111e42a9cd0739bb273ccf7fcb7c52db8b74a1e44108e061c6d
-EBUILD gtk-layer-shell-0.1.0.ebuild 789 BLAKE2B a0871802a8db925bd4d044137a6794715845413b3959d39ad52fbe8ea3e000fb7f8f98ac92e1582a8aed967d4840fb50862a3b1ef18859b858d4e65e614550f2 SHA512 bd310a7f23069e8ee57938821c5ccff03d0790a2728b3588e4982cc3e8a164aa63026afca87533f7cba0bce0e743e7b32f2145c31be1c06b60e671f413571052
+EBUILD gtk-layer-shell-0.1.0-r1.ebuild 830 BLAKE2B 738c36a3dd320720b6ab306d4242581f6cc87960f7d0e2661ca167dcd1e801cce766b97dfcea7c94c1847825180db95ff0b60b5cf29cea10f60a52e2830c7759 SHA512 82c8ad2e3bab7ff8fd3e6f78b938d590f7c4ccbccae7edf4d68553c92c33601edaafd4c40710a8a5d0f8901f61d0f0dc20c8b563cef57ab34a9c9546560a8fe3
 MISC metadata.xml 482 BLAKE2B 19f0a3db275c6912f7bb19f3ff1d17fe12db4e2b1c804abff3e87650e282506e57b72950fbd65b58c02ada9dd02426188cb7d9a47ad7b1f647eb4279a45c4902 SHA512 788e382605a2c25ff6bf932c99d72c5d77bc9f2adbe722996d1079509edac1c35d1fb95fbb146d856402927fb3ea5287ce87e1bddd7694ff8e5f9fc09db60dc8
diff --git a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0.ebuild b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild
index 3cff2fda1561..9c563ef3fd23 100644
--- a/gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0.ebuild
+++ b/gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/wmww/${PN}"
 else
 	SRC_URI="https://github.com/wmww/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Library to create desktop components for Wayland using the Layer Shell protocol"
@@ -25,7 +25,10 @@ DEPEND="
 	>=dev-libs/wayland-1.10.0
 "
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
 
 src_configure() {
 	local emesonargs=(
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 9ebb3669505b..7dcdc4a98311 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,5 +1,3 @@
 DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
-DIST libhandy-v0.0.9.tar.bz2 110100 BLAKE2B c1abf60b37d76a0b2f0ed82152decc9a87c9feff664af8df91ede192018a70003ac7ff3c1307668e7196089f59bb5dc21d1449ccc1deb3e2e362f32ff8f9f30b SHA512 d3256c2ff49a7fd0ccfec14ba3e34ed51577841c1670902d25f2a0166e63820428e689c722dddbccf787e1380c7f9a8ddc5b9042a1632b688b151ecce0f6d262
 EBUILD libhandy-0.0.13.ebuild 1524 BLAKE2B 213c411f65be0d25d85624d099ef0f2f5248a979809df66be110f62817c7624e2e19f0b66b0937e449286f16a01c286672cb5886e6c79f96a61a6f25ed3324c5 SHA512 4e8e8756659769f4ccf1464f8b542718549f9d8d7bfa64a04b63f8e724b122fd1fc8bb66bd05ccface82e6f88d291629e31fffb845b89067b94d65eb3e3b0c34
-EBUILD libhandy-0.0.9.ebuild 1524 BLAKE2B 213c411f65be0d25d85624d099ef0f2f5248a979809df66be110f62817c7624e2e19f0b66b0937e449286f16a01c286672cb5886e6c79f96a61a6f25ed3324c5 SHA512 4e8e8756659769f4ccf1464f8b542718549f9d8d7bfa64a04b63f8e724b122fd1fc8bb66bd05ccface82e6f88d291629e31fffb845b89067b94d65eb3e3b0c34
 MISC metadata.xml 474 BLAKE2B b8fba1ac64b79eaadbd70099133bc57a69be78738b9da3742ac9381286f62e5198b5b6dc5bf51dd5a11e0ea06819d3ccc00157f7f69939f18db18016db47705a SHA512 d9c79fbc1e8549dcdf6e42263040844efd729440d725df7c8f06bdf5e6c8da0de8f24186c94a2444e03f4396aaa1e4043d1893996770cfa2e5ea9f1b0ca71b4a
diff --git a/gui-libs/libhandy/libhandy-0.0.9.ebuild b/gui-libs/libhandy/libhandy-0.0.9.ebuild
deleted file mode 100644
index 1fa76729e3c2..000000000000
--- a/gui-libs/libhandy/libhandy-0.0.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg vala virtualx
-
-MY_P="${PN}-v${PV}"
-DESCRIPTION="Library with GTK widgets for mobile phones"
-HOMEPAGE="https://source.puri.sm/Librem5/libhandy/"
-SRC_URI="https://source.puri.sm/Librem5/libhandy/-/archive/v${PV}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.0/0" # It may or may not break ABI in future versions at this point; if new
-# SLOT happens, it'll likely file conflict on gtk-doc and glade library and catalog
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="examples glade gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.24.1:3[introspection?]
-	glade? ( dev-util/glade:3.10= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dprofiling=false # -pg passing
-		-Dstatic=false
-		$(meson_feature introspection)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use test tests)
-		$(meson_use examples)
-		$(meson_feature glade glade_catalog)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}