version bump ; removed bundled beautifulsoup to ensure usage of system-installed dependency

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 36 insertions, 36 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 218fb751db8c..bdcad6ba1b07 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.317 2014/05/01 16:14:31 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.318 2014/05/03 19:42:58 axs Exp $
+
+*calibre-1.35 (03 May 2014)
+
+  03 May 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> +calibre-1.35.ebuild,
+  -calibre-1.34.ebuild, -files/calibre-1.34-C-locale.patch:
+  version bump ; removed bundled beautifulsoup to ensure usage of system-
+  installed dependency
 
   01 May 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
   +files/calibre-1.34-C-locale.patch,
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index bae966434422..a5eacfd632f6 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,7 +2,6 @@
 Hash: SHA256
 
 AUX calibre-1.20-no_updates_dialog.patch 896 SHA256 fdc44ced4670ec51be8bacf796b8d793edc3f2735c235fdb1ba708cd3c9121d5 SHA512 84354a286d1258a9496e9adc68317c3016f1bb4551a090ded372376598dad989d02fe93d578a9c497154d49ec1fda098a9e3740145425a6cdbe80cf956ee8764 WHIRLPOOL 2348ce9d068d571d025abfccb5e07e6c2b4c4682242a1b7e77e777e3bc0e9684a214c80b1fa480214d8302115e7209e87a0b3edd140939274037a31445a17859
-AUX calibre-1.34-C-locale.patch 426 SHA256 e62c409510baac35cced6f49cf40396d851de93cb675e66f1592980df564d6ef SHA512 cddc1513857706a8b97c4f950ef6af6b3cf43d4862423f5df71ea739b3e0b75c5d9fcfdaffa59cefb6b2634fc022fcab8de60c4b3be39be335f8ae3924a2ef6b WHIRLPOOL 001e2b4d80eb9d068ba3d4923d98a875bb8e71e9e666244fa683ddd6049ddb5ea971c0e798a99016923b14acec47eb103112b52e27f5d5968e411db5e992e600
 AUX calibre-1.34-no_updates_dialog.patch 1902 SHA256 5e7909e814c3f5cc167674e91f8e2a9f19aafbc471d5044e2561cb9b41a2d672 SHA512 cadefae143474d924bbe1c3a2b48976c35cd660ee9762efd5757cdb7928e83ddade7e9a2d29871894efcb0051235491e2be5146ccb19168599c02ce3f6b9f274 WHIRLPOOL b926814819560fd88fe17faaf995856897366436814826311e1b09716e97f3c46082d23a9856a55a471f5ad8233f2a4d7bb3d80ad7d30e77caa1ac5e17ee7bd3
 AUX calibre-disable_plugins.patch 1042 SHA256 4921ba7be29d8e2789f3e31d23faa96f308cbf556f2704c001a3dd4dda9dfda2 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629 WHIRLPOOL 8a4870df539bc768b9dcfb28623773d730ba27ef307dac856f4fd9ff682b710a7b33dc93e505cb5d974a95885089c079838a59d579c496ad6a173384eb14bdda
 AUX calibre-no_updates_dialog.patch 891 SHA256 59cbef4d8026241bd198f36728c4dfde6fa063af393788c3126f788730d375a5 SHA512 f7cfa4b0675146275c155897b3bced4899487dcd6e3f5d94719d25dd698b4b74b9bb13477552f0ade3d243a35146e4cda36c46cad8bb74c57dcb549825428117 WHIRLPOOL 138bdd85270076d2a5f8560cbc994bc91bddec2385713c19237fe4db665dbf0bedc62941ec70c39b418c469de2fed036a00bfa9639832f7d435bd6bddad391ef
@@ -12,18 +11,18 @@ DIST calibre-1.2.0.tar.xz 29652528 SHA256 d27fdbe981620aa63f5c70909c63a3a7b747ce
 DIST calibre-1.20.0.tar.xz 32430560 SHA256 475e09b1be4b9977240cbbe6743ab79da4b1f1afe3fe6015d212d868e8f2fac4 SHA512 84ac25080cf4948398b79f9a1af688cca9cf9a5a9200b2aad649f5fda1cd0556be4ade0c8b09ea6ffcc95654eac0aaaa5b8f8ed6ea9830174bc150e64de85e31 WHIRLPOOL 61b6ecde2e3f8679c1afea95dcd152a94ce03522c06dff34b406a5705f6255243f0565fbb5f9bef3ac96d7127190bd1b4363233fa24fafcd0412e061201f6fe8
 DIST calibre-1.25.0.tar.xz 32683456 SHA256 cd95f64b721c6e7d0f392a7fce2c177bc8e1dec6a367891b3582e0b74b0e42f8 SHA512 fde5abbff3c4785160aa6286a8a50ae80ebf97a262b6902d6158648ba08c6d030e6031ced168131891d4cc7c291c74b6c3c7ce72be23c62c2dd783f47f0473b4 WHIRLPOOL f3cd373e8dbdfaff2d9e00cb7449916b0c6d2ae4530466ce1e98c8e5cb91e667db2a19952a11d5d35c044d6eb6804fc583d584753bec708560544e75c299aaf0
 DIST calibre-1.29.0.tar.xz 33022868 SHA256 b9cc2081528b72d7082e15efbc75b4edccf3e504d30697886bf23da4fa834faa SHA512 17a1e83c610122ef1bd0e4e0162bd907eec17fe7b012fb5476d3eb3d7e65df6d7b3e609d4b32cd6489fcddbfc55ac521b0e5f88d7cc2b2ccbf5f566e53c2f126 WHIRLPOOL e4501c9ed09b27853158c7485304c30be3cf4e1223ed5950d6d2ad1fb193941ea9a4ba4e1c7b37efe8252439993d51d15efaeadb190e5a3f25fe36455ff7a33b
-DIST calibre-1.34.0.tar.xz 33948776 SHA256 c1dcde1da1dd0e3117f4ee44f15d2d59de7d96c595da2a028742692bd59a37e6 SHA512 2f205786d1b06da40d45ba297c26b96dc2db32dab421a957e14e68b597e07d80b30d5c33d19688a81e4b0bbe8c47d912052ab83ce3c19c82358557e303e1a23b WHIRLPOOL 9136d1a1969daddf4fa8ab1683e11f77655c347f8ed14d7c48757e9d0890f7650aef188a9d8671c49fef0cbb5e46980ffed060d5dd58b2fc5b13e53aa760426f
+DIST calibre-1.35.0.tar.xz 34006392 SHA256 710941d2001a67959d9ccc11f8b89368e5d79cf96dbaa6e73efc92965cb8fd5f SHA512 d2946b7ecb6693c299067b5e870f5b2371a9fa3229ed15b2b34b2d1d641548486eb900235c2bc741ebd20a9ee237dcf644e662a125f085c1c04ab89c5fca1899 WHIRLPOOL 177135970f95016f8aea75b9146762874510618816118bea9edf13dbb8356a41a331e2828246e6fc5dc396ead7e610388ecdb9d76a479148d9d1b5c4e445b509
 EBUILD calibre-1.2.ebuild 7188 SHA256 90113b51d09bd3ab231eeceae07d4aae5f8ebd37ceac16525ec51184f39c294c SHA512 3fea7182ff45399da37eafa5e1b8ec9d86bbdd21e1e2a4559d12cedd8028f23313662b9f7b833dfd51f34b13f6320f5db040bca681ce580ef890b1c84a8c18c2 WHIRLPOOL 381ae7dc0ea326d08d94ef3016147d639755c645d928b4830dd8dc655e3dd3eec5cfe71b517831a63fcc48e688cf1eff0e95af0b38e51efac9b9f9b7ca1248b2
 EBUILD calibre-1.20.ebuild 6829 SHA256 97305bb462ce1af08b20a77ff1a27432e52c3d8f05e84c267649badf4a2c59cc SHA512 bec3b0e1bebe234f5bac4782e3c35d0237d6cd5561f3897c049a2c7e0d7e9c1a181897eb1741609cd1386a2594d579142f3a0e6b6045183163d5b0009c5a6b4d WHIRLPOOL 538238eebdf55ad11e3c6e72154e999bf90d17fcb916daf1c3cf0a37f3d3604e16f267707114b99bab1d884c1fe9e790354b02f1c940c72b713459a844eda3e0
 EBUILD calibre-1.25.ebuild 6834 SHA256 fccd4b963ae6a6a2a687566bba722f877f0f5b9b19203420ef181e13c4256cb1 SHA512 197844df92e82346747a6189d04d1a0df4c111c7549bc524ef6dfde7db08dc52147840e1340c738e0c58d81f281f3540c94159cfdb50e2c15dbf8bd1274a8995 WHIRLPOOL a77d7de048579c1d539c9af8583860fea880e21416b40f91591d7aaf7d10a2ed13580b52252a959d8d658f4de45669ee2512d209d7563956ee081c5d9376d644
 EBUILD calibre-1.29.ebuild 6845 SHA256 8b62380e75238694b459a4ab9d40139229a3dd1a09b2018dc8bb6315248ad362 SHA512 67f7d77a509be8d1bfbe1ce04a6e9959f259dd7da71f1023548806ff229ebcb23f95e55fc27e6e41c76aa0d51c3816433fe85f7ec83d82bdeb33c3ec6114aa5f WHIRLPOOL 1158539fadd0fc494c2eaefc496269b77a1d4043bd8d8bdb2a6dd269c4fbb4fe458ae564c22c8df29b362b167ee6956290fdd986182078466f1e41424cc7c299
-EBUILD calibre-1.34.ebuild 6967 SHA256 34a6e733f796e282327db0a6f7be758fcd85e71464cbf9b21df050a763942e3a SHA512 e253d62fd0ad8735ad5d7d9db967ca321cc9972c65c49e46460af41544b8026e1bf18c34d949726a4d67579ae9494789d495a08f9f74a996a07b4ab151463238 WHIRLPOOL 06106d7059e6769ba20e80bd544041ae336ca2665d809589f8fa3a79b2f702d39edcd874b63b1f709c3548fc8db96f70be3990dc96c11ffa5fb0af73b8d25795
-MISC ChangeLog 50453 SHA256 a34b93a125535ba53fd1cf537a4bb366953303477dfd75c26c7725c4b8e2ece5 SHA512 4f4f83bd8609553822d6c86373f75ef752417c4a485f8c986e321c39cbe56786e123d771f7cd335038b00516880c5c0398d1b1a8153e53a204a975112d6e7c44 WHIRLPOOL ed4db31d4d8c8069cb1a40ca201bcb1270305b08886fa8c9ad1d20cac9add4d3f0361e556216e74b0e033c34a1fd00271090b43229e019e1b32d44a324380675
+EBUILD calibre-1.35.ebuild 7636 SHA256 6cdd4798a00e2f373dbdb3abc12f5f12722b37de09e8c6ec018cde34a836a720 SHA512 fac0e893eaa1645c3c30ff9c52d7bc602c5e0147e61a3162948aa13954c8a710891e07b2e217f7d67b875d2814c0eb5ae0b4c0b890c63af08c13711bf8523877 WHIRLPOOL 4c10cd283ed1f95b1ef9d57d3b76686c265b94847cd36e9763c18b1317fac5591cdece472929bc1bd3dba7123b1b08a27350cca4d1e1dd0018f9bebf20335cd5
+MISC ChangeLog 50719 SHA256 7c6df15dd1c01eda9519673ba7fe265c41cf43cfc93835a0fdcdf47ec11077a6 SHA512 a4b0c61f053e1a18366482dae8a33582773ebbd00dfda34ba5130df0df778ed29d757d1dd3fdd3aa0f87f089ed6be8aeba0be88e88dd7d3e42284824e69bcae1 WHIRLPOOL acb3d7111fe98b4ee622163c2bc6645c9f6ee3d4c6fdd6295ec2a58cc36e2aa67eff47488dd93980216ae108605839c2f0c4d5b2a003d521fd3e2320cb3254a5
 MISC metadata.xml 494 SHA256 8636a504a39b901333bfb9aa1c1322dde87ddc3fa6c6da3a7b95abcf25d61786 SHA512 c8e1bf8c46e3b3285df1cffa1324042a82d6a40dfbe5384d018386e661c446204bfbf24b21d7afe893ceb1e1de07719b84ad2af3345c04e4419141f8e789ca2c WHIRLPOOL 7d89476c21141740f9b27f947b722bd64004b6e705fe6ee35237f94ef318f626e49a5adad5ac0ab86d015913c3663d4bb80d9a9f4014bb3e139623eb0938179a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNicucACgkQ2ugaI38ACPACugD+PNeFcmMCGnN1y/z5C3kx7ZIl
-83dBdaN0sBIX/DQV3m8A/0pt6b2iCcAmJJ3LPj9zfgC6jJktBoHhGVKs96yzWloT
-=lwEK
+iF4EAREIAAYFAlNlRsIACgkQ2ugaI38ACPC3HwD/WqcI4t3QOdrUKQ4YsKKKFP63
+8jrtraqHaPNTTfr0rEYA/jH71JLcqTre2C4MwXmVSCXi32Hpf1giDZLEAI98QGVB
+=zd1h
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-1.34.ebuild b/app-text/calibre/calibre-1.35.ebuild
index 9836098a7ab5..7f8f8124a8ea 100644
--- a/app-text/calibre/calibre-1.34.ebuild
+++ b/app-text/calibre/calibre-1.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.34.ebuild,v 1.2 2014/05/01 16:14:31 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.35.ebuild,v 1.1 2014/05/03 19:42:58 axs Exp $
 
 EAPI=5
 
@@ -42,18 +42,18 @@ COMMON_DEPEND="
 	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
 	>=dev-libs/chmlib-0.40:=
 	>=dev-libs/icu-4.4:=
-	>=dev-python/apsw-3.7.17
-	>=dev-python/beautifulsoup-3.0.5:python-2
-	dev-python/netifaces
-	dev-python/python-dateutil
-	>=dev-python/dnspython-1.6.0
-	>=dev-python/cssselect-0.7.1
-	>=dev-python/cssutils-0.9.9
-	>=dev-python/dbus-python-0.82.2
-	>=dev-python/lxml-3.2.1
-	>=dev-python/mechanize-0.1.11
-	>=dev-python/python-dateutil-1.4.1
-	>=dev-python/PyQt4-4.9.6[X,svg,webkit]
+	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
+	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
+	dev-python/netifaces[python_targets_python2_7(-)]
+	dev-python/python-dateutil[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
+	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
+	>=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)]
+	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
+	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
+	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
+	>=dev-python/PyQt4-4.9.6[X,svg,webkit,python_targets_python2_7(-)]
 	dev-qt/qtdbus:4=
 	dev-qt/qtsvg:4=
 	media-fonts/liberation-fonts
@@ -62,7 +62,7 @@ COMMON_DEPEND="
 	>=media-libs/libwmf-0.2.8
 	>=media-libs/libmtp-1.1.5:=
 	virtual/libusb:1=
-	virtual/python-imaging
+	virtual/python-imaging[python_targets_python2_7(-)]
 	>=x11-misc/xdg-utils-1.0.2-r2"
 
 RDEPEND="${COMMON_DEPEND}
@@ -102,13 +102,18 @@ src_prepare() {
 '-i', 'Makefile'])" \
 		-i setup/extensions.py || die "sed failed to patch extensions.py"
 
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py || die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
 	# no_updates: do not annoy user with "new version is availible all the time
 	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
 	# C locale: if LC_ALL=C do not raise an exception when locale cannot be canonicalized
 	epatch \
-		"${FILESDIR}/${P}-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch" \
-		"${FILESDIR}/${P}-C-locale.patch"
+		"${FILESDIR}/${PN}-1.34-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
 }
 
 src_install() {
diff --git a/app-text/calibre/files/calibre-1.34-C-locale.patch b/app-text/calibre/files/calibre-1.34-C-locale.patch
deleted file mode 100644
index 6a91d942bf90..000000000000
--- a/app-text/calibre/files/calibre-1.34-C-locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/calibre/spell/dictionary.py	2014-05-01 11:38:04.051290252 -0400
-+++ b/src/calibre/spell/dictionary.py	2014-05-01 11:37:55.061290088 -0400
-@@ -52,7 +52,7 @@
-     raw = raw or ''
-     parts = raw.replace('_', '-').split('-')
-     lc = canonicalize_lang(parts[0])
--    if lc is None:
-+    if lc is None and raw != 'C':
-         raise ValueError('Invalid language code: %r' % raw)
-     cc = None
-     if len(parts) > 1: