Respect LDFLAGS and remove unnecessary media-sound/alsa-headers dependency wrt #468712

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 30 insertions, 20 deletions

diff --git a/media-sound/dbmeasure/ChangeLog b/media-sound/dbmeasure/ChangeLog
index c6e220244bed..1b2eb59df457 100644
--- a/media-sound/dbmeasure/ChangeLog
+++ b/media-sound/dbmeasure/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/dbmeasure
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dbmeasure/ChangeLog,v 1.5 2013/02/05 18:31:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dbmeasure/ChangeLog,v 1.6 2013/05/06 14:04:22 ssuominen Exp $
+
+  06 May 2013; Samuli Suominen <ssuominen@gentoo.org>
+  dbmeasure-0.0.20100217.ebuild:
+  Respect LDFLAGS and remove unnecessary media-sound/alsa-headers dependency
+  wrt #468712
 
   05 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Revert as just talked with him via IRC
diff --git a/media-sound/dbmeasure/Manifest b/media-sound/dbmeasure/Manifest
index 0a70262aa7e2..e11efc03c2d7 100644
--- a/media-sound/dbmeasure/Manifest
+++ b/media-sound/dbmeasure/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST dbmeasure-0.0.20100217-ed8105083ab72f9afac9d18b7563fbc3d6c1c925.tar.gz 6647 SHA256 8258db8cee11ca6da051033a6bc0db4c556deede712e31ebc02c72c64160c8d9
-EBUILD dbmeasure-0.0.20100217.ebuild 1102 SHA256 763704f13e9870042fd1ba7ac86e7bcb4817405f5425effae537fe8acd204351 SHA512 43fecb5a68ae7091b1de8c1608b5008a4b62a38bc8266964490007e16f6b7fc8cb42a81bd06e6e99863c03c4586b06b34e177e3cc13ecb802b104f0966b801f6 WHIRLPOOL 0d645b57602a2d9b704e5a95ce6931b3f85db315ce57483cb202358dd48e511d53b26abe4cc7229fbbc15b3713c24223d00fc42e1ee3a49efd9a24a50363aaf9
-MISC ChangeLog 818 SHA256 8e4b3d1b2a5cea92e00cc55c4868a3fe36853b1283584caca26680144365c7b3 SHA512 a6ed1fecbb0cf89b903b31366e7a3c2f5519a7b531969a608157aa206569cb7b5e1819e9ba3835d1ff25d200f8a6156386841b29a4cbe67d3eacbcf82bd3953a WHIRLPOOL c43a147d204cb7955b9f108fb7fc09d746e63d8e42686292927aabd066e1a9dca61b58acc6d8817b8e0a4da6c452ddc3e608db7e131298543cb2224615a401ad
+DIST dbmeasure-0.0.20100217-ed8105083ab72f9afac9d18b7563fbc3d6c1c925.tar.gz 6647 SHA256 8258db8cee11ca6da051033a6bc0db4c556deede712e31ebc02c72c64160c8d9 SHA512 d52a6d8d34625b3ddbeff70e712ddefabfb955ceedc525377d672b472b57163c1194df29ffcc23d881bfb7a5d38cd2850c09ee7c5e30e579414f5c599ad2b78b WHIRLPOOL 2f58741bf6b54073689354674fe51dc44d9708aacb54a40d380deb5bf98989a861032a9bb4bda94177c9d79dbb8a4bd03b0fb3fbac7f57a4088c89a798e1e215
+EBUILD dbmeasure-0.0.20100217.ebuild 1124 SHA256 928443b0fde33a40d293862414a16b00514fe97ca0384eb24a1d48124ec63b85 SHA512 bcc981a84f6ff03332716484e39b5bb04f013029718cf823d9855f36b12a3337f38155de50cb565aab27e70521cb6bc933597e13a15bc3deec55c6fc25cf59ef WHIRLPOOL 1c9e23d627ad317f8249b252f78669f9a1ff52cdd7401083cf2798173050c6c585d9e8fb0cc9c8116c5521cf3f423649cd5614248dcea0edf149c2e886d6e081
+MISC ChangeLog 1001 SHA256 d6c9127d6a92e0e81556c1eb75aa77b2955e4e3a6a86225701aaefa70e8c2beb SHA512 0a845b9db922351d5d2126ae962ebc1e0318c58d28b51cd751974dc0e4b65582e637f9dc794578b805a1183efbac0db9bacad0c8fdee45ad8b03df3409c93109 WHIRLPOOL 1582144c6b9a4eef64bca1d29d74ea8aa3e6885add7fd4aa7ff14f0dd3bbda58ee8d7721a2dae7c17e41c4d8b7401bd378554ae520aa75399b29cf82361ac809
 MISC metadata.xml 205 SHA256 511768539e5897870df54783b05abd27789f17b6a633f862e5817af4d61cbad4 SHA512 e42adcafdc0ec8b1b52b304e967d7043818b8ab608a9c640815cdc2adc90b431f4e2cab219afb144f6a77d7adb3be758c5f0922d14971f7607f3e7761074ef73 WHIRLPOOL 872f8a12ba0d1ee4a9186dcb0c6e653ec35b328508544c2cffe156346ccdb40a6adccc2235b56121a5639fef6b8a8716b4ddb49589286e803d2afca43f8d3b75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlERT/gACgkQCaWpQKGI+9SG7wCffn0SgpNDF45tAjFlp5IRNV2b
-L84AmwTSqnjNSU/0ZpneiLYEz4IshVK2
-=TQ22
+iQEcBAEBCAAGBQJRh7hSAAoJEEdUh39IaPFN0B0H/2ohjkjDGRMzGuXnjNsmZbKw
+ILqREab6HkXStcx3tRelpC+sl52IlDNbfDmyiwRmTLWJx2UfkcsKfheEj/dlgYWF
+QfrHv2Q7mdeYm5jKXQKCAME+IsmMsm8puzi4eeasA+++1iPXC4UkZKHHtqMbD6EB
+6Ktenyvpc/cQplfXs1uXvILvLjJWJaHUujbpL3rt2bVUT5FoYcUprobR4p/fXWVk
+qSFiv2jJamQYF880e4Q9G6jng2MVSXeO+UPqbAe98P5utWhi7GQUiDawq4gVK969
+ZSpHlhWxQDMBYk2V+ebpq1Ql7nyPMPzAI14lnWcCX3bA+TarwomESr5/A8+Rkhk=
+=l/yF
 -----END PGP SIGNATURE-----
diff --git a/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild b/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
index bd646f07b323..ceb25cf2d98a 100644
--- a/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
+++ b/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild,v 1.2 2012/05/05 08:15:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild,v 1.3 2013/05/06 14:04:22 ssuominen Exp $
 
-EAPI=3
+EAPI=5
 GIT_COMMITID="ed8105083ab72f9afac9d18b7563fbc3d6c1c925"
 MY_PV="${PV}-${GIT_COMMITID}"
 MY_P="${PN}-${MY_PV}"
 
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="ALSA Volume Control Attenuation Measurement Tool"
 HOMEPAGE="http://pulseaudio.org/wiki/BadDecibel"
@@ -18,24 +18,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/alsa-lib"
-DEPEND="media-sound/alsa-headers
-		virtual/pkgconfig
-		${RDEPEND}"
+RDEPEND=">=media-libs/alsa-lib-1.0.26"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_prepare() {
+	tc-export CC
 	# We drop the -g for debug output but we keep the -O0, as we don't want GCC
 	# to optimize out some critical math.
 	strip-flags
 	sed -i \
-		-e '/^CFLAGS/s,=,+=,g' \
-		-e '/^CFLAGS/s,-g,,g' \
-		Makefile || die "Failed to fix makefile"
+		-e 's:$(CC):& $(LDFLAGS):' \
+		-e '/^CFLAGS/s:=:+=:' \
+		-e '/^CFLAGS/s:-g -pipe::' \
+		Makefile || die
 }
 
 src_install() {
-	dobin dbverify dbmeasure
+	dobin db{measure,verify}
 	dodoc README
 }