[gentoo-commits] repo/gentoo:master commit in: dev-perl/Ogg-Vorbis-Header/, dev-perl/Ogg-Vorbis-Header/files/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     80dc0403d1c073d3cb019cf5c15da3853d316f34
Author:     Kent Fredric <kentfredric <AT> gmail <DOT> com>
AuthorDate: Sun Mar 13 19:33:35 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 23:06:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80dc0403

dev-perl/Ogg-Vorbis-Header: Fix test failures and accidental test installation

`test.pl` in the root was previously accidentally installed, and
the test itself fails.

Bug: https://rt.cpan.org/Public/Bug/Display.html?id=104869

Package-Manager: portage-2.2.27

 .../Ogg-Vorbis-Header-0.30.0-r1.ebuild             |  6 +++-
 dev-perl/Ogg-Vorbis-Header/files/0.03-tests.patch  | 37 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.30.0-r1.ebuild b/dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.30.0-r1.ebuild
index e8c5c83..5c13829 100644
--- a/dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.30.0-r1.ebuild
+++ b/dev-perl/Ogg-Vorbis-Header/Ogg-Vorbis-Header-0.30.0-r1.ebuild
@@ -21,6 +21,10 @@ RDEPEND="
 	media-libs/libvorbis
 "
 DEPEND="${RDEPEND}"
-
+PATCHES=(
+	# https://rt.cpan.org/Public/Bug/Display.html?id=104869
+	# + relocate to t/ to avoid installation
+	"${FILESDIR}/${MODULE_VERSION}-tests.patch"
+)
 SRC_TEST="do"
 MAKEOPTS="${MAKEOPTS} -j1"

diff --git a/dev-perl/Ogg-Vorbis-Header/files/0.03-tests.patch b/dev-perl/Ogg-Vorbis-Header/files/0.03-tests.patch
new file mode 100644
index 0000000..a9e1b9f
--- /dev/null
+++ b/dev-perl/Ogg-Vorbis-Header/files/0.03-tests.patch
@@ -0,0 +1,37 @@
+diff --git a/Ogg-Vorbis-Header-0.03/MANIFEST b/Ogg-Vorbis-Header-0.03b/MANIFEST
+index 2a8649d..dc3369a 100644
+--- a/Ogg-Vorbis-Header-0.03/MANIFEST
++++ b/Ogg-Vorbis-Header-0.03b/MANIFEST
+@@ -3,7 +3,7 @@ Header.pm
+ Makefile.PL
+ MANIFEST
+ README
+-test.pl
++t/test.t
+ test.ogg
+ test.ogg.bak
+ LICENSE.GPL
+diff --git a/Ogg-Vorbis-Header-0.03/test.pl b/Ogg-Vorbis-Header-0.03b/t/test.t
+similarity index 92%
+rename from Ogg-Vorbis-Header-0.03/test.pl
+rename to Ogg-Vorbis-Header-0.03b/t/test.t
+index 8731290..7d7d0de 100644
+--- a/Ogg-Vorbis-Header-0.03/test.pl
++++ b/Ogg-Vorbis-Header-0.03b/t/test.t
+@@ -25,7 +25,7 @@ ok($ogg->load);
+ # Try all the routines
+ ok($ogg->info->{"rate"} == 44100);
+ ok($ogg->comment_tags);
+-ok(@{$ogg->comment("artist")}->[0] == "Dan");
++ok([$ogg->comment("artist")]->[0] eq "Dan");
+ ok($ogg->add_comments("moog", "bog"));
+ ok($ogg->edit_comment("moog", "bug"));
+ ok($ogg->delete_comment("artist"));
+@@ -36,6 +36,6 @@ ok($ogg->clear_comments);
+ 
+ # See if full load works
+ ok(my $ogg = Ogg::Vorbis::Header->load("test.ogg.2"));
+-ok(@{$ogg->comment("moog")}->[0] == "bug");
++ok([$ogg->comment("moog")]->[0] eq "bug");
+ 
+ unlink("test.ogg.2");