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

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

6 files changed, 41 insertions, 145 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/Manifest b/x11-wm/openbox/Manifest
index d336aa7b743b..4c020eb8e8bc 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,33 +2,30 @@
 Hash: SHA512
 
 AUX openbox-3.4.11.2-parallel-install.patch 366 RMD160 95a227b56dfbc0286ac0943f028f12cbc727abfb SHA1 e180fbf1cfa8cd34e1f914168bd698a0e1daaf65 SHA256 63f6e407461e071103009225a98ad0fb5d1b911ad28ea71a79c0b0e89efb5a8c
+AUX openbox-3.5.0-configure-imlib2.patch 413 RMD160 8b77b3ac8868f6473e770a438bb27eb78aa86a6d SHA1 ce6e6a6f45628407cf6ff276e2052a2d90391fe2 SHA256 a7d2f26033ae2424426c90a265db50d8349cc53d3d80eb6e7d3efa73fc28db36
 AUX openbox-as-needed.patch 413 RMD160 48e8092b8e732dcdcd3a73e98103bf67537249a7 SHA1 b28b438cfb3e97b3ddb49c358fe3a918cbdd374b SHA256 48f38ab155a15320fb4c9a447a58e27fac2b74eb4a5504cd0b7707ae5384703a
 AUX openbox-gnome-session-3.4.9.patch 449 RMD160 7a39d0d8ba997a6dc7c8de72edaef2ecf5c405e5 SHA1 1f9f9680ed4ca106761d24e4b38e3479c5f3a17a SHA256 0fbbf60ba8ce2503d307cf55b6467b3cf53e01d32deff1417e3afbf6397d9eb5
 DIST openbox-3.4.11.2.tar.gz 877633 RMD160 d1e2c0d48986dfdf916b374095c20f354f6c663c SHA1 e9eb2d91b3aea54158d0ce38694896e5669a7610 SHA256 2e7579389c30e6bb08cc721a2c1af512e049fec2670e71715aa1c4e129ec349d
 DIST openbox-3.5.0.tar.gz 911834 RMD160 af79a5e8b11f3605a9d3906ed6256ce4102effd5 SHA1 3c3b8d2bc4f4e229871254e92d6b18639be00302 SHA256 6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a
-DIST openbox-3.5.0_pre20110313.tar.gz 470371 RMD160 71bfdc758f73d19c3b24c2f1039d883c52cc63b0 SHA1 3a41e674620b9227cb203b4cbf22df30027bbb3c SHA256 97bdda9ac63b1fa93a1af8f4ee309820ae27c4a9a561a97c347663a92a618467
-DIST openbox-3.5.0_pre20110801.tar.gz 471815 RMD160 7b5a8f1cc03d2ba1ccf92d07f014a97baf7b69bb SHA1 31c4af82dadf5cd55eea4d207263fda0039a1258 SHA256 c71be9f9ad8dd26fbafe6ce2d1bc89d5f5f2715e6c72f600cef30e88a0e1cef2
 EBUILD openbox-3.4.11.2.ebuild 1410 RMD160 6d35ee35a72944d7b25edf482a50521ad64b9bc7 SHA1 8ee9daf95c5720b1b50f32e2dac02587652f98d0 SHA256 a1d649119a6720125cf39f2ef38219926125c38c5451c6f3e07bd013d817db0b
-EBUILD openbox-3.5.0.ebuild 1725 RMD160 195e014d60bae51786ffe142dbf3f94067fa59ad SHA1 c92dea354fbb4655c3d989251e6f7c56f3ca44ba SHA256 65382df796a5d2fea51906cb876fd411139aff0fca3ac78da2bba0ae2c5ac9cb
-EBUILD openbox-3.5.0_pre20110313.ebuild 1767 RMD160 ad225d5b6bc0e93c192d92e874d28034b42ffb8c SHA1 7a9600a934585cc1db03fedc49e69fab99f6d2a8 SHA256 7f96a4aca3d919a21a39fc392a93e4ec2fb2929108ac721e148d0ce9245fb9cb
-EBUILD openbox-3.5.0_pre20110801.ebuild 1767 RMD160 28e98c23ff84c0948ec6ff2c50ad747d37dd952b SHA1 59de90699970475e3f874352fe5e19d14752c170 SHA256 6fcabfe7a815ae0f2675d285b113b0f31540aaadf530d379c1cad4f5dc9f2247
+EBUILD openbox-3.5.0-r1.ebuild 1778 RMD160 1b9121c94f70b2cde1a8f4f3af407fd73ad8b09e SHA1 38a42acb5488c5917d871b31a4aff8271dbe5f17 SHA256 ed8904cb4253ca8359136a4dabf6af3d79d384cb1a47691a26171b6acdde28d0
 EBUILD openbox-9999.ebuild 1688 RMD160 5f187e2b8b7a14f8f53901dc2926cab4852dd29b SHA1 2f0743e21d0cd302c7345f71bed969af2204acbe SHA256 c124331b887573cca460628fbde0546e0a83080e2bcddd33e2516b3ffd623339
-MISC ChangeLog 34624 RMD160 d63896b2bc2aedff6a5e3186e89d45621199f513 SHA1 cc0f202814c5a7432df03c5feaf428f589fb8c5c SHA256 dbf4ec4b4bdd57570d0a31cf02b9160d89f724f4bbd87628333ab55cda32c28e
+MISC ChangeLog 34964 RMD160 143a29fef6154723b6121f3d50aa754f7c7f5b0e SHA1 353984061a3c6e0d2728f03d76e8db0acb302071 SHA256 ea9570957602eef7cc5d24de0ab2b8f18f1cb7e9708f08ee19cb0c1f8a282b8c
 MISC metadata.xml 699 RMD160 43120af2117149bbd15bb57e5fbdbf05d7d97b5a SHA1 6bfff1e27b4686c11f0d9aae06b7c3a86f8972cc SHA256 df6b2c4c2eb86857cdeb5cab7e07fe279b8abdf74ef6d4f88c34adbd26067212
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOTEbUAAoJEPqDWhW0r/LCxcEP/1sky8Wy3JwHOh85f49X6lOq
-MiaYoWSlWMz2vUMTAKWLQx9h+B75UHiQv4LFEcSIOdKcTQKxM3jL6NqbvDY34sfn
-WwZK42LRrYMqLoYEA7oqw/aTqV97dYDQ+M5lXu6ji+94pda/lmzZZFeHjSFQMhIM
-MXGd/au6x2XjdmpoWDFG5GuMV/VrrqYWImmjuYeL4Mkv0VG5uvJd2gwwjCwlww+Z
-2B1u2tbsvh9jg0GuR+ALfPvchYhRZbQiYSAQLl/SKfZ/Nru+D18ED75FshnI552U
-e6uUEKGMqgOswJTxwHeigp0Bss5KygYn3XzS23++fHsjz3a2roNTlVcLZRoWfz09
-L5OWi41ukiiH8YVyBOD4SIsKMqhtog0vS6KVLEpjToiBnEoGnciocAWSJAUB22of
-uAkHabe50gbTb9CLZSGXBp71qgsBucShk3X1wCois98+oaj8DQPFwVIHKpHJDx8H
-K2l/+I7FzmgtD4nEpy6c09HMcdWDGI5LVMYh8yfXxULSpCK7lVhHwDqTxk6uw9QB
-uvTR0bFkBICoZgCJX/fS9HI/D0MG1ZnRITOM+F4kfcl3mYi6/0jCy1YiyStN9RQV
-rh9lIBUsLtEcP6mBdveSCZGdW2w5CP/pzhiahXd8x87gOs4lV6NpB+uUanaDtNwg
-dvj2U4eZekJ4ki9XD2gD
-=1Kjd
+iQIcBAEBCgAGBQJOYgDLAAoJEPqDWhW0r/LCRUQQALdtL4Uq88Umo8ieLkzbSsuX
+XP4RMNKMNgMJ4qknaacigeSlYNuUbj412Cr4rp9uCwo0Twwhz3J/ANcrELxbv9az
+DD+HGbsL8Rbb4wXOXsthkd4+TrGeFpzWe3EgbpSCHOjFzRydI2yhjnaXi1NUf77z
+Hm1UWNmei6Feo58B0dXllZ4YU4UJsiTlNPHUUDhFjeD0OrCUNxejqlp1GhdNOL+e
+m3dICuIXaZsMVABgGzS904ksMRDeJdXwNp14d392IjS+fN2rFPDf/3/PY7xTu9Iv
+lzobX9QQg/VN0fVblIyjM3Z+mQ+Gi0K+c9duBQl5lYLMKOhbIaeCoqJjHkMTzZ4P
+An9gM78aTTqPgm+SbOc8FW+dWsOjzvr8kWDm3mccAW6p0SFiMCKQpX56c3ltVSe4
+tGsdKN1jmNqLCs8mBiYpgAST300ledCbQLRD8jdoDN2XXX+L5g5J647DYmDaPfuz
+HK4r3OR9qubNtjaK/m56GbxIKVTrmqMQWlwCoWGauDckYxpqPGbn4Fac6iPNQh2Y
+ANmXfjeXouA0jmiyEgzw3frjrnfZkoEgLVCdVar6P3AODlbCf4SeUcuYvg5TsFh9
+rFEyliJH7o+PYuESfQD0e43aTOK3b5sNPil0FMCnpwTsDqXGHaBfxE+J89nAFTdD
+/izk6yYmMXCuQ7mRYwL6
+=/Pz5
 -----END PGP SIGNATURE-----
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
-}