Inherit flag-o-matic for append-ldflags, and use that rather than append-flags.

Package-Manager: portage-2.2.0_alpha107_p3/cvs/Linux x86_64

5 files changed, 35 insertions, 24 deletions

diff --git a/sys-fs/dd-rescue/ChangeLog b/sys-fs/dd-rescue/ChangeLog
index c79588fe8f87..50d407b21cbe 100644
--- a/sys-fs/dd-rescue/ChangeLog
+++ b/sys-fs/dd-rescue/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/dd-rescue
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dd-rescue/ChangeLog,v 1.21 2012/02/04 18:12:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dd-rescue/ChangeLog,v 1.22 2012/05/24 03:07:11 vapier Exp $
+
+  24 May 2012; Mike Frysinger <vapier@gentoo.org> dd-rescue-1.10.ebuild,
+  dd-rescue-1.24.ebuild, dd-rescue-1.25.ebuild:
+  Inherit flag-o-matic for append-ldflags, and use that rather than append-
+  flags.
 
   04 Feb 2012; Tim Harder <radhermit@gentoo.org>
   -files/dd-rescue-1.14-ldflags.patch:
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 43cb0be8d658..394a74d7249c 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,22 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST dd_rescue-1.10.tar.gz 17113 RMD160 b163e6cc5a5573ae9d995c1a2c3fbe438809f302 SHA1 85e785cdb9bd0882869849dd23a2f56a247bdaef SHA256 9c36bfc662c065aabb4f952bd627a738d5827c27add8a65a850a85ed0c7f5c6d
 DIST dd_rescue-1.24.tar.gz 21344 RMD160 f506f770e5f48e5bc09faeee250423d703cd1d9c SHA1 e4c03778efbdc1dfa06e2f64bf021b6e18bfab2f SHA256 d11e33841d225cdb0596253948c14c9f6f12b33e00a1814217ec74ffa5e524b0
 DIST dd_rescue-1.25.tar.gz 21794 RMD160 6fad548cad1b5a8417cba59ee9325625f509cf42 SHA1 3f94aa38cd699079adf9ea0290f518f9a7c6b5b4 SHA256 22a2b030868c6e0639240df590a0c8483fda9ad1c01c5e6a0f7f188271c02585
-EBUILD dd-rescue-1.10.ebuild 807 RMD160 409d6ffc2d49443692e7c9522613016475bbf2c8 SHA1 4e310e1d8605ffd81f3e20c61ae3f756581d8048 SHA256 fdd79ecd4a88ed64cbe577a92b88c556dc5d123341f8ea907d587fe67e4579a6
-EBUILD dd-rescue-1.24.ebuild 1413 RMD160 25bec7edfb5f3f13fc87334e71afd5ad121fc536 SHA1 dd34f5cd40b3844fe47133a6e2a89c1d572a59bd SHA256 1d0ce666712e468e90f9333b86efd5fe54b8a403ee4c3d95c7ed397f46447f8a
-EBUILD dd-rescue-1.25.ebuild 1413 RMD160 b5486d50f205926e041d4c17276fdf528fd998fb SHA1 b6b10f68266c8328c9c0cab4f8e46e7159d53511 SHA256 e507005ed0d349f1fac8bfa52bd2689a1b9130a2ad2cf9a75ab7d09ac1b1261d
-MISC ChangeLog 3174 RMD160 82b58978fcd551a67d35aaefec2857fb945e2821 SHA1 f940b0f493c2cc5385d3e9f651c4d025c9a5c558 SHA256 53496973644cecbae6208650cb503bef0d6db8cf7cbb20d3dbdf4ace88db4664
+EBUILD dd-rescue-1.10.ebuild 809 RMD160 ae836876cd159ad3639babba8c005cf0050e8d4a SHA1 263016cb309fabc8fb20253bc787b969d065ca6f SHA256 21c7778c9508cbd793e6c219566ada8491eed9d117830bca07078db81dbab27c
+EBUILD dd-rescue-1.24.ebuild 1425 RMD160 704c49e39437163620dcfbba03d8b4d959a97265 SHA1 6c4da16f4282a22ae47a92e7ef165c888a3957af SHA256 4159b2aef081b867d2fc964a5160fe8fd9a15931495314d27078afd1151a80f8
+EBUILD dd-rescue-1.25.ebuild 1425 RMD160 b1d0b14d8b6ca7287503dcb71e79130665f27f06 SHA1 79e7a31bc829b9a5a8d512aaf2cb23a044ba9967 SHA256 cc411e0eef981113bf98a36763bca2dc5e19a78a4e9526a02013b61f6e42e1e7
+MISC ChangeLog 3378 RMD160 cdbbe30187ed1d7c47fa96c21655ffe9131c83cb SHA1 a0090c3f51afa2f8fa039bbebb4a7c4483e93b9f SHA256 dc0f77bad161059a546a58457849cd7661ee49d514cfdf1c78e374a2fac6fe78
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPLXUbAAoJEEqz6FtPBkyjBYAIAJ9XS98G5NTb8ZoGS/1X3JrC
-gE2fJG/tjzRmeZ/d32WsHsyK2CqVLzShIwk8JLqMZVM6yb/5xJtSJDDkWtQTjrxf
-IAq8S8hH3uMru8yVBVcZRkJ0Wog5Y/cCs8EqAY2TAdGyVSTAWnBj9YCz6t18W1vz
-GCVhwEKfJAEhjtsEPzxP4SlNbabfB2YPbVLDHTny7uubliTAUKhCMUuitRmDN3VN
-+bb/zsbzIZS3FIKPeICiaIXvRR+7I6kJfwYtVbqdW0Xd+stAyg35UVk+dvwnSLay
-jbcstAIsfBHtECvpJ5w0Dd0OKh3Umyf9TcEW0Wuakgq6M9agRTjpJL8Pi0Nb/Ig=
-=M98/
+iQIcBAEBAgAGBQJPvaYyAAoJELEHsLL7fEFWSoYQAJKlXvX/Pp0eU7b9Q6D2sz63
+ticcCQ6fXAxNgYg/dY0xfQ0uqbxKaKExFDk6Ql/lfZfCSmZfdGlXtt00Vjy7a6it
+m9wdYZr0uYp78mCBWIoNFODTaEgASGJFrSLtz3XQ8vYQXirgnJDb8h8hiJDa/9w+
+YhMKCxXCa8M9jsDoWtRre+BnlwWp+eJiDEBlEtv0z0QNVhB+LeYMgFkGBvwfjQbr
+gUaz2CZ9WM2W6eFJgtLu+V4w2BFYwcuCZi0zxLS3Earg0XZYWUpgokJsCWHiklb8
+lVv1Vcv0RCE4eZ0d7WmoYk31r0rubOPcB7d585uAzcejYirVyeJXNiJgHUXI4/9W
+i0HEIfoOzQ8YIoA27ajbdwITd3oTty1vGzPMQvUNdGPKGIOI0RVSCXNdMG90htSk
+mBcg+L0NJJ5WPVGgdjOxjnixnTI89Q/pSl4dNiNBRRW0UXbemkTCf/nMDPGUJD5I
+YGNwakEPviTM3AOn+vxro8RVa3zD5lxLRq+2+vMfzDYkx7Sf/rvUpknmh+2xYnvX
+CMh0tOirEvb9GiPYImUe2QXpTdV1dEhqTlbUM8VJ9a+TC74hfCOeVMMZ6qvUsaOT
+7uwmwgBY72oKgna6JPh3smXFHaL+XUc9Vus6VivB8HzyIEyscPw8eiqxJvm+jC+N
+OF8sm4Z7MaklOKdg03cq
+=MG1D
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/dd-rescue/dd-rescue-1.10.ebuild b/sys-fs/dd-rescue/dd-rescue-1.10.ebuild
index 5128745250df..adf862a33267 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.10.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dd-rescue/dd-rescue-1.10.ebuild,v 1.2 2004/10/26 04:44:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dd-rescue/dd-rescue-1.10.ebuild,v 1.3 2012/05/24 03:07:11 vapier Exp $
 
 inherit flag-o-matic
 
@@ -20,7 +20,7 @@ RDEPEND=""
 DEPEND=">=sys-apps/sed-4"
 
 src_compile() {
-	use static && append-flags -static
+	use static && append-ldflags -static
 	emake RPM_OPT_FLAGS="${CFLAGS}" || die "emake failed"
 }
 
diff --git a/sys-fs/dd-rescue/dd-rescue-1.24.ebuild b/sys-fs/dd-rescue/dd-rescue-1.24.ebuild
index c03b07c3fae9..85ca4accecc9 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.24.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.24.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dd-rescue/dd-rescue-1.24.ebuild,v 1.1 2011/12/05 10:22:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dd-rescue/dd-rescue-1.24.ebuild,v 1.2 2012/05/24 03:07:11 vapier Exp $
 
 EAPI=4
 
-inherit base toolchain-funcs
+inherit base toolchain-funcs flag-o-matic
 
 MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
@@ -21,7 +21,7 @@ IUSE="static kernel_linux elibc_glibc"
 S=${WORKDIR}/${MY_PN}
 
 src_compile() {
-	use static && append-flags -static
+	use static && append-ldflags -static
 
 	# Passing LDFLAGS together with CFLAGS is not often a good idea, but
 	# in this case it makes it possible to avoid patching; after all it
diff --git a/sys-fs/dd-rescue/dd-rescue-1.25.ebuild b/sys-fs/dd-rescue/dd-rescue-1.25.ebuild
index a6b597c9e327..91753d52fccd 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.25.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.25.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dd-rescue/dd-rescue-1.25.ebuild,v 1.1 2012/02/04 18:08:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dd-rescue/dd-rescue-1.25.ebuild,v 1.2 2012/05/24 03:07:11 vapier Exp $
 
 EAPI=4
 
-inherit base toolchain-funcs
+inherit base toolchain-funcs flag-o-matic
 
 MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
@@ -21,7 +21,7 @@ IUSE="static kernel_linux elibc_glibc"
 S=${WORKDIR}/${MY_PN}
 
 src_compile() {
-	use static && append-flags -static
+	use static && append-ldflags -static
 
 	# Passing LDFLAGS together with CFLAGS is not often a good idea, but
 	# in this case it makes it possible to avoid patching; after all it