media-sound/xmms2: tweak ExtUtils detection against perl-5.22, bug #578778

Reported-by: Scott McClung
Bug: https://bugs.gentoo.org/578778

Package-Manager: portage-2.2.28

diff --git a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch
index d4c10b98548aa5f3d6c4f2d86e01b32399911c19..220e91e6813667b8d9b7432ef8e0454a5bd776f7 100644 (file)
--- a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch
+++ b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch
@@ -9,6 +9,7 @@ Use xsubpp from @INC instead of bundled one with perl.
 
 Original bug: https://bugs.gentoo.org/380469
 Related: https://bugs.gentoo.org/378783
+Updated for perl-5.20.2: https://bugs.gentoo.org/578778
 diff --git a/waflib/Tools/perl.py b/waflib/Tools/perl.py
 index 2c69fe5..a75b069 100644
 --- a/waflib/Tools/perl.py
@@ -19,8 +20,8 @@ index 2c69fe5..a75b069 100644
        env['CFLAGS_PERLEXT']=read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'")
 -      env['XSUBPP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'")
 -      env['EXTUTILS_TYPEMAP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'")
-+      env["XSUBPP"]           = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::xsubpp\")'")
-+      env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::typemap\")'")
++      env["XSUBPP"]           = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::xsubpp\")'")
++      env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::typemap\")'")
        if not getattr(Options.options,'perlarchdir',None):
                env['ARCHDIR_PERL']=self.cmd_and_log(perl+" -MConfig -e'print $Config{sitearch}'")
        else:

diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild
index f424d494144be334d96ca24d52de4c8c04e5df44..4db61184103583374a1398bee8f7145d98d461bc 100644 (file)
--- a/media-sound/xmms2/xmms2-0.8-r2.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild
@@ -70,7 +70,8 @@ RDEPEND="server? (
 DEPEND="${RDEPEND}
        dev-lang/python
        python? ( dev-python/pyrex )
-       perl? ( dev-perl/Module-Build )
+       perl? ( dev-perl/Module-Build
+               virtual/perl-Module-Metadata )
        virtual/pkgconfig
        test? ( dev-util/cunit )
        "
@@ -105,7 +106,7 @@ pkg_setup() {
 src_prepare() {
        ./waf # inflate waf
        cd .waf* || die
-       epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch
+       epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
        cd "${S}"
        epatch "${FILESDIR}/${P}"-ffmpeg-0.11.patch #443256
        epatch "${FILESDIR}/${P}"-libav-9-p2.patch #443256