only patch Makefile.in and run eautoreconf, bug #226773. use emake instead of make, dont ignore cflags

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

5 files changed, 38 insertions, 29 deletions

diff --git a/media-sound/meterbridge/ChangeLog b/media-sound/meterbridge/ChangeLog
index 85d1dc7d30db..374d57128f74 100644
--- a/media-sound/meterbridge/ChangeLog
+++ b/media-sound/meterbridge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/meterbridge
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/ChangeLog,v 1.19 2008/01/13 14:49:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/ChangeLog,v 1.20 2008/06/25 16:37:17 aballier Exp $
+
+  25 Jun 2008; Alexis Ballier <aballier@gentoo.org>
+  files/meterbridge-0.9.2-asneeded.patch,
+  +files/meterbridge-0.9.2-cflags.patch, meterbridge-0.9.2.ebuild:
+  only patch Makefile.in and run eautoreconf, bug #226773. use emake instead
+  of make, dont ignore cflags
 
   13 Jan 2008; Alexis Ballier <aballier@gentoo.org>
   meterbridge-0.9.2.ebuild:
diff --git a/media-sound/meterbridge/Manifest b/media-sound/meterbridge/Manifest
index d7d1f452040d..072078c9b7ca 100644
--- a/media-sound/meterbridge/Manifest
+++ b/media-sound/meterbridge/Manifest
@@ -1,6 +1,17 @@
-AUX meterbridge-0.9.2-asneeded.patch 1402 RMD160 ed9cf9ccdf716d012bbeeeaab84685aaf52c48b0 SHA1 68ed9e707956e1faab23c8bffca3918dfdb961bc SHA256 2c2d78f99413f828b15510abeb94ad3ca57b3d25f4a034caa186d54a0a693fde
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX meterbridge-0.9.2-asneeded.patch 503 RMD160 ec96ef9fd6625a8cce2375121863ee604e9d95c9 SHA1 ae17b18d988869d433cfc270c2c8e4238347e6df SHA256 b38edca0530e95e0658829c2fc77f6e2b4e4ad2cd8ff210759cfc7257da2a255
+AUX meterbridge-0.9.2-cflags.patch 473 RMD160 993f41ff36fa0a9c1710b13751b886d315ee5ec7 SHA1 379c47bccd18a9f0c7816875855e825db36b1ba0 SHA256 82eac1c367e2ace84fd340ba4d357b7b5fc58be51a519edf542d0340b4ac2fc2
 AUX meterbridge-0.9.2-gcc41.patch 490 RMD160 a7202e0730986f3d7a20fc2cb1678f329dd85aeb SHA1 6e16134e2e505d9b2dab54e08ec10c2b0e87dfec SHA256 3c112824a5eea44fae1e6607f9aad2efeab37e8cbffccd1c180fe968ed078190
 DIST meterbridge-0.9.2.tar.gz 607742 RMD160 c4b78b337a65bb2b61a9f512d15ddff390c0d0f0 SHA1 cf683c623b12342a951f541c9e674cd162a9ad91 SHA256 b3c887e2ab381f9183a8a1e42b6300ac2ea1766496ae5d91f3257bb7e6786649
-EBUILD meterbridge-0.9.2.ebuild 792 RMD160 b3868b1b7e26b1ab014c60a60c03077abb0389e7 SHA1 cd9863d52e1aaff9795a7bf4cdd5d8c881d67031 SHA256 b5ff6221064df9ca4f5d1478a8e579267acf2b5c15b6ae30ff8e8238008b5451
-MISC ChangeLog 2317 RMD160 3cb7f9115f7e7fef2dd1d068aacb64b23e09d037 SHA1 f4f19473540bc16fd535209e8205664c08f757f1 SHA256 74531525bb8a607635fddad0405ac201cbefc8e18602717626f38e73a24543dc
+EBUILD meterbridge-0.9.2.ebuild 867 RMD160 658e4b63a5fdd7ce065b754427188d8c2263aca7 SHA1 8c1dacdb83a94d13bc9e304ee467f0567927b84d SHA256 2cbed6a154409b4fa08c9c7262794515318ea37a20c692054afcdbc01d67350b
+MISC ChangeLog 2586 RMD160 c2847c914df2cf4257764695d8d52f42eade55f1 SHA1 accb51e8ebf955512bc6595865795f1faa61607e SHA256 3dcf9367cac6686d23490403fed47f155b95f8e573030523a929b353f165f73a
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhidEUACgkQvFcC4BYPU0rppQCePxrdFLjG/YFx657RqcNSSsVC
+RZcAoJFfQiD3SiOj66aoJK/TsdIZC7RC
+=b2v0
+-----END PGP SIGNATURE-----
diff --git a/media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch b/media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch
index b2c79a09c6a5..18d742fbbf46 100644
--- a/media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch
+++ b/media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch
@@ -8,25 +8,3 @@ Index: meterbridge-0.9.2/src/Makefile.am
  meterbridge_SOURCES = main.c linedraw.c vu_meters.c ppm_meters.c dpm_meters.c jf_meters.c scope.c envelopes.c find_image.c
 -meterbridge_LDFLAGS = -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image
 +meterbridge_LDADD = -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image
-Index: meterbridge-0.9.2/src/Makefile.in
-===================================================================
---- meterbridge-0.9.2.orig/src/Makefile.in
-+++ meterbridge-0.9.2/src/Makefile.in
-@@ -89,7 +89,7 @@ bin_PROGRAMS = meterbridge
- EXTRA_DIST = *.h
- 
- meterbridge_SOURCES = main.c linedraw.c vu_meters.c ppm_meters.c dpm_meters.c jf_meters.c scope.c envelopes.c find_image.c
--meterbridge_LDFLAGS = -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image
-+meterbridge_LDFLAGS =
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
-@@ -102,7 +102,7 @@ am_meterbridge_OBJECTS = main.$(OBJEXT) 
- 	jf_meters.$(OBJEXT) scope.$(OBJEXT) envelopes.$(OBJEXT) \
- 	find_image.$(OBJEXT)
- meterbridge_OBJECTS = $(am_meterbridge_OBJECTS)
--meterbridge_LDADD = $(LDADD)
-+meterbridge_LDADD = $(LDADD) -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image
- meterbridge_DEPENDENCIES =
- 
- DEFS = @DEFS@
diff --git a/media-sound/meterbridge/files/meterbridge-0.9.2-cflags.patch b/media-sound/meterbridge/files/meterbridge-0.9.2-cflags.patch
new file mode 100644
index 000000000000..fbd90b7b7aa0
--- /dev/null
+++ b/media-sound/meterbridge/files/meterbridge-0.9.2-cflags.patch
@@ -0,0 +1,11 @@
+Index: meterbridge-0.9.2/src/Makefile.am
+===================================================================
+--- meterbridge-0.9.2.orig/src/Makefile.am
++++ meterbridge-0.9.2/src/Makefile.am
+@@ -1,5 +1,5 @@
+ #CFLAGS = -O6 `sdl-config --cflags` -DPKG_DATA_DIR=\"$(pkgdatadir)\"
+-CFLAGS = -Wall -g $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
++AM_CFLAGS = -Wall -g $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
+ 
+ bin_PROGRAMS = meterbridge
+ 
diff --git a/media-sound/meterbridge/meterbridge-0.9.2.ebuild b/media-sound/meterbridge/meterbridge-0.9.2.ebuild
index 9951aeedeb6c..26862f93bc8f 100644
--- a/media-sound/meterbridge/meterbridge-0.9.2.ebuild
+++ b/media-sound/meterbridge/meterbridge-0.9.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/meterbridge-0.9.2.ebuild,v 1.14 2008/01/13 14:49:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/meterbridge-0.9.2.ebuild,v 1.15 2008/06/25 16:37:17 aballier Exp $
 
-inherit eutils
+inherit eutils autotools
 
 IUSE=""
 
@@ -21,11 +21,14 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gcc41.patch
 	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	eautoreconf
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog
 }