Remove the unbundling of projectM seems like 2.1 again does not work well even after fixed underlinking (now it just crashes the xbmc with pretty trace).

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

7 files changed, 30 insertions, 252 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index c1656d5dad6c..16358e3037ea 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.191 2013/07/06 11:25:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.192 2013/07/06 12:12:03 scarabeus Exp $
+
+  06 Jul 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-12.2-r1.ebuild, xbmc-9999.ebuild:
+  Remove the unbundling of projectM seems like 2.1 again does not work well even
+  after fixed underlinking (now it just crashes the xbmc with pretty trace).
 
   06 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org>
   files/xbmc-12.0-system-projectm.patch, files/xbmc-13.0-system-projectm.patch:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index e27796280a00..0e02026a4a83 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -9,8 +9,6 @@ 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 3991 SHA256 b94622aa90df0c81bd9ab88240d02e3df54a7ac81454968969c1855959fb6394 SHA512 d2174e6fb042952a34a0579b203e294f1616ea99e6be0c046bbe90f80df5c3bbbca389d9613ede82acb92c568397a43defed56c5578eb9095634a2afa9fd39a8 WHIRLPOOL 49befcb5a924f8f5db5d62a201c97901f77fd1cf501d7558b084f508f3b06a3fdc11427a49f60664cef699670e75b6eb8d5dbf155abcf0838ad4807ba038c8e8
-AUX xbmc-13.0-system-projectm.patch 3991 SHA256 9d80cc70c09c607848384e14e0ab20faced26eba6968493727c598045fce6e19 SHA512 f3639df669cd021d28bbf9ea55dbfcc304534d160afa78595263512982ce2fc8ac5168c57a9c3bd11cb731adcf34e5f63ed1c91824dcd98972fb71c3bd2ddbce WHIRLPOOL ced8f1f481a08f27d617c352c857884a1e45a709dd35d782bde961b8db337d06bc0962df9f0350403e4470ddccc64c4e9fc330dd46e10db785ba590c3097cda4
 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.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 SHA512 ba738129f70dd171b3fae385ab44317f62c9041a116bfe809d6d07c99ea69c663ad5d598552a17be0b942251ce12a68f34d0be21b303b256055849a6dde90043 WHIRLPOOL 4dd068749c86542e39b8fc42b45bbb56e885813b17876d3583cb4d91c902ff075e1f16f1c19720e3430dc149c40e52e7d1ab3323f666263fb353a59e2ef94a8e
@@ -20,25 +18,25 @@ DIST xbmc-12.2.tar.gz 67663000 SHA256 b2330634fc513d27a44b131bbbe4ca6b61d60a1fe6
 DIST xbmc-9999-20130413-generated-addons.tar.xz 53088 SHA256 20f752b240f2fd9f0f5b061d576c9d215d494bdaeee0d6118a413b2cf62567bc SHA512 203d1e143f83c03f5700710167b050d09d0d7996b8499d47f886009a801bab9eb2ae67ab612b551a9d2e541fc622e08a21f91df4206b3dd456f2b2bc12d514c3 WHIRLPOOL 92470a764ddd55cc2ea242b7b7df2a15c40fd6b273c30510624ef11a7b7870418956b3ad0df0853334053e50c4b141e00969f8458a9bd13aaf9dfeb3f79902a6
 DIST xbmc_backports-12-1.tar.bz2 5010 SHA256 a222c32f5a4a0a8690b1544674cfbfeddf81943e85b6ea716768b83c9eba5fa8 SHA512 19b29808f7a3a7b0642f8463bdd229041588d2f42952fe55a17ab69b5b259cde249eb763598893463218d0ab6c747bf3c81e045bdbf5655f9f5f2d2067cb35d2 WHIRLPOOL cc6870dabca8b53a1a6055a4218a8f9bbb2c031ab3b928040325fb121ea75ae6db431542660d28c3bc6900a904e2c0949d69651b2f63faffe8bc7f670d519f06
 EBUILD xbmc-11.0.ebuild 6295 SHA256 5a700f39848da84db6e79eed1a316dbec2cea01252ae412f2219f63b653e8c71 SHA512 02fd0286655573965dc9204d1580d69dce5a9beef049a92ad10d619e39ef9ad07524b4172503626a442c8f4969200e4e9587b31e776fc5ca8a2b3f2596a11b12 WHIRLPOOL 1b03964b773587217dea06243a2c4b9f459e7deb3f6efbaed17ae8fa0b80e0f83e286b03d97a4ac2f19fce5df7bb609232a38f6c7366183c42165013ed7f08d6
-EBUILD xbmc-12.1-r1.ebuild 7075 SHA256 34a0c48fca3eadf20e15fc8b83495c9b3c4ee3672125cf00cf2ec721e1d625b5 SHA512 4b5a51e09e97aac67985588d2fa44891f3d409bff554ce9e80c9083a2fbe1b564a8652fedd4c8553c427894e58e4b30bac33236b3d396cf49eb290ffcb26f627 WHIRLPOOL 6cef003efd1e1cecd1ffc6366c0f123ba5c8fb58b8f8f738678fbbc3fcfb7b76be22a6ef9e0289afb8d900f84770cf4d588147b3fda05423f15fc9f0e6ac226f
-EBUILD xbmc-12.2-r1.ebuild 7117 SHA256 2a38a7327a9b8fd2e04e363e38081cb6b4e7a82401d327d59d9c99797e5d44e3 SHA512 d4b2e0acbf15e396f3c2e7d297e02cb8baa314c1b01bc979b75ea9c90b463e59103103f753c6ee9c389308c5e92528ae5c88a2bb5c0d1396f64dc5337b0f61e8 WHIRLPOOL d5613b1eca2ede31b019d3a689c516dcc8055b90874185a5847603dc6379eef1d158e54ec1e3f08f89c5e59ee46ceb0ccd6d6155c597227b67080204414eb811
-EBUILD xbmc-9999.ebuild 8326 SHA256 714105239e8629d5a77ac52959e4a73173c170434ad3c439a3e7e9fc10a872aa SHA512 1343bc4507b1430ff03adce3fddaed1ed6716d6c61b9d674a36b6b62c08581c54a9a7724e18d0e5e18594462ca39fecbdb66da144f60460324688b890246ffdf WHIRLPOOL 1475c72a9eddd03865d4c0b0532ea1f8c628f77f74e08721060dfccd57d3bf17dccbcb970b41cfbfeb91cd8468c1b35bf9b4e655b7774d46b954ffc935888fb0
-MISC ChangeLog 31555 SHA256 73a0b8ccbee675f6b9f4fd43188d215fa92e1a23918417664dc9e3c6fd6be8df SHA512 bff9c2b85a01740b613ccf029a8d79971ce381070b53408146c4eeada05c0c7ddca5e79fe92c924a39573c35b70ca5f0a5096d146a03961f62ba56d2b39ca1a9 WHIRLPOOL 4df2e5ce840ca6a4d784da36c4a64f9747ae6dfae041dfa4fe3aeaa524a9dbd7f4ec387a1e324c67317d30144430e423b9bdb7c6377ebaa757561b7d6be3ce97
+EBUILD xbmc-12.1-r1.ebuild 7107 SHA256 99e379a1e82034364056f3360e3fdaf34c2296062461b2337308441a0b9bac19 SHA512 1d05469a049f6e41543832bc7de98f718f50d9a6e9d9131634499131a726a386c4edf2120c23ff2d402866a89e5d92bb32ca3c1453edcf6e8c6cb13a4293ee21 WHIRLPOOL 699b7289fdfcdabef4dba77095915ef157b3a6640c3f73d3c0418e844b9c92688d531a6102a68c309e7a60dfc9c964b0757b9a45c647d536dfe8e8b5df1fca0b
+EBUILD xbmc-12.2-r1.ebuild 7068 SHA256 dd2345798b6b6438545e70f6d5a3f6ef4cedb7a3af48c1c6be894c86eee2f3a9 SHA512 26e894096eb932049ad34056af3d2e8890bc63dbb630c8991ee6f9578c6299e7f855afa2c7578374546bb9c293db35952bf79fce7044ac1048dd7b7f5304b7db WHIRLPOOL 62f3d6ca3d3e9d0dc78abb27ce019cb4ca6340f3da5c0d5ba39219c4dd0a9b5773eca8528e4f8acfcb03f41545e6b71b3ed25052ef07b9d60527b55fc71e4c8d
+EBUILD xbmc-9999.ebuild 8272 SHA256 ddf9dbdb87b9ae6d7d6a202c4543368c28b4860b073db7c0c8b3e135407dba7c SHA512 2ccd2025c1765d651afe48f80a314c7c8d26379e3d79dfc848a2cac3f1231fa8fbb5c343385a15cd242a5098011fd5bb99016d4f40f2ca40d2a67d9d79255a02 WHIRLPOOL d7c4234e88ee06bf2639e7145c5df6a1476a866576216548b043bf44b0d4885e57236f7bf3e9574ec6daf69fab883e03b97e0db37ae5614a63b80971643c76eb
+MISC ChangeLog 31915 SHA256 0361ccb0168ffd0234f5e6f7cc2c247de1dedaa76c4631422674ceb2ac38cea9 SHA512 1ec4f3339af7d9a57418603bd137d52e6f8baff794881c6088d4b0dedb03645292f5ec31d5f51c2a54bb03598ed462ca8c3a44306f0746493a4e261dd06da0b1 WHIRLPOOL 0599f15010540a96af3d05adf444170999c9a6180d8f46f12b897e0dc0f8b34e4671b0de91a30307d15b79f0eae2d639c207866e46001698f427b6dee3ed2f7b
 MISC metadata.xml 1140 SHA256 00929104e646c293b0ee5dc8a42701b940a0e908f7293c15a277ce138a56999a SHA512 e6a4b148543b613ffad57925310bc7562629e18f726cc958bf2de64020b0ec3d72cf82eb2e506a194c1c3610361d96ff41245d1e7a411be08f87719abbb80410 WHIRLPOOL 92f8748f2fedb7fe0bd34ed29e4e4ff25cb55b7ceacc15a9a4c561c3544530d216d5494de1862591156f3290e641a38aa91000c2b33e850d8a923e1818eb5ac1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR1/6qAAoJEOSiRoyO7jvoIFYP/06dItlPykYhhV+6uKTN3rGk
-McWTZdtUNJVcpJVCcT04ykEJMkJTsJ9pfusw1z3a+Djt/3GnZUWbWgq+odmheFa7
-VWSE4J3yIipEWjO/xOQGNtdUQeLfRYndlf8ZIzgvPXxVhDj10gMeVrj/TGQk2XDW
-U3+YysFK9ES5rxGyF9X6yPzYAxXYfAYcMQoibcLROletGYS6eqLfV69vAmh1KNpb
-jpqUuhUntgvj/ShEPp3MbBMy/LjC4fjt9J+Ysvceoj0KKDtMkNGdqR5uz6JMP2X/
-oL8NT97hrUhPlvhjAnt02m/56Qv1IATa4XjFma+73npXfxy5ua5XTVCpMSwetS09
-IWtwEt/8ffIRBS14n4s391DQu4rRoLOaBOb5zxgwOzz9/bMpxMRVW1b6mRTzPdLu
-moGObDF+28711nzJQ3M5BK7u0nvFGuBh07KKwgVHuwJORUKGcuvhPsP+pr7jWE7a
-ndueJDOvXJs72Qioz2Fyu1WSeVOmXebm1ILKkGgNeIjhEUFqQ1XVyZ2IcCWcbs0C
-BFOX5HV7gBDJntet7eNF29ehfPrUl8/wp+6ZJAQ0IuI7mjCGdgpnTUnGi4SJvWYR
-+lAkoZpLuKY19joQUBl6AWKFul9pk990tGO1DEc/VbVfL5JxeuAhW932J+qZcp9J
-I+IGxqMtFnA3r9CSe56a
-=zIGk
+iQIcBAEBCAAGBQJR2AmTAAoJEOSiRoyO7jvoDosQALLM3vEPL51bpOHpZ63L7abh
+3Hr7S6t7eSrIR0+hC/u3cL5SrKk9t8i2CeLWA7ubc0svqqwQM4pbUX3vpJiqMM1E
++hQSH/ww8mwzbXS1GN0aXciYc0Z62pFGrvV6VPp1qeXyFh5S+hvOrfRXRgjOU2G9
+xzY8wXhdC7VhBUOg9QiZ3Q7Jxmngr0wN7cQwtk+KNDym3moWVI9cJyS0BYBV/aJT
+eGRGZ+5NOfhBtET4eRSy5FGj3NjdDcyzvGcJzL3YhHEuXaM2x/PTgc7NyWB7oXU8
+s19cECwLbncmqRx613sjoxWK1dDCuQGf/jyS1WzOuz45SW5K37meNAbePYMr5hO5
+aJdIJOVdF0JAOKsMsm6N8Tay0LnbP1yCPFgtyOE/+mKFAgQWB5s9mJ7K/r5oMicG
+8g3lVaNEktYDs+3Vgc9CWz7LwGP1jXy+wAmzScs6mzc9kavgSuSCn6rMacCig8tU
+YVgs2klEL875eoIVdsK8PjiztkZtJ17Wstr+E5X8FHgzpuRUlz0CEytc989vNJrP
+sM6KNc9kDVa1j2m78pHRbIqphO9sjPiBFXg/9RMbsPVOghxw6rkop35ogkCQ/kKj
+giAx854Xk8Pb3tCxoHdTZYMXTWgfkh2vkZ7zsalInWUdwFMrPLfB1h3ZSYUBXLUQ
+jXDW01mDdT4IDNbtgCuw
+=jCew
 -----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
deleted file mode 100644
index 0a42fcad9891..000000000000
--- a/media-tv/xbmc/files/xbmc-12.0-system-projectm.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-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";AC_SUBST(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 @PROJECTM_LIBS@ -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
deleted file mode 100644
index a404bbe7bfd1..000000000000
--- a/media-tv/xbmc/files/xbmc-13.0-system-projectm.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-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";AC_SUBST(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 @PROJECTM_LIBS@ -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
index 5e6ee3a14317..23387e1c0241 100644
--- a/media-tv/xbmc/xbmc-12.1-r1.ebuild
+++ b/media-tv/xbmc/xbmc-12.1-r1.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/media-tv/xbmc/xbmc-12.1-r1.ebuild,v 1.2 2013/04/23 01:33:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.1-r1.ebuild,v 1.3 2013/07/06 12:12:03 scarabeus Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ case ${PV} in
 *)
 	MY_P=${P/_/-*_}
 	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~x86"
 	;;
 esac
 
@@ -149,7 +149,6 @@ src_unpack() {
 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
 
@@ -234,6 +233,7 @@ src_configure() {
 		$(use_enable opengl gl) \
 		$(use_enable profile profiling) \
 		$(use_enable projectm) \
+		--with-projectm-presets-dir="${EPREFIX}/usr/share/projectM/presets/" \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable pvr mythtv) \
 		$(use_enable rsxs) \
diff --git a/media-tv/xbmc/xbmc-12.2-r1.ebuild b/media-tv/xbmc/xbmc-12.2-r1.ebuild
index f6657914479b..eb17d8ba0bee 100644
--- a/media-tv/xbmc/xbmc-12.2-r1.ebuild
+++ b/media-tv/xbmc/xbmc-12.2-r1.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/media-tv/xbmc/xbmc-12.2-r1.ebuild,v 1.4 2013/06/27 18:08:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.2-r1.ebuild,v 1.5 2013/07/06 12:12:03 scarabeus Exp $
 
 EAPI=5
 
@@ -149,7 +149,6 @@ src_unpack() {
 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
 	# Backported fixes
 	EPATCH_MULTI_MSG="Applying patches backported from master..." \
 		EPATCH_SUFFIX="patch" \
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index c82983df80b8..85f55d208a00 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.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/media-tv/xbmc/xbmc-9999.ebuild,v 1.146 2013/06/14 16:36:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.147 2013/07/06 12:12:03 scarabeus Exp $
 
 EAPI=5
 
@@ -147,7 +147,6 @@ 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