media-sound/mp3splt-gtk: Automake 1.13 (bug #470802)

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

4 files changed, 74 insertions, 7 deletions

diff --git a/media-sound/mp3splt-gtk/ChangeLog b/media-sound/mp3splt-gtk/ChangeLog
index cd521b595998..ed02598c925c 100644
--- a/media-sound/mp3splt-gtk/ChangeLog
+++ b/media-sound/mp3splt-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mp3splt-gtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/ChangeLog,v 1.33 2013/05/01 20:55:02 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/ChangeLog,v 1.34 2013/06/08 20:06:08 sping Exp $
+
+  08 Jun 2013; Sebastian Pipping <sping@gentoo.org> mp3splt-gtk-0.8.2.ebuild,
+  +files/mp3splt-gtk-0.8.2-automake-1.13.patch:
+  Fix compilation with automake 1.13 (bug #470802)
 
 *mp3splt-gtk-0.8.2 (01 May 2013)
 
diff --git a/media-sound/mp3splt-gtk/Manifest b/media-sound/mp3splt-gtk/Manifest
index ef9cd998ca4a..759fe7cb6667 100644
--- a/media-sound/mp3splt-gtk/Manifest
+++ b/media-sound/mp3splt-gtk/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX mp3splt-gtk-0.7-disable-docs.patch 1437 SHA256 18b04f85044e1adc5466fb5965e63b4ea7593eb0c0686ce725558bf1de4705d6 SHA512 115447d6f9dca43d0e2ca9442fc0286e94afe2c1ff49a225d138712b2fb86a88ebabe1c81e8d9cf37450407df1f0b26f0072f40ef4b49773720ead06cd72636c WHIRLPOOL eefe1ccc32b82c966b917b9b73c9900a2c9a5dbcfe00b90bdd97ab51ad60d9ceb3e8567fce700c6442836a34afd73b47f96144c8b2d4b290c4dc3686d2a6dbac
 AUX mp3splt-gtk-0.7.0.930-gtk.patch 1413 SHA256 bc8cebdeabdc06a6bab7c95bd0ab929504401bbb04ddc912ddbe7c304d90ff6b SHA512 e174d47f3b7c0782e4e36b03b61e5ffd1f68e3e8f0d9eb54f9d6f4c23b323585ce7bed0fa3129a8bb2e9693956aaa4fa26afa896c71afb3a28500585c6240dac WHIRLPOOL 62065e05e4d18de509cb399580737fbdc9793383772ba3f3bba0be74e742fa69f6fd6e50365a02cd0c33f67425bc05d833130168dfeeaf3430e19c61a33ac3d6
+AUX mp3splt-gtk-0.8.2-automake-1.13.patch 1692 SHA256 757fdba93aef77961af031f829d867f7f58d0fbe758747f83836622e2983b4b8 SHA512 4f2dac824f430e84e69856be0ad13e30a7d69376d573f4bb872a338da4d7fde20e3668e723f32a7dadb594a7f5783e5463470079865a97efe893a99122d2cf21 WHIRLPOOL 0444360f93f2fde35f94aed92ea2c5d66151701b5d43400cd649c923f82238400022f075da4958a490eb2d56acd74b604b1b84c9ec25b20a427bb9451d6de4dd
 AUX mp3splt-gtk-0.8.2-desktop-file.patch 756 SHA256 564cf60a377b4fec1b440607ef4d48520a8ceb96b15c7e9eb8da50c859512460 SHA512 dc3ea5e6bc6c3fee3ea9f426a1900eae56837cac8f0a967a917730425f9be9741587c2fcdb39f4fd91d672f772b95635952700e68ea89d681a366afbf12968a5 WHIRLPOOL 944d3abe74adc43ccd088a2f49f73eaf5c41eee90355a2484ba0fdc479f2844ec4c5cfcd77ff551c5538d5ca3fe658f3e0a2a9f51c58492a8030dbaf8816f3b0
 DIST mp3splt-gtk-0.5.9.tar.gz 304691 SHA256 6742caf7f79246d1b06d2dd9fb53c9d7d9df97508dcd6dc716e6f679ef2905b3 SHA512 b5eb711d1ee1cbabf56ac4decfa719c0b0340e5cd5e297c80478c6ac5d0b2e479258160278629549a0335bece03abf8a46c9d667b2ef818732aa694adb4c4eb9 WHIRLPOOL c4a82b8488e39c84426446de55920d7a793ac94cc01a78f94bc2a9ea3216d733164084051da622755b6d3714228f4361912b75ce3cbdaf2b2d4aa9ef894d3b48
 DIST mp3splt-gtk-0.7.0.920.tar.gz 854263 SHA256 16b7cec7bd2375db89b4ad0b463ec6dcefbd33c434b411de138ade7812f12ee2
@@ -21,13 +22,13 @@ EBUILD mp3splt-gtk-0.7.2.ebuild 1589 SHA256 af9cf69c88f5128833e0df641ee78dfdac65
 EBUILD mp3splt-gtk-0.7.3.ebuild 1641 SHA256 b596861b713feb0fb4b38b234af80429a130f05e9a76a5c0c7ecabbdf7e888de SHA512 fcdc23d451d0fb2430ef73f1aa677c0876a95413e87aca4e9fe76afac85b32b2ebbd37b7418e0a1befc8f852ac984c9c4d16c2c456bc85ea6eccf16b8a0081ad WHIRLPOOL c651aa0996f6ac361cc9225429bd0c1726a90364c6c178524f1d3b327b9e31d2c7db8afdff1884a0e67998f387bce8a4e2712fa0f827b632ba16b40d2fbf4cb1
 EBUILD mp3splt-gtk-0.7.ebuild 1544 SHA256 2ae10248ee49f224100e0cd01de740293bc7b4f5f0a059371c3beb10c597a25e SHA512 dfea32c7b24b0a371c38928ab8a3a7f3cc87566decc5796fdcd90287e0f1a4fc0e4571896a7d3dedbbdc31d172fb52eded564aa45f90121d76bbbde47e7d9a88 WHIRLPOOL 33b4ed4d084a4d838d2bd4f30aefe891de09b95edfdcbac4732b2a5cb7312298f596e6c954bff8747bd7f2504354a7fb96766500eafda143a2c485cb1af69847
 EBUILD mp3splt-gtk-0.8.1.ebuild 1646 SHA256 3ad75cba056cd86ee6cc1f473c25d726b5fc038bfcf2e0f349fc70212dd7216d SHA512 fd2339af5381e5baf833a89e878f5a8ddcc8cfc6d2554b00ca79cedf5dcd08f40d6950760761b79142f8a790d262624ad157d7c3ab7724e39517d1fbe572e8c8 WHIRLPOOL f389ddaca3b2ebb5078e8c1dfbfe8f44c1f5223e1f66f106a75c8fcf7bf80f31487d6e9c357847efe477c3df621f988a0c75d051dc61524112e3f114a1b14175
-EBUILD mp3splt-gtk-0.8.2.ebuild 1590 SHA256 347b6604046074e8dc06974d23ad9110c8c6bb46c55b45b0ff8bb934f52d6232 SHA512 7271faf18889d210d0bd834d0292d7d0d9f7c5f18785dd8f69d20558f58e6c341ac2e2fcddb32b7465ced6409401dd87d465ba9a5bdcbd0ba52db271ad5d0ae1 WHIRLPOOL 91646545bc1b06e33ee851a0dda6ec783129a4ccf1002d94e22e2a7bb31cd4f60c7a4eef37103bacc3f3fb5b5760a562324b0b33daf03a0e2a42f89fee4ba55a
-MISC ChangeLog 4738 SHA256 b65d5551380f9d1e9af95814433a3d1de8da5a281219e0bd8a0806393d04ab54 SHA512 f5c2071eaecca9799e885f805a175fc1ea11d9f2dc9040e452166aed1bd80785f4e54f1f0eb0eefcc5f62785c605c6bcc028c312fe8e34e69d55f92deb77b11f WHIRLPOOL f95f2edc437d4d0fcce5058d025c4d2bff3cfe6f02643b69372a7903d32b06f79824d1a0a184bbc6ffddd7243b44b0d0a76c3bf18537d9812d4ed10513ced3a9
+EBUILD mp3splt-gtk-0.8.2.ebuild 1637 SHA256 f8a6d2a4de04c087ab58d67c639d0474c13887b11b054a2a96e08e127fd85cfe SHA512 42d68785821bfab84c46468fb4526322b5f9de5cdb3af4b9298d6d8dec01ac65b1e26d979e702b3f5c3c436f263561dbdde860a8bd6642037a9fc4734ae05ad6 WHIRLPOOL 4e55b0b972f0d271d239bd8d3a523c3d66338cd3f71f5635c5bfb0482119b2815e6e1d875d616d8f02d191a8ba6a7fe6bde00fab1389a161a548cff1f27c7d30
+MISC ChangeLog 4916 SHA256 de66aaf01c184412b661b8fb11b223337cedd8f975a11a7146da52866a8fb438 SHA512 a98c53416e0f8b5a4eae1cb4bc05e99a2f1d3236ef1d18955641f8b0c4173030f8eeab337e8c0bf8da99e33bdfe127367e7f5f4b23a1568c543d3adda0034934 WHIRLPOOL cfb22a72f5dde5173c108f2915498b6e884256a4fe5a1c32c473f4322ffd88b6e5db36757c9e6564f15fb8ea690b3e236bd85eab3a3aceb6f79fc8acc3b4ec2c
 MISC metadata.xml 456 SHA256 9f9f9850d89bbf3730cc288e9c0dda30e23a2fb79aed5ac69d2f9e1a7ff055cf SHA512 c3fd9c071fa4be397f50e7ce0f9fd20cbf74761c977fb0b226b6ad45ffc18b71dc3cd8562fe370d2a4e05d5c8e4c67320f539fd6a601260828248f351973da43 WHIRLPOOL 215efeae1038d7a27aae2e64e6098bfa4011e5201ecd6418b7300d4d93d4b149a2663ffd2faef3338c085a66e70127e8908304c68783ac00091e05f2ef84a533
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGBgUcACgkQsAvGakAaFgCJTQCfRleWWitgY25im0IjDKArfCjf
-dkcAn0Z/qn2AXMswY/8FJlqxu0ioIsMv
-=JXn7
+iEYEAREIAAYFAlGzjtYACgkQsAvGakAaFgAsEQCZAdjjGhQ1iB69rjF9xnrSFota
+bkYAn0CyxJf/lSyupzrj+0WPVizQVp4K
+=iOwK
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.8.2-automake-1.13.patch b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.8.2-automake-1.13.patch
new file mode 100644
index 000000000000..109682f46fcc
--- /dev/null
+++ b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.8.2-automake-1.13.patch
@@ -0,0 +1,61 @@
+From cb38e44936aa6a923f9dedffb7084de657caa54f Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 8 Jun 2013 21:44:45 +0200
+Subject: [PATCH] Resolve use of $(top_srcdir) in TESTS to stop Automake 1.13.1
+ from erroring out
+
+This is actually a cheap port of a fix to upstream bug #153
+https://sourceforge.net/p/mp3splt/bugs/152/
+https://sourceforge.net/p/mp3splt/code/1326/
+---
+ test/Makefile.am  | 7 +++++--
+ test/run-tests.sh | 7 ++++++-
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index bb77e86..81159e3 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -34,11 +34,14 @@ test_douglas_peucker_la_SOURCES = test_douglas_peucker.c tests.h \
+ $(top_srcdir)/src/douglas_peucker.c $(top_srcdir)/src/douglas_peucker.h \
+ $(top_srcdir)/src/utilities.c $(top_srcdir)/src/utilities.h
+ 
+-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
+ 
+diff --git a/test/run-tests.sh b/test/run-tests.sh
+index a7bee7a..49ca19e 100755
+--- a/test/run-tests.sh
++++ b/test/run-tests.sh
+@@ -5,6 +5,11 @@ top_dir="$BASE_DIR/.."
+ 
+ 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 @@ fi
+   exit 1
+ }
+ 
+-$CUTTER -s $BASE_DIR "$@" $BASE_DIR
++$CUTTER -s $BASE_DIR "$@" $TESTS_DIR
+ 
+-- 
+1.8.2.1
+
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.8.2.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.8.2.ebuild
index de431d8725dd..774d2d868e17 100644
--- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.8.2.ebuild
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-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-sound/mp3splt-gtk/mp3splt-gtk-0.8.2.ebuild,v 1.1 2013/05/01 20:55:02 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt-gtk/mp3splt-gtk-0.8.2.ebuild,v 1.2 2013/06/08 20:06:08 sping Exp $
 
 EAPI=4
 inherit eutils versionator autotools multilib
@@ -34,6 +34,7 @@ src_prepare() {
 			src/Makefile.am || die
 	fi
 
+	epatch "${FILESDIR}"/${P}-automake-1.13.patch
 	eautoreconf
 
 	epatch "${FILESDIR}"/${P}-desktop-file.patch