gentoo resync : 25.05.2018

3 files changed, 123 insertions, 0 deletions

diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
index dc2563a8088b..8d4d9810634c 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -1,7 +1,9 @@
 AUX gmrun-0.9.2-gcc43.patch 744 BLAKE2B 3b9fb28048c9ed4017811348011c7560cb71e1fe54b8c1348e795abec8593afcd1823202270ee7727450bf654ff0327b14f74d66defd62cb3ec77210c88498ef SHA512 376d0a5425f264044cb0d1635e0c5aaede0ad962fa21fc552cf2ae4145a33520f8035193fd4e9c3108ef5cfdc671aa2fc4922479836d392a0d3d287e810593c5
+AUX gmrun-0.9.2-gcc6-pie.patch 2772 BLAKE2B 7fc08a7a1570d1dba41551b99209636f2c13337c35c8bd0e90bcc4526eee0d44f40be339b2946ff8dc4e040b9589c733478b251b267a54b39bc3e54af2f666e2 SHA512 55fe649a1a79a9a5b78e84856577ac9bfddcee56b671941932b8907212203e67e3de186dfdbc117341e486b7fce2ab511df3df0032b9438da1e221280ad553cc
 AUX gmrun-0.9.2-glibc210.patch 324 BLAKE2B 6080d23e033fe589c6df27622c955dc4c81100635c8fb977c0bd7dfd99dd128247ce72f03d63964b045944f492db899fd262a8e41ba303a7709e81377db2e474 SHA512 6488186908e33fe27e4e4f6d81fe9dd5fc1bb74e15b2153ebd660788be75432e68dfebb6ee21b17a0711b99d5d1e54eaf0a4384111bfe56134cce817b4bed49d
 AUX gmrun-0.9.2-stlport.patch 697 BLAKE2B 6ebb5d3a8a0a0047ab5a537a5a6f7814add9b9a9ae05feb0ac9b9eab8b5643097b2b31ec0afadfbe345abba89d46432b64bdf34e1f1516ffa2c0c4fd8422bddd SHA512 84ea68891309b6c3a29188e188e4572b7228abf3d874f138750cf51f33f8fc42aee33f8f4538fc80e324c16e64c68b739cc321cb94e49dd4ace5ec1b3bc4605d
 AUX gmrun-0.9.2-sysconfdir.patch 863 BLAKE2B 11cd0ded75db0d90843799a1e06cc9118bf323d540d3870acf3c98e34486b902cb08e03a859c2a0debb1761a5d20923d560b41e276743640d9ab7a85026cb8ce SHA512 0c201cc73f35bf1d56ccc072e2adcc8c6acf5d42d325919fc2e4c4d4440db076812e5a4dc67cde3f857b78332b7f37adc1fb250bababee6ff4aecc16ecc0cbee
 DIST gmrun-0.9.2.tar.gz 66097 BLAKE2B 3b8f253e8d683d02c8b6cc8da3d54103b53c6b9ebd4d90b4675325809f592f407a32532e6f0d3d3a112f5c7b9304eaae75bc3ba7f1e1b372614d95206edf0da3 SHA512 3ce881463c23b6c2c39b4d41ff98f3d4a2b77f45a46d4ac43d8bbf726fcb3769b643436932714f9f5c22b855188928453810468d165af2c2433059a0149d6422
 EBUILD gmrun-0.9.2-r1.ebuild 837 BLAKE2B 597e3bf5f5bb78fa88d6cd30f40ff8b988ddadd4628951280b0822d00a4c41c4a99639328564ccaa5cce79fef0ef778b1676eb3be8f73e2e498eac5b891dabf7 SHA512 20d45866530f4c4b817a44eecb37a756f7381c1679bea84413d4bd2064c6f9df5993f465d33545fd3425327edb9266c5318c8f13b11a50e22318c73bdc032885
+EBUILD gmrun-0.9.2-r2.ebuild 768 BLAKE2B 3e79d32b18a322c86b83da6eb171ff6314757a8b2c81f7a6282301b015d73e3c29743354921b6ab7e410f1d88a808607313029ff6f9b689bdb80a8acd6b7011a SHA512 e36415e424243fd967bf85fb7cc66b8790da7db137aa61de9a0eaf24fc9c0199c2820a2bf54257e7e9827f0e427c653fd963941d72d824c4353f48040bfde46c
 MISC metadata.xml 523 BLAKE2B 64ba9f284e12ddc2c01c23641870422810ea147ef875177c633082e9ab65f86b0cef0ae332eb61235cee9facdc2de08a9a3e07b27cf595696ab3e42d03a161e2 SHA512 8cd78652f2a6be93952b1edb9570261fba71afff13eeba915e47c4178adfbb26450ed1159812ad211c941a0ffbd96b3e5b864c2c7300b882d2245285a1d3f730
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch b/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch
new file mode 100644
index 000000000000..3ef46c7bd653
--- /dev/null
+++ b/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch
@@ -0,0 +1,84 @@
+From 351d355835532dbea8430902977873e887dd1c12 Mon Sep 17 00:00:00 2001
+From: Lucian Poston <lucian.poston@gmail.com>
+Date: Wed, 6 Dec 2017 04:22:28 -0800
+Subject: [PATCH] fix segfault in gcc-6
+
+---
+ src/gtkcompletionline.cc | 27 +++++++++++++++------------
+ src/gtkcompletionline.h  |  2 +-
+ 2 files changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/src/gtkcompletionline.cc b/src/gtkcompletionline.cc
+index eb324b5..537fafb 100644
+--- a/src/gtkcompletionline.cc
++++ b/src/gtkcompletionline.cc
+@@ -77,22 +77,25 @@ static gboolean
+ on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data);
+ 
+ /* get_type */
+-guint gtk_completion_line_get_type(void)
++GType gtk_completion_line_get_type(void)
+ {
+-  static guint type = 0;
++  static GType type = 0;
+   if (type == 0)
+   {
+-    GtkTypeInfo type_info =
++    static const GTypeInfo type_info =
+     {
+-      "GtkCompletionLine",
+-      sizeof(GtkCompletionLine),
+       sizeof(GtkCompletionLineClass),
+-      (GtkClassInitFunc)gtk_completion_line_class_init,
+-      (GtkObjectInitFunc)gtk_completion_line_init,
+-      /*(GtkArgSetFunc)*/NULL /* reserved */,
+-      /*(GtkArgGetFunc)*/NULL /* reserved */
++      NULL,
++      NULL,
++      (GClassInitFunc)gtk_completion_line_class_init,
++      NULL,
++      NULL,
++      sizeof(GtkCompletionLine),
++      0,
++      (GInstanceInitFunc)gtk_completion_line_init,
++      NULL
+     };
+-    type = gtk_type_unique(gtk_entry_get_type(), &type_info);
++    type = g_type_register_static(GTK_TYPE_ENTRY, "GtkCompletionLine", &type_info, (GTypeFlags)0);
+   }
+   return type;
+ }
+@@ -114,7 +117,7 @@ gtk_completion_line_class_init(GtkCompletionLineClass *klass)
+ 
+   gtk_completion_line_signals[NOTUNIQUE] =
+     gtk_signal_new("notunique",
+-                   GTK_RUN_FIRST, G_TYPE_FROM_CLASS(object_class),
++                  GTK_RUN_FIRST, G_TYPE_FROM_CLASS(object_class),
+                    GTK_SIGNAL_OFFSET(GtkCompletionLineClass,
+                                      notunique),
+                    gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+@@ -778,7 +781,7 @@ complete_line(GtkCompletionLine *object)
+ GtkWidget *
+ gtk_completion_line_new()
+ {
+-  return GTK_WIDGET(gtk_type_new(gtk_completion_line_get_type()));
++  return GTK_WIDGET(g_object_new(gtk_completion_line_get_type(), NULL));
+ }
+ 
+ static void
+diff --git a/src/gtkcompletionline.h b/src/gtkcompletionline.h
+index 5e14cd7..0d7f2dc 100644
+--- a/src/gtkcompletionline.h
++++ b/src/gtkcompletionline.h
+@@ -76,7 +76,7 @@ extern "C++" {
+     void (* cancel)(GtkCompletionLine *cl);
+   };
+ 
+-  guint gtk_completion_line_get_type(void);
++  GType gtk_completion_line_get_type(void);
+   GtkWidget *gtk_completion_line_new();
+ 
+   void gtk_completion_line_last_history_item(GtkCompletionLine*);
+-- 
+2.13.6
+
diff --git a/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..b2ce6fb13cbd
--- /dev/null
+++ b/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!"
+HOMEPAGE="https://sourceforge.net/projects/gmrun/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/popt
+	x11-libs/gtk+:2
+"
+DEPEND="
+	${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.10 )
+	sys-apps/sed
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	eapply \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc6-pie.patch \
+		"${FILESDIR}"/${P}-sysconfdir.patch \
+		"${FILESDIR}"/${P}-glibc210.patch \
+		"${FILESDIR}"/${P}-stlport.patch
+
+	eapply_user
+	eautoreconf
+}