dev-libs/libhandy: drop 0.0.6, bump to gnome-next build

+ fixed KEYWORDS for live build

Signed-off-by: David Heidelberg <david@ixit.cz>

3 files changed, 3 insertions, 71 deletions

diff --git a/dev-libs/libhandy/files/g-enum-no-auto-ptr.patch b/dev-libs/libhandy/files/g-enum-no-auto-ptr.patch
deleted file mode 100644
index cb796b7..0000000
--- a/dev-libs/libhandy/files/g-enum-no-auto-ptr.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/hdy-combo-row.c b/src/hdy-combo-row.c
-index 633dd7d00e16fc8581823ecc501e53b0908c2ca6..b221c220a95ea0ff5d365b0e9df396962d2ffc74 100644
---- a/src/hdy-combo-row.c
-+++ b/src/hdy-combo-row.c
-@@ -479,7 +479,7 @@ hdy_combo_row_set_for_enum (HdyComboRow                     *self,
-                             GDestroyNotify                   user_data_free_func)
- {
-   g_autoptr (GListStore) store = g_list_store_new (HDY_TYPE_ENUM_VALUE_OBJECT);
--  g_autoptr (GEnumClass) enum_class = g_type_class_ref (enum_type);
-+  GEnumClass *enum_class = g_type_class_ref (enum_type);
-   gsize i;
- 
-   g_return_if_fail (HDY_IS_COMBO_ROW (self));
-@@ -488,6 +488,7 @@ hdy_combo_row_set_for_enum (HdyComboRow                     *self,
-     g_list_store_append (store, hdy_enum_value_object_new (&enum_class->values[i]));
- 
-   hdy_combo_row_bind_name_model (self, G_LIST_MODEL (store), (HdyComboRowGetNameFunc) get_name_func, user_data, user_data_free_func);
-+  g_type_class_unref (enum_class);
- }
- 
- /**
diff --git a/dev-libs/libhandy/libhandy-0.0.6.ebuild b/dev-libs/libhandy/libhandy-0.0.6.ebuild
deleted file mode 100644
index f694b6b..0000000
--- a/dev-libs/libhandy/libhandy-0.0.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson vala
-
-DESCRIPTION="A library full of GTK+ widgets for mobile phones"
-HOMEPAGE="https://source.puri.sm/Librem5/libhandy"
-
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-
-	SRC_URI=""
-	EGIT_REPO_URI="https://source.puri.sm/Librem5/${PN}.git"
-else
-	SRC_URI="https://source.puri.sm/Librem5/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-v${PV}"
-
-	PATCHES=("${FILESDIR}/g-enum-no-auto-ptr.patch")
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="dev-util/meson
-	dev-lang/vala
-	dev-util/glade
-	dev-libs/gobject-introspection
-	gnome-base/gnome-desktop"
-
-VALA_USE_DEPEND=vapigen
-BUILD_DIR="${S}/build"
-
-src_prepare() {
-	default
-
-	vala_src_prepare --vala-api-version $(vala_best_api_version)
-}
diff --git a/dev-libs/libhandy/libhandy-9999.ebuild b/dev-libs/libhandy/libhandy-9999.ebuild
index bb69399..b2f90e8 100644
--- a/dev-libs/libhandy/libhandy-9999.ebuild
+++ b/dev-libs/libhandy/libhandy-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit meson vala
+inherit multilib-minimal meson vala
 
 DESCRIPTION="A library full of GTK+ widgets for mobile phones"
 HOMEPAGE="https://source.puri.sm/Librem5/libhandy"
@@ -13,18 +13,15 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 
 	SRC_URI=""
-	EGIT_REPO_URI="https://source.puri.sm/guido.gunther/${PN}.git"
-	EGIT_BRANCH="g-enum-no-auto-ptr"
+	EGIT_REPO_URI="https://source.puri.sm/Librem5/${PN}.git"
 else
 	SRC_URI="https://source.puri.sm/Librem5/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
-
-	PATCHES=("${FILESDIR}/g-enum-no-auto-ptr.patch")
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""