Fix CPPFLAGS usage #526790 by Victor.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 176 insertions, 18 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 4007245892ac..3ab12e18e5d0 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.314 2014/10/22 23:38:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.315 2014/10/26 03:19:56 vapier Exp $
+
+*timezone-data-2014i-r1 (26 Oct 2014)
+
+  26 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+  +timezone-data-2014i-r1.ebuild, files/timezone-data-2014h-makefile.patch:
+  Fix CPPFLAGS usage #526790 by Victor.
 
 *timezone-data-2014i (22 Oct 2014)
 
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 8da4d9b17bb5..3ec3a02ba425 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -10,7 +10,7 @@ AUX timezone-data-2013f-makefile.patch 3898 SHA256 7437b00386ee673467e0fa01a0dba
 AUX timezone-data-2013h-makefile.patch 3745 SHA256 c6ff4692c63998a85fd7639aa6770a0650eedd5646e2f56835dac263426a4368 SHA512 27708eba2dfa0959d178c1a31d3dd5458f3ddcc929723f3516897a2d1418ff2a058270f38322523c52b610659258abe588ab161d6e3e9ccf738e787be4b697f7 WHIRLPOOL 3795a2b6b0752cec93c1277012e2d8b6856ff3b45c18574e89d0e29ab6350921dd134f27a3c0a1de968b71aedddb759a6ccea560c58d0f249b0bf6500864d187
 AUX timezone-data-2014f-makefile.patch 3750 SHA256 a8d2438e4cd132052acdb4fd17f99e45981f7f278777485cc20eb1b6e78742c9 SHA512 b748790745fca23b34d8c4ad1be453b8111591925f542cae219af37ce1eaf174dfc918d1b4c8cd8d3dd95657a22be7120ebf2f2e7b442f89f59ffb2f80724f07 WHIRLPOOL 5f580beb195124c4e5d9db10336c4c864a24f9abd95447e2f76de2db74909d3b7bd50aaa20341f2741cb7b9665e668fb513a8de9d83138d513ea6972376dfa3c
 AUX timezone-data-2014g-makefile.patch 3833 SHA256 71eb5fb7a78c6f08d72bd8c69ae06701c064c411708e05101b1fe324f1fafa05 SHA512 fa2edfc02fa0a482709edbcbe255a438973fd38c5ce12873ae366366b4e5d2eab2b79c6881ebaad018a4e1ff553eadbe3df226764e6cf8db128b864a51d32ecd WHIRLPOOL a16c58b755c490ca3c9df3052e4f7291aa91d04fe170f2b14f18d53217eea8adef92222b745682d00d40f59dfbfd08d7fc10d961953149861e96eb419f70f3cd
-AUX timezone-data-2014h-makefile.patch 3799 SHA256 cb0e7cd152ba586c3a65bb3f72a0c8d0e30e54da59d5bda24a1a7139ad4f40b6 SHA512 1d4ca9f2ec708fa809c722a9c37dd3a28cf66eca015eb44fcc1705ef4d2ea8588a22cf0d79afe73b00d4aa26b8458cfba6da3c061f0c9d6cc1d1be5a5c67c5d8 WHIRLPOOL 3e26525593d0ffbdc904f6fda98717303520ee15a9ee33055e4362ae6bb56034f552c1ed1c0dd0a747553e47eb3b4ae3c9f3e3954f892b6fa466eda52bf3483e
+AUX timezone-data-2014h-makefile.patch 3811 SHA256 815932985476d2ff349e7dbbe8f22d136ec753575eca65b676ab6425b0fde0c7 SHA512 0cd2312d526015420a3195658471d1e94da3b7743f8fd7725c968bbff1486f0178314a63eadab8b54fbafea8e149fcd5230efbc837258b6786423134d6a2ee31 WHIRLPOOL e3b34dddbd5cfd055bbf16ecd746c0512c5e210581025c32d0a6db2600d465f3a01cfb05c8183fb8dfa3438c73f2b3acc4d64ca35c327480e64a226ab754be27
 DIST tzcode2011i.tar.gz 135022 SHA256 f0dd991de3f8d6c599c104e294377c9befa1ef40aa5a1d09e2e295a453f3c1ec SHA512 4febb158d9799cb9a7017259d76b74d54d0a8f9dfb46443fa79701f488964080b1d64d81eec38c11fcb85aecf31f42bf42437d77575537c598c37a6569765696 WHIRLPOOL 7ce496081a31e891c7b55ff66be39a78be0369a55b70531c793ccace3c274a59d1c602c5c07a2e93eb377578995d33c9a6508b02535121665d2fb4090bd6dc16
 DIST tzcode2012j.tar.gz 134654 SHA256 ee4361b3b4ae201a270857c84d0f063c2a2191b3e4cd7414ea4622bb8bae9a82 SHA512 a0182438fedb1d855b52c0734f52bfd4dd3707d65c6f347833d5a68aab132a68f2b77a0e182d7ecfe7c58185245d7181ab01da909c2fdc84b71150c3090382c2 WHIRLPOOL 430e7320976e184753364d034f16109713a350ec0828d864be2f30ce6d29dd403d8f9c25866f828c664f0324f57ad72197fd752ba343f316d80d7c11a1ebdee6
 DIST tzcode2013a.tar.gz 135569 SHA256 c2be9f6c0449df21308df1ab17bfd88e7d0652961b0dcbc768c2829cab6331bc SHA512 cf02e22cc5dd7a8f7614f7ffcb85148abf481aa278f58e26f4a11e1af9d9f24799aa68f6b8a7b6a209d57d3b120e77fdccba8b42dfdb5b142563460dba17c1f1 WHIRLPOOL 4ee6dc489f62d1e93fbac1400a78c99099f3f451879199ab006e8402cfb3434261e5144b037a25b89946fde0a6e68cd4a9efe7372441b49e3402937b9d2da9fc
@@ -67,23 +67,24 @@ EBUILD timezone-data-2014e.ebuild 4464 SHA256 be14485512201d7c39332c8fad06145144
 EBUILD timezone-data-2014f.ebuild 4451 SHA256 611cfd6edd198648bea8850cac1f0d20a236aed24afe7a0fe90fd70d61bf36b5 SHA512 429bb952d5f9a08f47b07586bd0cb245fcd82c627fbd7f096a9e8aea6b15cd91593cb88d30e5fa31858aab642f227af27b130ffbcfd64d1f8243e8bf71dd1e84 WHIRLPOOL 8d5426a4b9c46f5d5b59a8e753fcda0d58be46f02ba881830ff9dc0ae2d5b53cb66f74f25a0969ecf7ca60c251de4b200c488fd1ed31949ced623641270df014
 EBUILD timezone-data-2014g.ebuild 4362 SHA256 fff04f9a3c3c0f2b128693ac60160f2aefd58179704156a5c502ff3ce82b09c5 SHA512 ecc61f09bbdebd487b0b579accb77537414cb7d021341ac4c101f97f19d92fa3880eebca633855bf5b20ff34c0b13faff2065346a2e0f360d437687705d8320d WHIRLPOOL f7efa1ad08577f47389f22ec7c3fd20eaece24ac5508d0aa127f2b7e840f732ee0caf5ca0aac665c50b55453bf3935a75d2a369ed699b5ce55aa518433a46fb5
 EBUILD timezone-data-2014h.ebuild 4375 SHA256 b9ab319d9b1c268d7f00f3ecb97f523286910f445500bb80e7659474ab567f7b SHA512 9f56dcc5e488734814ff332cc68c0e4b3fd3763136c45609b088ee598941936af4d80144d606c21965f1efab5a1aef06ffdeffc16397558263899160003668bd WHIRLPOOL 1b6607974ad0cf6fd16e1e248a2a9c0d15ae64e1b4f562a8425f4ca03f158045fcaa3dea2548fe66dc7413421e6fd4d682c5127d77834c3f9d88205f9eb622f8
+EBUILD timezone-data-2014i-r1.ebuild 4400 SHA256 7d288cec2af5d7c6eb0960ae4109f4b7a844860aaf2d753e676eb9e7260b56a0 SHA512 ca1419cd9269054c29d4f806140eeb7066613368f499377d9c7ee0f61127e461fe6dcaef0280dfe8d17fc1332559b86ee779a1eeea2b7f441764aa751d2ed92d WHIRLPOOL 95102c1b44ac84213fb78bbeb42b4393a0cec255b4c8a408aea7793d36c4d0045987438d76e087e73d2c1f3b14437220fac2cf5093bc30581fb6b3b7892ff62c
 EBUILD timezone-data-2014i.ebuild 4375 SHA256 80356f5b1cd671c95fc74e0ca1c2524828a4cf0c2ba23e4359982225a70e49a0 SHA512 d87f69c0941c977ec393c4ae19f7422a12d38b94e4f1a868825fe06b3ec7db7516178b7ae94827995fdac1fc5ff990f81ff911028d4c6866f1df51a04a0c2421 WHIRLPOOL 6d1f3447209a199e54e73e8b1110188279763e1a99d58eb44e39dfac44c78ec9e2b98345524c1b4a1caf11789404d0a8fa45b149279ede3a9320e1f8ba214283
-MISC ChangeLog 42400 SHA256 6ebf5b5e657f8cdfa5100221034576a99cf67c8e0ae4a301476cfd1f42ae6cc8 SHA512 99c5be67d92668e0b585ccdb5c9b5d04b2b6ec286f867e8d4845d384b5911b0b34d2865e38a10e7de7304b95c79aa2b36b334130cb13f71f8a356efcd2499619 WHIRLPOOL 2e05c37335b1a27466245f7630ba4a38fbbacb18067748d1cc5e11ff456b56c9ce0819a99def0db13e35b49757a35922b6c20baa15171e388e38cf6f3d54d4da
+MISC ChangeLog 42606 SHA256 4fcb465c816661aeee8b4de0fe23cd95d91733f6ead9865e5c5a799e3efd5be7 SHA512 2a3240580aa76ba73cf61690d3a2f7e97d0360041e538ded506a3b22e0581d4da2e2f2cceafdef7d2681e9a9eaccc79c0d74e3ccc490a2d4292e6c1743e99857 WHIRLPOOL a91316b0dffebf00cc6135c92888dcbf0126c8e533dde15284a3ad2b6ec861cd405b17c957b20a5e282c55d2e633d3e33d9738eb88138f06e6429bf79a833df6
 MISC metadata.xml 472 SHA256 4ab35a5283c62aa867e05bcfdcaeb90e5ac191347a32735d37290885502a2511 SHA512 f91ce6146a369ddb6ee82c0d6e221ceb1fbe9beb073c2e37c27b07e0684c701328891a51f58ef9fefea6007e0111979af7034787b167735fb6d79c8462d9dfcc WHIRLPOOL ab3bbde9fbc205a887f591b7362034b01081c9a477dab314acfd92b4aa4b7e010532fdee7b2684504044fb3df2e8e8d09466d67765ec9feff3a2223ff7c54a1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUSD//AAoJEPGu1DbS6WIAW+UP/3lHiQHzUy7+bFa8DYCW5MXY
-EmIS5a6VjzCgGRaohgN7zmqfOrKLCQoMB0DKmFckkTOQxnCts1KJDe1sQ6FbuudF
-EAisyJABfh67SCAs2mLlr7whB8lvnn4ndouyaVVq3whaX75ulLaDj3J659RHxb4R
-kDz1EuGmsuzeSn9uzAI/pDIgaGR/xYQmEl955mSxEoYhTUN5rVQ6TGjseAcg7CEv
-JCZT0G4XkJxK3ibjCM6NslsrnIBMzMdL3On4qwViBgImBuRVAPY0vCgxbJdeWBFv
-HMyrNvleZzrfACEjDXmk6HgmvZPHYyRcbCl6R0LhfZamNnLMovAxHuU9LVZiDIN/
-m0BIRVmc6SGe/Rx/wHdzyZosd8T6vwAwn3/gVW3iXhoHCtf6CxHkBHuK4794EDUv
-w4HH54Jngn6vT+mQFyjRcJJ1XVBp8lcQRuS24NIIUG6QwHs7Ph8ElZmeyVyr62GF
-WJSLKM5S03dSgWWa9qTjiLpCJrBJZqbgmWOSu7pD8M2c2fmRjbsgCHyC+4AcSCgO
-Cl+Du3Id2NByj9I0STUZtlA8Hp7ytpF6IWyNUvY1IxS0vmzMCjhVMtwzPwwz/gPD
-DLL895FehHwQnxWA+4wRop6caoRoHBju60JWQW0vd4x/ejeqj4H5/nU5xP4JZujk
-L4eehQTbzVCvy0vY6XVr
-=Y+hk
+iQIcBAEBCAAGBQJUTGheAAoJEPGu1DbS6WIAkdYP/39p4S8/gEKNpViqbST0dIMB
+Lss4mhcHSIo/2eDhKl6xYRP+u26qRNP5Z80bp+hgmMzd25pSIdVH18HDb9GEn3jd
+DxV2lEBdUn3cMTQFKoQWbLcAe8CwbjNGLEBCLhsGp12hWURPP8V2+zAignJy38bY
+wZHRkwpE4DEWy8Dx1r9tTINRtKoRQY4jNCQzlGASRpzb1A0u+ocgThkIYqNTZBGr
+/hAc0E77msloYHJLsKW5FWKzYJu5IK2JmeUdU4w6W6nhkTC6B5lJqzEs6owiCqGW
+DLEV/RGxUDAxDgnQtPeKGXt7nbEJn0dBkVbMX9MMVbk1JMcWfeZB++jzjXW9JJxx
+FvRKBUgsvSXXEvdUBNIbLTk3n8WQXKNjETh4vKGYe4hZM9rU3LUw4kH7nHVgcM/x
+BAZ3tN3VK3NXUWbEU7ph5nxvzaA8Vq99/gZXQdYpKzUKa0H/BX4WLEDphvg2ceN+
+H/SgQZjsPEIGZAmEX2PSDFOH1AKMd4YfzStAZ0sT1Ta0pivdiDEYiZmnto3QHBYT
+L2piYGTS0xBqnoOAaF5vhIJuCJds2jtIJhSN2NdxCrch8zAjwf4g9nIYIKh+ZFeh
+RSX3+RA+h9gXqaghub1Kg4nvhRRAXhB8RCDWc1qGo0qcu0i7unqh+CxrxeHbo1Y/
+9THmgJEIejpvYWw/l8Lj
+=HxXl
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch
index fe6a766519b5..38af3bebc97d 100644
--- a/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch
+++ b/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch
@@ -49,9 +49,9 @@
  
 -cc=		cc
 -CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+=		-DTZDIR=\"$(TZDIR)\"
++CPPFLAGS+=		-DTZDIR=\"$(TZDIR)\"
 +ifeq ($(NLS),1)
-+CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
++CPPFLAGS+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
 +endif
  
  AR=		ar
diff --git a/sys-libs/timezone-data/timezone-data-2014i-r1.ebuild b/sys-libs/timezone-data/timezone-data-2014i-r1.ebuild
new file mode 100644
index 000000000000..7b04bb7752c9
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2014i-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014i-r1.ebuild,v 1.1 2014/10/26 03:19:56 vapier Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
+SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
+	http://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="nls right_timezone elibc_FreeBSD elibc_glibc"
+
+RDEPEND="!sys-libs/glibc[vanilla(+)]"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# Deal with the case where older timezone-data installed a
+	# dir here, but newer one installs symlinks.  Portage will
+	# barf when you try to transition file types.
+	if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then
+		# In case of a failed upgrade, clean up the symlinks #506570
+		if [ -L .gentoo-upgrade ] ; then
+			rm -rf posix .gentoo-upgrade
+		fi
+		if [ -d posix ] ; then
+			rm -rf .gentoo-upgrade #487192
+			mv posix .gentoo-upgrade || die
+			ln -s .gentoo-upgrade posix || die
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2014h-makefile.patch
+	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+_emake() {
+	emake \
+		TOPDIR="${EPREFIX}/usr" \
+		REDO=$(usex right_timezone posix_right posix_only) \
+		"$@"
+}
+
+src_compile() {
+	local LDLIBS
+	tc-export CC
+	if use elibc_FreeBSD || use elibc_Darwin ; then
+		append-cppflags -DSTD_INSPIRED #138251
+	fi
+	export NLS=$(usex nls 1 0)
+	if use nls && ! use elibc_glibc ; then
+		LDLIBS+=" -lintl" #154181
+	fi
+	# TOPDIR is used in some utils when compiling.
+	_emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CFLAGS="${CFLAGS} -std=gnu99" \
+		LDFLAGS="${LDFLAGS}" \
+		LDLIBS="${LDLIBS}"
+	if tc-is-cross-compiler ; then
+		_emake -C "${S}"-native \
+			CC="$(tc-getBUILD_CC)" \
+			CFLAGS="${BUILD_CFLAGS}" \
+			CPPFLAGS="${BUILD_CPPFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			LDLIBS="${LDLIBS}" \
+			zic
+	fi
+}
+
+src_install() {
+	local zic=""
+	tc-is-cross-compiler && zic="zic=${S}-native/zic"
+	_emake install ${zic} DESTDIR="${D}"
+	dodoc CONTRIBUTING README NEWS Theory
+	dohtml *.htm
+
+	# install the symlink by hand to not break existing timezones
+	if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then
+		dosym . /usr/share/zoneinfo/posix
+	fi
+}
+
+get_TIMEZONE() {
+	local tz src="${EROOT}etc/timezone"
+	if [[ -e ${src} ]] ; then
+		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+	else
+		tz="FOOKABLOIE"
+	fi
+	[[ -z ${tz} ]] && return 1 || echo "${tz}"
+}
+
+pkg_preinst() {
+	local tz=$(get_TIMEZONE)
+	if ! use right_timezone && [[ ${tz} == right/* ]] ; then
+		eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone."
+		die "Please fix your USE or timezone"
+	fi
+}
+
+pkg_config() {
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime"
+
+	tz=$(get_TIMEZONE) || return 0
+	if [[ ${tz} == "FOOKABLOIE" ]] ; then
+		elog "You do not have TIMEZONE set in ${src}."
+
+		if [[ ! -e ${etc_lt} ]] ; then
+			# if /etc/localtime is a symlink somewhere, assume they
+			# know what they're doing and they're managing it themselves
+			if [[ ! -L ${etc_lt} ]] ; then
+				cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+				elog "Setting ${etc_lt} to Factory."
+			else
+				elog "Assuming your ${etc_lt} symlink is what you want; skipping update."
+			fi
+		else
+			elog "Skipping auto-update of ${etc_lt}."
+		fi
+		return 0
+	fi
+
+	if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
+		elog "You have an invalid TIMEZONE setting in ${src}"
+		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
+	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
+	cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
+}
+
+pkg_postinst() {
+	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade &
+	pkg_config
+	wait
+}