From: Sebastian Pipping <sping@gentoo.org>
Date: Sun, 7 Aug 2011 05:47:03 +0000 (+0000)
Subject: media-libs/libmp3splt: QA fixes (bug #377999)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9d879451a5205790dabebc4ac55d34d52eb81e28;p=gentoo.git

media-libs/libmp3splt: QA fixes (bug #377999)

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64
---

diff --git a/media-libs/libmp3splt/ChangeLog b/media-libs/libmp3splt/ChangeLog
index aae7450c20e2..556031c01e06 100644
--- a/media-libs/libmp3splt/ChangeLog
+++ b/media-libs/libmp3splt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libmp3splt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp3splt/ChangeLog,v 1.19 2011/08/06 17:04:08 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp3splt/ChangeLog,v 1.20 2011/08/07 05:47:03 sping Exp $
+
+  07 Aug 2011; Sebastian Pipping <sping@gentoo.org> libmp3splt-0.7.ebuild,
+  +files/libmp3splt-0.7-libltdl.patch,
+  -files/libmp3splt-0.7-maintainer-mode.patch:
+  Move from eautoconf to eautoreconf (bug #377999)
 
   06 Aug 2011; Sebastian Pipping <sping@gentoo.org> libmp3splt-0.7.ebuild,
   +files/libmp3splt-0.7-maintainer-mode.patch:
diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index 88b0a5553e43..b445b441b134 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
 
 AUX libmp3splt-0.7-disable-docs.patch 1437 RMD160 d4289b18f24e7a7abe18e08af3f2dbbac8fd1d60 SHA1 27f5a60995866b6354c19b4b97ccfaacf28ccf3b SHA256 18b04f85044e1adc5466fb5965e63b4ea7593eb0c0686ce725558bf1de4705d6
 AUX libmp3splt-0.7-flags.patch 779 RMD160 e4cb662f1f4325dc30d3142ccfbb3f88805b4ba6 SHA1 f3993bf5f57d94eeb469de30fcbf4e479546b71c SHA256 d17c67190b0623f680ee9a30e4df7239067057b95bbfba67cd7f784d7dd37e63
-AUX libmp3splt-0.7-maintainer-mode.patch 331 RMD160 9a621234a08b7c7980e24a2125d13b6a3346fbf7 SHA1 96c0516595fd56db8adfc013c457441e5f4e38f5 SHA256 74a0d6e9b6616e9dd747f1a4d2db06f2ae3949454904410828f9a77a637bf6e7
+AUX libmp3splt-0.7-libltdl.patch 672 RMD160 1e68f1e3d458fd6620caaff567b13e1d1eaf0aed SHA1 07abd4d45a31700aefb0b984423f9a199cae20fd SHA256 68f1deba6fe977020b5ffbc5e3896b4f59605564ee1a1fab8d8ca0fb391817b5
 DIST libmp3splt-0.5.9.tar.gz 506810 RMD160 cb45c34f2aab21ae612829c21a1b097a9a944e69 SHA1 08238cb192de35524abadda6200ff8fd9d2a5df5 SHA256 ea25c307ff5ceab720eb1ce03d14f7ade43dda6f0f1f08dfcbba5a05e25a248a
 DIST libmp3splt-0.7.tar.gz 628384 RMD160 69d694fd2e491485d634c55b7175ea3f24eaf7e6 SHA1 8774c0ddc4ae3dfb468e2f991c918a09aa763e8f SHA256 f73093de1bff2492d5f52b1fab2608b4fb5ecd027c8d62672efb92fde5f5db26
 EBUILD libmp3splt-0.5.9.ebuild 878 RMD160 7c4d9fe09b07b6b29a8181436098f64c4538eed6 SHA1 9827296f376fd2c73e71f4bca063c972bba3b165 SHA256 2b87ac96af79b926505bf62f9f35cca0b7e39bb60b9a081a21259023375ae554
-EBUILD libmp3splt-0.7.ebuild 1425 RMD160 c7f5c1ec3f069ad7ab493731e005c5e3ac6af48d SHA1 17455d54de73bcb555112aae61f53e2f8633203c SHA256 fdba94ece79fff43d1397034929cdc5ad1ec0c90446ecb8fdf45c1e2f78406c9
-MISC ChangeLog 2857 RMD160 ad4e29aa5b7cd10e06dffe5758f7aea3769e9151 SHA1 2425568017e2fc106ae359e1c11a40a4aca4dec5 SHA256 a089a1aff887bf03fe8dc486fcf56956219747ce8fd7f397bb7cbdf6b24a0c3a
+EBUILD libmp3splt-0.7.ebuild 1419 RMD160 bd2d9ca69993f53ce446fba27d3ae061e18e347b SHA1 b3a60b95947118c61a6942e9576e54a1f6a594cf SHA256 91f5dee7f41cacd9beff97ad38ef426f9e981d3996bdc9a15c021c3a381431c4
+MISC ChangeLog 3070 RMD160 b86b82aa798a5bfa69a7bc62cfa612f58116a891 SHA1 054d54a5daefedfa0d958e595edef2418cbbae6a SHA256 a0355dc5e98555eba801e037d803efed409907a38ead3e5d361614c5dbd72953
 MISC metadata.xml 255 RMD160 2fcfa76f4ca0757988c843673e7335c9afdbbf02 SHA1 373346e2ac122dd036756a8195e6055fb513d739 SHA256 8f9bd1c478e1ea27c1c4d4a19a402da9c930c3d3b109af8c7e357ac16c97f285
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk49dAQACgkQsAvGakAaFgCxswCfWFO9tGDth7PinZl2GUIlcqm3
-sI4AnjiFWSC+BxeUyaFHe+s5rqBVFDYN
-=hwG8
+iEYEARECAAYFAk4+JtIACgkQsAvGakAaFgCzsgCfchN54gDatbmcFo3oZAKrCSQA
+VxYAniVJH/f8OgnwFtegCrwTCh3qu4B9
+=ztry
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch b/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch
new file mode 100644
index 000000000000..95650f87a078
--- /dev/null
+++ b/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch
@@ -0,0 +1,21 @@
+--- configure.ac	2011-08-07 00:14:06.723806363 +0200
++++ configure.ac	2011-08-07 00:14:02.405860340 +0200
+@@ -68,16 +68,13 @@
+ # Enable libtool, check for libltdl and define @LIBLTDL@ and @INCLTDL@
+ #################################################################
+ 
+-ifdef([LT_CONFIG_LTDL_DIR],
+-      [ LT_CONFIG_LTDL_DIR([libltdl]) ],
+-      [])
++AC_SUBST([INCLTDL], [])
++AC_SUBST([LIBLTDL], [-lltdl])
+ 
+ ifdef([LT_INIT],
+       [ LT_INIT([win32-dll]) ],
+       [ AC_PROG_LIBTOOL ])
+ 
+-AC_WITH_LTDL
+-
+ #################################################################
+ # Check for the type of the host
+ #################################################################
diff --git a/media-libs/libmp3splt/files/libmp3splt-0.7-maintainer-mode.patch b/media-libs/libmp3splt/files/libmp3splt-0.7-maintainer-mode.patch
deleted file mode 100644
index 36a019d9e187..000000000000
--- a/media-libs/libmp3splt/files/libmp3splt-0.7-maintainer-mode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac	2011-08-06 18:58:25.969125703 +0200
-+++ configure.ac	2011-08-06 18:58:38.835964841 +0200
-@@ -37,7 +37,7 @@
- AC_CONFIG_AUX_DIR([libltdl/config])
- AM_INIT_AUTOMAKE(libmp3splt, 0.7)
- AC_CONFIG_HEADERS([config.h])
--AM_MAINTAINER_MODE([enable])
-+AM_MAINTAINER_MODE([disable])
- 
- DEBUG_FLAGS="-g"
- #OPTIMISE_FLAGS="-O2"
diff --git a/media-libs/libmp3splt/libmp3splt-0.7.ebuild b/media-libs/libmp3splt/libmp3splt-0.7.ebuild
index 535ccd084e67..20cb4c57be58 100644
--- a/media-libs/libmp3splt/libmp3splt-0.7.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp3splt/libmp3splt-0.7.ebuild,v 1.2 2011/08/06 17:04:08 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp3splt/libmp3splt-0.7.ebuild,v 1.3 2011/08/07 05:47:03 sping Exp $
 
 EAPI=2
 inherit autotools multilib
@@ -27,9 +27,9 @@ src_prepare() {
 	if ! use doc ; then
 		epatch "${FILESDIR}"/${P}-disable-docs.patch
 	fi
-	epatch "${FILESDIR}"/${P}-{flags,maintainer-mode}.patch
+	epatch "${FILESDIR}"/${P}-{flags,libltdl}.patch
 
-	eautoconf
+	eautoreconf
 }
 
 src_configure() {