summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2013-05-03 00:11:47 +0000
committerSebastian Pipping <sping@gentoo.org>2013-05-03 00:11:47 +0000
commitd5bcbec29de99d0e432d022426ac2d3ebe49ce8e (patch)
treed3f4251a39ba705386048bd48951f343f1774fb3 /media-libs
parentmultiple security bugs (diff)
downloadgentoo-2-d5bcbec29de99d0e432d022426ac2d3ebe49ce8e.tar.gz
gentoo-2-d5bcbec29de99d0e432d022426ac2d3ebe49ce8e.tar.bz2
gentoo-2-d5bcbec29de99d0e432d022426ac2d3ebe49ce8e.zip
media-libs/libmp3splt: automake 1.13 (bug #468242)
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libmp3splt/ChangeLog6
-rw-r--r--media-libs/libmp3splt/files/libmp3splt-0.8.2-automake-1.13.patch44
-rw-r--r--media-libs/libmp3splt/libmp3splt-0.8.2.ebuild3
3 files changed, 51 insertions, 2 deletions
diff --git a/media-libs/libmp3splt/ChangeLog b/media-libs/libmp3splt/ChangeLog
index 6b0312c277a0..0469a1f8f812 100644
--- a/media-libs/libmp3splt/ChangeLog
+++ b/media-libs/libmp3splt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libmp3splt
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp3splt/ChangeLog,v 1.33 2013/05/01 20:52:15 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp3splt/ChangeLog,v 1.34 2013/05/03 00:11:47 sping Exp $
+
+ 03 May 2013; Sebastian Pipping <sping@gentoo.org> libmp3splt-0.8.2.ebuild,
+ +files/libmp3splt-0.8.2-automake-1.13.patch:
+ Fix build with automake 1.13 (bug #468242), patch by upstream
*libmp3splt-0.8.2 (01 May 2013)
diff --git a/media-libs/libmp3splt/files/libmp3splt-0.8.2-automake-1.13.patch b/media-libs/libmp3splt/files/libmp3splt-0.8.2-automake-1.13.patch
new file mode 100644
index 000000000000..f64a2f84a09d
--- /dev/null
+++ b/media-libs/libmp3splt/files/libmp3splt-0.8.2-automake-1.13.patch
@@ -0,0 +1,44 @@
+Index: test/Makefile.am
+===================================================================
+--- test/Makefile.am (revision 1325)
++++ test/Makefile.am (revision 1326)
+@@ -32,11 +32,14 @@
+
+ test_tags_handling_la_SOURCES = test_tags_handling.c
+
+-TESTS = $(top_srcdir)/test/run-tests.sh
+-TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)"
++TESTS = run-tests.sh
++TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)" TESTS_DIR="$(top_builddir)/test"
+
+ echo-cutter:
+ @echo $(CUTTER)
+
++echo-tests-dir:
++ @echo $(top_builddir)/test
++
+ endif
+
+Index: test/run-tests.sh
+===================================================================
+--- test/run-tests.sh (revision 1325)
++++ test/run-tests.sh (revision 1326)
+@@ -5,6 +5,11 @@
+
+ if test -z "$NO_MAKE"; then
+ make -C $top_dir > /dev/null || exit 1
++ TESTS_DIR=$BASE_DIR
++else
++ if test -z "$TESTS_DIR"; then
++ TESTS_DIR="`make -s -C $BASE_DIR echo-tests-dir`"
++ fi
+ fi
+
+ if test -z "$CUTTER"; then
+@@ -21,5 +26,5 @@
+ exit 1
+ }
+
+-$CUTTER -s $BASE_DIR "$@" $BASE_DIR
++$CUTTER -s $BASE_DIR "$@" $TESTS_DIR
+
diff --git a/media-libs/libmp3splt/libmp3splt-0.8.2.ebuild b/media-libs/libmp3splt/libmp3splt-0.8.2.ebuild
index 99ec9972ab70..9857a6872f4f 100644
--- a/media-libs/libmp3splt/libmp3splt-0.8.2.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.8.2.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-libs/libmp3splt/libmp3splt-0.8.2.ebuild,v 1.1 2013/05/01 20:52:15 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp3splt/libmp3splt-0.8.2.ebuild,v 1.2 2013/05/03 00:11:47 sping Exp $
EAPI=4
inherit versionator autotools eutils multilib
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.7-libltdl.patch
+ epatch "${FILESDIR}"/${P}-automake-1.13.patch
eautoreconf
}