| 1 |
commit: 54c5cda4372004c31c5b91cb3f5cbc77da776512 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 2 09:04:11 2016 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 2 09:06:31 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c5cda4 |
| 7 |
|
| 8 |
media-sound/xmms2: tweak ExtUtils detection against perl-5.22, bug #578778 |
| 9 |
|
| 10 |
Reported-by: Scott McClung |
| 11 |
Bug: https://bugs.gentoo.org/578778 |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.28 |
| 14 |
|
| 15 |
media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch | 5 +++-- |
| 16 |
media-sound/xmms2/xmms2-0.8-r2.ebuild | 5 +++-- |
| 17 |
2 files changed, 6 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
index d4c10b9..220e91e 100644 |
| 21 |
--- a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch |
| 22 |
+++ b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch |
| 23 |
@@ -9,6 +9,7 @@ Use xsubpp from @INC instead of bundled one with perl. |
| 24 |
|
| 25 |
Original bug: https://bugs.gentoo.org/380469 |
| 26 |
Related: https://bugs.gentoo.org/378783 |
| 27 |
+Updated for perl-5.20.2: https://bugs.gentoo.org/578778 |
| 28 |
diff --git a/waflib/Tools/perl.py b/waflib/Tools/perl.py |
| 29 |
index 2c69fe5..a75b069 100644 |
| 30 |
--- a/waflib/Tools/perl.py |
| 31 |
@@ -19,8 +20,8 @@ index 2c69fe5..a75b069 100644 |
| 32 |
env['CFLAGS_PERLEXT']=read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'") |
| 33 |
- env['XSUBPP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'") |
| 34 |
- env['EXTUTILS_TYPEMAP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'") |
| 35 |
-+ env["XSUBPP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::xsubpp\")'") |
| 36 |
-+ env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::typemap\")'") |
| 37 |
++ env["XSUBPP"] = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::xsubpp\")'") |
| 38 |
++ env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::typemap\")'") |
| 39 |
if not getattr(Options.options,'perlarchdir',None): |
| 40 |
env['ARCHDIR_PERL']=self.cmd_and_log(perl+" -MConfig -e'print $Config{sitearch}'") |
| 41 |
else: |
| 42 |
|
| 43 |
diff --git a/media-sound/xmms2/xmms2-0.8-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild |
| 44 |
index f424d49..4db6118 100644 |
| 45 |
--- a/media-sound/xmms2/xmms2-0.8-r2.ebuild |
| 46 |
+++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild |
| 47 |
@@ -70,7 +70,8 @@ RDEPEND="server? ( |
| 48 |
DEPEND="${RDEPEND} |
| 49 |
dev-lang/python |
| 50 |
python? ( dev-python/pyrex ) |
| 51 |
- perl? ( dev-perl/Module-Build ) |
| 52 |
+ perl? ( dev-perl/Module-Build |
| 53 |
+ virtual/perl-Module-Metadata ) |
| 54 |
virtual/pkgconfig |
| 55 |
test? ( dev-util/cunit ) |
| 56 |
" |
| 57 |
@@ -105,7 +106,7 @@ pkg_setup() { |
| 58 |
src_prepare() { |
| 59 |
./waf # inflate waf |
| 60 |
cd .waf* || die |
| 61 |
- epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch |
| 62 |
+ epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778 |
| 63 |
cd "${S}" |
| 64 |
epatch "${FILESDIR}/${P}"-ffmpeg-0.11.patch #443256 |
| 65 |
epatch "${FILESDIR}/${P}"-libav-9-p2.patch #443256 |
Archives