8 files changed, 48 insertions, 147 deletions
diff --git a/x11-misc/obconf/ChangeLog b/x11-misc/obconf/ChangeLog
index 22d910986491..7589677da5dd 100644
--- a/x11-misc/obconf/ChangeLog
+++ b/x11-misc/obconf/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/obconf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.109 2013/08/04 13:35:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/ChangeLog,v 1.110 2013/08/17 12:02:14 hwoarang Exp $
+
+*obconf-2.0.4 (17 Aug 2013)
+
+  17 Aug 2013; Markos Chandras <hwoarang@gentoo.org> +obconf-2.0.4.ebuild,
+  -files/obconf-2.0.3-hardened.patch,
+  -files/obconf-2.0.3_p20110314-config-path.patch, -files/obconf-lxde,
+  -obconf-2.0.3_p20110314-r1.ebuild, -obconf-2.0.3_p20110314.ebuild,
+  metadata.xml:
+  Version bump. Clean up old patches and ebuilds
 
   04 Aug 2013; Agostino Sarubbo <ago@gentoo.org> obconf-2.0.3_p20111019.ebuild:
   Stable for ppc64, wrt bug #477744
diff --git a/x11-misc/obconf/files/obconf-2.0.3-hardened.patch b/x11-misc/obconf/files/obconf-2.0.3-hardened.patch
deleted file mode 100644
index 31621f9c323b..000000000000
--- a/x11-misc/obconf/files/obconf-2.0.3-hardened.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./src/preview_update.c.orig	2010-05-12 20:09:07.177608591 +0400
-+++ ./src/preview_update.c	2010-05-12 20:09:21.638774481 +0400
-@@ -1,4 +1,5 @@
- #include "preview_update.h"
-+#include "preview.h"
- #include "main.h"
- 
- static gboolean restart_theme_preview_update = TRUE;
diff --git a/x11-misc/obconf/files/obconf-2.0.3_p20110314-config-path.patch b/x11-misc/obconf/files/obconf-2.0.3_p20110314-config-path.patch
deleted file mode 100644
index cc981609a459..000000000000
--- a/x11-misc/obconf/files/obconf-2.0.3_p20110314-config-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: work/src/tree.c
-===================================================================
---- work.orig/src/tree.c
-+++ work/src/tree.c
-@@ -91,7 +91,8 @@ void tree_apply()
-     gboolean err;
- 
-     if (obc_config_file)
--        p = g_strdup(obc_config_file);
-+        p = g_build_filename(obt_paths_config_home(paths), "openbox",
-+                             obc_config_file, NULL);
-     else
-         p = g_build_filename(obt_paths_config_home(paths), "openbox",
-                              "rc.xml", NULL);
diff --git a/x11-misc/obconf/files/obconf-lxde b/x11-misc/obconf/files/obconf-lxde
deleted file mode 100644
index 949f54c2e973..000000000000
--- a/x11-misc/obconf/files/obconf-lxde
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# Gentoo bug: 369555
-obconf  --config-file lxde-rc.xml
diff --git a/x11-misc/obconf/metadata.xml b/x11-misc/obconf/metadata.xml
index d1e72070f9fa..17a61fed5bf0 100644
--- a/x11-misc/obconf/metadata.xml
+++ b/x11-misc/obconf/metadata.xml
@@ -6,7 +6,4 @@
   	<email>hwoarang@gentoo.org</email>
 	<name>Markos Chandras</name>
   </maintainer>
-<use>
-<flag name='lxde'>Add wrapper for LXDE environment</flag>
-</use>
 </pkgmetadata>
diff --git a/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild b/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild
deleted file mode 100644
index 792c43311832..000000000000
--- a/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild,v 1.10 2012/05/16 18:34:12 hwoarang Exp $
-
-EAPI=2
-inherit autotools fdo-mime eutils
-
-DESCRIPTION="ObConf is a tool for configuring the Openbox window manager."
-HOMEPAGE="http://openbox.org/wiki/ObConf:About"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="lxde nls"
-
-RDEPEND="gnome-base/libglade:2.0
-	x11-libs/gtk+:2
-	x11-libs/startup-notification
-	>=x11-wm/openbox-3.5.0_pre20110313"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# need --config-file switch when used on LXDE environment
-	if use lxde; then
-		sed -i -e "/^Exec/s:obconf.*$:obconf-lxde:" ${PN}.desktop || die
-	fi
-	# Make sure the correct path is appended to the config file
-	epatch "${FILESDIR}"/${P}-config-path.patch
-	eautopoint
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	# add wrapper for lxde environment. Bug #369555
-	if use lxde; then
-		dobin "${FILESDIR}"/${PN}-lxde || die
-	fi
-	dodoc AUTHORS CHANGELOG README || die "dodoc failed"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild b/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild
deleted file mode 100644
index c4f895ff0c74..000000000000
--- a/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild,v 1.10 2012/05/16 18:34:12 hwoarang Exp $
-
-EAPI=2
-inherit autotools fdo-mime
-
-DESCRIPTION="ObConf is a tool for configuring the Openbox window manager."
-HOMEPAGE="http://openbox.org/wiki/ObConf:About"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="lxde nls"
-
-RDEPEND="gnome-base/libglade:2.0
-	x11-libs/gtk+:2
-	x11-libs/startup-notification
-	>=x11-wm/openbox-3.5.0_pre20110313"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# need --config-file switch when used on LXDE environment
-	if use lxde; then
-		sed -i -e "/^Exec/s:obconf.*$:obconf-lxde:" ${PN}.desktop || die
-	fi
-	eautopoint
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	# add wrapper for lxde environment. Bug #369555
-	if use lxde; then
-		dobin "${FILESDIR}"/${PN}-lxde || die
-	fi
-	dodoc AUTHORS CHANGELOG README || die "dodoc failed"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4.ebuild
new file mode 100644
index 000000000000..60c502d618b0
--- /dev/null
+++ b/x11-misc/obconf/obconf-2.0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-2.0.4.ebuild,v 1.1 2013/08/17 12:02:14 hwoarang Exp $
+
+EAPI=5
+inherit fdo-mime
+
+DESCRIPTION="ObConf is a tool for configuring the Openbox window manager."
+HOMEPAGE="http://openbox.org/wiki/ObConf:About"
+SRC_URI="http://openbox.org/dist/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="nls"
+
+RDEPEND="gnome-base/libglade:2.0
+	x11-libs/gtk+:2
+	x11-libs/startup-notification
+	>=x11-wm/openbox-3.5.2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf \
+		$(use_enable nls)
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}