Remove obsolete files

(Portage version: 2.2_rc88/cvs/Linux x86_64)

2 files changed, 4 insertions, 85 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 616dc2c3cf92..86dd0401f4cb 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.214 2010/07/11 22:07:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.215 2010/10/03 20:14:34 hwoarang Exp $
+
+  03 Oct 2010; Markos Chandras <hwoarang@gentoo.org> -files/obxprop.patch:
+  Remove obsolete files
 
   11 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
   -openbox-3.4.7.2.ebuild, -openbox-3.4.10.ebuild, -openbox-3.4.11.ebuild,
diff --git a/x11-wm/openbox/files/obxprop.patch b/x11-wm/openbox/files/obxprop.patch
deleted file mode 100644
index 3171fbf71185..000000000000
--- a/x11-wm/openbox/files/obxprop.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Dana Jansens <danakj@orodu.net>
-Date: Mon, 21 Dec 2009 14:59:28 +0000 (-0500)
-Subject: Rename obprop to obxprop (Fixes bug #4419)
-X-Git-Url: http://git.icculus.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=6d8b7bd5f7ede1803c1259f5c1b760e5dbf4dbe3;hp=1fb198410e9d3ca660d91d1049249db0f2f47732
-
-Rename obprop to obxprop (Fixes bug #4419)
-
-Avoids collision with openbabel.
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 4b3e0b5..60c2232 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -33,7 +33,7 @@ bin_PROGRAMS = \
- 	openbox/openbox \
- 	tools/gdm-control/gdm-control \
- 	tools/gnome-panel-control/gnome-panel-control \
--	tools/obprop/obprop
-+	tools/obxprop/obxprop
-
- dist_secretbin_SCRIPTS = \
- 	tools/xdg-autostart/xdg-autostart
-@@ -289,16 +289,16 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \
- tools_gnome_panel_control_gnome_panel_control_SOURCES = \
- 	tools/gnome-panel-control/gnome-panel-control.c
-
--## obprop ##
-+## obxprop ##
-
--tools_obprop_obprop_CPPFLAGS = \
-+tools_obxprop_obxprop_CPPFLAGS = \
- 	$(GLIB_CFLAGS) \
- 	$(X_CFLAGS)
--tools_obprop_obprop_LDADD = \
-+tools_obxprop_obxprop_LDADD = \
- 	$(GLIB_LIBS) \
- 	$(X_LIBS)
--tools_obprop_obprop_SOURCES = \
--	tools/obprop/obprop.c
-+tools_obxprop_obxprop_SOURCES = \
-+	tools/obxprop/obxprop.c
-
- ## gdm-control ##
-
-diff --git a/data/rc.xml b/data/rc.xml
-index d7a31bd..eaf3df7 100644
---- a/data/rc.xml
-+++ b/data/rc.xml
-@@ -646,10 +646,10 @@
-   # this is an example with comments through out. use these to make your
-   # own rules, but without the comments of course.
-
--  <application name="the window's _OB_NAME property (see obprop)"
--              class="the window's _OB_CLASS property (see obprop)"
--               role="the window's _OB_ROLE property (see obprop)"
--               type="the window's _NET_WM_WINDOW_TYPE (see obprob)..
-+  <application name="the window's _OB_NAME property (see obxprop)"
-+              class="the window's _OB_CLASS property (see obxprop)"
-+               role="the window's _OB_ROLE property (see obxprop)"
-+               type="the window's _NET_WM_WINDOW_TYPE (see obxprob)..
-                       (if unspecified, then it is 'dialog' for child windows)">
-   # the name or the class can be set, or both. this is used to match
-   # windows when they appear. role can optionally be set as well, to
-diff --git a/tools/obprop/Makefile b/tools/obxprop/Makefile
-similarity index 100%
-rename from tools/obprop/Makefile
-rename to tools/obxprop/Makefile
-diff --git a/tools/obprop/obprop.c b/tools/obxprop/obxprop.c
-similarity index 99%
-rename from tools/obprop/obprop.c
-rename to tools/obxprop/obxprop.c
-index e288d7c..2685154 100644
---- a/tools/obprop/obprop.c
-+++ b/tools/obxprop/obxprop.c
-@@ -12,7 +12,7 @@ gint fail(const gchar *s) {
-     else
-         fprintf
-             (stderr,
--             "Usage: obprop [OPTIONS]\n\n"
-+             "Usage: obxprop [OPTIONS]\n\n"
-              "Options:\n"
-              "    --help              Display this help and exit\n"
-              "    --display DISPLAY   Connect to this X display\n"