gentoo auto-resync : 07:12:2022 - 21:14:14

8 files changed, 11 insertions, 270 deletions

diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
index 5f95fd0c9127..a4823df8cc6a 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -1,10 +1,3 @@
-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
 DIST gmrun-1.4w.tar.xz 43304 BLAKE2B 14c4ffc0770b37d851ad101c7967f691801bf2e95abb8c7fc06abc7c39f94ffac289253febb51bdba6e5237abdea38981e8072ceb997fb410620f691b8fc7ae7 SHA512 3e36304782d4d288abf2e81b4dee60230d262fa9e3ca8ab236d52619f0a226cfa95c8cc830e6506308ed65191ff7295501a9dfe162b54d67ce1f9154d33d9473
-EBUILD gmrun-0.9.2-r2.ebuild 748 BLAKE2B 3d3b07937d862c1230e68b425223e72e2a5f3ab92c0d24faef5253d2112dd163217d1a4c2ecd2a735dc145f6162aec123507501fddee86ce706acd2db2decc4f SHA512 1de10472c52d160a05584d06a14715e0cfa6008151ac5f47322ff566eca04227c3468f570d001fb97ac1bcbfce1cb334ebe2778e7e39742d58a2a61fe261aa48
-EBUILD gmrun-1.4w.ebuild 830 BLAKE2B 04d1ff2fd8727c2d69210752c6f52ca88a539bea6b670c726eb05702e303f992850643b6aa8cb91b3c50b5e8b77af5d804e898bc74a030dfbd524032786eedee SHA512 004b38d4435df6b2b497e6a756719d3335b0b5e93e92851955a60751dba920810ed7bde1195c1579933934b491e174b172b6595e80d52d5cbb7d1840508d01cd
+EBUILD gmrun-1.4w-r1.ebuild 681 BLAKE2B 0d617ab9aaef368c23d2b1e01d8de3377d222f7e695deba17c65013cc60647f20ce0f611bb2501423dbc3800f68288a691a8701c830643cfeb67dadf13ab5780 SHA512 f1a43f988c88d895c92fc33725aab4cf730838f4559906afad027ea90047fca11900300c760ea6700614f36e0afc228f540beee0d3db6ed26606a36579357439
 MISC metadata.xml 881 BLAKE2B 8f45f661f8c62d32d22d34b3249fa71e0a730195651cb85ca87a4b2f6086fab6ef106b5e7b7f3bf288c4db1da3d9329b7a369b4ce6167ae6f35e7bf0eaf13660 SHA512 02d8175beb3233a1401ce718c6cd392a9633dc00ec936db3be82854fca236e9e10915bc4cd47825d14144ef3eb468c9d9a0fe6ff43bf413ef381cc24843bc3a3
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch b/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch
deleted file mode 100644
index e1d4d6d211ac..000000000000
--- a/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/gtkcompletionline.cc
-+++ b/src/gtkcompletionline.cc
-@@ -29,6 +29,7 @@
- #include <set>
- #include <sstream>
- #include <string>
-+#include <cstring>
- #include <vector>
- using namespace std;
- 
---- a/src/ci_string.h
-+++ b/src/ci_string.h
-@@ -7,6 +7,7 @@
- #define __CI_STRING_H__
- 
- #include <string>
-+#include <cstring>
- #include <ctype.h>
- 
- struct ci_char_traits : public std::char_traits<char>
---- a/src/prefs.cc
-+++ b/src/prefs.cc
-@@ -13,6 +13,7 @@
- #include <fstream>
- #include <iostream>
- #include <stdio.h>
-+#include <stdlib.h>
- 
- #include <list>
- 
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -14,6 +14,7 @@
- #include <gdk/gdkkeysyms.h>
- 
- #include <string>
-+#include <cstring>
- #include <iostream>
- #include <sstream>
- #include <vector>
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
deleted file mode 100644
index 3ef46c7bd653..000000000000
--- a/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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/files/gmrun-0.9.2-glibc210.patch b/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch
deleted file mode 100644
index 6e12a56f431d..000000000000
--- a/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gtkcompletionline.cc
-+++ b/src/gtkcompletionline.cc
-@@ -376,7 +377,7 @@
-   return 0;
- }
- 
--int my_alphasort(const void* va, const void* vb) {
-+int my_alphasort(const dirent** va, const dirent** vb) {
-   const struct dirent** a = (const struct dirent**)va;
-   const struct dirent** b = (const struct dirent**)vb;
- 
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch b/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch
deleted file mode 100644
index 426f652a0c2b..000000000000
--- a/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=164339
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- 
- INCLUDES = \
--	@GTK_CFLAGS@ @STLPORT_CXXFLAGS@
-+	@GTK_CFLAGS@ 
- 
- bin_PROGRAMS = gmrun
- 
-@@ -13,7 +13,7 @@
- 
- # gmrun_LDFLAGS = -s
- 
--gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@
-+gmrun_LDADD = @GTK_LIBS@ 
- 
- AM_CPPFLAGS = \
- 	-DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"'
---- a/configure.in
-+++ b/configure.in
-@@ -37,8 +37,8 @@
- AC_HEADER_DIRENT
- AC_HEADER_STDC
- AC_PROG_CXX
--AC_PATH_STLPORT_LIB
--AC_PATH_STLPORT_INC
-+dnl REMOVED _LIB
-+dnl REMOVED _INC
- 
- 
- AC_CHECK_FUNC( poptGetContext,
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch b/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
deleted file mode 100644
index 92db743a8df5..000000000000
--- a/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-http://bugs.gentoo.org/292856
-
---- a/config/Makefile.am
-+++ b/config/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id$
- 
--myrcdir = @PACKAGE_DATA_DIR@
-+myrcdir = $(sysconfdir)
- myrc_DATA = gmrunrc
- 
- EXTRA_DIST = gmrunrc
---- a/config.h.in
-+++ b/config.h.in
-@@ -10,7 +10,6 @@
- #undef HAVE_STPCPY
- #undef HAVE_LIBSM
- #undef PACKAGE_LOCALE_DIR
--#undef PACKAGE_DATA_DIR
- #undef PACKAGE_SOURCE_DIR
- 
- /* Define if you have the <dirent.h> header file.  */
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -15,3 +15,5 @@
- 
- gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@
- 
-+AM_CPPFLAGS = \
-+	-DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"'
---- a/src/prefs.cc
-+++ b/src/prefs.cc
-@@ -30,7 +30,7 @@
- 
- Prefs::Prefs()
- {
--  string file_name = PACKAGE_DATA_DIR"/";
-+  string file_name = PACKAGE_SYSCONF_DIR"/";
-   file_name += GMRUNRC;
-   init(file_name);
- 
diff --git a/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
deleted file mode 100644
index ba116f437ace..000000000000
--- a/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# 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 )
-	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
-}
diff --git a/x11-misc/gmrun/gmrun-1.4w.ebuild b/x11-misc/gmrun/gmrun-1.4w-r1.ebuild
index 3385f765aee3..7f630b5887ad 100644
--- a/x11-misc/gmrun/gmrun-1.4w.ebuild
+++ b/x11-misc/gmrun/gmrun-1.4w-r1.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=8
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/WdesktopX/${PN}.git"
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://github.com/wdlkmpx/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~mips ~ppc x86"
+	KEYWORDS="amd64 ~mips ppc x86"
 fi
 
 DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!"
@@ -17,20 +17,15 @@ HOMEPAGE="https://github.com/wdlkmpx/gmrun"
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="elibc_glibc nls xdg"
+IUSE="nls xdg"
 
-RDEPEND="
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	elibc_glibc? ( >=sys-libs/glibc-2.10 )"
+RDEPEND="x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
-	econf --disable-gtk2 $(use_enable nls) $(use_enable xdg)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README.md
+	econf \
+		--disable-gtk2 \
+		$(use_enable nls) \
+		$(use_enable xdg)
 }