fixed multilib-build issue where append-cppflags is forgotten after src_configure finishes, commit OKed by WilliamH

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

3 files changed, 14 insertions, 20 deletions

diff --git a/sys-apps/tcp-wrappers/ChangeLog b/sys-apps/tcp-wrappers/ChangeLog
index 48b1507706f9..d40ef1315e74 100644
--- a/sys-apps/tcp-wrappers/ChangeLog
+++ b/sys-apps/tcp-wrappers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/tcp-wrappers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.50 2014/01/18 03:46:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.51 2014/01/30 20:36:44 axs Exp $
+
+  30 Jan 2014; Ian Stakenvicius <axs@gentoo.org> tcp-wrappers-7.6.22-r1.ebuild:
+  fixed multilib-build issue where append-cppflags is forgotten after
+  src_configure finishes, commit OKed by WilliamH
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> tcp-wrappers-7.6-r8.ebuild,
   tcp-wrappers-7.6.22-r1.ebuild, tcp-wrappers-7.6.22.ebuild:
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 941e448e15ce..2627298dd99c 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -8,24 +8,14 @@ DIST tcp-wrappers-7.6-patches-1.0.tar.bz2 16128 SHA256 dcb10f194684b16ae6aa9faf0
 DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 SHA256 0ff28337c5effe4f91e7ea43ddd65fc629c06922326f5ef2804f70943be64fb3 SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8 WHIRLPOOL 4a22c083d3bfe18af020ea48663ab3eb5a77d613665bbeb935daffcce64641d66f5c32a88ef4e4dbf8b4edfe9d71bfc4e35601451d065c10806ea726430d2aa8
 DIST tcp_wrappers_7.6.tar.gz 99438 SHA256 9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac WHIRLPOOL e04861d03a49dd6d6d5cd9eba86732a40e79deff39d981a5e883bcfae4979c6e1c2a388eabd84691927b159e606a5649073473a717cb62c12cbd8546d75635bf
 EBUILD tcp-wrappers-7.6-r8.ebuild 1994 SHA256 472c465ba36c51b250cd7d8db3eb6c0c09d8c3f129bd32f62ad705c394527a49 SHA512 c35dc3f0a0f5fc0bdb6f58344afc5f5d3aa5d4ece505dfc8fca2dce68e00e6a8dff21adad5888c9b65e4721afa587014b0ab22fefedc05ee06bbadef72d99350 WHIRLPOOL d4115a382165c638a517b6be90133b37e966c454343b63c4df205164496ab1515a98cb12ce54d959f2e24ac6ef3046e90d16723b5787bef608711908fbd28b0b
-EBUILD tcp-wrappers-7.6.22-r1.ebuild 2795 SHA256 4d341d14f23e698f19dd3c9851f6f283b71819ce783171c9baf536496216b2e8 SHA512 4772d25a26af479d234b4d25e0afbfd438040798c3b73f4e0ff0347a7b8d470cb5a929a10d82409f80e82df523aec3e51ee64fc830e9338476630f3a2ee62e0f WHIRLPOOL 121b44e9241e29db8b1a501432ec650bcca3df10caec5185c40739f60059ef99be3807ca259d46ff250819bb955c353b4979dfcb6b4b8ee17de3f6cf741557e6
+EBUILD tcp-wrappers-7.6.22-r1.ebuild 2808 SHA256 06cccdd3fbc0e060e987f6ad8e66755d0ec49f904fa8b02a9869d6db5261259a SHA512 218d99ba0de247ab4d056fd5d90e2fdbc537a2a56f42b6dae5fb8ba28419b51e006a4b8e168504c2d56870f9d5a0145787318be3b16032ce98be04298b3640e8 WHIRLPOOL 21fb1e9ea15b6424a4ab0deb46d9474b2b32b28b3a7e97e994200faa9464c5b74695da08d6ec62ef678c54240ef2c602c92d638cf2228db87d081fff60c00ba2
 EBUILD tcp-wrappers-7.6.22.ebuild 2509 SHA256 d43db3e7012c978557d50d6db91e3cd9bf8ef18ce94ef882394cc59fd17666ad SHA512 3cd63abbe12a4e7d7be0e2852ea650b6100affb09d3ce793da64e69cb219c7222763162d071939ae377597d91e64694914e9ab7f637797ef48cdde7d64b0d665 WHIRLPOOL d6a0d1134fe49d78da891db756fb9486ded00e6181a980176b48e6055c6709fcc7b7ccaf2676e49195573bb5a41eec56d4668337004456c59a015f237eabdac2
-MISC ChangeLog 7530 SHA256 171546ea8bd867e085b537d3fc1394e413aa9bcf561535841e73992491b31e8b SHA512 b94c796b12fc187367b48f433dad58b59687320bb012451a8d0ac38e0261f370a8b135402cb6556c0141e64e821d746439b9e4e5b0fd684ebed6c69c94842205 WHIRLPOOL 21157308b0a039a6f76574dff27b54566345e7b08dc7b1a28707f96d4f981290efb4aaddbafa33204b41a53e465ee56d416d9e13c8cd8495d551394a38244e37
+MISC ChangeLog 7728 SHA256 f3fe2dcd31bb31828813ef7bddb2d11ea41ccd1d7637b36782247513b259004a SHA512 f7b9000fa4a5674ddfce9233c1f6120be9cd37607880b57e6b9c73f22438a2a96c4fc91f87b86b0efd29ded61a84cacd15caebd1d82d068ef4510335c43534e8 WHIRLPOOL 051826807db81735983998055c5a1dd2234b2bc18d52e89ce5bc7294f4fdf1c258a3e68157b61b69e0c71c828079e60ff8aee739104e241371bdb523e6a9f37a
 MISC metadata.xml 349 SHA256 81a5bdc0c787284f58b68dd7e3db3cfe6652b336d03698826dd86a705626b725 SHA512 b3c8aa5ea459990ef57ffa5b66e230ea6cf7aa8acd3481183f2dbe7394d98add0a2712cd5b74fd494ca0372e79097c3e2d712514a5f20815c7673372351f5755 WHIRLPOOL 2c28eb2f649bb90041c36b7c9b5fe5ec5826382a59a13f64846bd99746172bdea5daa8d3c025d74402ec9d8beb8a675ec536405b2b223aeffd9122d9af8342cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2fkqAAoJEPGu1DbS6WIA7e4P/01YKEAaEJ7uy1hoomIWKZBi
-WrOthtNzm9QNSIwXekcZSxIBJpQ8UNKqyC0RWjZNym2Dxzb9j2G1zs169/JZ13YA
-vbCeWyPO1HWDMP2W6ST4M+ifyid/zw7e/Bs1CCU7b8xWx3XQlRZxuNw3+VO4TyBc
-lXlE87MefNYCJhNRjgRe/4HfbMBnN5h37o+5U/jU2jGyxehvHvT0/U+Z1kDhOU8w
-9PZ7Pub14i2L4cNLiBQv3CnPV09U5CvClcUqyhpzgxSMSRRcchG0pEK0ru/eY7uD
-Mcgy4QyBBlQx69po3Qtj8vSdlg25d9z9KoWoEDfUBmH4MFSzRHXtb7BKWG8E1vaY
-fuxYFNjE1wnAawADYwAkfOXKfOLTZ8ZLXX19vkWPJYrSQlq55btKBhLkNX1gZsSZ
-1Ncezb0bgx+fvrPJumA/V1fLZHJcIztmVZNg0NRUuDDMli+CYidjbOWFzeECaqMM
-Wfe31ZBLoSSLUKYHBiZtWMgRlpGrEEYrBwxqHpgGKf9IwcWFXZgUZ2auoo2gEiBD
-uc6k3dJ9lgaujbargDy/TXvkuHq8eKopoIrdceiWvLJ6YO9WPcsmSYf3ei9RcRY/
-+Z3DhA+K2Y/CoHo4cpDdEv9la/bUwa26DTVHw0i/8nQA8ilXFWWcAsXalY2lM2cQ
-oN6P8d9r12DTRlVNZnyF
-=chSA
+iF4EAREIAAYFAlLqt94ACgkQ2ugaI38ACPB7bAD/ZX4IFDiu8nGk5tHsmR7VnWX4
+WqsH7Eq+LJql3b1CLXUA/REZKBqwLgyrQeE3xTiyR6vOVet4vsWcyikHsnXRy7ht
+=DWTN
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
index dc976a7b02ac..8fb92c88c121 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild,v 1.3 2014/01/18 03:46:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild,v 1.4 2014/01/30 20:36:44 axs Exp $
 
 EAPI="4"
 
@@ -37,6 +37,8 @@ src_prepare() {
 }
 
 temake() {
+	local mycppflags="-DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED"
+	use ipv6 && mycppflags+=" -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
 	emake \
 		REAL_DAEMON_DIR="${EPREFIX}"/usr/sbin \
 		TLI= VSYSLOG= PARANOID= BUGS= \
@@ -51,15 +53,13 @@ temake() {
 		AR="$(tc-getAR)" ARFLAGS=rc \
 		CC="$(tc-getCC)" \
 		RANLIB="$(tc-getRANLIB)" \
-		COPTS="${CFLAGS} ${CPPFLAGS}" \
+		COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \
 		LDFLAGS="${LDFLAGS}" \
 		"$@" || die
 }
 
 multilib_src_configure() {
 	tc-export AR RANLIB
-	append-cppflags -DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED
-	use ipv6 && append-cppflags -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len
 	temake config-check
 }