Clean up errors in patch/install, and handle the upgrade from previous versions #485720 by Dirkjan Ochtman.

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

4 files changed, 63 insertions, 36 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 6603c6a239a3..7b53fd62d12e 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.288 2013/09/26 12:26:58 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.289 2013/09/28 10:55:44 vapier Exp $
+
+*timezone-data-2013f-r1 (28 Sep 2013)
+
+  28 Sep 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/timezone-data-2013f-makefile.patch, +timezone-data-2013f-r1.ebuild,
+  -files/2013f-makefile.patch, -timezone-data-2013f.ebuild:
+  Clean up errors in patch/install, and handle the upgrade from previous
+  versions #485720 by Dirkjan Ochtman.
 
   26 Sep 2013; Dirkjan Ochtman <djc@gentoo.org> timezone-data-2013d.ebuild:
   Stabilize 2013d for everyone.
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 598e300521ee..ad6590d4fd47 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 2013f-makefile.patch 3858 SHA256 fb7b94311af04ec273a983d31cf391d34681b731f1d69988569735297454d111 SHA512 3ea360a4e8c6cd38d3653dca3cf4ff705e67feb1637d8afff77e9cd72c931535b60eda2f60b709a83b64309a4da52fee07924974bc6bcaf103788d38ebb208e7 WHIRLPOOL 0fd4f01c7c901c19451265df827086ae57aecd7995b310a077f674ca4987558a438931d7a3bb42644bc819eef11ca8f6249b2de07f8e708e8bf61b0228589cf9
 AUX timezone-data-2008h-makefile.patch 4037 SHA256 fc496b869ed6b70c60b0fcdea0a176e31c9405c96e6bf73b5edc26339de66c39 SHA512 85871ce688d529660ad8948ebf73918fdada5d950abbd9f33241d2d89e6df521223f7a1a24369c00b3f7258ce41bf296ee6f04cf2b91d0591d08640d06a6e4d6 WHIRLPOOL ade3e7e17318abf2e4989c4d673f643ebcbd787f26719c22ca0f90ba8b70d293c9f99334f6594fc1eaa2ef233539bed3ff0b5f20d9042b990f5ec4671432a8ee
 AUX timezone-data-2012a-makefile.patch 4022 SHA256 4bbcd3fa36ee6b2506df766b0f283826fd5bd2402b24aa25845971e8f38b51e2 SHA512 cddf38b690d1631d26f9d338bdf55e48692e240437d999fb494043ae24dd2b3167de9244f94e10605dba990777e20e886ba6f30429a6855286996004551dcc23 WHIRLPOOL dc92fd0dadd20e0f6504c7ce4dd736854e683336e08168f62badcdf6d1730ce830791f10ad71aee614760df4c89f6bf826101df7291994c736022d2d3d9c1d1b
 AUX timezone-data-2012i-makefile.patch 2977 SHA256 c2ad2ff248962d12a7fdc2689172b7220bbaee52bc846e8f10f5a57a8b6d345e SHA512 2b61ba4791ba9bde7605fadbfed0104a7f862e2907bd067239c7cd1a731b4a85f7597a547290f7c604b6f37972913b9167eb72033f458af047bd0d5a127d463c WHIRLPOOL c60158a1c849ee78bc37ee25bf723688ee107dfc3a8032e42947582be036d8be3eac70abf7fdd8a052dfa284819082019d583c344943220f569ef996bc6507be
 AUX timezone-data-2013a-makefile.patch 3017 SHA256 33278b69ebeb41523befd2627d4fc3cf0ac84da34b6d49299eb9437722ccc457 SHA512 8d7716ea8bc2e5599220f8aad3cb98efa3c5ede692ea4e32f4ca8dd1310ce7c33f36683916cbc80a440c3b77aeed9286a65ca3cfc4ab965723d40aacdef7fd21 WHIRLPOOL 3ca63c5dcba24f7867d0ff95bae59c0ea5b999f0ac7462fcb35e68c2452e9ab2bae57278c84c85062fa6b262e3ba061af86636f25783a7fdae9ffa93f975a1bc
 AUX timezone-data-2013d-makefile.patch 3042 SHA256 b138d8ff362fed49af4487de98ebbb0e61dc73612643a800bf1df7a3f443ead4 SHA512 ad09fba6facd4e5fd49b9176f5087669f880e96e904bad23458d280b9846bb9e75c8cb0738d64d886f07047b66b23aa9f3da489f67df1f27dbfe9b6b1e1a1ea3 WHIRLPOOL 503673dabb24e233f554805ceb2cb871870a357e3ff378460f8f72fdae1c46a306703f255de6cfc78e91099f3e275b0108c8c3c6607cc302658c5236750a48bb
+AUX timezone-data-2013f-makefile.patch 3898 SHA256 7437b00386ee673467e0fa01a0dbae1a3a32d709e444443c1eefd00b890ed725 SHA512 5ab04af020cca764179885f7c7b93402bc16a625a92acdde0e52ba56552aaa04c50723d2e0f98e13d7090a1a34b450818a86119d20301e2b8518bccc0cbdd10f WHIRLPOOL b622f3581078e4c4f2fd908b89eb204056d43aa786f581fedaf299ac498c4b0a8214c7da4534b80d61dc6dd7f8ddb9a7429580c71055c4cee015cba4c72a2d4b
 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
@@ -27,23 +27,23 @@ EBUILD timezone-data-2013a.ebuild 3236 SHA256 1fc1cba3d07afaacb31d71942d542deccf
 EBUILD timezone-data-2013b.ebuild 3224 SHA256 573ef78495aa0f61c794fde1ee37b10acd66cafe9cbb4d1ff8c106814dffadcf SHA512 eddbab729e525cacb80c58f64cd4e1f46bc438a742592377a9b82c3ee91a9d3608b8ca86647fb16c3141a3149dcdb14c0b0b5a93947c96c67d5ba463e5193a3c WHIRLPOOL 4411e9ed26f285edfe8472f4022ff3760662b82bd464b85e6814673e35cd0c0198ef11b04cf28a807fd5fb125d5b7033cf9e6182bb057a1b71675a96f29ad500
 EBUILD timezone-data-2013c.ebuild 3224 SHA256 fe5f492145bd0f33173646455765088d88855549a2c03962ec87af64a99bf21d SHA512 ebd4fe19a8cb5550456a797229812008716f3e7a3117e65794be6ac1eb80663525c8538a0b2343e83f8bacfdd39fa283aef0f3f463316b6cfbe4c3c76454eaa8 WHIRLPOOL 3788d04bac8644b5c7ac4a7274daddd870f5420b5b949abb92f7603386f8526b8358eff23e9eb5e4bb77d2eaa2e9952a3e5fb9b6f9215cec969c05be695af0ce
 EBUILD timezone-data-2013d.ebuild 3224 SHA256 1670371b57ee8da742e2c8938d543f806e868c988bfc538c77bd3d0d055ee375 SHA512 639afe9c614ba7a93d60be295ad54d265745d9928169120e2a06a181ee9455b87f817bb4e757da49cf6bb94fb0e9a5d8685f7eb98d2923a8e1dfdc487ac65328 WHIRLPOOL 971ab512428b64029273457f60627a50652b658c1b2c2948858b60970a500e1abcb4bbaa29d05e40f2ba909e20a1ed311295d6a3d1928401084378d50a14a8b2
-EBUILD timezone-data-2013f.ebuild 3368 SHA256 bda3ff44989ba6fc82d6684ebd590bcc319dc3923ffb0ed1a00285a9be0c59f1 SHA512 8a58815919e4900516c35b748245c49628fd96d466accf5b63b9721d229a690d28b3f7bc846032352c5a1391149c04743dfd860f6057c8308340f17a32cd15aa WHIRLPOOL 6a687e9029bc1ba9d7356bf1752c7f95862772cdbb5334149e90375ae16f4d7860dcacab5d818fd7f991512aa8c0f63a7ad71e0f7386aa04e32320e76455e1ec
-MISC ChangeLog 38310 SHA256 8b7706a48f78c5e69d19e5a4c0b954b2ef5ca1947cd7ea9414f0aa58f2f77464 SHA512 21324bdf72bc19a7e6197546402844500c47197240ed684d1767fa1072d473f2267743851c4f9bcd6b7ebb5a16a2e81826a977b1ad0716c901bb028c803e4782 WHIRLPOOL d6000acf32d59323da92358329abedf24f11ca998d56b0980eba6614c9e2c6c55dbd2198e5e9ea410958824c2dfab8b879fd69789daed28586db55b804d9ee12
+EBUILD timezone-data-2013f-r1.ebuild 3807 SHA256 97d87668785c4bd1e365cd82f69f703a05a33ca209715c9d7ae4cf4301527a2c SHA512 14ee078a5e266945ed4fef8419b7c553ae4595db65c63175aa19d85123af1b727a94b5e93f0b2b8bbce1ca0472b9aba458b657f6ceae026df924ed443cf85771 WHIRLPOOL 7ad2acc42ac3482c1574e63520678dd00981e48c494a537c8f3f0a7649654bdc535bd3224b0f428c5ed720edcc716700a2539d014add2c27f64b130b9807abce
+MISC ChangeLog 38652 SHA256 9062c4cd4f3baa301e60fda89ae538c239741ba1d1421c342002df28b0148481 SHA512 e4ebb60c8e8e23cf067d680527e05cf110402a15d472de1fd97105f0aeff86b2e2a72d2e5b8af9deccc721fb9288288935ad02a8d7a2b5d15ab70c4873935325 WHIRLPOOL 32a9ab916c8363410842c25a6b986148914e39c280f28caa06dd69b9d0245d912a0b4c37e128b2f79c3f534ed345f3193e5693e835bb6f195977dbf6fa98ae56
 MISC metadata.xml 262 SHA256 fc8b85adf6da7103f13237c3796f6deabbfaa022ce4ee9eed4510c32442df512 SHA512 8e54516211de1628ecc1d896a47efdbdf828abd1815d5f3220a724b8e0dc160d9daa905f0b8fa3685ba0ff0a58abd23c75ce61998e20d8a8ec1f1d642eb74b17 WHIRLPOOL 56834aa3ee133edfc9aed39692f48f28978c927b36d4d790eb6f67cb6080a797f9e1c4b27d68bed16961e31ae024c132fd15c546f2b79b1216080ffbd8ea056b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSRCg/AAoJEJ+WuSkwOAOB9dwP/ix06oGYaTDlUuG2rz1yT5AO
-rto/ITB4JYAlq9eptrE7nMdIJ13K3PRMPUFbVkT3gwlOrlHNvOvjeQP1Ls4TyEnn
-3s1R7OqpfZpu/7/FR5kcK9Hy+ag6o6UfsX10LJa5175r/XE89hEqXOSyObctjdbi
-ByBbXHw1I2NwvtT702+gvnr/+qXgnKNSJt+49zdj99dHSSSk5SSRBBjr30OAEWXC
-BFCxm1lzHVsK/zob1Idb5QSCGn0GdVz/ZtnRSlEtf1pBqEMVaN7b0WzGwN8QPRfY
-9X23NPDPmfqYmgogu6GzqeJ+cIQlK9AhYtqHuwL+UrWmu/2deOjDlZ5dfyVX4cQB
-0GHL/b22Jtv/ZXcetIQ1f6kSinNdd8SC9ug20pcd2wFhhkNSjVmtFJFfm5+pob1w
-F6a1Xx+OvUiulMv+bchI3DnEYS11m+ha9yNq7VsJBoHR9I8wtRGCWwzMKuQQEifN
-1rDjiAlw/iqDD4KYqfuA0t1wuMMNcJsgeYYw1aOrYFD1VLcO5GohtahjHToWmaBb
-4vHu46v3pN1Bvz5xQUxsQ3/j+45MWFoxM/ChAYVZUyFRNA2FSwHYuRl4ZCKfEcKD
-vtTYhPWI1SHbyWVX3sdpmm0miBGqeAOhbTYrrUu+4zS50qo4sLps6fhwVYuvy0zq
-VkElYvVdDqjwmxBE4Sgp
-=pL0/
+iQIcBAEBCAAGBQJSRrWyAAoJELEHsLL7fEFWEy8P/iKQwEAFVdlnT3ycNZ6vt/IG
+YcIXViT9swCGCTGMS8XJiW3sUZVIb6XeZntl3FfrrHMqa4aX/wNCJjQE96BlbCyF
+fUAuI3W6emnSaVjcQh2vsvI6v4fjECUCw25U6mk5xZxZroXIYdbByZHq6mUWc5jA
+glTH0AS22JGgSSucwf+AH0xnayLCh5IMi74cdapKLXjNCFGkGf5+rSkuJlvsTsvo
+6EEfzgjNadYWmxDftrX+EtJS1gYO6mZ+FrZj8XVLjZmjhSd3rPdYOGODOb8t3lzx
+fSRFjeaJBeaaooRNScsrdFxBZsIctYB2ISoTYYCfiHxNf9QAzBtpBqp4/1QlC2J1
+nxVkelSihgAdJsp687HOE8HebK2YIBDAgM0zNQxexO/OGhOpup40w/YaBm5Q4pyf
+bdL4MzosE2IVPo3x8YMUCMtaJskVuJlrWMI5GlKFOIwwq18aJhKl3MMy3KuOPLTW
+0d/W9ZYMdaDMaj8v7GfCbnFSXfu+j+3rb7iY9CyJycVhrdkcfqncBLp8Nc/Nmvml
+9F9asqiOP+XE9x1vS+i+u1kU5QG7DPpw+ar/Q+rBWy1zvnZc7ULmldkGpRN+WEv4
+ERlPHa72J5Mo27tOMqDrDYA8JFAAwRZjkU2nY0r/qPb/dOI9XfdOfBwOjVqaeraN
+bVQoKUkgyJ71AA9C5x1z
+=jwzp
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/files/2013f-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2013f-makefile.patch
index 9532a4bae0e8..f496098f3048 100644
--- a/sys-libs/timezone-data/files/2013f-makefile.patch
+++ b/sys-libs/timezone-data/files/timezone-data-2013f-makefile.patch
@@ -1,12 +1,13 @@
-- Support env CC
-- Don't build/install libtz.a
-- Don't install man-pages provided by sys-apps/man-pages
-- Move zic, zdump to sbin and tzselect to bin ala glibc
-- Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc
-- Install leaps zoneinfo into zoneinfo/right/ ala glibc
+ - Fix up default paths
+ - Support env CC
+ - Don't build/install libtz.a
+ - Don't install man-pages provided by sys-apps/man-pages
+ - Move zic, zdump to sbin and tzselect to bin ala glibc
+ - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc
+ - Install leaps zoneinfo into zoneinfo/right/ ala glibc
 
---- Makefile.bak	2013-09-26 13:24:59.164794620 +0200
-+++ Makefile	2013-09-26 13:53:05.078434968 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -45,21 +45,21 @@
  
  # Everything gets put in subdirectories of. . .
@@ -86,9 +87,10 @@
 @@ -405,17 +407,17 @@
  right_posix:	right_only leapseconds
  		rm -fr $(DESTDIR)$(TZDIR)-leaps
- 		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
+-		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
++		ln -s . $(DESTDIR)$(TZDIR)/right || \
 -		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
-+		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/leaps \
++		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
  			-L leapseconds $(TDATA)
 -		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
 +		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
@@ -96,12 +98,13 @@
  
  posix_right:	posix_only leapseconds
  		rm -fr $(DESTDIR)$(TZDIR)-posix
- 		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
+-		ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
++		ln -s . $(DESTDIR)$(TZDIR)/posix || \
 -		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
 +		  $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
  			-L /dev/null $(TDATA)
 -		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
-+		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/leaps \
++		$(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
  			-L leapseconds $(TDATA)
  
  zones:		$(REDO)
diff --git a/sys-libs/timezone-data/timezone-data-2013f.ebuild b/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild
index 288080333e8c..c44a51995519 100644
--- a/sys-libs/timezone-data/timezone-data-2013f.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013f.ebuild,v 1.1 2013/09/26 12:22:01 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild,v 1.1 2013/09/28 10:55:44 vapier Exp $
 
-EAPI=3
+EAPI="3"
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -24,8 +24,20 @@ RDEPEND="!<sys-libs/glibc-2.3.5"
 
 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
+		if [[ -d posix ]] ; then
+			mv posix .gentoo-upgrade || die
+			ln -s .gentoo-upgrade posix || die
+		fi
+	fi
+}
+
 src_prepare() {
-	epatch "${FILESDIR}"/2013f-makefile.patch
+	epatch "${FILESDIR}"/${PN}-2013f-makefile.patch
 	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
 }
 
@@ -33,18 +45,19 @@ src_compile() {
 	local LDLIBS
 	tc-export CC
 	if use elibc_FreeBSD || use elibc_Darwin ; then
-		append-flags -DSTD_INSPIRED #138251
+		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 \
 		TOPDIR="${EPREFIX}/usr" \
 		CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \
 		LDFLAGS="${LDFLAGS}" \
 		LDLIBS="${LDLIBS}" \
-		|| die "emake failed"
+		|| die
 	if tc-is-cross-compiler ; then
 		emake -C "${S}"-native \
 			CC=$(tc-getBUILD_CC) \
@@ -55,11 +68,14 @@ src_compile() {
 	fi
 }
 
+pkg_postinst() {
+	rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade
+}
+
 src_install() {
 	local zic=""
 	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	emake install ${zic} DESTDIR="${ED}"
-	rm -rf "${ED}"/usr/share/zoneinfo-leaps
+	emake install ${zic} DESTDIR="${ED}" || die
 	dodoc README Theory
 	dohtml *.htm
 }