Fix tzselect shell interpreter #110681 by Priit Laes.

Package-Manager: portage-2.0.53_rc6

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index a990e1d14ad8d52d19905e4e55580b6af70a3d9a..ac5f6db064055267b351e489ce0c6cad4511f38c 100644 (file)
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.3 2005/10/28 00:01:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.4 2005/10/28 23:14:38 vapier Exp $
+
+*timezone-data-2005n-r1 (28 Oct 2005)
+
+  28 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  files/timezone-data-2005n-makefile.patch, +timezone-data-2005n-r1.ebuild:
+  Fix tzselect shell interpreter #110681 by Priit Laes.
 
 *timezone-data-2005n (19 Oct 2005)
 

diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 704c8c2493b247cea071fc0f065fc384c06fb46a..8f571653c1e8b0f8d57e8b1d04999bc125575dc2 100644 (file)
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 af65a2721bafe2b1fa55570ce543033f ChangeLog 356
-MD5 d63afc85b422a2e85f255c74ea505795 files/digest-timezone-data-2005n 126
-MD5 770e90002ad35edb97b21fee535e40f8 files/timezone-data-2005n-makefile.patch 2965
+MD5 8b4550c24a55a2bafab31160f8b098e9 ChangeLog 578
+MD5 d63afc85b422a2e85f255c74ea505795 files/digest-timezone-data-2005n-r1 126
+MD5 648febdd6feeaeb8c85323151917d163 files/timezone-data-2005n-makefile.patch 3128
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 0d0d0dab2d8dcb755fb8cbee6b338dec timezone-data-2005n.ebuild 814
+MD5 6ede98b54124113aa91f081a53a24c37 timezone-data-2005n-r1.ebuild 817
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDYWpRgIKl8Uu19MoRAli6AJsHRejzg6ssqrQZIEaI+giaGYt6VwCeIqb5
-hWUYoBZIREjOFvHdqo59KEU=
-=+lxA
+iD8DBQFDYrDwgIKl8Uu19MoRAsIlAJ4k4IAxjeMeB1kxMQw0Zurnpi+D6wCfbx+b
+7QSrjOYFNZVXpgpFPcga0Rg=
+=zZxb
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/timezone-data/files/digest-timezone-data-2005n-r1 b/sys-libs/timezone-data/files/digest-timezone-data-2005n-r1
new file mode 100644 (file)
index 0000000..297d84b
--- /dev/null
+++ b/sys-libs/timezone-data/files/digest-timezone-data-2005n-r1
@@ -0,0 +1,2 @@
+MD5 bee0af62d8071698fcae7afd33103b8a tzcode2005n.tar.gz 179923
+MD5 850c65397e88be9a5fb804b42df8837f tzdata2005n.tar.gz 147122

diff --git a/sys-libs/timezone-data/files/timezone-data-2005n-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2005n-makefile.patch
index f640fd59fd37da60f7b1cf3fa61690223d8f97ec..5e325681374dc4f002949bc6210a667693115749 100644 (file)
--- a/sys-libs/timezone-data/files/timezone-data-2005n-makefile.patch
+++ b/sys-libs/timezone-data/files/timezone-data-2005n-makefile.patch
@@ -7,6 +7,7 @@
  - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc
  - Install leaps zoneinfo into zoneinfo/right/ ala glibc
  - Disable broken web test
+ - Make sure tzselect uses #!/bin/bash and not #!/bin/ksh
 
 --- Makefile
 +++ Makefile
@@ -98,3 +99,10 @@
 +check:                check_tables
  
  check_tables: checktab.awk $(PRIMARY_YDATA)
+--- tzselect.ksh
++++ tzselect.ksh
+@@ -1,3 +1,3 @@
+-#! /bin/ksh
++#! /bin/bash
+ 
+ # '@(#)tzselect.ksh   1.8'

diff --git a/sys-libs/timezone-data/timezone-data-2005n-r1.ebuild b/sys-libs/timezone-data/timezone-data-2005n-r1.ebuild
new file mode 100644 (file)
index 0000000..9094141
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2005n-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2005n-r1.ebuild,v 1.1 2005/10/28 23:14:38 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="ftp://elsie.nci.nih.gov/pub/"
+SRC_URI="ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz
+       ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+       unpack ${A}
+       cp Makefile{,.orig}
+       epatch "${FILESDIR}"/${PN}-2005n-makefile.patch
+}
+
+src_install() {
+       make install DESTDIR="${D}" || die
+       rm -rf "${D}"/usr/share/zoneinfo-leaps
+       dodoc README Theory
+       dohtml *.htm *.jpg
+}