Update to python-single-r1 wrt bug#458682. Apply projectm unbundle patch. Apply libav patchset provided by Anton Khirnov to 12.1-r1 ebuild and remove keywords as it depends on too new ffmpeg/libav with this. (the patchset still needs few touchups before submitting to master/9999 ebuild)

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

6 files changed, 535 insertions, 30 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 94ae73e94aca..067ea7ff508f 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.179 2013/04/13 19:45:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.180 2013/04/20 17:22:26 scarabeus Exp $
+
+*xbmc-12.1-r1 (20 Apr 2013)
+
+  20 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/xbmc-12.0-system-projectm.patch,
+  +files/xbmc-13.0-system-projectm.patch, +xbmc-12.1-r1.ebuild,
+  xbmc-9999.ebuild:
+  Update to python-single-r1 wrt bug#458682. Apply projectm unbundle patch.
+  Apply libav patchset provided by Anton Khirnov to 12.1-r1 ebuild and remove
+  keywords as it depends on too new ffmpeg/libav with this. (the patchset still
+  needs few touchups before submitting to master/9999 ebuild)
 
   13 Apr 2013; Mike Frysinger <vapier@gentoo.org> files/generate.sh,
   xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index edcc2ac66225..92a24e9eb5d9 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -10,34 +10,38 @@ AUX xbmc-11.0-nfs-limits.patch 727 SHA256 0161fe96fc164517ba83dab4e48fb7863aebfe
 AUX xbmc-11.0-no-arm-flags.patch 542 SHA256 72164a8b91f3209cff06ea1a103580f827135951a7a798eefabc04ee1a6d3e84 SHA512 7d40be4bdef2a2b1e53f8b96c489a87ec67975ae486fb44e619d66c1b5333ad33f896f64cca4e1c8050c3d92cd6537a9ca776e743c88fc2c8cabea1eae62b4b5 WHIRLPOOL 7c6666198b7d987028925e0f578d71796f6541995aa87964de3275f6a087610ef69d630ac349500a7c534de213b8fbff4cca6c25c3d0e6f1b1d8cd89f27d3d9d
 AUX xbmc-11.0-no-exec-stack.patch 807 SHA256 e36c83746838dd362512a046dc066c0f3fdc1252289b2761be381f84262cab78 SHA512 d0d4c2d4bb257c722ec40470fb6c8da59033009152598e69133b6184b25da36debf42f86859389c878a072603f3d583e28a52519e8dca47d9bdf7edd5f9e44c5 WHIRLPOOL d18dd387fe55b18be78fdad08b0a4319c2a5ccd161f1dfc0d5ab8015d88c5842780415c903a098a4683524658fc31c07e285e61fcff04ad6e4777c77e5691f38
 AUX xbmc-11.0-nomythtv.patch 6190 SHA256 ffb1eb49f94b4ae41e5d79172499671915122a58af248b0585ee276e4aa2c87e SHA512 4a9ff4b4f5cb56c92932f05b5b812bee0fdce37ed9f568a6e0dc0cd62335e2131361a63d8026b64f9c7078fa9c4ef0e439b52234c722b1b854aeeed1cc2764c7 WHIRLPOOL ce457b509c6fd222ae6002420db7cc438e1352114f38790b623f04e6834eb5508d4609a1bf71628bfafde3bcef830e84b42448619c19227d5729d6d8a824a13c
+AUX xbmc-12.0-system-projectm.patch 3951 SHA256 4750781ecb5be94e3d23375e4bfb46a84d240083c70e03da034c328ec2cfc185 SHA512 a8ad1207f7f9f591af9bc2034ac56793c6a5b33406542adaef65fb5a1b89c233990c6e9f740a966a67c16bd389454c03c828ce9f97f8a07e23aac67d902775a7 WHIRLPOOL 21489d98ed7aad3519533142a89076697acf06fc565f2438e6a32b244b4b1908b9a9737b2cfa4f5dcf36369bbbe30af63b98acb99ae9e7460b69fbf6df18df1b
+AUX xbmc-13.0-system-projectm.patch 3955 SHA256 355232161fb00a42d90b5efa04c466ba6276d93f6cb26e7e86dab747f78a95d1 SHA512 ce21716a669daeb24f56e7a049c1ae0b6dbbd6f5481976a56e0e3c5a49a49f8225ce17758a697280941a564ba3f98d5734d68070aa5b140e224e6690c75c0cc6 WHIRLPOOL 5b51e11b307788a450543d7af3667d5a1adddba923ae8c17536b27add6602e4255629ce31a582b052d3716a3ec11d6a126ba555b63ac687bdc6866df4be6831b
 AUX xbmc-9999-no-arm-flags.patch 478 SHA256 075db2562d31914d86b4394500d4b3168ea77114b63d1a7929ddae96111017a2 SHA512 b958cf3ab4877dbae4e5bd1376e8b9bd82f0dab43b1695c1d85e0e8ff366ef278ff686fe6394a04b3d79e19f11d8c92689fc049d2874e3fc12c907e36e993064 WHIRLPOOL f322fa4db24ff6f3372bdadd3dba8fbd4aed5849dc676f8c63d654f2c83de2165e60b26af821647a46cfa5ff129e7e0cb7c39c5cddbc2e5d9ec675bb148b2d63
 AUX xbmc-9999-nomythtv.patch 1680 SHA256 fe0289d1361b0dde3c261bc082bcad123c9cc9a2b7398e4eb48773f976be93a2 SHA512 403389bb1bf1442be1a8d23106bd78dc672c66fcf588b6076e6105023a69a92ca58cdaa91c9e2664123f244c3d5f42a9de6f72845c702339e3f8a0e976330ca1 WHIRLPOOL dcf13b59133f2b7288bc734803ad1317d6e943f7cd85b0428ec257b2ec9fb6a23311fbdd8574dbfb985a473dac7cf8ca30c2ac6d59b62797adb1f63d8bcc0b12
 DIST xbmc-11.0-ffmpeg-1.0-compat-1.tar.bz2 32687 SHA256 bfdca8283c35d0062ed2c2b3f67da29dcd71bb3e0f6b06c1dcc2e43d35d7c427 SHA512 e28f69719ee9b7343c8f43f34b0ae932b66452507daf3876f10e78c79fc2edeee2569c8470c0a7519ff24a43bf2558fe6d9e08a3aca73123ef423447b90f6abf WHIRLPOOL e0caafa34d99f8cfd7908ee7755352f2972794cd7460b04ab207d4f55ec39cbf09a22c77fc954b269d09b232dcf0cb357d6a41568337df5ea97aae6ee0d6faa6
 DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 SHA512 ba738129f70dd171b3fae385ab44317f62c9041a116bfe809d6d07c99ea69c663ad5d598552a17be0b942251ce12a68f34d0be21b303b256055849a6dde90043 WHIRLPOOL 4dd068749c86542e39b8fc42b45bbb56e885813b17876d3583cb4d91c902ff075e1f16f1c19720e3430dc149c40e52e7d1ab3323f666263fb353a59e2ef94a8e
+DIST xbmc-12-libav.tar.xz 6080 SHA256 84ba05dc66a476d2cb940c10355a22a04c5ef3b4fd6bd96a87a1fb2ffa7ccc0c SHA512 cde76dd435fb449ec843aaaa41a46f0fb4efeeb753669f9e4d052c06f00fe512be9fe994d5dd56794f47ce2f49146a2782f2da72dd78a1f66e5f54ca15723f13 WHIRLPOOL 07ba9e3fb3a4ba6d2c52055bcbe52009a87363bc8e0b21ebc90965bd3562196eee728103028fe8baaad250def5c6f76616a19731f825955648df9ff01c905e6b
 DIST xbmc-12.0.tar.gz 67176825 SHA256 53018cd014b5203df5e5ef4080931ef499d3740815f32d17dce92ef7d050c16f SHA512 37da579b055d4ea72cd18cf92541b47e6c42682091ef123baccdbce740b23842ac7c28eea032ada9a9c2232be034c7c4113ee8107ac3c7287834d08d4bcb67d6 WHIRLPOOL 6282dd7a728696c9a4577725d949d54992996d18a7b3c054c7d318b070fcad33efc4292afb83aa934c586cf718de67e294b2c498e491311b896e6a632cfa5b73
 DIST xbmc-12.1.tar.gz 67430677 SHA256 29e3f36e1884913088f786179a4c925f52e46e9ba7bf8f24e35e934177c01ec3 SHA512 a8b5194766e32e09fa65c0e3656ff180c15761ce2348dc8a1fff0c65247b47e644db4fc91a829e73907b6a52c8e1bdebf624640b9dd06cea2c46bda1d2b3b4a5 WHIRLPOOL 13dbaf040faaaef1b04da892949e9684d7a958cec286b3a5f8cb449ec0fea6b5f96c2a473ece840b86103eb03dd1f39dd66411e5b0526785256d2cc92e1e95e8
 DIST xbmc-9999-20130413-generated-addons.tar.xz 53088 SHA256 20f752b240f2fd9f0f5b061d576c9d215d494bdaeee0d6118a413b2cf62567bc SHA512 203d1e143f83c03f5700710167b050d09d0d7996b8499d47f886009a801bab9eb2ae67ab612b551a9d2e541fc622e08a21f91df4206b3dd456f2b2bc12d514c3 WHIRLPOOL 92470a764ddd55cc2ea242b7b7df2a15c40fd6b273c30510624ef11a7b7870418956b3ad0df0853334053e50c4b141e00969f8458a9bd13aaf9dfeb3f79902a6
 EBUILD xbmc-11.0-r1.ebuild 6507 SHA256 8a061777222215b70be0e356744a733da97bff974afa311c945b33c46938cfc9 SHA512 118a994f758de41de5c1e294d4982750db0e55e15388d219a8bb0b5d703b7662910028effc002eb6923e5c2e8b4a65583ba03974e92b7f5f351d689ab729c65f WHIRLPOOL 198d13ab2449bcb49fcc8ffa3975a340af3ee97d1a9d0e2848977e4fd5809f56c84355b905dbc0fdb433cfa71c4b9f828ffd3fe5a9c06f70685e90d15418a878
 EBUILD xbmc-11.0.ebuild 6295 SHA256 5a700f39848da84db6e79eed1a316dbec2cea01252ae412f2219f63b653e8c71 SHA512 02fd0286655573965dc9204d1580d69dce5a9beef049a92ad10d619e39ef9ad07524b4172503626a442c8f4969200e4e9587b31e776fc5ca8a2b3f2596a11b12 WHIRLPOOL 1b03964b773587217dea06243a2c4b9f459e7deb3f6efbaed17ae8fa0b80e0f83e286b03d97a4ac2f19fce5df7bb609232a38f6c7366183c42165013ed7f08d6
 EBUILD xbmc-12.0.ebuild 6481 SHA256 b232410feb0c2715dc2b2e9ad9204f1e1f09a9237c0cc57b9a2f23f8a9e2b8d3 SHA512 65a1cac4a88b806ecc327cfec1ac3ef90dc73868a82c8ace3a47fcf5eb2b61f125d317646c096b671bc88f7814e08231ace11312e74e595a8c421696bd1982c3 WHIRLPOOL da70651c655c64ca82895236d11e1ae4462cce62809ab0338364b142bcd03c42c6d244c75591df381cc93bc9809d44b6f5f6a9a518fd52e150d4c520a21d2622
+EBUILD xbmc-12.1-r1.ebuild 7066 SHA256 42f2d70e2e15f19179c8cec2d65444207e36fdeb1f4baeec819816bcfadde17c SHA512 533e3a6dbc6e608c17104ef35e20fc32dea271fcc7ad3b104ab79efdb658e0327e27f4674b5bf1a962f30d58139fe453b04e43740b6628e79f0c2a10188a038a WHIRLPOOL 23dac7f65a6b8d150a052c288f6cd83901f36b93b1e1dd99a90e17117d2b79bafa6dba02cdfcc99989518349288f626c58bac9a625e4cdbfe7287042526a5f90
 EBUILD xbmc-12.1.ebuild 6868 SHA256 9f0c53b808bfdcce7f89e31ec66c520ea5f4163068c8f526de0c44ee3b4ce1e9 SHA512 3d4ad64cdc2c4b19923e9143caf9210d9377c26af4e7bf6a1b22dfc660320ed2493c4617ea7122ef1c84b5d875240458f3d332ae58a649141e64b3571f4d4f99 WHIRLPOOL 6009890ca8b44e18f0348399639734752fe22aaa09d702c4f0c4da14ffb9d8a99828404fcf10f7913052af56c8f5bcbe60490bc060a3a63e71d7ef64a2e5f08f
-EBUILD xbmc-9999.ebuild 8285 SHA256 a2cdc8342f178c6b4716b3bcf6a172b26399fd1987a66216e22b615f00c96736 SHA512 08107ef7928f7a57fd9e653618f766a82a0b9428065d4e0955c430db7096023d776d4937bf34c9bf6115a53385123b9fd4d050534d8b30a59e535861fc78aad5 WHIRLPOOL 642a7b98285488be9dc0c442ca509f8d8a329001c0127b57556c052ae01fe99570dd16a90ebfbb7035c68c7abe7471c23c58c17f5357bfb50df061836dd8880e
-MISC ChangeLog 28744 SHA256 6c6b95173f232963b131ccffc21c8943db6097ffa0f8e57db3b53d28885f7d3e SHA512 06ad77d115453bafcded6ef18bb27c77782e547511a07f18e461d975442fbfa2eab6c634916559e0a7e6ad80cbc525947784c30144ec2f2cf7c4923394fd0834 WHIRLPOOL 847256ff69530e2409bdff6d76ff094021e6ffb269a2234c1a5f6774a904a70157a20fa17ad63957265e31c572320939db0ca9c7063a5778b180e9125f8a9c5e
+EBUILD xbmc-9999.ebuild 8314 SHA256 975e712faba1f569d410419bef1535f6a56550c536802d1aacb4760a2f0fefcd SHA512 594aaf2194ac5a1964c314d3145312056063b31411a9bc457e95b4f5cdfdd3b0320b9c2eed6f3e8bd8477cb35609cdebdc34f78032b713d0957d62ba66dc4488 WHIRLPOOL a8a821ff203b1e4ccf7d7c64fdb58484d07dd8fef9df1652fdd4602f705e8b7ed7b67f0787ea98ab126aea0b6d9d5398efdcce3f19b006decc5e8a36763edb5d
+MISC ChangeLog 29254 SHA256 457e2b2ecacfc8996a8058e9d259a6902c4fcfd3020c7bef88a19be9c8c3bbc5 SHA512 1159ee92a02fed14471ac25c5f2a074adf882d7bc7ff4f66dddcfb3ce51f064abc21950306cccaf660c16165f120f531a715216c320b2e34e53a87c8d5b9248f WHIRLPOOL e52f260853a8d7374867d77e98c48cb40b041ffd4a97707efe44eca13239a53baac8c2e6b6fdc50ab968df7f299bcd721c407d4c28a063b8781a9f8ad3206ac6
 MISC metadata.xml 1140 SHA256 00929104e646c293b0ee5dc8a42701b940a0e908f7293c15a277ce138a56999a SHA512 e6a4b148543b613ffad57925310bc7562629e18f726cc958bf2de64020b0ec3d72cf82eb2e506a194c1c3610361d96ff41245d1e7a411be08f87719abbb80410 WHIRLPOOL 92f8748f2fedb7fe0bd34ed29e4e4ff25cb55b7ceacc15a9a4c561c3544530d216d5494de1862591156f3290e641a38aa91000c2b33e850d8a923e1818eb5ac1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRabY1AAoJELEHsLL7fEFWCKcP/2MAAMojiR5d7Q2rcwDVHocd
-cZsvvbUzK/w0LiVkrs8vAUrxlCGu3z5jwW+BpCew3JaFJayDfnVroCrNIjTNau8z
-mzfM87hYmKnqKIk+lE4eMYeWI+KG0JybGExrTMqpl/5Ia3f5dVY/lWP2upQW5w4a
-YqyU8Pmk/Tl60j1yXGVeLoKcrsaTgw5wdpEgOPxB1AXJdFfvWqO0Kzhbbqmkq3Xw
-aTEgnop7E3eyApHszpkiCqjfnooJ1xCjlbdCmWuKrC8YZ60n9KHxE6BDc9SMdu75
-ri73b4CocaoMkp7LB8rBaReakrwfzD+jby3KMO7unKSNDEJqZAqAXEut/UaENA+p
-nsq5ODU9OVTauPsKcritvJQIJ1jOxLKQ7uQb3a2uWIje6n+b+EgtShRW4GNO6XLO
-Q42F4+AEEn+YJVsVsCwbZCMBuBm0dPlhhJmlpqRNP+VzLC/VOkWupL+VOPmf9Zv8
-ytbv4jb8Mf65fop66AgxmJlncoaVPK1gRWf2Ev6Z0hr2xi+pfbqhs5hQbwKnutne
-zDVBUyB4mXKQnvvVZAkjkLylkQDK1WocFvWhDJckHq1lm4o6YI8aXzIF6IUCYBrQ
-CT3O6XC1SG5pGIZPVbT3SAe6GD2z4PFE/9+enO2H6IkYaS90WxWbgQvqnlMvXzoL
-2vehniW3CEPDiiFUodtf
-=08NB
+iQIcBAEBCAAGBQJRcs7UAAoJEOSiRoyO7jvoPQIQAInLtJCjFB6SKCOebJ56kQQ8
+Esy0S2Lfrs9xwdDn1gywPMIOWnUGwriT25cFcOSpSN/u3ipPOhsf36s7vQZzZqJa
+RVWdWXTsGx4Y0lLYZjI5IeuyGs2WznHn4yMQi1n/dpKciURPnoZyqalDP6mbw+JM
+BYjbKCKh3pQdxk7LnQRuwwBl4mEbOd+AQcYqFCoVQ6K5ploRa3J6CLHIDUQ+nVeB
+x/p0qGZuBn2XnrKS1LIDGw4cyRUQ6LtQZeBP1jh5bqTHLv0JoNrJZruWTiXhOM+Y
+hMIY/a+r5alXDzC3n1IM0uQswdQs0p28fvRsF4/GGz+0VPbzI48tgwcM6lnZW37Y
+RhD93oBsX4SeaE/7n4OQ3tlS9CPfT0B/UkrJXgiPaHW0PrULXCFuAezoA8Or2fsg
+i6TAeNNr/juxKEqE8abmscwpbEOvNSRDX7w9Ie6eKDmxlB9USvTaGvzXNuW6Y6+q
+qnBux4nsReMNxxDg4sCD7I8KQWTHZbrdM9q654HNvwNaxJEb+GHldTBJpysthR1+
+0fSC6yMJIDqvuCxpH3spjaA/8eBIjBlUs+pOLwbDlyMCEHGnGz1GHfUd1VukaRQt
+ACxCLa3ppug23vWrQkNNxdRNZCCjx9PZ+hHgIn0JkzumrY5Biv2E0Y4YsapTkdCf
+xtyzyA12ZgBWWyTfPSRW
+=3fDA
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch b/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch
new file mode 100644
index 000000000000..959071c2ae7f
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch
@@ -0,0 +1,113 @@
+From 72f017641cf7acdb1d3caf408bbcdaec39de8ce3 Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <tchvatal@suse.cz>
+Date: Sat, 23 Feb 2013 11:21:44 +0100
+Subject: [PATCH] Allow usage of system ProjectM
+
+Conflicts:
+	configure.in
+---
+ configure.in                                 | 45 ++++++++++++++++++++++++----
+ xbmc/visualizations/XBMCProjectM/Makefile.in | 12 ++++----
+ 2 files changed, 45 insertions(+), 12 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 78104ad..296eb4d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -302,9 +302,15 @@ AC_ARG_ENABLE([rsxs],
+ 
+ AC_ARG_ENABLE([projectm],
+   [AS_HELP_STRING([--enable-projectm],
+-  [enable ProjectM visualisation (default is yes)])],
++  [enable ProjectM visualisation (default is auto)])],
+   [use_projectm=$enableval],
+-  [use_projectm=yes])
++  [use_projectm=auto])
++
++AC_ARG_WITH([projectm-presets-dir],
++  [AS_HELP_STRING([--with-projectm-presets-dir],
++  [path to ProjectM presets to incude in default list (default is bundled path)])],
++  [projectm_presets_dir=$withval],
++  [projectm_presets_dir=bundled])
+ 
+ AC_ARG_ENABLE([x11],
+   [AS_HELP_STRING([--enable-x11],
+@@ -1257,9 +1263,38 @@ fi
+ if test "$use_projectm" = "no" || test "$use_gl" = "no"; then
+   AC_MSG_NOTICE($projectm_disabled)
+   DISABLE_PROJECTM=1
++  DISABLE_INTERNAL_PROJECTM=1
+ else
+-  AC_MSG_NOTICE($projectm_enabled)
+-  DISABLE_PROJECTM=0
++  if test "$host_vendor" != "apple" ; then
++    if test "$use_projectm" = "yes"; then
++      PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_ERROR([$projectm_disabled])])
++    else
++      PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_RESULT([$projectm_disabled])])
++    fi
++    if test "$use_projectm" != "no"; then
++      INCLUDES="$INCLUDES $PROJECTM_CFLAGS";LIBS="$LIBS $PROJECTM_LIBS"
++    fi
++    DISABLE_INTERNAL_PROJECTM=1
++  else
++    DISABLE_INTERNAL_PROJECTM=0
++  fi
++  if test "$use_projectm" != "no"; then
++    AC_MSG_NOTICE($projectm_enabled)
++    DISABLE_PROJECTM=0
++    # verify preset dir actually exist if user don't want to use bundled one
++    if test "$projectm_presets_dir" != "bundled" ; then
++      if ! test -d "$projectm_presets_dir"; then
++        AC_MSG_ERROR([$projectm_presets_dir is not existing directory])
++      fi
++      PROJECTM_PRESETS_DIR=$projectm_presets_dir
++    else
++      PROJECTM_PRESETS_DIR=libprojectM/presets/
++    fi
++    AC_SUBST(PROJECTM_PRESETS_DIR)
++  else
++    AC_MSG_NOTICE($projectm_disabled)
++    DISABLE_PROJECTM=1
++  fi
+ fi
+ 
+ # skin touched
+@@ -2661,7 +2696,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[
+     sed -ie "s|-I/opt/local/include| |" CMakeFiles/projectM.dir/flags.make
+   fi
+   set +x
+-], [$DISABLE_PROJECTM])
++], [$DISABLE_INTERNAL_PROJECTM])
+ 
+ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
+   ./configure  \
+diff --git a/xbmc/visualizations/XBMCProjectM/Makefile.in b/xbmc/visualizations/XBMCProjectM/Makefile.in
+index 249338c..2c16306 100644
+--- a/xbmc/visualizations/XBMCProjectM/Makefile.in
++++ b/xbmc/visualizations/XBMCProjectM/Makefile.in
+@@ -18,16 +18,14 @@ $(SLIB): $(OBJS) libprojectM/libprojectM.dylib
+ libprojectM/libprojectM.dylib:
+ 	$(MAKE) -C libprojectM
+ else
+-$(SLIB): $(OBJS) libprojectM/libprojectM.so
+-	$(CXX) $(CXXFLAGS) $(LDFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
++$(SLIB): $(OBJS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o -o $(SLIB)
+ 	$(MAKE) $(PRESETS)
+-
+-libprojectM/libprojectM.so: 
+-	$(MAKE) -C libprojectM
+ endif
+ 
+-$(PRESETS): libprojectM/presets/*
+-	zip -j $@ libprojectM/presets/*
++$(PRESETS):
++	zip -j $@ @PROJECTM_PRESETS_DIR@/*
++
+ 
+ CLEAN_FILES = \
+ 	libprojectM/libprojectM.so \
+-- 
+1.8.1.5
+
diff --git a/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch b/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch
new file mode 100644
index 000000000000..acc72d1f9fdf
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch
@@ -0,0 +1,112 @@
+From 57b29a277ca8d87bdfe4d6865eb23441b133ae52 Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <tchvatal@suse.cz>
+Date: Sat, 23 Feb 2013 11:21:44 +0100
+Subject: [PATCH] Allow usage of system ProjectM
+
+---
+ configure.in                                 | 45 ++++++++++++++++++++++++----
+ xbmc/visualizations/XBMCProjectM/Makefile.in | 12 ++++----
+ 2 files changed, 45 insertions(+), 12 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index db1d012..3e11588 100644
+--- a/configure.in
++++ b/configure.in
+@@ -310,9 +310,15 @@ AC_ARG_ENABLE([fishbmc],
+ 
+ AC_ARG_ENABLE([projectm],
+   [AS_HELP_STRING([--enable-projectm],
+-  [enable ProjectM visualisation (default is yes)])],
++  [enable ProjectM visualisation (default is auto)])],
+   [use_projectm=$enableval],
+-  [use_projectm=yes])
++  [use_projectm=auto])
++
++AC_ARG_WITH([projectm-presets-dir], [
++  [AS_HELP_STRING([--with-projectm-presets-dir], [
++  [path to ProjectM presets to incude in default list (default is bundled path)])],
++  [projectm_presets_dir=$withval],
++  [projectm_presets_dir=bundled])
+ 
+ AC_ARG_ENABLE([x11],
+   [AS_HELP_STRING([--enable-x11],
+@@ -1313,10 +1319,39 @@ fi
+ if test "$use_projectm" = "no" || test "$use_gl" = "no"; then
+   AC_MSG_NOTICE($projectm_disabled)
+   DISABLE_PROJECTM=1
++  DISABLE_INTERNAL_PROJECTM=1
+   use_projectm="no"
+ else
+-  AC_MSG_NOTICE($projectm_enabled)
+-  DISABLE_PROJECTM=0
++  if test "$host_vendor" != "apple" ; then
++    if test "$use_projectm" = "yes"; then
++      PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_ERROR([$projectm_disabled])])
++    else
++      PKG_CHECK_MODULES([PROJECTM],[libprojectM],,[use_projectm="no";AC_MSG_RESULT([$projectm_disabled])])
++    fi
++    if test "$use_projectm" != "no"; then
++      INCLUDES="$INCLUDES $PROJECTM_CFLAGS";LIBS="$LIBS $PROJECTM_LIBS"
++    fi
++    DISABLE_INTERNAL_PROJECTM=1
++  else
++    DISABLE_INTERNAL_PROJECTM=0
++  fi
++  if test "$use_projectm" != "no"; then
++    AC_MSG_NOTICE($projectm_enabled)
++    DISABLE_PROJECTM=0
++    # verify preset dir actually exist if user don't want to use bundled one
++    if test "$projectm_presets_dir" != "bundled" ; then
++      if ! test -d "$projectm_presets_dir"; then
++        AC_MSG_ERROR([$projectm_presets_dir is not existing directory])
++      fi
++      PROJECTM_PRESETS_DIR=$projectm_presets_dir
++    else
++      PROJECTM_PRESETS_DIR=libprojectM/presets/
++    fi
++    AC_SUBST(PROJECTM_PRESETS_DIR)
++  else
++    AC_MSG_NOTICE($projectm_disabled)
++    DISABLE_PROJECTM=1
++  fi
+ fi
+ 
+ # skin touched
+@@ -2712,7 +2747,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/XBMCProjectM/libprojectM],[
+     sed -ie "s|-I/opt/local/include| |" CMakeFiles/projectM.dir/flags.make
+   fi
+   set +x
+-], [$DISABLE_PROJECTM])
++], [$DISABLE_INTERNAL_PROJECTM])
+ 
+ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
+   ./configure  \
+diff --git a/xbmc/visualizations/XBMCProjectM/Makefile.in b/xbmc/visualizations/XBMCProjectM/Makefile.in
+index 249338c..2c16306 100644
+--- a/xbmc/visualizations/XBMCProjectM/Makefile.in
++++ b/xbmc/visualizations/XBMCProjectM/Makefile.in
+@@ -18,16 +18,14 @@ $(SLIB): $(OBJS) libprojectM/libprojectM.dylib
+ libprojectM/libprojectM.dylib:
+ 	$(MAKE) -C libprojectM
+ else
+-$(SLIB): $(OBJS) libprojectM/libprojectM.so
+-	$(CXX) $(CXXFLAGS) $(LDFLAGS) ./libprojectM/CMakeFiles/projectM.dir/*.o -fPIC -shared -o $(SLIB) $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
++$(SLIB): $(OBJS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared $(OBJS) `cat @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.def` @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o -o $(SLIB)
+ 	$(MAKE) $(PRESETS)
+-
+-libprojectM/libprojectM.so: 
+-	$(MAKE) -C libprojectM
+ endif
+ 
+-$(PRESETS): libprojectM/presets/*
+-	zip -j $@ libprojectM/presets/*
++$(PRESETS):
++	zip -j $@ @PROJECTM_PRESETS_DIR@/*
++
+ 
+ CLEAN_FILES = \
+ 	libprojectM/libprojectM.so \
+-- 
+1.8.1.5
+
diff --git a/media-tv/xbmc/xbmc-12.1-r1.ebuild b/media-tv/xbmc/xbmc-12.1-r1.ebuild
new file mode 100644
index 000000000000..69f63a592e46
--- /dev/null
+++ b/media-tv/xbmc/xbmc-12.1-r1.ebuild
@@ -0,0 +1,265 @@
+# 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.1-r1.ebuild,v 1.1 2013/04/20 17:22:26 scarabeus Exp $
+
+EAPI=5
+
+# Does not work with py3 here
+# It might work with py:2.5 but I didn't test that
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-single-r1 multiprocessing autotools
+
+case ${PV} in
+9999)
+	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+	inherit git-2
+	SRC_URI="!java? ( mirror://gentoo/${P}-20121224-generated-addons.tar.xz )"
+	;;
+*_alpha*|*_beta*|*_rc*)
+	MY_PV="Frodo_${PV#*_}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+		!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+	;;
+*)
+	MY_P=${P/_/-*_}
+	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
+	KEYWORDS=""
+	;;
+esac
+
+# libav patchset
+SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/xbmc-12-libav.tar.xz"
+
+DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
+HOMEPAGE="http://xbmc.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug gles goom java joystick midi mysql neon nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl sse sse2 sftp udev upnp +usb vaapi vdpau webserver +X +xrandr"
+REQUIRED_USE="
+	pvr? ( mysql )
+	rsxs? ( X )
+	xrandr? ( X )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/zip
+	app-i18n/enca
+	airplay? ( app-pda/libplist )
+	dev-libs/boost
+	dev-libs/fribidi
+	dev-libs/libcdio[-minimal]
+	cec? ( >=dev-libs/libcec-2.1 )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	dev-libs/yajl
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	media-libs/alsa-lib
+	media-libs/flac
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/glew-1.5.6
+	media-libs/jasper
+	media-libs/jbigkit
+	>=media-libs/libass-0.9.7
+	bluray? ( media-libs/libbluray )
+	css? ( media-libs/libdvdcss )
+	media-libs/libmad
+	media-libs/libmodplug
+	media-libs/libmpeg2
+	media-libs/libogg
+	media-libs/libpng
+	projectm? ( media-libs/libprojectm )
+	media-libs/libsamplerate
+	sdl? ( media-libs/libsdl[audio,opengl,video,X] )
+	alsa? ( media-libs/libsdl[alsa] )
+	>=media-libs/taglib-1.8
+	media-libs/libvorbis
+	sdl? (
+		media-libs/sdl-gfx
+		>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
+		media-libs/sdl-mixer
+		media-libs/sdl-sound
+	)
+	media-libs/tiff
+	pulseaudio? ( media-sound/pulseaudio )
+	media-sound/wavpack
+	|| ( media-libs/libpostproc media-video/ffmpeg )
+	>=virtual/ffmpeg-9[encode]
+	rtmp? ( media-video/rtmpdump )
+	avahi? ( net-dns/avahi )
+	nfs? ( net-fs/libnfs )
+	webserver? ( net-libs/libmicrohttpd[messages] )
+	sftp? ( net-libs/libssh )
+	net-misc/curl
+	samba? ( >=net-fs/samba-3.4.6[smbclient] )
+	bluetooth? ( net-wireless/bluez )
+	sys-apps/dbus
+	caps? ( sys-libs/libcap )
+	sys-libs/zlib
+	virtual/jpeg
+	usb? ( virtual/libusb )
+	mysql? ( virtual/mysql )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gles? ( virtual/opengl )
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? (
+		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
+		virtual/ffmpeg[vdpau]
+	)
+	X? (
+		x11-apps/xdpyinfo
+		x11-apps/mesa-progs
+		x11-libs/libXinerama
+		xrandr? ( x11-libs/libXrandr )
+		x11-libs/libXrender
+	)"
+RDEPEND="${COMMON_DEPEND}
+	udev? (	sys-fs/udisks:0 sys-power/upower )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-lang/swig
+	dev-util/gperf
+	X? ( x11-proto/xineramaproto )
+	dev-util/cmake
+	x86? ( dev-lang/nasm )
+	java? ( virtual/jre )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
+	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+	epatch "${FILESDIR}"/${PN}-12.0-system-projectm.patch
+	# The mythtv patch touches configure.ac, so force a regen
+	rm -f configure
+
+	# libav patchset
+	EPATCH_FORCE="yes" \
+	EPATCH_SOURCE="${WORKDIR}" \
+	EPATCH_SUFFIX="patch" \
+	epatch
+
+	# some dirs ship generated autotools, some dont
+	multijob_init
+	local d
+	for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
+		[[ -e ${d} ]] && continue
+		pushd ${d/%configure/.} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
+		multijob_child_init eautoreconf
+		popd >/dev/null
+	done
+	multijob_finish
+	elibtoolize
+
+	# Disable internal func checks as our USE/DEPEND
+	# stuff handles this just fine already #408395
+	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
+
+	local squish #290564
+	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
+	use sse && squish="-DSQUISH_USE_SSE=1 -msse"
+	use sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
+	sed -i \
+		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
+		-e "1iCXXFLAGS += ${squish}" \
+		lib/libsquish/Makefile.in || die
+
+	# Fix XBMC's final version string showing as "exported"
+	# instead of the SVN revision number.
+	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	epatch_user #293109
+
+	# Tweak autotool timestamps to avoid regeneration
+	find . -type f -print0 | xargs -0 touch -r configure
+}
+
+src_configure() {
+	# Disable documentation generation
+	export ac_cv_path_LATEX=no
+	# Avoid help2man
+	export HELP2MAN=$(type -P help2man || echo true)
+	# No configure flage for this #403561
+	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
+	# Requiring java is asine #434662
+	export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-ccache \
+		--disable-optimizations \
+		--enable-external-libraries \
+		--enable-gl \
+		$(use_enable airplay) \
+		$(use_enable avahi) \
+		$(use_enable bluray libbluray) \
+		$(use_enable caps libcap) \
+		$(use_enable cec libcec) \
+		$(use_enable css dvdcss) \
+		$(use_enable debug) \
+		$(use_enable gles) \
+		$(use_enable goom) \
+		--disable-hal \
+		$(use_enable joystick) \
+		$(use_enable midi mid) \
+		$(use_enable mysql) \
+		$(use_enable neon) \
+		$(use_enable nfs) \
+		$(use_enable opengl gl) \
+		$(use_enable profile profiling) \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable pvr mythtv) \
+		$(use_enable rsxs) \
+		$(use_enable rtmp) \
+		$(use_enable samba) \
+		$(use_enable sdl) \
+		$(use_enable sftp ssh) \
+		$(use_enable usb libusb) \
+		$(use_enable upnp) \
+		$(use_enable vaapi) \
+		$(use_enable vdpau) \
+		$(use_enable webserver) \
+		$(use_enable X x11) \
+		$(use_enable xrandr)
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
+
+	domenu tools/Linux/xbmc.desktop
+	newicon tools/Linux/xbmc-48x48.png xbmc.png
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
+}
+
+pkg_postinst() {
+	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
+}
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 65cbdceb3fa3..bfbcaf72e655 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,15 +1,15 @@
 # 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.141 2013/04/13 19:45:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.142 2013/04/20 17:22:26 scarabeus Exp $
 
-EAPI="4"
+EAPI=5
 
 # 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
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite"
 
-inherit eutils python multiprocessing autotools
+inherit eutils python-single-r1 multiprocessing autotools
 
 case ${PV} in
 9999)
@@ -43,7 +43,8 @@ REQUIRED_USE="
 	xrandr? ( X )
 "
 
-COMMON_DEPEND="app-arch/bzip2
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/bzip2
 	app-arch/unzip
 	app-arch/zip
 	app-i18n/enca
@@ -57,7 +58,7 @@ COMMON_DEPEND="app-arch/bzip2
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
 	dev-libs/yajl
-	dev-python/simplejson
+	dev-python/simplejson[${PYTHON_USEDEP}]
 	media-fonts/corefonts
 	media-fonts/roboto
 	media-libs/alsa-lib
@@ -90,8 +91,8 @@ COMMON_DEPEND="app-arch/bzip2
 	media-libs/tiff
 	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
-	|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
-	>=virtual/ffmpeg-0.6[encode]
+	|| ( media-libs/libpostproc media-video/ffmpeg )
+	>=virtual/ffmpeg-9[encode]
 	rtmp? ( media-video/rtmpdump )
 	avahi? ( net-dns/avahi )
 	nfs? ( net-fs/libnfs )
@@ -137,8 +138,7 @@ DEPEND="${COMMON_DEPEND}
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 }
 
 src_unpack() {
@@ -148,6 +148,7 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+	epatch "${FILESDIR}"/${PN}-13.0-system-projectm.patch
 	# The mythtv patch touches configure.ac, so force a regen
 	rm -f configure
 
@@ -278,9 +279,8 @@ src_install() {
 	dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
 		/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Bold.ttf
 
-	insinto "$(python_get_sitedir)" #309885
-	doins tools/EventClients/lib/python/xbmcclient.py || die
-	newbin "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send || die
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
 }
 
 pkg_postinst() {