sys-fs/aufs3: Pass raw ldflags if ld is called directly, #432398; use KV_OUT_DIR instead of KV_DIR, #432346 thanks Dennis Schride for the patches

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

3 files changed, 15 insertions, 11 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 2cca835c7fd3..6d48112f929b 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.23 2012/10/07 11:37:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.24 2012/10/07 11:49:11 jlec Exp $
+
+  07 Oct 2012; Justin Lecher <jlec@gentoo.org> aufs3-3_p20120813.ebuild:
+  Pass raw ldflags if ld is called directly, #432398; use KV_OUT_DIR instead of
+  KV_DIR, #432346 thanks Dennis Schride for the patches
 
 *aufs3-3_p20120813-r1 (07 Oct 2012)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index e0cbbc161368..74f4da5f4e42 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -33,14 +33,14 @@ EBUILD aufs3-3_p20120531.ebuild 4632 SHA256 f9ef7f6e4bf5660f7e875a38bbcc07db4ea3
 EBUILD aufs3-3_p20120619.ebuild 4632 SHA256 1458e837811fbaa6aad77be59353df89e3b49a5b91cd4af4df57882f5a604010 SHA512 2259a1a7282cc584509388a0c0a8709562938513c37d1f858128aa3dd2078e7ca6737dfbbcdb31e8504e96cbfd573362aeb637e8dce1fc0144506e1878213559 WHIRLPOOL 513891aa0ed31fddc9525a301fded6aa36d76b0ec82201edba4bfad05caecb6a12e73e7b72f333e1968e16d369d45180d2d6232f9156c2d8804dbd5cb284eba7
 EBUILD aufs3-3_p20120730.ebuild 4632 SHA256 3866934b24a6228d36c1a94caddc9e80d948a116af3f350436342501c1666855 SHA512 8af0e924679c2feb285b45471f27e9a121456e0a53d6193acf8dc2273b4de251cd1f527020a84799bdbb84989a27591e04444710e73435fb4b40ff4d3151835e WHIRLPOOL b2c251210a553241e14f0015f34e8ba9045860d8073acd4baeb0c8396a3d9c46016f2eaaa90ef8c6e431a6e2508bf40e51adaaf458aba8d62e59fd18b677d44d
 EBUILD aufs3-3_p20120813-r1.ebuild 4664 SHA256 d51ac6e376bcb79cc97a58dde3defc6f1b40882fc4ccf08788dabbf467c0d30e SHA512 17fc49ea9a49a8251fb1dcdc9262ea689b22656ff31cb186b1628a26cc9eba6e086ceba520b7ece218c9071f3879bbca1ca0440ced0eb49bebc0b467db960b32 WHIRLPOOL 39ea3b2e4a5cd715b64c1000cbfed4dc3fbc12454eea626ead63cb1a738ad4d79f0c39352f2bb2b78b25f9ba698fb64be5c03df503365b9d7c4538a61ea633ee
-EBUILD aufs3-3_p20120813.ebuild 4632 SHA256 579695d1cb25ed09daaf8ac64d7bb2494ca3d69458b26326bfc2e1160e8027a1 SHA512 440849f3df869014f298e4a833cd1dddaaf315d8690b90e4d9d53fd6297a6f423a4f1723ab288082bf30efdfb6c354f04bd3f8ea15ceabd6892d3c9db5ad7e41 WHIRLPOOL 952a11055e4b0e5f8a80646a826ea72b3afa5c456bfaacc7582317e9f6c5ba5439a50ed0a53832821bef4a4650a3ef45cb061ad60782380e88be835e12147818
-MISC ChangeLog 5728 SHA256 2d7cf3fe6b003e5216b6b6b918493521f0f6302bb1dc6b373f2abd76e127948f SHA512 18e7ddb1774e94bf8f8e03edaadb5dcae318ad41c0d96ffeb5b2781efd7f5f8815ca13b3ac6d254986d56d0f3b328f52bd36c21f337189b601577f13a7a39d59 WHIRLPOOL 7d04f4def056896eea603095768a591430ebe090e4e1797dca57d99466ff46680b31c23a435c3b6687f8c91bc28991da586e694e0194e147347d2958e750d739
+EBUILD aufs3-3_p20120813.ebuild 4682 SHA256 cde51eac99246bcb04cab124cf473f255309be56e692a439336f558756dca14f SHA512 f7380e08cf73f048a20391119f880d8a83d30e06a47a4c5e6fe90b0325205aeedf45906430afaa701e534544356348a9d4967d64b50a770115e807eb90dfd07e WHIRLPOOL 7d1ac2c48b67c1c4eec2a0abb3a54a10a4232e6fcca18eb84844a4c7cc5f7600c9c24173713a485038d2bddc37e4fa8715c33ec0499aa63e0f9c9af383998dd9
+MISC ChangeLog 5938 SHA256 b6e5c9241401c4dda04026ef7fdfbe20dd1413eda7c99ca77a8c3efb556100e5 SHA512 944a6c3f6c8cfe7069023433dac14ac6bbed4db09600ebaaaeeccca3413fa5f476471996e77046a0202af5d0154c08a4d379a4628519b332e4c2c9f0661a50f1 WHIRLPOOL b7fddec714418b2cb89a5b223038b5719104bb944cefb147c83ab10778ac4eeb9f0fbcc7879c4236f6e2b0dc832cddb9579e6d36c30d747319a2ae96a4a5670f
 MISC metadata.xml 758 SHA256 7107603a0759e5737aa5d9b674155f39b79695c4f582df4976b825be5e7b5536 SHA512 6dcf4ddf5616e78d0b43e54d08dbde64ddaa0ef995af863de3623c34bcab139c9e36329722a1f965821f6a2513a62906ad3a436f07368e25893704ea46dbf566 WHIRLPOOL 32198ee0cfa5cbd5fc12109e5136f84d0b240dabd7515a9fb0ef3617458372b063c51a60930309853526f297646e5a2afc3264f4a2e0e02383d970e5816c305f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBxaYkACgkQgAnW8HDreRbxxwCZATIUQSDQSPWohfS6eWOiIEek
-miUAnijDdCJrhNBmQ1ecxpcFnWQcppgH
-=wZ6N
+iEYEAREIAAYFAlBxbDgACgkQgAnW8HDreRbrFwCfWifWloqJIniMygag3KfLjXKU
+rpYAnR/iPAPOBOTenwHdaqqzmCGaoXIc
+=ARyl
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20120813.ebuild b/sys-fs/aufs3/aufs3-3_p20120813.ebuild
index db3397f60f4f..fbde606fb750 100644
--- a/sys-fs/aufs3/aufs3-3_p20120813.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20120813.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/aufs3/aufs3-3_p20120813.ebuild,v 1.1 2012/08/13 07:50:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120813.ebuild,v 1.2 2012/10/07 11:49:11 jlec Exp $
 
 EAPI=4
 
-inherit linux-mod multilib toolchain-funcs eutils
+inherit eutils flag-o-matic linux-mod multilib toolchain-funcs
 
 AUFS_VERSION="${PV%%_p*}"
 # highest branch version
@@ -126,10 +126,10 @@ src_prepare() {
 src_compile() {
 	local ARCH=x86
 
-	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
+	emake CC=$(tc-getCC) LDFLAGS="$(raw-ldflags)" CONFIG_AUFS_FS=m KDIR=${KV_OUT_DIR}
 
 	cd "${WORKDIR}"/${PN/3}-util
-	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
+	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_OUT_DIR} C_INCLUDE_PATH="${S}"/include
 }
 
 src_install() {
@@ -142,7 +142,7 @@ src_install() {
 	dodoc Documentation/filesystems/aufs/README
 
 	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_DIR} install
+	emake DESTDIR="${D}" KDIR=${KV_OUT_DIR} install
 
 	newdoc README README-utils
 }