Fix sqlite3 module dependency -- the package supports only built-in Python sqlite3, not external pysqlite2.

Package-Manager: portage-2.2.0_alpha152/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

4 files changed, 21 insertions, 24 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index bb026dd5ba7b..56c1c6de59a6 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.163 2012/12/29 20:12:18 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.164 2013/01/15 23:41:32 mgorny Exp $
+
+  15 Jan 2013; Michał Górny <mgorny@gentoo.org> xbmc-12.0_rc2.ebuild,
+  xbmc-9999.ebuild:
+  Fix sqlite3 module dependency -- the package supports only built-in Python
+  sqlite3, not external pysqlite2.
 
   29 Dec 2012; Mike Frysinger <vapier@gentoo.org> xbmc-12.0_rc2.ebuild,
   xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 500beea6aa04..3e10adf045c8 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -18,24 +18,16 @@ DIST xbmc-12.0_rc2.tar.gz 63734373 SHA256 e8d08df41ddbd6490e07f46c9ce28d7ada2160
 DIST xbmc-9999-20121224-generated-addons.tar.xz 51980 SHA256 21284fe7ccee065eee10064f73a469722d6ffddf2fe882a0aefc07ea0eba0401 SHA512 48cdf8c685a48cd32462509962c888e8bc16254268d6fc891aacc5222da42e227ee5b6858c9e2b80d7d9fecc63862cd0c62c181a106212886a25f9be52778a1f WHIRLPOOL 12a31d33cc322b4afc3bdc829fc330a0971cab8a557a2f87885569d817a3664ae7506bfe7984322ec95b7786a246cd5edb10fceabfd96965ef33dd19cb934ae7
 EBUILD xbmc-11.0-r1.ebuild 6509 SHA256 eb80e9c0f938833ad8cf7571dc718a4c29fedaee05646d58d1d509ef8a5a5902 SHA512 ec3732f072a4d7a4960a9ccb270c93c72b3d07fbeccec213fa62f4f5e1fc681db161b577ee226330900200fc1bb96b7b20b6e36f9908e36d77588fe4c31a6af1 WHIRLPOOL c84d67c21ac1287f82e41fd41a81f99947105ab22d900f1f8d82172f3fb9d3ebe73b8d707e5ed536c02f94f56a5bb14df33b936367a9baf93bff11dc4847eaf3
 EBUILD xbmc-11.0.ebuild 6297 SHA256 7395c414fbd86dc3cc3bef80a68a108ee750c4cb39280d255b2a4f086658c98d SHA512 c2ecfb837deac387388b56bdf297f5d0305a24b2f251f6fc9722c74e44689997a6b62330c98d7d72b73ecba6681b7659916f0f5ce8d5c7f2af22342653e0e3d0 WHIRLPOOL eebbf81f6e994a118a1b0bea796df3189d0f86a1f9984059d67d8968fe17b7c03de35b326d1569fe32762c4dd744740e5e04f5a4d8559dcd513c614408c61fb6
-EBUILD xbmc-12.0_rc2.ebuild 6487 SHA256 7f897d5ae3c4bf9ff299762c2686e4328fb70f5c0a5913f92cb2de3da99266f9 SHA512 ab07e30eb8c32ee9dae2e40c7ee9892b0773bf6536b86a6006126964c83ff3417ac231b3d9ecbf25bfa1b03694f12ee3b669286f24841e21a2bf55b052cfc60f WHIRLPOOL 29b67bd8527fcc485475c5a844c6bf61d8031d0d37bf50ffd854a14ed10256e6c27e5ee7e05f0369409e923a3e006b166c046792fa0b7adb407de5b9334e4cb8
-EBUILD xbmc-9999.ebuild 6485 SHA256 368ab059000ddec568637ef2feec8fe992d5fd2b7f20b64a6a0af99e7636dfd5 SHA512 121e7505407d209b40f166f347462688f98fc5037341f56c5e0a68dca078387ecf6691c23bbbfd908bd7e155b74b41cc2c18a9101b0f2d4e80f41385ae7574cf WHIRLPOOL 3e102d480ec44f125821ec0f9b1e2a6e85baa48a480455787ca53311a5fa2d700306643bb07835ef6b4ba8571abaa0901d9ae833ece70af0d8643b2d9e504bad
-MISC ChangeLog 26375 SHA256 9b777db6faa452c9566573e2aa8a746cfdafead1b90e0689add7b9e62a11d237 SHA512 c18e1b084aa46fe2d5028e8509ac9cbfdb603fc895d950ee6997b3a7e8870c9bf9d1fa7df1393cc9b433ed10f88e507ebc3254a07a628b7ff19e68f72efb460a WHIRLPOOL d87665222122112fab5eef661b35803a0042017802291f33df38cb4efba7357fd8db66125c22298ec9ee5d3257c5d824e897b43d90a4e273f71d12e3cbe025d0
+EBUILD xbmc-12.0_rc2.ebuild 6485 SHA256 c1747574823327f1e3d30662e12effaec969d5362553fb5af18f9145ab790a2c SHA512 507b3416cb85ddc201cfb83a0ff3d71f9f3fd53abb386f070d55700460f6800b90b17f4237998536443cd47fdb3502bae28c99559664db3bfa102971a32523e8 WHIRLPOOL 9f9444da3a277ceeca19cd762d7b0e24a2be28f2c14c868cb87b5f1228b63689f6560d9dec16551244d40d1d7e97194b3fa7d7e418c940d72ffa1441cc59b644
+EBUILD xbmc-9999.ebuild 6483 SHA256 e8c7b3c68a027af4fea50b7204898da7cfcb16bc99b231fc3020916d73245ecb SHA512 87322f88d0775849df105d1d67399cf68170e2a8767c44915424f6f1233f2bbb4fd2fc6641f526f96befdeb32725860bbaae664a600cceee6466d3aa1ebad469 WHIRLPOOL 56598e6a6988f2f2179032bd32ba336d05e4e38716a1772d3e9c63a6dbee30bffbb5f86317e2fbf90fe260375bc9ba39a94d8c2819a79a3320b63c34f1e4d2e6
+MISC ChangeLog 26580 SHA256 74d34a67d709d08c88570d84f12004c94e5ad120c7f8ffe75c926470eb8cdd05 SHA512 27f773cf4a50c6ed803dd98504249c517699f9358d82f6884c4b944842c66cc4c04e7434315400422490c1bc6826c5852f613a741c889ef3424710ce2c9a1d1c WHIRLPOOL 6cf9b7ed91b01d475ce82f2dbb0fd374d447d1a5ca99b3fe8c16ef9a6c2d01970bbb0d7088454f0e203fd12d004254e4c3d157bdd26114be3baa556fa7395239
 MISC metadata.xml 1025 SHA256 73ced63a34ac528635412bea6d8e671d6ba517c6bfa17d0f48a560a9de0f12f9 SHA512 40d2a20175ef2fd0bdc5228339f4236905cd91758d30bec4c8575ff2a90f59e3333167e8ffcb125f382530248931e1a0a98f7e67a40073bff0850c350bccc36f WHIRLPOOL 3c4f940a8a42426b530041e0958635cbd46d9a23817594f82dbe4dce2a0873189c727a53663bb98c198c146dd38dc2fcb6e06823c4c22cb9ae860c3d51ea6750
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ307tAAoJELEHsLL7fEFW0PUQAINVEIoL5yANkZQNfCZjJKXt
-PIBrDWeX8WTd7Bkqo/oBMn0d2W0jyHFA3L2Zf576cFza2GL9MENducoubPEdIwHN
-iqW/qKYdEYZQLfU9CqtVfCM6WoVQ7xxB8CpY+Jetnkw03Tgm+sc0xbDry2YNYUw7
-LIHJ7zcRANGgDC5Lu5l+zsaSMMjXOBJN5+qNTCVOKUT3K++8sY95I9T/Z/2IdUTG
-e/C1JxIlzENCPpLbgseQmQXvQgmc8O14ZDjr2v+xopgYmZ6eY9m3OsthteP5AjkI
-zMlSBdcuFwNp2O7A6ZvcvSSaEjcaFwhrBtS15ibaRgLX5A/NzeCaIf1WWgrLoVxB
-3iZREY7HQkGMQf2A+SkoOW6BwLLpgm7dCluTI+dWTN8LLj8oSwswh2Zpo/Yszmvh
-pU/zB/3Tf/5H/ERpbw2PuQ2S2z/v/WCfmK8K9Yv0hzVqRAZpV+JOPOnkVHuuLV1L
-dgG6TGNHNqSC/Kv9+tH388wt9vseWGGRim6mfd/yqg4oJl4rYIUt3ZDQX740nAft
-oQxUtbJaT/ie/P69ggiWXFSm9mPG0r1NpurE4c7dh/izysFK1wVQ1B2Wx/OnQXUE
-ZeK1nwfdUI38jBMrn39xbcPiBT5JcSV748HhGFPmEvhcAfgDib1NX3cOHU+p0Osn
-wM1muBBeJ0pDKTG+fCa4
-=UbRS
+iJwEAQEIAAYFAlD16VIACgkQfXuS5UK5QB3yQAP/XbvZIPIRZd0ZFFMqDqaOOExf
+6q9s/62RDIMMKxLCPcF2RvL0D1EHq9BQYJYHw4TmuAjdSyEtAKKUag+1nUAwfcVy
+3o0Modn9zhxuK4ZoLHQYUVoK9pxp45E9dBOABZGGNHYXAkmiFLGGM94P7kTBkmMi
+SC1RsFqcoQ4gY3YyuAI=
+=KTG/
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-12.0_rc2.ebuild b/media-tv/xbmc/xbmc-12.0_rc2.ebuild
index bd4a3288af3b..1a1ea648e025 100644
--- a/media-tv/xbmc/xbmc-12.0_rc2.ebuild
+++ b/media-tv/xbmc/xbmc-12.0_rc2.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.0_rc2.ebuild,v 1.5 2012/12/29 20:12:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.0_rc2.ebuild,v 1.6 2013/01/15 23:41:32 mgorny Exp $
 
 EAPI="4"
 
 # Does not work with py3 here
 # It might work with py:2.5 but I didn't test that
 PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH=sqlite
 
 inherit eutils python multiprocessing autotools
 
@@ -54,7 +55,6 @@ COMMON_DEPEND="virtual/glu
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
 	dev-libs/yajl
-	>=dev-python/pysqlite-2
 	dev-python/simplejson
 	media-libs/alsa-lib
 	media-libs/flac
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index b4fe09de706e..cc865c8d6db4 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.129 2012/12/29 20:12:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.130 2013/01/15 23:41:32 mgorny Exp $
 
 EAPI="4"
 
 # Does not work with py3 here
 # It might work with py:2.5 but I didn't test that
 PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH=sqlite
 
 inherit eutils python multiprocessing autotools
 
@@ -54,7 +55,6 @@ COMMON_DEPEND="virtual/glu
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
 	dev-libs/yajl
-	>=dev-python/pysqlite-2
 	dev-python/simplejson
 	media-libs/alsa-lib
 	media-libs/flac