Adjust -3.2.1.ebuild to depend on beautifulsoup-3, beatufulsoup3 added to IUSE

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 28 insertions, 18 deletions

diff --git a/dev-python/lxml/ChangeLog b/dev-python/lxml/ChangeLog
index c1cced664941..0b308e967c37 100644
--- a/dev-python/lxml/ChangeLog
+++ b/dev-python/lxml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/lxml
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.158 2013/05/14 22:39:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.159 2013/05/22 21:22:23 idella4 Exp $
+
+  22 May 2013; Ian Delaney <idella4@gentoo.org> lxml-3.2.0.ebuild,
+  lxml-3.2.1.ebuild:
+  Adjust -3.2.1.ebuild to depend on beautifulsoup-3, beatufulsoup3 added to IUSE
 
 *lxml-3.2.1 (14 May 2013)
 
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 0044a20052df..6b73acf2e55c 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -19,18 +19,14 @@ EBUILD lxml-3.0.1.ebuild 2304 SHA256 a9084b2c8da7a3b3e7160b255f09fd8bb90a35c7a4d
 EBUILD lxml-3.1.0.ebuild 1785 SHA256 d6fcb81dc8921634166dd47e0d41e95b67982f89f11730eea08db540c8ab8c36 SHA512 7f701fe689c4569b7bc6be4cd5e1b4a6517a8e65c01c6b4b0b7b787d7b905dd174903af978955b103ceb82040807ecfa78dcd0b99b3887e39f6c35a2af95a5fb WHIRLPOOL 15dc2cffc6ed6fb7ebe4ebd44f1bd2439cd49eb367b21a9421e63a60b00498e60fdf88ae06949a3eb6fee53a4130b27e9f76f2fd2efb5fafe446ec535ebf2a18
 EBUILD lxml-3.1.1.ebuild 1785 SHA256 bd0c13628e68e1be2929d1e5fd715aee26e25b84dded4ab0a3dd904b9f35d0fb SHA512 23a231cc1e720a9e4eb1a4d13923a048dce98a803de19482644846449d4c059c1138337e19043a0b040b6bbcf7ba1936442df94ce749deacde63403dd594b133 WHIRLPOOL a25848cdaf137faa32e89aebfdc901eaaa47644f34e8715e5bf2c3745a2e6878dd08797c3d39066b101111c1f300b5f888cab2e34b86bc588c63233d18b7e4a9
 EBUILD lxml-3.1.2.ebuild 1785 SHA256 4c8a469e8a7ac92ca65a2b9cfd402c89188b3efb2dfc9ca6c785dfe5f609d273 SHA512 1bc7a46d8bd6463f2e3f95b7b5f3689f786580c3b3db12306c60d8d04570c05431b92a8162708ccaa5abaafd7a712653999c9b8d0f29c0015ab83affc446bb6f WHIRLPOOL af528a01f64f15ca28a6c4852da7e018e942cf0b05b275cc921e74b8f98429205a406058add105355340f02bfc042d648716e71a2a06aca9d2434bc47ea6b9e8
-EBUILD lxml-3.2.0.ebuild 2007 SHA256 39d16714982a9d248f7483c19500c0127d62d090237697003478a71fc9b9d3d6 SHA512 d400570f36efd1019981890ed7d05d6576f995be18866b8500ce4ba9bfc48a1ed62c1e721ec3856461bf4aac4cf173d7a8e11ff0e78c46e8051a71a9ed14c165 WHIRLPOOL eb74687e2ff2fd42b6984c51419e3535df353da1c1f14054e266dfaf5223ac841767ae977e17b40b568f735cf7fb849aa5ebee9707d2a0a276d0020b622dbb63
-EBUILD lxml-3.2.1.ebuild 1954 SHA256 2535ab50141d397eed455473ebe4d0cba2ccff0e826c0f031a9f6626fd127eda SHA512 32006c65ea98c9a3788d90f503166299c1bb3b3345c4b75cceb0225ed991320df6ccf7b86178e2cb435e12d076481562cbe8d7eb3f24ca8ee16cafaa2bc9d6fd WHIRLPOOL 607690004d666f1ac00a71b3ddcab262f0f1c4a96163b97aaf9f9990469ccd5169804461d183f0605a713b61944d8870c32d2b4058f2dd5e573d0227d20d12dc
-MISC ChangeLog 19450 SHA256 ac70fb4d58f06fdc951dd906d3ae9577e18d59e1dd16b4f0a776be54325b85e6 SHA512 6119378104d50507c3eca49466bfa488418c15e9f3fd6a27b2b16e974611e5eea2b087a0cb5d52e38fd96f7eac1e3d5a8c31b18ddd25d0327d2454e46e1a6ad6 WHIRLPOOL e7a5c3e2aeacd14f7055e293380af9292264186e63531aea3a3332032a82b8b68d10b52a8bb3b509b4ea502ce8848f9d8a2a74698159b16b18b388ae2a7e5a73
-MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
+EBUILD lxml-3.2.0.ebuild 2015 SHA256 50d86d2fbcd7c58a0508923dbb44ee41a277cc08750079b58254e2117ff19e83 SHA512 44bef4a679c0ee20c2c10e93c10763f9d3b63ec3660d9e4527c0f67a33034c2ca950e3cfd4959185946f86d1d231c7f05f6a2e896e80cd85cc123425e796a299 WHIRLPOOL f4cafcf4972789a920ceddc223636e1310e3f6f0f471bc22e72be470b74fb729a2f5f53ef1a275d654b848e2be0419e92e9a34427cbb40e782352df92b428535
+EBUILD lxml-3.2.1.ebuild 2408 SHA256 ca606de7c39069750fd277c26571990b34630745500b7ab873f60529770a07a8 SHA512 56d2ef89f42c190d93a5c9b1eb82b85e88fb3e097385248a2669e974ee6a41800b3d5c41aad6e5d58560895fefcca3a7b974991ec2e30d0cba2dd820d954aa33 WHIRLPOOL 75174cfe17d1e258fbfb3cb42caeed7e971440ae55ea2524aa378e64c33319da634c3c6806c10a5594e4bb47f8ad862d96e35879ca74a90775489a99912994c1
+MISC ChangeLog 19618 SHA256 123b2fe53182e9c131e687c56fbb22fa49524b24c868bac3902539254fcfb29d SHA512 6a34a2875bc56bcb427cde0fc74b696ea472115cf1ae863837956a4adc48d03bb486d929aed0a946c182662d97a75e5faf0b527a9cdb7cca8264b12dced195c9 WHIRLPOOL d13406f10646ecc780bdd767c91b7ef7d84dbce9ab18426cf33e712826af52e7c8e0d733d654a6f143dc87592bd43d812743412c540b1b4e5c297cfba87163aa
+MISC metadata.xml 248 SHA256 e7807b576fc37fc13cb9ad6785defe55a0dfeeb1c8d4c0765186169ef23fa146 SHA512 0f61003e05b546ed78531f3ed7e416a67ee0d13a76d238fb9907bf93b1ce732a8f33d66763e831f607c4b8c3739836627c4bbbe3569db6b0506142e41c45e0dc WHIRLPOOL 327f14c55f4be41d29c3ee1973e67fefc8df5c11925b88ebe989528ddac6b8ac85b46ae0d7520745c739ce3cfc60c0cba85875933af621cd6890e59c85bf5072
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRkr0kAAoJEEqz6FtPBkyj4hkH/RwGq8F2C8GZY2I99zDlHX2a
-C7ZGzNHSQlVk2uaau8fZtyKqiAzhIexXYRCMFTu9Sx6+8DUXBaQhzkxmxISq3Ky4
-bbyxMDa4ci/5PyzmVG4gW9DGai6srhNFUyMv2iCd8kcBaJeIzLKiaNBI1ljgPOSE
-UOViEUOrZELlOQJGXVNkxeFtjg/z1aTrrkHmgaWWGO/eKEN8MTHiO/6mvpjjkMTv
-Wd/bilsvQCg4tc45ruB0tKLLC4jajQqFtfMW9X2/IYlOwFo2G05zzSybovzIdVnr
-dZrVRhptNIp8NRgYWOaFqvAenA+b1asCUL9k4rOyGVQxlebKz+tJUFhcqX33ZLY=
-=wvxt
+iEYEAREIAAYFAlGdNyAACgkQso7CE7gHKw3liACgpWSBgwWBZ1zDBSePoMjk2u6c
+DVIAn3UhhtSZlDRb+22LiSvr6Ate09JY
+=8N+O
 -----END PGP SIGNATURE-----
diff --git a/dev-python/lxml/lxml-3.2.0.ebuild b/dev-python/lxml/lxml-3.2.0.ebuild
index 7dadf1072a00..7273bdae582f 100644
--- a/dev-python/lxml/lxml-3.2.0.ebuild
+++ b/dev-python/lxml/lxml-3.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.0.ebuild,v 1.3 2013/05/04 20:40:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.0.ebuild,v 1.4 2013/05/22 21:22:23 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/lxml/lxml-3.2.1.ebuild b/dev-python/lxml/lxml-3.2.1.ebuild
index 1e1cce88dd6e..f0b090fe8131 100644
--- a/dev-python/lxml/lxml-3.2.1.ebuild
+++ b/dev-python/lxml/lxml-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.1.ebuild,v 1.1 2013/05/14 22:39:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.1.ebuild,v 1.2 2013/05/22 21:22:23 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
@@ -13,13 +13,20 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd \
+	~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="beautifulsoup3 doc examples +threads"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
 RDEPEND=">=dev-libs/libxml2-2.7.2
 	>=dev-libs/libxslt-1.1.15
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]"
+	beautifulsoup3? (
+		python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] )
+		python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] )
+		python_targets_python3_1? ( dev-python/beautifulsoup:python-3[python_targets_python3_1] )
+		python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] )
+		python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] )
+	)"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 # lxml tarball contains files pregenerated by Cython.
diff --git a/dev-python/lxml/metadata.xml b/dev-python/lxml/metadata.xml
index de483c53568f..76cfdbee32d4 100644
--- a/dev-python/lxml/metadata.xml
+++ b/dev-python/lxml/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+	<use>
+		 <flag name='beautifulsoup3'>Enable support for Beautiful Soup 3</flag>
+	</use>
 </pkgmetadata>