gentoo resync : 21.05.2019

3 files changed, 0 insertions, 76 deletions

diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index e4a51910190b..f9dba7188747 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,6 +1,3 @@
-AUX 3.26.0-glib-2.60-compat.patch 1154 BLAKE2B a513831c02906d83f93c6864d18dc176e9453ea417d22423e3823e2f2b692fa472bd5492fe6403dbbbb8e87f7010a555ba29090614b6cad2b9bd1090e72ddeda SHA512 54ba7e58820eadcfcb9e3568be09ac389274a1088d7113548c6abc534136261fa30455e701f047a547ee310234cc4fcc26c6051902f0988ea4c09c69b4b8ccd7
-DIST libgnomekbd-3.26.0.tar.xz 449204 BLAKE2B 360f6da6ea7ad2850ecba062e0825cadcbc62ab9fdd432ad1fd4f38d32230e9eb6da1b7eb50116302b39be76565da7554df2c96e3a348e5130c428158bfa7792 SHA512 dc3ee91468e570d038bc91c4458ddb49dc097639c671815eecc4308efea85e29c1121cfd959e62f970a2e8112f818296802be804e99b96ee89fd5de8136645d9
 DIST libgnomekbd-3.26.1.tar.xz 450636 BLAKE2B 241f2f9af95696600f82ab3a1f53f80c6e76f6e81636419407957f172a2758ee16f5c6d419ab1c1c37d2e054c42b65404062471eceabc0fba45099481eb7b214 SHA512 8e83522f4d96001f9635278a001e0208d6d37e74b19a8c1702ec6de651036ad37a03385e66adbd3bae01d845a9a6181bb76f45bffec31eac98d600b49ab4360c
-EBUILD libgnomekbd-3.26.0.ebuild 844 BLAKE2B b3da8f610a5c4f5c554abc10f6f3342fdee60f4b88ee09e20867f70af501bb9792bee031109f3eedfc9cd5d2e9360185526407147bfc407a2d46e52d39009032 SHA512 09e7286cfa12e556f595f3f118a69325fdc9900bede6bc6f68165f5b40bfbd8c317c3369ec47911cce4e5ebb808758de5b1c44d6bd01c345ba9dcbb1911a1edc
 EBUILD libgnomekbd-3.26.1.ebuild 787 BLAKE2B f3d17bb3e3ffff4fdf1f0017a59c306cffe8f46ed9dfb14f210d4e38408344d33cd11bc190218b1d2da40d27d3e7f3cc62b0a66612463574a84d56aca29bc9d4 SHA512 88281fa426ac1acc6fcb1c4c1a7fcbfca028425cf1d77eee9356bf43838d3cd4b295e76e3035a22cb446eae2265703c97d1c7b8830b995db8a305b97cee552e0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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 c6bcf66160f9..000000000000
--- 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 d07c943fef68..000000000000
--- 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)
-}