Respect imlib2 configuration option. Bug #381067. Patch is already in git repo

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

5 files changed, 25 insertions, 126 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 51404a1c8221..c5f92781d787 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.225 2011/08/17 22:56:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.226 2011/09/03 10:27:07 hwoarang Exp $
+
+*openbox-3.5.0-r1 (03 Sep 2011)
+
+  03 Sep 2011; Markos Chandras <hwoarang@gentoo.org>
+  -openbox-3.5.0_pre20110313.ebuild, -openbox-3.5.0_pre20110801.ebuild,
+  -openbox-3.5.0.ebuild, +openbox-3.5.0-r1.ebuild,
+  +files/openbox-3.5.0-configure-imlib2.patch:
+  Respect imlib2 configuration option. Bug #381067. Patch is already in git
+  repo
 
   17 Aug 2011; Markos Chandras <hwoarang@gentoo.org> openbox-3.5.0.ebuild:
   Remove app-text/docbook2X per bug #378939
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
new file mode 100644
index 000000000000..74f3df8ed25e
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-3.5.0-configure-imlib2.patch
@@ -0,0 +1,13 @@
+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/openbox-3.5.0.ebuild b/x11-wm/openbox/openbox-3.5.0-r1.ebuild
index 3e80787ea79c..297267144d35 100644
--- a/x11-wm/openbox/openbox-3.5.0.ebuild
+++ b/x11-wm/openbox/openbox-3.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.ebuild,v 1.2 2011/08/17 22:56:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.0-r1.ebuild,v 1.1 2011/09/03 10:27:07 hwoarang Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="1.9"
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-gnome-session-3.4.9.patch
 	epatch "${FILESDIR}"/${PN}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-configure-imlib2.patch
 	eautopoint
 	eautoreconf
 }
diff --git a/x11-wm/openbox/openbox-3.5.0_pre20110313.ebuild b/x11-wm/openbox/openbox-3.5.0_pre20110313.ebuild
deleted file mode 100644
index 14968668f1b3..000000000000
--- a/x11-wm/openbox/openbox-3.5.0_pre20110313.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 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_pre20110313.ebuild,v 1.6 2011/08/02 11:03:07 hwoarang Exp $
-
-EAPI="2"
-WANT_AUTOMAKE="1.9"
-inherit multilib autotools eutils
-
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
-HOMEPAGE="http://openbox.org/"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${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
-	app-text/docbook2X
-	dev-util/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
-	eautopoint
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(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.0_pre20110801.ebuild b/x11-wm/openbox/openbox-3.5.0_pre20110801.ebuild
deleted file mode 100644
index 9866a415c38e..000000000000
--- a/x11-wm/openbox/openbox-3.5.0_pre20110801.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 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_pre20110801.ebuild,v 1.1 2011/08/02 11:03:07 hwoarang Exp $
-
-EAPI="2"
-WANT_AUTOMAKE="1.9"
-inherit multilib autotools eutils
-
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
-HOMEPAGE="http://openbox.org/"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${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
-	app-text/docbook2X
-	dev-util/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
-	eautopoint
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(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
-}