Fix build failure against ExtUtils-ParseXS-3.20. Bug #380469 by Diego Elio Pettenò. Use Module::Build to detect latest xsubpp instead of hardcoded privlib.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 45 insertions, 8 deletions

diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog
index 3e7586c42155..2cff0e07f8e8 100644
--- a/media-sound/xmms2/ChangeLog
+++ b/media-sound/xmms2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/xmms2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.15 2011/07/17 16:12:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.16 2011/08/25 20:03:51 slyfox Exp $
+
+  25 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> xmms2-0.7-r3.ebuild,
+  +files/xmms2-0.7DrNo-XsParse-3.patch:
+  Fix build failure against ExtUtils-ParseXS-3.20. Bug #380469 by Diego Elio
+  Pettenò. Use Module::Build to detect latest xsubpp instead of hardcoded
+  privlib.
 
   17 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   mms USE flag is now global.
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 5f86d0789b05..12ae38edf829 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xmms2-0.7DrNo-XsParse-3.patch 1544 RMD160 6903d87e738a1f30b665a68bdcdb932b9fcc0e8b SHA1 3ab9f160bbfcec3aff50e5b94a25e3ecaf668920 SHA256 9b690bec7c5e82eb905c95f01bdc321785caf72f88308d08b78f90e231304160
 AUX xmms2-0.7DrNo-missing-protos.patch 4252 RMD160 0d3d15c8b326690bab11850450f02462c76ec2a8 SHA1 bee9cfb77011e1537c1526005343d288f4bf9946 SHA256 76c5953772fa9a2108384539235cbd5127948f8f7a0a5d354faf99b7f916dcd3
 AUX xmms2-0.7DrNo-windres-build-fix.patch 1929 RMD160 61f8840d4e4349b5459f6760b94f0a439b6cfa87 SHA1 41ccd4db5c48d70a860d59ebb323796f243774bf SHA256 f71546af163b017678282a9ded8ec8e70ea486b95f96c68a62ad5a3edf0db39f
 DIST xmms2-0.7DrNo.tar.bz2 1519973 RMD160 3a526df9fa1ed5103b6a252c34c0394bf0e4f156 SHA1 4999568654a0d2aba84bda4b22145058bbd3fcb2 SHA256 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c
 EBUILD xmms2-0.7-r2.ebuild 6240 RMD160 882dd49e27680bd924afa47daeee356291b4018e SHA1 35e54a2f176516ea7fd5f1a9e71640e7f0af3608 SHA256 91b40b2652de69cc3430114f57b16aa4fb3f3958fdd8b9d8c37c97afea6a5d94
-EBUILD xmms2-0.7-r3.ebuild 6403 RMD160 b2543246bbc1479d05a87f71034a91b4a9207ac8 SHA1 e093789da6a2aeb30ba4741411ed0258f4ef2f16 SHA256 268b08d986ae6a49ab05e37c573a314365929ea36aed34a1c70ebd5b52199cc5
-MISC ChangeLog 2851 RMD160 4d814d1c64308dfe0b3c4a1856a8272fadd0566b SHA1 ef8d05d85892513a92c6ea8f3419fc787411fdb2 SHA256 7890d86fd72a8a91895c754e01d90956e870438e71941fd154841911219d9a4b
+EBUILD xmms2-0.7-r3.ebuild 6482 RMD160 78fd75bfb9107f5a76cf87d57f95d81a068014cc SHA1 8f3098148f510f05a1c86cd9adadff44cdcdae47 SHA256 150381aaa1cf362c8ffabd664df6e0b8f6711b9cd7304cd0a5cc502b388adb80
+MISC ChangeLog 3131 RMD160 367f799dfb6a9599b73ce77a3b24d48d478a7ae0 SHA1 882a8ade89067f3802c789e90235b96a7d765a14 SHA256 df9800f1d789e395bda9eb639368eb3fa27e476f9495d7f6615b2246d3484efe
 MISC metadata.xml 2457 RMD160 4cad303948d784e08559c2ac04fa656faaebc039 SHA1 8f936076746a8f69fe60f170cf7c2f4b43c737a6 SHA256 24f6a5018de607fd8ff936a5c690d8d2e7d217adbcb311b177feab12d53f2066
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4jCgcACgkQCaWpQKGI+9TjLwCeIuwZ9rRUVzqrrvgaWdHpVRpW
-UPMAoIQZuvjvEoHny5SOssf7on68JuOk
-=t8zW
+iEYEARECAAYFAk5Wq3wACgkQcaHudmEf86qlrQCfbSWfIwry6pL+yu5y/B/0KY3Y
++W8An3/Nq7P3TTKp1HnqXp/U79p8/6IF
+=2pPv
 -----END PGP SIGNATURE-----
diff --git a/media-sound/xmms2/files/xmms2-0.7DrNo-XsParse-3.patch b/media-sound/xmms2/files/xmms2-0.7DrNo-XsParse-3.patch
new file mode 100644
index 000000000000..0e3cbc4fd67a
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.7DrNo-XsParse-3.patch
@@ -0,0 +1,28 @@
+diff --git a/wafadmin/Tools/perl.py b/wafadmin/Tools/perl.py
+index 9e3b12a..9005e6a 100644
+--- a/wafadmin/Tools/perl.py
++++ b/wafadmin/Tools/perl.py
+@@ -99,8 +99,8 @@ def check_perl_ext_devel(conf):
+ 	conf.env["CPPPATH_PERLEXT"] = read_out(" -MConfig -e'print \"$Config{archlib}/CORE\"'")
+ 	conf.env["CCFLAGS_PERLEXT"] = read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'")
+ 
+-	conf.env["XSUBPP"] = read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'")
+-	conf.env["EXTUTILS_TYPEMAP"] = read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'")
++	conf.env["XSUBPP"]           = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::xsubpp\")'")
++	conf.env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::typemap\")'")
+ 
+ 	if not getattr(Options.options, 'perlarchdir', None):
+ 		conf.env["ARCHDIR_PERL"] = Utils.cmd_output(perl + " -MConfig -e'print $Config{sitearch}'")
+diff --git a/src/clients/lib/perl/typemap b/src/clients/lib/perl/typemap
+index 6cb033f..54e6c4d 100644
+--- a/src/clients/lib/perl/typemap
++++ b/src/clients/lib/perl/typemap
+@@ -3,6 +3,8 @@ xmmsc_connection_t*			XMMSC_CONNECTION_T
+ xmmsv_coll_t*				XMMSV_COLL_T
+ xmmsv_coll_type_t			XMMSV_COLL_TYPE_T
+ xmmsv_coll_namespace_t		T_PV
++const unsigned char*		T_PV
++xmmsv_t*			T_PV
+ xmmsc_result_t*				XMMSC_RESULT_T
+ xmmsc_result_propdict_t*	XMMSC_RESULT_PROPDICT_T
+ xmms_plugin_type_t			XMMS_PLUGIN_TYPE_T
diff --git a/media-sound/xmms2/xmms2-0.7-r3.ebuild b/media-sound/xmms2/xmms2-0.7-r3.ebuild
index fb83fe9264aa..2e6c5df4076d 100644
--- a/media-sound/xmms2/xmms2-0.7-r3.ebuild
+++ b/media-sound/xmms2/xmms2-0.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.7-r3.ebuild,v 1.2 2011/04/03 21:12:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.7-r3.ebuild,v 1.3 2011/08/25 20:03:51 slyfox Exp $
 
 EAPI=3
 
@@ -69,12 +69,14 @@ RDEPEND="server? (
 DEPEND="${RDEPEND}
 	=dev-lang/python-2*
 	python? ( dev-python/pyrex )
+	perl? ( virtual/perl-Module-Build )
 	dev-util/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=("${FILESDIR}/xmms2-0.7DrNo-windres-build-fix.patch"
-	"${FILESDIR}/xmms2-0.7DrNo-missing-protos.patch")
+	"${FILESDIR}/xmms2-0.7DrNo-missing-protos.patch"
+	"${FILESDIR}/xmms2-0.7DrNo-XsParse-3.patch")
 
 # use_enable() is taken as proto
 # $1 - useflag