From eae48e9d4dc532ca28f71045d241cc54278fc5c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 9 Jun 2021 18:31:25 +0700
Subject: [PATCH 1/3] tzutils: fix version, setbootstrap

---
 srcpkgs/tzutils/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 3bd79fb85cbb..252a714929c6 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,16 +1,18 @@
 # Template file for 'tzutils'
 pkgname=tzutils
 version=2021a
-revision=1
+revision=2
+bootstrap=yes
 wrksrc="tz-${version}"
 short_desc="Time zone and daylight-saving time utilities"
-maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="Public Domain, BSD-3-Clause"
 homepage="https://www.iana.org/time-zones"
 distfiles="https://github.com/eggert/tz/archive/${version}.tar.gz"
 checksum=bd7ecd99cbb0a2f15bb7e38be2cbc04dced89922fce4ac0ffcd1ca844ba9362f
 
 do_build() {
+	echo "$version" >version
 	make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 }
 
@@ -21,8 +23,5 @@ do_install() {
 	vman zic.8
 	vman zdump.8
 	vman tzselect.8
-}
-
-post_install() {
 	vlicense LICENSE
 }

From 15f569da771de2fc459b8fc14416e874a626d92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 9 Jun 2021 18:31:27 +0700
Subject: [PATCH 2/3] tzdata: set bootstrap=yes

---
 srcpkgs/tzdata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 25f79d0a1926..618ad6c9e10a 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -2,7 +2,7 @@
 pkgname=tzdata
 version=2021a
 revision=1
-wrksrc=tzdata
+bootstrap=yes
 create_wrksrc=yes
 hostmakedepends="tzutils"
 short_desc="Time zone and daylight-saving time data"

From 78b24fc62068f67aafce9976555afe3630998b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 9 Jun 2021 18:31:28 +0700
Subject: [PATCH 3/3] base-chroot: add tzdata

Some packages require tzdata to testing, however, adding `tzdata` to
those checkdepends will break masterdir, since `tzdata` provides
`/usr/share/zoneinfo/UTC`, hence, it will be removed upon cleanup.

Let's add `tzdata` into `base-chroot` and remove the shenanigan in
`chroot.sh`.
---
 common/xbps-src/shutils/chroot.sh | 10 +---------
 srcpkgs/base-chroot/template      |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index c7ada3151618..53e3d4a4c70f 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -109,15 +109,7 @@ chroot_prepare() {
     # Some software expects /etc/localtime to be a symbolic link it can read to
     # determine the name of the time zone, so set up the expected link
     # structure.
-    if [ -f /usr/share/zoneinfo/UTC ]; then
-        tzfile=/usr/share/zoneinfo/UTC
-        mkdir -p $XBPS_MASTERDIR/usr/share/zoneinfo
-        cp /usr/share/zoneinfo/UTC $XBPS_MASTERDIR/usr/share/zoneinfo/UTC
-        ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
-    else
-        # Should never happen.
-        msg_warn "No local timezone configuration file created.\n"
-    fi
+    ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
 
     for f in dev sys tmp proc host boot; do
         [ ! -d $XBPS_MASTERDIR/$f ] && mkdir -p $XBPS_MASTERDIR/$f
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 5003e3c37247..599183f8c54b 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -19,7 +19,7 @@ depends+="
  patch sed findutils diffutils make gzip coreutils
  file bsdtar xbps mpfr ncurses libreadline8
  chroot-bash chroot-grep chroot-gawk chroot-distcc
- chroot-util-linux chroot-git"
+ chroot-util-linux chroot-git tzdata"
 
 if [ "$CHROOT_READY" ]; then
 	depends+=" ccache"