[gentoo-commits] repo/gentoo:master commit in: x11-misc/wmakerconf/files/, x11-misc/wmakerconf/
commit: 61dabecd1f95240f6ae95e9a61b768c27b0aa72a
Author: Bernard Cafarelli gentoo org>
AuthorDate: Sat Mar 7 22:25:07 2020 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Sat Mar 7 22:28:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61dabecd
x11-misc/wmakerconf: fix compilation with glib 2.62
Closes: https://bugs.gentoo.org/711042
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli gentoo.org>
x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch | 14 ++
x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild | 3 ++-
2 files changed, 16 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000..422aa9e813a
--- /dev/null
+++ b/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch
@@ -0,0 +1,14 @@
+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.0 +0200
wmakerconf-2.12/src/error.h2020-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/wmakerconf-2.12-r3.ebuild
b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
index 57ed8fa294b..dcb30653f05 100644
--- a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
+++ b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -27,6 +27,7 @@ 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() {
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wmakerconf/
commit: fb2949ada239c63120239da89fa235eab98c6552
Author: Bernard Cafarelli gentoo org>
AuthorDate: Sun Mar 3 23:54:27 2019 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Sun Mar 3 23:54:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb2949ad
x11-misc/wmakerconf: drop imlib support
This was an alternative to using libwraster, and imlib-1 is dead
Closes: https://bugs.gentoo.org/678912
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Bernard Cafarelli gentoo.org>
x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
index dce5d2c3bcf..57ed8fa294b 100644
--- a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
+++ b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,11 +10,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="imlib nls perl"
+IUSE="nls perl"
RDEPEND="x11-libs/gtk+:2
>=x11-wm/windowmaker-0.95.2
- imlib? ( media-libs/imlib )
perl? ( dev-lang/perl
dev-perl/HTML-Parser
|| ( dev-perl/libwww-perl
@@ -36,10 +35,8 @@ src_prepare() {
}
src_configure() {
- local myconf
- use imlib || myconf="--disable-imlibtest"
-
econf \
+ --disable-imlibtest \
$(use_enable perl upgrade) \
$(use_enable nls) \
${myconf}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wmakerconf/
commit: 9c280b1f35c981585c0c15b2f0d085e724ba3dbe
Author: Harri Nieminen gmail com>
AuthorDate: Tue Mar 28 18:26:37 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Apr 1 10:23:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c280b1f
x11-misc/wmakerconf: Remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4319
x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild | 56 ---
1 file changed, 56 deletions(-)
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
b/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
deleted file mode 100644
index 991e592960c..000
--- a/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-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="imlib nls perl"
-
-RDEPEND="x11-libs/gtk+:2
- >=x11-wm/windowmaker-0.95.2
- imlib? ( media-libs/imlib )
- 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"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-wmaker-0.95_support.patch
- epatch "${FILESDIR}"/${P}-desktop.patch
-
- sed -e "/^LIBS =/s/$/ -lX11/" -i src/Makefile.in || die
-}
-
-src_configure() {
- local myconf
- use imlib || myconf="--disable-imlibtest"
-
- econf \
- $(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"
-}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wmakerconf/, x11-misc/wmakerconf/files/
commit: 9163e59ab6e1a1ce4b2a8edca956eca3c43fbceb
Author: Bernard Cafarelli gentoo org>
AuthorDate: Mon Apr 11 18:49:55 2016 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Mon Apr 11 18:50:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9163e59a
x11-misc/wmakerconf: fix compilation with format-security
Bug #579442 by ago
Update ebuild for EAPI 6
Package-Manager: portage-2.2.28
.../wmakerconf/files/wmakerconf-2.12-desktop.patch | 4 +-
.../files/wmakerconf-2.12-format-security.patch| 12 +
x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild | 60 ++
3 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
b/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
index 2277c6c..184fa55 100644
--- a/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
+++ b/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
@@ -1,5 +1,5 @@
wmakerconf.desktop.in.orig 2015-08-23 23:14:56.272180470 +0200
-+++ wmakerconf.desktop.in 2015-08-23 23:15:05.446195859 +0200
+--- 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
diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-format-security.patch
b/x11-misc/wmakerconf/files/wmakerconf-2.12-format-security.patch
new file mode 100644
index 000..91b6109
--- /dev/null
+++ b/x11-misc/wmakerconf/files/wmakerconf-2.12-format-security.patch
@@ -0,0 +1,12 @@
+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.0 +0100
wmakerconf-2.12/src/error.c2016-04-11 20:42:32.810590888 +0200
+@@ -109,7 +109,7 @@
+ GtkTextIteriter;
+ 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, , -1);
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
new file mode 100644
index 000..de12699
--- /dev/null
+++ b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="imlib nls perl"
+
+RDEPEND="x11-libs/gtk+:2
+ >=x11-wm/windowmaker-0.95.2
+ imlib? ( media-libs/imlib )
+ 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
+)
+
+src_prepare() {
+ sed -e "/^LIBS =/s/$/ -lX11/" -i src/Makefile.in || die
+ default
+}
+
+src_configure() {
+ local myconf
+ use imlib || myconf="--disable-imlibtest"
+
+ econf \
+ $(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"
+}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wmakerconf/
commit: 1e640e26f05c009fac26ab70e8854a0378b1e633
Author: Bernard Cafarelli gentoo org>
AuthorDate: Mon Apr 11 14:15:05 2016 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Mon Apr 11 14:15:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e640e26
x11-misc/wmakerconf: drop versions for old windowmaker
Package-Manager: portage-2.2.28
x11-misc/wmakerconf/wmakerconf-2.12-r1.ebuild | 54 ---
x11-misc/wmakerconf/wmakerconf-2.12.ebuild| 44 --
2 files changed, 98 deletions(-)
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r1.ebuild
b/x11-misc/wmakerconf/wmakerconf-2.12-r1.ebuild
deleted file mode 100644
index 13808a5..000
--- a/x11-misc/wmakerconf/wmakerconf-2.12-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils
-
-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="imlib nls perl"
-
-RDEPEND="x11-libs/gtk+:2
- >=x11-wm/windowmaker-0.95.2
- imlib? ( media-libs/imlib )
- 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"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-wmaker-0.95_support.patch
-}
-
-src_configure() {
- local myconf
- use imlib || myconf="--disable-imlibtest"
-
- econf \
- $(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"
-}
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12.ebuild
b/x11-misc/wmakerconf/wmakerconf-2.12.ebuild
deleted file mode 100644
index bf7a858..000
--- a/x11-misc/wmakerconf/wmakerconf-2.12.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-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="imlib nls perl"
-
-RDEPEND="x11-libs/gtk+:2
-
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wmakerconf/
commit: ee7b1529a38d6455c98c0ae498a34cec3ef74704
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Apr 9 14:16:48 2016 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Apr 9 14:16:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee7b1529
x11-misc/wmakerconf: x86 stable wrt bug #579234
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
b/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
index 70483ac..55be47e 100644
--- a/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
+++ b/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="imlib nls perl"
RDEPEND="x11-libs/gtk+:2
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wmakerconf/
commit: c880f411a2135387a40ff29d7bc67d5fdba8b1fa
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Apr 9 14:13:53 2016 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Apr 9 14:13:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c880f411
x11-misc/wmakerconf: amd64 stable wrt bug #579234
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
b/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
index 5754afe..70483ac 100644
--- a/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
+++ b/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="imlib nls perl"
RDEPEND="x11-libs/gtk+:2
[gentoo-commits] repo/gentoo:master commit in: x11-misc/wmakerconf/, x11-misc/wmakerconf/files/
commit: 4837cd0c2183dc5c04a6833c1faa656febfbc4ea
Author: Bernard Cafarelli voyageur AT gentoo DOT org
AuthorDate: Sun Aug 23 21:20:22 2015 +
Commit: Bernard Cafarelli voyageur AT gentoo DOT org
CommitDate: Sun Aug 23 21:22:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4837cd0c
x11-misc/wmakerconf: fix libX11 link and .desktop file
Fixes bug #558362 by Toralf Förster toralf.foerster AT gmx.de
Package-Manager: portage-2.2.20.1
x11-misc/wmakerconf/Manifest | 2 +-
.../wmakerconf/files/wmakerconf-2.12-desktop.patch | 8 +++
x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild | 57 ++
3 files changed, 66 insertions(+), 1 deletion(-)
diff --git a/x11-misc/wmakerconf/Manifest b/x11-misc/wmakerconf/Manifest
index 18e2eec..f94a810 100644
--- a/x11-misc/wmakerconf/Manifest
+++ b/x11-misc/wmakerconf/Manifest
@@ -1 +1 @@
-DIST wmakerconf_2.12.tar.gz 830156 SHA256
debfc3b2a26fd4bd2dab4a06155b786e1b36e64145012410eb0de730a79a9bb3
+DIST wmakerconf_2.12.tar.gz 830156 SHA256
debfc3b2a26fd4bd2dab4a06155b786e1b36e64145012410eb0de730a79a9bb3 SHA512
4289846b20667a12c729b646ce5cc9d673adc49c3c99f1afcf0bf2eb978d7a62c93104e44f38c47984f5fc7bd22a78fff89d68646701c7e763a26ec18d4ff059
WHIRLPOOL
545dafebc909ae029efcb6c5f3d8283eec6e96a5c9095511c1808cbac4a36dbcb4143f67d77744f7907669fa2c6f2004131cd2c9f1f4b56815dbc88f40904f46
diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
b/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
new file mode 100644
index 000..2277c6c
--- /dev/null
+++ b/x11-misc/wmakerconf/files/wmakerconf-2.12-desktop.patch
@@ -0,0 +1,8 @@
+--- wmakerconf.desktop.in.orig 2015-08-23 23:14:56.272180470 +0200
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/wmakerconf-2.12-r2.ebuild
b/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
new file mode 100644
index 000..5754afe
--- /dev/null
+++ b/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+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=imlib nls perl
+
+RDEPEND=x11-libs/gtk+:2
+ =x11-wm/windowmaker-0.95.2
+ imlib? ( media-libs/imlib )
+ 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
+
+src_prepare() {
+ epatch ${FILESDIR}/${P}-wmaker-0.95_support.patch
+ epatch ${FILESDIR}/${P}-desktop.patch
+
+ sed -e /^LIBS =/s/$/ -lX11/ -i src/Makefile.in || die
+}
+
+src_configure() {
+ local myconf
+ use imlib || myconf=--disable-imlibtest
+
+ econf \
+ $(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
+}
