[gentoo-commits] repo/gentoo:master commit in: profiles/, x11-misc/wmakerconf/files/, x11-misc/wmakerconf/

[Michał Górny]

commit:     c0c8660b28a2cea252e12d28aa3a4682208112b4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 10:27:40 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 31 10:29:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c8660b

x11-misc/wmakerconf: Remove last-rited pkg

Closes: https://bugs.gentoo.org/716890
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 profiles/package.mask                              |  5 --
 x11-misc/wmakerconf/Manifest                       |  1 -
 .../wmakerconf/files/wmakerconf-2.12-desktop.patch |  8 ---
 .../files/wmakerconf-2.12-format-security.patch    | 12 ----
 .../files/wmakerconf-2.12-glib-2.62.patch          | 14 ----
 .../wmakerconf-2.12-wmaker-0.95_support.patch      | 82 ----------------------
 x11-misc/wmakerconf/metadata.xml                   | 11 ---
 x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild      | 57 ---------------
 8 files changed, 190 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index b264bec5770..02aa676933d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -213,11 +213,6 @@ dev-tex/revtex
 # Last release in 2007. Masked for removal in 30 days.
 x11-plugins/fsviewer
 
-# Bernard Cafarelli <voyageur@g.o> (2020-04-30)
-# Does not compile with latest windowmaker, bug #716890
-# Last release in 2007. Masked for removal in 30 days.
-x11-misc/wmakerconf
-
 # Matt Turner <mattst88@g.o> (2020-04-29)
 # Masked for testing
 >=dev-libs/gjs-1.64

diff --git a/x11-misc/wmakerconf/Manifest b/x11-misc/wmakerconf/Manifest
deleted file mode 100644
index 467ada25242..00000000000
--- a/x11-misc/wmakerconf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wmakerconf_2.12.tar.gz 830156 BLAKE2B 65dd7d16606304b9746e84a3e71764b5491149ac27f4a1802faa5c14a66cbeaa4d04ecce66649acaf05f798e4fe643ac48b9df15c22e5b4e054951adf1d921df SHA512 4289846b20667a12c729b646ce5cc9d673adc49c3c99f1afcf0bf2eb978d7a62c93104e44f38c47984f5fc7bd22a78fff89d68646701c7e763a26ec18d4ff059

diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch b/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
deleted file mode 100644
index 184fa55ea04..00000000000
--- a/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- wmakerconf-2.12.orig/wmakerconf.desktop.in	2015-08-23 23:14:56.272180470 +0200
-+++ wmakerconf-2.12/wmakerconf.desktop.in	2015-08-23 23:15:05.446195859 +0200
-@@ -10,4 +10,4 @@
- Icon=@prefix@/share/wmakerconf/wmakerconf.xpm
- Terminal=false
- Type=Application
--Categories=GTK;Application;DesktopSettings
-+Categories=GTK;DesktopSettings;

diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-format-security.patch b/x11-misc/wmakerconf/files/wmakerconf-2.12-format-security.patch
deleted file mode 100644
index 91b6109fddb..00000000000
--- a/x11-misc/wmakerconf/files/wmakerconf-2.12-format-security.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur wmakerconf-2.12.orig/src/error.c wmakerconf-2.12/src/error.c
---- wmakerconf-2.12.orig/src/error.c	2004-12-05 02:44:37.000000000 +0100
-+++ wmakerconf-2.12/src/error.c	2016-04-11 20:42:32.810590888 +0200
-@@ -109,7 +109,7 @@
-       GtkTextIter    iter;
-       GtkTextBuffer *buffer;
-       
--      g_log ("Wmakerconf", G_LOG_LEVEL_WARNING, message);
-+      g_log ("Wmakerconf", G_LOG_LEVEL_WARNING, "%s", message);
-       Free (text);
-       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (log_text));
-       gtk_text_buffer_get_iter_at_offset (buffer, &iter, -1);

diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch b/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch
deleted file mode 100644
index 422aa9e813a..00000000000
--- a/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur wmakerconf-2.12.orig/src/error.h wmakerconf-2.12/src/error.h
---- wmakerconf-2.12.orig/src/error.h	2001-04-18 23:13:33.000000000 +0200
-+++ wmakerconf-2.12/src/error.h	2020-03-07 23:21:51.336443663 +0100
-@@ -37,8 +37,8 @@
- #define  N_(string)	(string)
- /* I18n */
- 
--#define error     error_line=__LINE__,error_file=__FILE__,_error
--#define warning   error_line=__LINE__,error_file=__FILE__,_warning
-+#define error     _error
-+#define warning   _warning
- #define MAXSTRLEN 1024
- 
- #undef NO

diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-wmaker-0.95_support.patch b/x11-misc/wmakerconf/files/wmakerconf-2.12-wmaker-0.95_support.patch
deleted file mode 100644
index 5b598c3c154..00000000000
--- a/x11-misc/wmakerconf/files/wmakerconf-2.12-wmaker-0.95_support.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur wmakerconf-2.12.orig/src/menu.c wmakerconf-2.12/src/menu.c
---- wmakerconf-2.12.orig/src/menu.c	2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/menu.c	2012-02-10 17:35:03.917287748 +0100
-@@ -500,10 +500,10 @@
-  *  No return value.
-  */
- {
--   if (!WMWritePropListToFile (orig_wmaker, orig_wmaker_fname, YES))
-+   if (!WMWritePropListToFile(orig_wmaker, orig_wmaker_fname))
-       warning (_("Can't revert to backupfile of `WindowMaker'. "
- 		 "Please manually revert from file WindowMaker.bak."));
--   if (orig_rootmenu && !WMWritePropListToFile (orig_rootmenu, orig_rootmenu_fname, YES))
-+   if (orig_rootmenu && !WMWritePropListToFile(orig_rootmenu, orig_rootmenu_fname))
-       warning (_("Can't revert to backupfile of `WMRootMenu'. "
- 		 "Please manually revert from file WMRootMenu.bak."));
-    gtk_main_quit ();
-diff -Naur wmakerconf-2.12.orig/src/rootmenu.c wmakerconf-2.12/src/rootmenu.c
---- wmakerconf-2.12.orig/src/rootmenu.c	2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/rootmenu.c	2012-02-10 17:35:03.929287391 +0100
-@@ -365,7 +365,7 @@
- 		       node_freeitem, NULL);
-       g_node_destroy (node);
- 
--      if (WMWritePropListToFile (menu, filename, YES))
-+      if (WMWritePropListToFile(menu, filename))
-       {
- 	 menu_changed = NO;
- 	 message (_("Window Maker root menu file '%s' saved."), filename);
-diff -Naur wmakerconf-2.12.orig/src/themebrowser.c wmakerconf-2.12/src/themebrowser.c
---- wmakerconf-2.12.orig/src/themebrowser.c	2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/themebrowser.c	2012-02-10 17:35:56.515722786 +0100
-@@ -2705,7 +2705,7 @@
- 	 oldfiles = g_list_remove (oldfiles, tmp);
- 	 Free (tmp);
-       }
--      if (!WMWritePropListToFile (theme, stylename, YES))
-+      if (!WMWritePropListToFile(theme, stylename))
-       {
- 	 dialog_popup (DIALOG_ERROR, NULL, NULL,
- 		       _("Can't save theme file\n`%s'\n"
-diff -Naur wmakerconf-2.12.orig/src/window.c wmakerconf-2.12/src/window.c
---- wmakerconf-2.12.orig/src/window.c	2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/window.c	2012-02-10 17:35:03.953286677 +0100
-@@ -1069,7 +1069,7 @@
- 	 WMReleasePropList (all_keys);
-       }
- 
--      if (WMWritePropListToFile (newwm, orig_wmaker_fname, YES))
-+      if (WMWritePropListToFile(newwm, orig_wmaker_fname))
-       {
- 	 changed = NO;
- 	 message (_("Window Maker config file '%s' saved."),
-diff -Naur wmakerconf-2.12.orig/src/wmconfig.c wmakerconf-2.12/src/wmconfig.c
---- wmakerconf-2.12.orig/src/wmconfig.c	2012-02-10 17:34:57.601475631 +0100
-+++ wmakerconf-2.12/src/wmconfig.c	2012-02-10 17:35:03.957286559 +0100
-@@ -216,7 +216,7 @@
- 	 /*
- 	  *  Generate backup file "'path'.bak"
- 	  */
--	 if (WMWritePropListToFile (orig_rootmenu, new, YES))
-+	 if (WMWritePropListToFile(orig_rootmenu, new))
- 	    message (_("Backupfile `%s' generated."), new);
- 	 else
- 	    error (_("Can't write backupfile `%s'."), new);
-@@ -280,7 +280,7 @@
-    if (!windowmaker)
-    {
-       windowmaker = global_windowmaker;
--      if (WMWritePropListToFile (windowmaker, orig_wmaker_fname, YES))
-+      if (WMWritePropListToFile(windowmaker, orig_wmaker_fname))
- 	 warning (_("New WindowMaker configuration file `%s' created."),
- 		  orig_wmaker_fname);
-       else
-@@ -294,7 +294,7 @@
-       /*
-        *  Generate backup file "'path'.bak"
-        */
--      if (WMWritePropListToFile (windowmaker, new, YES))
-+      if (WMWritePropListToFile(windowmaker, new))
- 	 message (_("Backupfile `%s' generated."), new);
-       else
- 	 error (_("Can't write backupfile `%s'."), new);

diff --git a/x11-misc/wmakerconf/metadata.xml b/x11-misc/wmakerconf/metadata.xml
deleted file mode 100644
index 2fc688f0802..00000000000
--- a/x11-misc/wmakerconf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@g.o</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">wmakerconf</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
deleted file mode 100644
index dcb30653f05..00000000000
--- a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="X based config tool for the windowmaker X windowmanager"
-HOMEPAGE="http://wmakerconf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls perl"
-
-RDEPEND="x11-libs/gtk+:2
-	>=x11-wm/windowmaker-0.95.2
-	perl? ( dev-lang/perl
-		dev-perl/HTML-Parser
-		|| ( dev-perl/libwww-perl
-		www-client/lynx
-		net-misc/wget ) )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-wmaker-0.95_support.patch
-	"${FILESDIR}"/${P}-glib-2.62.patch
-)
-
-src_prepare() {
-	sed -e "/^LIBS =/s/$/ -lX11/" -i src/Makefile.in || die
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-imlibtest \
-		$(use_enable perl upgrade) \
-		$(use_enable nls) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" gnulocaledir="${ED}/usr/share/locale" install
-	dodoc AUTHORS ChangeLog MANUAL NEWS README TODO
-	doman man/*.1
-
-	rm -f "${ED}"/usr/share/${PN}/{AUTHORS,README,COPYING,NEWS,MANUAL,ABOUT-NLS,NLS-TEAM1,ChangeLog}
-}
-
-pkg_postinst() {
-	elog "New features added with WindowMaker >= 0.95 will not be available in wmakerconf"
-	elog "WPrefs is the recommended configuration tool"
-}