Remove old files and ebuilds

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

8 files changed, 10 insertions, 296 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 5bab747bd1ac..6cd1679acf16 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.280 2013/10/19 15:27:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.281 2013/12/14 11:35:21 hwoarang Exp $
+
+  14 Dec 2013; Markos Chandras <hwoarang@gentoo.org>
+  -files/openbox-3.5.0-configure-imlib2.patch,
+  -files/openbox-3.5.0-fix-desktop-files.patch,
+  -files/openbox-3.5.0-gtk34.patch,
+  -files/openbox-3.5.0_p20121006-javaswing.patch,
+  -files/openbox-as-needed.patch, -openbox-3.5.0-r1.ebuild,
+  -openbox-3.5.2.ebuild:
+  Remove old files and ebuilds
 
   19 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due desktop-wm removal
diff --git a/x11-wm/openbox/files/openbox-3.5.0-configure-imlib2.patch b/x11-wm/openbox/files/openbox-3.5.0-configure-imlib2.patch
deleted file mode 100644
index 74f3df8ed25e..000000000000
--- a/x11-wm/openbox/files/openbox-3.5.0-configure-imlib2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openbox-3.5.0/configure.ac
-===================================================================
---- openbox-3.5.0.orig/configure.ac
-+++ openbox-3.5.0/configure.ac
-@@ -168,7 +168,7 @@ AC_ARG_ENABLE(imlib2,
-     [--disable-imlib2],
-     [disable use of Imlib2 image library for loading icons. [default=enabled]]
-   ),
--  [enable_imlib2=$enableeval],
-+  [enable_imlib2=$enableval],
-   [enable_imlib2=yes]
- )
- 
diff --git a/x11-wm/openbox/files/openbox-3.5.0-fix-desktop-files.patch b/x11-wm/openbox/files/openbox-3.5.0-fix-desktop-files.patch
deleted file mode 100644
index 02528461f352..000000000000
--- a/x11-wm/openbox/files/openbox-3.5.0-fix-desktop-files.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Julian Ospald <julian.ospald@googlemail.com>
-Date: Mon, 1 Oct 2012 02:54:18 +0000 (-0400)
-Subject: Make .desktop files obey specs where possible (Fix bug 5737)
-X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=951183654d439a21d2f777148218c8ed3255f928;hp=9e1b59a42981b608a147f6ca6f95946e9d933297
-
-Make .desktop files obey specs where possible (Fix bug 5737)
----
-
-diff --git a/data/openbox.desktop b/data/openbox.desktop
-index d49ae22..631778b 100644
---- a/data/openbox.desktop
-+++ b/data/openbox.desktop
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Type=Application
--Encoding=UTF-8
- Name=Openbox
- Exec=openbox
- Icon=openbox
-diff --git a/data/xsession/openbox-gnome.desktop.in b/data/xsession/openbox-gnome.desktop.in
-index 19ae82e..24931b5 100644
---- a/data/xsession/openbox-gnome.desktop.in
-+++ b/data/xsession/openbox-gnome.desktop.in
-@@ -1,8 +1,7 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=GNOME/Openbox
- Comment=Use the Openbox window manager inside of the GNOME desktop environment
- Exec=@bindir@/openbox-gnome-session
- TryExec=gnome-session
--Icon=openbox.png
--Type=XSession
-+Icon=openbox
-+Type=Application
-diff --git a/data/xsession/openbox-kde.desktop.in b/data/xsession/openbox-kde.desktop.in
-index ddfc72d..bc78a97 100644
---- a/data/xsession/openbox-kde.desktop.in
-+++ b/data/xsession/openbox-kde.desktop.in
-@@ -1,8 +1,7 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=KDE/Openbox
- Comment=Use the Openbox window manager inside of the K Desktop Environment
- Exec=@bindir@/openbox-kde-session
- TryExec=startkde
--Icon=openbox.png
--Type=XSession
-+Icon=openbox
-+Type=Application
-diff --git a/data/xsession/openbox.desktop.in b/data/xsession/openbox.desktop.in
-index 0914e5b..21669cf 100644
---- a/data/xsession/openbox.desktop.in
-+++ b/data/xsession/openbox.desktop.in
-@@ -1,8 +1,7 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Openbox
- Comment=Log in using the Openbox window manager (without a session manager)
- Exec=@bindir@/openbox-session
- TryExec=@bindir@/openbox-session
--Icon=openbox.png
--Type=XSession
-+Icon=openbox
-+Type=Application
diff --git a/x11-wm/openbox/files/openbox-3.5.0-gtk34.patch b/x11-wm/openbox/files/openbox-3.5.0-gtk34.patch
deleted file mode 100644
index 99394db3e535..000000000000
--- a/x11-wm/openbox/files/openbox-3.5.0-gtk34.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=424747
-https://bugzilla.icculus.org/show_bug.cgi?id=5460
-
-From: Mikael Magnusson <mikachu@gmail.com>
-Date: Sun, 3 Jun 2012 18:18:48 +0000 (+0200)
-Subject: Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages
-X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=339c19d1b3a7a5139aed8b59bad755ddd0e518ff;hp=9a20250243dd57525d83d6e9bba069c932dbe542
-
-Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages
-
-gtk+ 3.4 apparently sends these randomly when you select text in a
-GtkEntry. This also fixes bug #5460.
----
-
-diff --git a/openbox/event.c b/openbox/event.c
-index b9ec1c5..4d091bf 100644
---- a/openbox/event.c
-+++ b/openbox/event.c
-@@ -1495,7 +1495,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
-             }
-             else if ((Atom)e->xclient.data.l[2] ==
-                      OBT_PROP_ATOM(NET_WM_MOVERESIZE_CANCEL))
--                moveresize_end(TRUE);
-+                if (moveresize_client)
-+                    moveresize_end(TRUE);
-         } else if (msgtype == OBT_PROP_ATOM(NET_MOVERESIZE_WINDOW)) {
-             gint ograv, x, y, w, h;
- 
diff --git a/x11-wm/openbox/files/openbox-3.5.0_p20121006-javaswing.patch b/x11-wm/openbox/files/openbox-3.5.0_p20121006-javaswing.patch
deleted file mode 100644
index a49ab50a6982..000000000000
--- a/x11-wm/openbox/files/openbox-3.5.0_p20121006-javaswing.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c5468fb6cf6341205c15603eb96130fa26bfaea3 Mon Sep 17 00:00:00 2001

-From: Dana Jansens <danakj@orodu.net>

-Date: Sun, 30 Sep 2012 23:24:45 -0400

-Subject: [PATCH] Get the window's title in the fake-managed case since we

- apply app rule matching (Fix bug 5277)

-

----

- openbox/client.c |   10 ++++++----

- 1 file changed, 6 insertions(+), 4 deletions(-)

-

-diff --git a/openbox/client.c b/openbox/client.c

-index da1650a..970377d 100644

---- a/openbox/client.c

-+++ b/openbox/client.c

-@@ -1210,12 +1210,14 @@

-        from per-app settings */

-     client_get_session_ids(self);

- 

--    /* now we got everything that can affect the decorations */

-+    /* get this early so we have it for debugging, also this can be used

-+     by app rule matching */

-+    client_update_title(self);

-+

-+    /* now we got everything that can affect the decorations or app rule

-+       matching */

-     if (!real)

-         return;

--

--    /* get this early so we have it for debugging */

--    client_update_title(self);

- 

-     /* save the values of the variables used for app rule matching */

-     client_save_app_rule_values(self);

--- 

-1.7.10

-

diff --git a/x11-wm/openbox/files/openbox-as-needed.patch b/x11-wm/openbox/files/openbox-as-needed.patch
deleted file mode 100644
index a46d7c10d848..000000000000
--- a/x11-wm/openbox/files/openbox-as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: openbox-9999/Makefile.am
-===================================================================
---- openbox-9999.orig/Makefile.am
-+++ openbox-9999/Makefile.am
-@@ -75,6 +75,7 @@ obrender_libobrender_la_CPPFLAGS = \
- obrender_libobrender_la_LDFLAGS = \
- 	-version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
- obrender_libobrender_la_LIBADD = \
-+	obt/libobt.la \
- 	$(X_LIBS) \
- 	$(PANGO_LIBS) \
- 	$(GLIB_LIBS) \
diff --git a/x11-wm/openbox/openbox-3.5.0-r1.ebuild b/x11-wm/openbox/openbox-3.5.0-r1.ebuild
deleted file mode 100644
index 0ecd3e572d27..000000000000
--- a/x11-wm/openbox/openbox-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.0-r1.ebuild,v 1.14 2012/11/30 20:06:52 hwoarang Exp $
-
-EAPI="2"
-inherit multilib autotools eutils
-
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
-HOMEPAGE="http://openbox.org/"
-SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="debug imlib nls session startup-notification static-libs"
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/libxml2-2.0
-	dev-python/pyxdg
-	>=media-libs/fontconfig-2
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-libs/libXt
-	>=x11-libs/pango-1.8[X]
-	imlib? ( media-libs/imlib2 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-gnome-session-3.4.9.patch
-	epatch "${FILESDIR}"/${PN}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-configure-imlib2.patch
-	sed -i \
-		-e "s:-O0 -ggdb ::" \
-		-e 's/-fno-strict-aliasing//' \
-		"${S}"/m4/openbox.m4 || die
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-silent-rules \
-		$(use_enable debug) \
-		$(use_enable imlib imlib2) \
-		$(use_enable nls) \
-		$(use_enable startup-notification) \
-		$(use_enable session session-management) \
-		$(use_enable static-libs static) \
-		--with-x
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox-session" > "${D}/etc/X11/Sessions/${PN}"
-	fperms a+x /etc/X11/Sessions/${PN}
-	emake DESTDIR="${D}" install || die "emake install failed"
-	! use static-libs && rm "${D}"/usr/$(get_libdir)/lib{obt,obrender}.la
-}
diff --git a/x11-wm/openbox/openbox-3.5.2.ebuild b/x11-wm/openbox/openbox-3.5.2.ebuild
deleted file mode 100644
index d4668fb38ac6..000000000000
--- a/x11-wm/openbox/openbox-3.5.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.2.ebuild,v 1.1 2013/08/14 18:05:31 hwoarang Exp $
-
-EAPI="5"
-inherit multilib autotools python eutils
-
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
-HOMEPAGE="http://openbox.org/"
-SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
-branding? ( http://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="branding debug imlib nls python session startup-notification static-libs"
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/libxml2-2.0
-	python? ( dev-python/pyxdg )
-	>=media-libs/fontconfig-2
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-libs/libXt
-	>=x11-libs/pango-1.8[X]
-	imlib? ( media-libs/imlib2 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xineramaproto"
-
-src_prepare() {
-	use python && python_convert_shebangs -r 2 .
-	epatch "${FILESDIR}"/${P}-gnome-session.patch
-	sed -i \
-		-e "s:-O0 -ggdb ::" \
-		-e 's/-fno-strict-aliasing//' \
-		"${S}"/m4/openbox.m4 || die
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-silent-rules \
-		$(use_enable debug) \
-		$(use_enable imlib imlib2) \
-		$(use_enable nls) \
-		$(use_enable startup-notification) \
-		$(use_enable session session-management) \
-		$(use_enable static-libs static) \
-		--with-x
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
-	fperms a+x /etc/X11/Sessions/${PN}
-	emake DESTDIR="${D}" install
-	if use branding; then
-		insinto /usr/share/themes
-		doins -r "${WORKDIR}"/Surreal_Gentoo
-		# make it the default theme
-		sed -i \
-			"/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
-			"${D}"/etc/xdg/openbox/rc.xml \
-			|| die "failed to set Surreal Gentoo as the default theme"
-	fi
-	! use static-libs && rm "${ED}"/usr/$(get_libdir)/lib{obt,obrender}.la
-	! use python && rm "${ED}"/usr/libexec/openbox-xdg-autostart
-}