Replace docbook-to-man command with docbook2man.pl (not tested) and use imlib2 patch from 3.5.0 package

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

3 files changed, 26 insertions, 17 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index c5f92781d787..76d8879f684e 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,10 @@
 # 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.226 2011/09/03 10:27:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.227 2011/09/10 11:59:41 hwoarang Exp $
+
+  10 Sep 2011; Markos Chandras <hwoarang@gentoo.org> openbox-9999.ebuild:
+  Replace docbook-to-man command with docbook2man.pl (not tested) and use
+  imlib2 patch from 3.5.0 package
 
 *openbox-3.5.0-r1 (03 Sep 2011)
 
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 4c020eb8e8bc..297f84a1f78f 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -9,23 +9,23 @@ DIST openbox-3.4.11.2.tar.gz 877633 RMD160 d1e2c0d48986dfdf916b374095c20f354f6c6
 DIST openbox-3.5.0.tar.gz 911834 RMD160 af79a5e8b11f3605a9d3906ed6256ce4102effd5 SHA1 3c3b8d2bc4f4e229871254e92d6b18639be00302 SHA256 6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a
 EBUILD openbox-3.4.11.2.ebuild 1410 RMD160 6d35ee35a72944d7b25edf482a50521ad64b9bc7 SHA1 8ee9daf95c5720b1b50f32e2dac02587652f98d0 SHA256 a1d649119a6720125cf39f2ef38219926125c38c5451c6f3e07bd013d817db0b
 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 34964 RMD160 143a29fef6154723b6121f3d50aa754f7c7f5b0e SHA1 353984061a3c6e0d2728f03d76e8db0acb302071 SHA256 ea9570957602eef7cc5d24de0ab2b8f18f1cb7e9708f08ee19cb0c1f8a282b8c
+EBUILD openbox-9999.ebuild 1997 RMD160 f64015bb4269673418d0b644e82be45449267775 SHA1 b00e761c2bab5225112a0c6e053a83afd1d44910 SHA256 92ba7f303cd64efcc51b3ec36a4094b4b16912faa7e0378d5c74b86306ade002
+MISC ChangeLog 35147 RMD160 1d80c9db9a1c38a6b6f994a2e0bb5d4c212b6230 SHA1 0a3b8c0dc5de880cd6697350e7b857d22d7e66e0 SHA256 c9929b578a6298e5d8639c9ba41468c3a83ed7ddabcc2268a2f61b252aa8c62e
 MISC metadata.xml 699 RMD160 43120af2117149bbd15bb57e5fbdbf05d7d97b5a SHA1 6bfff1e27b4686c11f0d9aae06b7c3a86f8972cc SHA256 df6b2c4c2eb86857cdeb5cab7e07fe279b8abdf74ef6d4f88c34adbd26067212
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-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
+iQIcBAEBCgAGBQJOa1ExAAoJEPqDWhW0r/LCKhEQAL80I+8hAGNSz0NlexxdOQLf
+a+fBOlhcBK02ZzWa7B4jssZ8OfoyUtwurEbmFHz/Mnt9+31nlrAaWS3z/uxRehl7
+6aHGuEVcScJvm89g+qF4ibAXWDmKA4TV+Y4UnGz+VkHVhjDgJt3BQOr6bFSlP+pu
+RrnUVTJTBQgPVxvVcEPsTaQx+WU7Jbh4tSQFO/MgBJwUfR8ia6GZMk0xpqZPLVli
+wsNinAs3lPuWb3MLAuCPdjYLajP3QnBxqWUEmhNB0EoDJUikP9KI4+9xK3EUnfC+
+2VsFVqJyuac3sD3WybmAVmWB2hbJWlFA6y3Sqn3Ua7Degod9VvamzDMd2yH5qahj
+9TYhzeK4XmSBDMoO+K/8uXnx4UKimHdBNIr5uOOw279Wyv9dWU9YbSZL3qfweJ4B
+8RLQs6kO+GtX3FwS1s8K+m+XnoPsEjJzAklW5vBdBflObXW9XotmcksfcUeyR16a
+5/8tKGL+jG8Dcm+wueuYh5/8Wq71oi3NVKt47OKpVOJZtDviQ3bx8n0fAlQX/hZe
++ofli0QvOi5ts27u3orFRe+IaziszZYjRRV7YBuh/M4YtTR0iXhwnU/aPtROx2/Q
+EZqhGRvy/YzOwSDBbzVUH0wAwLyE+ZeiLQuYO8DOi211r8Af6e/JWkkkEkDGiewZ
+AD3Zw6E9S9dMu3JFiOWW
+=Rzff
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index c3cd1b1a3b55..68d7ed0271b7 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.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-9999.ebuild,v 1.10 2011/08/02 11:03:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild,v 1.11 2011/09/10 11:59:41 hwoarang Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="1.9"
@@ -37,6 +37,11 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-gnome-session-3.4.9.patch
 	epatch "${FILESDIR}"/${PN}-as-needed.patch
+	# Lets try to replace docbook-to-man with docbook2man.pl since
+	# Gentoo does not provide (why?) a docbook-to-man package
+	sed -i -e "s:docbook-to-man:docbook2man.pl:" "${S}"/Makefile.am
+	# Use the patch from 3.5.0 package until it hits master branch
+	epatch "${FILESDIR}"/${PN}-3.5.0-configure-imlib2.patch
 	eautopoint
 	eautoreconf
 }