Revert my previous commit re pango[X]. Bug #293368 and bug #372619

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

5 files changed, 28 insertions, 24 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index fb2dac91cb58..b433f6fb1753 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.219 2011/06/22 08:05:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.220 2011/06/23 10:59:23 hwoarang Exp $
+
+  23 Jun 2011; Markos Chandras <hwoarang@gentoo.org> openbox-3.4.11.2.ebuild,
+  openbox-3.5.0_pre20110313.ebuild, openbox-9999.ebuild:
+  Revert my previous commit re pango[X]. Bug #293368 and bug #372619
 
   22 Jun 2011; Markos Chandras <hwoarang@gentoo.org> openbox-3.4.11.2.ebuild,
   openbox-3.5.0_pre20110313.ebuild, openbox-9999.ebuild:
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 781d771dce02..35197b16345a 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -6,25 +6,25 @@ AUX openbox-as-needed.patch 413 RMD160 48e8092b8e732dcdcd3a73e98103bf67537249a7
 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_pre20110313.tar.gz 470371 RMD160 71bfdc758f73d19c3b24c2f1039d883c52cc63b0 SHA1 3a41e674620b9227cb203b4cbf22df30027bbb3c SHA256 97bdda9ac63b1fa93a1af8f4ee309820ae27c4a9a561a97c347663a92a618467
-EBUILD openbox-3.4.11.2.ebuild 1407 RMD160 b9f7b3be51f038dfb83775c9aa9e1da01921c4eb SHA1 26e6ae63b1c7f74627ee4e39ea66ae5af2b8f90c SHA256 ac86d6f8174207d035606d906565c1a6e1485146480bdd3c231eca6ee0da0820
-EBUILD openbox-3.5.0_pre20110313.ebuild 1783 RMD160 9699e036adfbb3e121ba61012467459f9d2636de SHA1 4f0efa0ee32559d573a24bca4f80499dd8f76696 SHA256 55c2409ca96aa778c162c0b5f6c3bd8d038c51e28cefc1cf7493f468f3ce1025
-EBUILD openbox-9999.ebuild 1703 RMD160 7278ae5c6d6021d2d0c195a7bbde729d3f2fd6fb SHA1 af69ac569d9ef08b957fd35b502790b6d4252269 SHA256 1fccfdade6a15b42d9d76802a44494574ebcc8b343bbf4ce74367a4262609513
-MISC ChangeLog 33606 RMD160 9f6635066e2b194409a50880db5fa193c197bf18 SHA1 a0af1d4d574ec8feaf2b926eb2d9a0c0963922e4 SHA256 f9fc58d80d1efbfe6d46cdaea9de32b43512be07489151fecdd8f0f3019700f3
+EBUILD openbox-3.4.11.2.ebuild 1410 RMD160 6d35ee35a72944d7b25edf482a50521ad64b9bc7 SHA1 8ee9daf95c5720b1b50f32e2dac02587652f98d0 SHA256 a1d649119a6720125cf39f2ef38219926125c38c5451c6f3e07bd013d817db0b
+EBUILD openbox-3.5.0_pre20110313.ebuild 1786 RMD160 1434ab14166c88b6b15cf4c8e2a2b5f616272207 SHA1 c75358c58a3364ea2b240046660345e092beb8c2 SHA256 99a93d85f54d305890f0efe5210d252b66c30e92a58cfeb0832c42b0215fa9c8
+EBUILD openbox-9999.ebuild 1706 RMD160 ab659d3075b8b6a1a738f9e7b3f894e161328a41 SHA1 18f6956f1f045dabb6409739e6fa40e9591e41fc SHA256 d173ce11f962d03e91d7217beb004c85ce26015cdd0486abcc24239f04d532ae
+MISC ChangeLog 33811 RMD160 bb1f77cbf79a8eafe08aa14ba32832bc28738ba1 SHA1 888e9d905aacfe761ca321dc69209d79e61f4aa8 SHA256 323e7e01c3f29f2f8b1f8aff681f6c9ddd942c33ea64d9b730842ad00015ccbc
 MISC metadata.xml 699 RMD160 43120af2117149bbd15bb57e5fbdbf05d7d97b5a SHA1 6bfff1e27b4686c11f0d9aae06b7c3a86f8972cc SHA256 df6b2c4c2eb86857cdeb5cab7e07fe279b8abdf74ef6d4f88c34adbd26067212
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOAaIBAAoJEPqDWhW0r/LCx4gP/3ok+Carf+HOYp/8GKMpwp/B
-14PDWGo3ZWOufmFC9LeSUf04t2OH1FcgVIyxxMWUvNmMJ9vbyd3A1BI/Em5PsCM5
-hPYcH1u5eGuPytQUDM+6HwdmcoyU0AYWl4l6Y3Gdnh+0cwcamMq1H8YTVkAVoHR0
-tGVgbB9LPh9Ux33f7dQvAOG1/XFVWmUip77Korg7Vfiwa837j5cM6kj7t7JPIB9/
-Ycas629i2UGWb89fBL3Djn+mGhpg4AUNMmFHFHAX7aOmO1rD39fdeuKHAxE7zJU0
-tNeOMHFBEHw8CIfQ3HW19tHbmKwzOqtLX6EHLv+1cbkrGJyCzwg7qvh5UYB9KXTm
-9DLLv6RUImOfryXGsgcWgWKZt86ZLo+E1FzTPRKaqz7er4/DEQf0MzrbmW3BVrq1
-aiO6Qwlx6gD6sBGtneukdOEb8XHPZuhJ0i/KR7rhyNrKN8Spfi6aez3oShdiddr1
-TYzsBHb3jVO6nUYCRRjkuAae97O2v83bGz+hNo51NW/yqxC0UUKwoxzqXyq0SLbL
-zlulgXfDURIGdYshOP8bsSblrzPmOlvg6V5UkBXBvsY+XoCa5QpucAX+9mGOWvtF
-bbsTubLNkdwRwvOaq2NjCUzOvXkR/o9hPF/diQciIeM4fBHi8UuVFg0hYSSYkaYO
-shmhJJ6fAFxkyNoUiAic
-=kxDg
+iQIcBAEBCgAGBQJOAxw+AAoJEPqDWhW0r/LCXFMQAIJiLxpx76eZDrqe6/YFhK1f
+9KeDJNFbXSMaWQtbYRYD9CcPSvapgqWRPGo3gG/cfP76BT//8OXyhqppnFor1Jb/
+4HX7kZLfKRUYkJjZBYJdcYosGAzT8lKsRbGxEcvAbZGYlUe7kdxrkmH7LP0YczdL
+6oaeczo9EiDbOWdATRsKXhE/xRwBOVZr16P1QbNa57hVQDUZO0/K2PkeCqyIx/jm
+61mVNjCbLrsxWlAvS29ZK1MhRyYhuEVFsOTJAW+s9UrkvdlMllOnFLzM16iybuBt
+XhWmvEkqoFv5IkfgaBdCOB7GIiAk2m0b8tlGD/a95ArHqgP9yD1Ji+0kKuQq+Gab
+V2W3f6VNNjtbC4aVm4MSgvQ3zw9txWjc14J8VHn6EiqWSE7GEOLFq28D1s7Z9PH8
+x4ODqCwiJu1pdrTlMG2BXyTZTrNXUvHb+uDtfUVdI1M/Nh6uv0j9PkvTLVuAGSeE
+AeD5kzMalFWnGfy2XvWmhtOiEQjItqZsJUHqhOscRYzM41WESD/b3nJ3ONahkSl7
+El9EAfrVfFoMyuWfpu/JeiAkmcmpXpMEf/9Hm7mC20UooJ/JX03W2sFl5i8cmZKz
+bE/LFlpL5BTeEjY9dM+ni1d3Wc3UsNHdZ51oPGpqN7ETR3VADeUt4f6zyWAAfXEj
+BQ7EG2JPTBJUa4Gh5YMn
+=wIDc
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/openbox/openbox-3.4.11.2.ebuild b/x11-wm/openbox/openbox-3.4.11.2.ebuild
index 6dddd4de13e3..bfb3ed89a012 100644
--- a/x11-wm/openbox/openbox-3.4.11.2.ebuild
+++ b/x11-wm/openbox/openbox-3.4.11.2.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.4.11.2.ebuild,v 1.12 2011/06/22 08:05:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.4.11.2.ebuild,v 1.13 2011/06/23 10:59:23 hwoarang Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ RDEPEND="dev-libs/glib:2
 	x11-libs/libXft
 	x11-libs/libXrandr
 	x11-libs/libXt
-	>=x11-libs/pango-1.8
+	>=x11-libs/pango-1.8[X]
 	nls? ( sys-devel/gettext )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )
 	x11-libs/libXinerama"
diff --git a/x11-wm/openbox/openbox-3.5.0_pre20110313.ebuild b/x11-wm/openbox/openbox-3.5.0_pre20110313.ebuild
index 1a6c987ade1c..9ccde92250d8 100644
--- a/x11-wm/openbox/openbox-3.5.0_pre20110313.ebuild
+++ b/x11-wm/openbox/openbox-3.5.0_pre20110313.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_pre20110313.ebuild,v 1.2 2011/06/22 08:05:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.5.0_pre20110313.ebuild,v 1.3 2011/06/23 10:59:23 hwoarang Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="1.9"
@@ -21,7 +21,7 @@ RDEPEND="dev-libs/glib:2
 	x11-libs/libXft
 	x11-libs/libXrandr
 	x11-libs/libXt
-	>=x11-libs/pango-1.8
+	>=x11-libs/pango-1.8[X]
 	imlib? ( media-libs/imlib2 )
 	nls? ( sys-devel/gettext )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index c4f74084c97d..e80301e635bd 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.6 2011/06/22 08:05:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-9999.ebuild,v 1.7 2011/06/23 10:59:23 hwoarang Exp $
 
 EAPI="2"
 WANT_AUTOMAKE="1.9"
@@ -21,7 +21,7 @@ RDEPEND="dev-libs/glib:2
 	x11-libs/libXft
 	x11-libs/libXrandr
 	x11-libs/libXt
-	>=x11-libs/pango-1.8
+	>=x11-libs/pango-1.8[X]
 	imlib? ( media-libs/imlib2 )
 	nls? ( sys-devel/gettext )
 	startup-notification? ( >=x11-libs/startup-notification-0.8 )