[gentoo-commits] repo/gentoo:master commit in: gnome-base/libgnomekbd/, gnome-base/libgnomekbd/files/

[gentoo-commits] repo/gentoo:master commit in: gnome-base/libgnomekbd/, gnome-base/libgnomekbd/files/

[Mart Raudsepp]

commit:     0c1afe5a0444686382590211d26e16c4e4212492
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 20:36:19 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 18 20:44:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c1afe5a

gnome-base/libgnomekbd: remove old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-base/libgnomekbd/Manifest                    |  1 -
 .../files/3.26.0-glib-2.60-compat.patch            | 35 --------------------
 gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild   | 38 ----------------------
 3 files changed, 74 deletions(-)

diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index 024cd359945..18bf1ff8266 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,2 +1 @@
-DIST libgnomekbd-3.26.0.tar.xz 449204 BLAKE2B 360f6da6ea7ad2850ecba062e0825cadcbc62ab9fdd432ad1fd4f38d32230e9eb6da1b7eb50116302b39be76565da7554df2c96e3a348e5130c428158bfa7792 SHA512 dc3ee91468e570d038bc91c4458ddb49dc097639c671815eecc4308efea85e29c1121cfd959e62f970a2e8112f818296802be804e99b96ee89fd5de8136645d9
 DIST libgnomekbd-3.26.1.tar.xz 450636 BLAKE2B 241f2f9af95696600f82ab3a1f53f80c6e76f6e81636419407957f172a2758ee16f5c6d419ab1c1c37d2e054c42b65404062471eceabc0fba45099481eb7b214 SHA512 8e83522f4d96001f9635278a001e0208d6d37e74b19a8c1702ec6de651036ad37a03385e66adbd3bae01d845a9a6181bb76f45bffec31eac98d600b49ab4360c

diff --git a/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch b/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch
deleted file mode 100644
index c6bcf66160f..00000000000
--- a/gnome-base/libgnomekbd/files/3.26.0-glib-2.60-compat.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 7e0b6f0a96477c5d12434231ea413d3a16658ed0 Mon Sep 17 00:00:00 2001
-From: Abderrahim Kitouni <akitouni@gnome.org>
-Date: Tue, 18 Dec 2018 10:54:06 +0100
-Subject: [PATCH] rename g_strv_equal to gkbd_strv_equal
-
-it conflicts with the newly added g_strv_equal in glib
----
- libgnomekbd/gkbd-keyboard-config.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c
-index bbe6904..00dc429 100644
---- a/libgnomekbd/gkbd-keyboard-config.c
-+++ b/libgnomekbd/gkbd-keyboard-config.c
-@@ -52,7 +52,7 @@ const gchar *GKBD_KEYBOARD_CONFIG_ACTIVE[] = {
-  */
- 
- static gboolean
--g_strv_equal (gchar ** l1, gchar ** l2)
-+gkbd_strv_equal (gchar ** l1, gchar ** l2)
- {
- 	if (l1 == l2)
- 		return TRUE;
-@@ -555,7 +555,7 @@ gkbd_keyboard_config_equals (GkbdKeyboardConfig * kbd_config1,
- 	    (kbd_config2->model != NULL) &&
- 	    g_ascii_strcasecmp (kbd_config1->model, kbd_config2->model))
- 		return False;
--	if (!g_strv_equal (kbd_config1->layouts_variants,
-+	if (!gkbd_strv_equal (kbd_config1->layouts_variants,
- 			   kbd_config2->layouts_variants))
- 		return False;
- 
--- 
-2.17.0
-

diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild
deleted file mode 100644
index d07c943fef6..00000000000
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="https://www.gnome.org"
-
-LICENSE="LGPL-2+"
-SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+introspection test"
-
-RDEPEND="
-	>=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.91.7:3[X,introspection?]
-	>=x11-libs/libxklavier-5.2[introspection?]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-glib-2.60-compat.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}