summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-08-12 00:19:46 -0400
committerMike Frysinger <vapier@gentoo.org>2015-08-12 00:20:33 -0400
commit939c07e18f83055b3daa49bbcc4013b877860850 (patch)
tree4c5f51ae5170fa00951c37b10427d96398d6b9f5 /sys-libs/timezone-data/files
parentqemu-guest-agent: trim old (diff)
downloadgentoo-939c07e18f83055b3daa49bbcc4013b877860850.tar.gz
gentoo-939c07e18f83055b3daa49bbcc4013b877860850.tar.bz2
gentoo-939c07e18f83055b3daa49bbcc4013b877860850.zip
sys-libs/timezone-data: trim old
Diffstat (limited to 'sys-libs/timezone-data/files')
-rw-r--r--sys-libs/timezone-data/files/timezone-data-2008h-makefile.patch138
-rw-r--r--sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch138
-rw-r--r--sys-libs/timezone-data/files/timezone-data-2012i-makefile.patch95
-rw-r--r--sys-libs/timezone-data/files/timezone-data-2013a-makefile.patch95
-rw-r--r--sys-libs/timezone-data/files/timezone-data-2013d-makefile.patch95
-rw-r--r--sys-libs/timezone-data/files/timezone-data-2013f-makefile.patch119
-rw-r--r--sys-libs/timezone-data/files/timezone-data-2013h-makefile.patch112
-rw-r--r--sys-libs/timezone-data/files/timezone-data-2014f-makefile.patch112
-rw-r--r--sys-libs/timezone-data/files/timezone-data-2014g-makefile.patch113
-rw-r--r--sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch113
10 files changed, 0 insertions, 1130 deletions
diff --git a/sys-libs/timezone-data/files/timezone-data-2008h-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2008h-makefile.patch
deleted file mode 100644
index 70f43c35f2d..00000000000
--- a/sys-libs/timezone-data/files/timezone-data-2008h-makefile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
- - Fix up default paths
- - Support env DESTDIR / LDFLAGS / CFLAGS / CC
- - Use awk instead of nawk
- - 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
- - Disable broken web test
- - Make sure tzselect uses #!/bin/bash and not #!/bin/ksh
- - Flags to the linking are passed as LDFLAGS, not LFLAGS
- - LDFLAGS was missed for the 'date' target
-
---- Makefile
-+++ Makefile
-@@ -35,5 +35,5 @@
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= $(DESTDIR)/usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
-@@ -41,9 +41,9 @@
- # Use an absolute path name for TZDIR unless you're just testing the software.
-
--TZDIR= $(TOPDIR)/etc/zoneinfo
-+TZDIR= $(TOPDIR)/share/zoneinfo
-
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
-
--ETCDIR= $(TOPDIR)/etc
-+SBINDIR= $(TOPDIR)/sbin
-
- # If you "make INSTALL", the "date" command gets installed in. . .
-@@ -53,5 +53,5 @@
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-@@ -211,5 +211,5 @@
- # falls on a Friday, Saturday, or Sunday.
-
--CFLAGS=
-+CFLAGS += -std=gnu99
-
- # If you want zic's -s option used when installing, uncomment the next line
-@@ -220,5 +220,5 @@
-
- # The name of a Posix-compliant `awk' on your system.
--AWK= nawk
-+AWK= awk
-
- # The path where SGML DTDs are kept.
-@@ -241,8 +241,10 @@
-
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
-
- TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
- TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -281,11 +281,13 @@
- ALL: all date
-
--install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install: all $(DATA) $(REDO) $(MANS) $(TABDATA)
- $(ZIC) -y $(YEARISTYPE) \
- -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- cp iso3166.tab zone.tab $(TZDIR)/.
-- -mkdir $(TOPDIR) $(ETCDIR)
-- cp tzselect zic zdump $(ETCDIR)/.
-+ -mkdir $(TOPDIR) $(SBINDIR)
-+ cp zic zdump $(SBINDIR)/.
-+ -mkdir $(TOPDIR) $(BINDIR)
-+ cp tzselect $(BINDIR)/.
- -mkdir $(TOPDIR) $(MANDIR) \
- $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
-@@ -297,6 +299,4 @@
- $(MANDIR)/man8/zic.8
- cp newctime.3 newtzset.3 $(MANDIR)/man3/.
-- cp tzfile.5 $(MANDIR)/man5/.
-- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
-@@ -309,10 +309,10 @@
- cp date.1 $(MANDIR)/man1/.
-
- zdump: $(TZDOBJS)
-- $(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
-
- zic: $(TZCOBJS) yearistype
-- $(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
-
- yearistype: yearistype.sh
- cp yearistype.sh yearistype
-@@ -333,7 +333,7 @@
- # to using them, or vice versa.
- other_two: zic leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
-+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
- $(ZIC) -y $(YEARISTYPE) \
-- -d $(TZDIR)-leaps -L leapseconds $(TDATA)
-+ -d $(TZDIR)/right -L leapseconds $(TDATA)
-
- posix_right: posix_only other_two
-@@ -351,7 +351,7 @@
- then ranlib $@ ; fi
-
- date: $(DATEOBJS)
-- $(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \
-+ $(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o strftime.o \
- $(LDLIBS) -lc -o $@
-
- tzselect: tzselect.ksh
-@@ -366,5 +366,5 @@
- chmod +x $@
-
--check: check_tables check_web
-+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/files/timezone-data-2012a-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch
deleted file mode 100644
index 38e10dd7f0f..00000000000
--- a/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch
+++ /dev/null
@@ -1,138 +0,0 @@
- - Fix up default paths
- - Support env DESTDIR / LDFLAGS / CFLAGS / CC
- - Use awk instead of nawk
- - 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
- - Disable broken web test
- - Make sure tzselect uses #!/bin/bash and not #!/bin/ksh
- - Flags to the linking are passed as LDFLAGS, not LFLAGS
- - LDFLAGS was missed for the 'date' target
-
---- Makefile
-+++ Makefile
-@@ -35,5 +35,5 @@
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= $(DESTDIR)/usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
-@@ -41,9 +41,8 @@
-
--# TZDIR= $(TOPDIR)/etc/zoneinfo
--TZDIR= /home/kre/src/tz/data/TZ
-+TZDIR= $(TOPDIR)/share/zoneinfo
-
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
-
--ETCDIR= $(TOPDIR)/etc
-+SBINDIR= $(TOPDIR)/sbin
-
- # If you "make INSTALL", the "date" command gets installed in. . .
-@@ -53,5 +53,5 @@
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-@@ -211,5 +211,5 @@
- # falls on a Friday, Saturday, or Sunday.
-
--CFLAGS= -DSTD_INSPIRED
-+CFLAGS += -DSTD_INSPIRED -std=gnu99
-
- # If you want zic's -s option used when installing, uncomment the next line
-@@ -220,5 +220,5 @@
-
- # The name of a Posix-compliant `awk' on your system.
--AWK= nawk
-+AWK= awk
-
- # The path where SGML DTDs are kept.
-@@ -241,8 +241,10 @@
-
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
-
- TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
- TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -281,11 +281,13 @@
- ALL: all date
-
--install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install: all $(DATA) $(REDO) $(MANS) $(TABDATA)
- $(ZIC) -y $(YEARISTYPE) \
- -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- cp iso3166.tab zone.tab $(TZDIR)/.
-- -mkdir $(TOPDIR) $(ETCDIR)
-- cp tzselect zic zdump $(ETCDIR)/.
-+ -mkdir $(TOPDIR) $(SBINDIR)
-+ cp zic zdump $(SBINDIR)/.
-+ -mkdir $(TOPDIR) $(BINDIR)
-+ cp tzselect $(BINDIR)/.
- -mkdir $(TOPDIR) $(MANDIR) \
- $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
-@@ -297,6 +299,4 @@
- $(MANDIR)/man8/zic.8
- cp newctime.3 newtzset.3 $(MANDIR)/man3/.
-- cp tzfile.5 $(MANDIR)/man5/.
-- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
-@@ -309,10 +309,10 @@
- cp date.1 $(MANDIR)/man1/.
-
- zdump: $(TZDOBJS)
-- $(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
-
- zic: $(TZCOBJS) yearistype
-- $(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
-
- yearistype: yearistype.sh
- cp yearistype.sh yearistype
-@@ -333,7 +333,7 @@
- # to using them, or vice versa.
- other_two: zic leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
-+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
- $(ZIC) -y $(YEARISTYPE) \
-- -d $(TZDIR)-leaps -L leapseconds $(TDATA)
-+ -d $(TZDIR)/right -L leapseconds $(TDATA)
-
- posix_right: posix_only other_two
-@@ -351,7 +351,7 @@
- then ranlib $@ ; fi
-
- date: $(DATEOBJS)
-- $(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \
-+ $(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o strftime.o \
- $(LDLIBS) -lc -o $@
-
- tzselect: tzselect.ksh
-@@ -366,5 +366,5 @@
- chmod +x $@
-
--check: check_tables check_web
-+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/files/timezone-data-2012i-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2012i-makefile.patch
deleted file mode 100644
index 383492dcce0..00000000000
--- a/sys-libs/timezone-data/files/timezone-data-2012i-makefile.patch
+++ /dev/null
@@ -1,95 +0,0 @@
- - Fix up default paths
- - Support env DESTDIR / LDFLAGS / CFLAGS / CC
- - Use awk instead of nawk
- - 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
- - Disable broken web test
- - Make sure tzselect uses #!/bin/bash and not #!/bin/ksh
- - Flags to the linking are passed as LDFLAGS, not LFLAGS
- - LDFLAGS was missed for the 'date' target
-
---- Makefile
-+++ Makefile
-@@ -35,5 +35,5 @@
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= $(DESTDIR)/usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
-@@ -41,9 +41,9 @@
- # Use an absolute path name for TZDIR unless you're just testing the software.
-
--TZDIR= $(TOPDIR)/etc/zoneinfo
-+TZDIR= $(TOPDIR)/share/zoneinfo
-
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
-
--ETCDIR= $(TOPDIR)/etc
-+SBINDIR= $(TOPDIR)/sbin
-
- # If you "make INSTALL", the "date" command gets installed in. . .
-@@ -53,5 +53,5 @@
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-@@ -241,8 +241,10 @@
-
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
-
- TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
- TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -281,11 +281,13 @@
- ALL: all date
-
--install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install: all $(DATA) $(REDO) $(MANS) $(TABDATA)
- $(ZIC) -y $(YEARISTYPE) \
- -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- cp iso3166.tab zone.tab $(TZDIR)/.
-- -mkdir $(TOPDIR) $(ETCDIR)
-- cp tzselect zic zdump $(ETCDIR)/.
-+ -mkdir $(TOPDIR) $(SBINDIR)
-+ cp zic zdump $(SBINDIR)/.
-+ -mkdir $(TOPDIR) $(BINDIR)
-+ cp tzselect $(BINDIR)/.
- -mkdir $(TOPDIR) $(MANDIR) \
- $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
-@@ -297,6 +299,4 @@
- $(MANDIR)/man8/zic.8
- cp newctime.3 newtzset.3 $(MANDIR)/man3/.
-- cp tzfile.5 $(MANDIR)/man5/.
-- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
-@@ -333,7 +333,7 @@
- # to using them, or vice versa.
- other_two: zic leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
-+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
- $(ZIC) -y $(YEARISTYPE) \
-- -d $(TZDIR)-leaps -L leapseconds $(TDATA)
-+ -d $(TZDIR)/right -L leapseconds $(TDATA)
-
- posix_right: posix_only other_two
-@@ -366,5 +366,5 @@
- chmod +x $@
-
--check: check_tables check_web
-+check: check_tables
-
- check_tables: checktab.awk $(PRIMARY_YDATA)
diff --git a/sys-libs/timezone-data/files/timezone-data-2013a-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2013a-makefile.patch
deleted file mode 100644
index b3bbcf54186..00000000000
--- a/sys-libs/timezone-data/files/timezone-data-2013a-makefile.patch
+++ /dev/null
@@ -1,95 +0,0 @@
- - Fix up default paths
- - Support env DESTDIR / LDFLAGS / CFLAGS / CC
- - Use awk instead of nawk
- - 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
- - Disable broken web test
- - Make sure tzselect uses #!/bin/bash and not #!/bin/ksh
- - Flags to the linking are passed as LDFLAGS, not LFLAGS
- - LDFLAGS was missed for the 'date' target
-
---- Makefile
-+++ Makefile
-@@ -35,5 +35,5 @@
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= $(DESTDIR)/usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
-@@ -41,9 +41,9 @@
- # Use an absolute path name for TZDIR unless you're just testing the software.
-
--TZDIR= $(TOPDIR)/etc/zoneinfo
-+TZDIR= $(TOPDIR)/share/zoneinfo
-
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
-
--ETCDIR= $(TOPDIR)/etc
-+SBINDIR= $(TOPDIR)/sbin
-
- # If you "make INSTALL", the "date" command gets installed in. . .
-@@ -53,5 +53,5 @@
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-@@ -241,8 +241,10 @@
-
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
-
- TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
- TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -281,11 +281,13 @@
- ALL: all date
-
--install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install: all $(DATA) $(REDO) $(MANS) $(TABDATA)
- $(ZIC) -y $(YEARISTYPE) \
- -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- cp iso3166.tab zone.tab $(TZDIR)/.
-- -mkdir $(TOPDIR) $(ETCDIR)
-- cp tzselect zic zdump $(ETCDIR)/.
-+ -mkdir $(TOPDIR) $(SBINDIR)
-+ cp zic zdump $(SBINDIR)/.
-+ -mkdir $(TOPDIR) $(BINDIR)
-+ cp tzselect $(BINDIR)/.
- -mkdir $(TOPDIR) $(MANDIR) \
- $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
-@@ -297,6 +299,4 @@
- $(MANDIR)/man8/zic.8
- cp newctime.3 newtzset.3 $(MANDIR)/man3/.
-- cp tzfile.5 $(MANDIR)/man5/.
-- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
-@@ -333,7 +333,7 @@
- # to using them, or vice versa.
- other_two: zic leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
-+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
- $(ZIC) -y $(YEARISTYPE) \
-- -d $(TZDIR)-leaps -L leapseconds $(TDATA)
-+ -d $(TZDIR)/right -L leapseconds $(TDATA)
-
- posix_right: posix_only other_two
-@@ -366,5 +366,5 @@
- chmod +x $@
-
--check: check_character_set check_tables check_web
-+check: check_character_set check_tables
-
- check_tables: checktab.awk $(PRIMARY_YDATA)
diff --git a/sys-libs/timezone-data/files/timezone-data-2013d-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2013d-makefile.patch
deleted file mode 100644
index eb52f87f600..00000000000
--- a/sys-libs/timezone-data/files/timezone-data-2013d-makefile.patch
+++ /dev/null
@@ -1,95 +0,0 @@
- - Fix up default paths
- - Support env DESTDIR / LDFLAGS / CFLAGS / CC
- - Use awk instead of nawk
- - 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
- - Disable broken web test
- - Make sure tzselect uses #!/bin/bash and not #!/bin/ksh
- - Flags to the linking are passed as LDFLAGS, not LFLAGS
- - LDFLAGS was missed for the 'date' target
-
---- a/Makefile
-+++ b/Makefile
-@@ -46,5 +46,5 @@
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= $(DESTDIR)/usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
-@@ -52,5 +52,5 @@
- # Use an absolute path name for TZDIR unless you're just testing the software.
-
--TZDIR= $(TOPDIR)/etc/zoneinfo
-+TZDIR= $(TOPDIR)/share/zoneinfo
-
- # Types to try, as an alternative to time_t. int64_t should be first.
-@@ -59,5 +59,5 @@
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
-
--ETCDIR= $(TOPDIR)/etc
-+SBINDIR= $(TOPDIR)/sbin
-
- # If you "make INSTALL", the "date" command gets installed in. . .
-@@ -67,5 +67,5 @@
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-@@ -293,6 +293,8 @@
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
-
- TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
-@@ -335,11 +337,13 @@
- ALL: all date
-
--install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install: all $(DATA) $(REDO) $(MANS) $(TABDATA)
- $(ZIC) -y $(YEARISTYPE) \
- -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- cp iso3166.tab zone.tab $(TZDIR)/.
-- -mkdir $(TOPDIR) $(ETCDIR)
-- cp tzselect zic zdump $(ETCDIR)/.
-+ -mkdir $(TOPDIR) $(SBINDIR)
-+ cp zic zdump $(SBINDIR)/.
-+ -mkdir $(TOPDIR) $(BINDIR)
-+ cp tzselect $(BINDIR)/.
- -mkdir $(TOPDIR) $(MANDIR) \
- $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
-@@ -351,6 +355,4 @@
- $(MANDIR)/man8/zic.8
- cp newctime.3 newtzset.3 $(MANDIR)/man3/.
-- cp tzfile.5 $(MANDIR)/man5/.
-- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
-@@ -392,7 +394,7 @@
- # to using them, or vice versa.
- other_two: zic leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
-+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
- $(ZIC) -y $(YEARISTYPE) \
-- -d $(TZDIR)-leaps -L leapseconds $(TDATA)
-+ -d $(TZDIR)/right -L leapseconds $(TDATA)
-
- posix_right: posix_only other_two
-@@ -422,5 +424,5 @@
- chmod +x $@
-
--check: check_character_set check_tables check_web
-+check: check_character_set check_tables
-
- check_character_set: $(ENCHILADA)
diff --git a/sys-libs/timezone-data/files/timezone-data-2013f-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2013f-makefile.patch
deleted file mode 100644
index f496098f304..00000000000
--- a/sys-libs/timezone-data/files/timezone-data-2013f-makefile.patch
+++ /dev/null
@@ -1,119 +0,0 @@
- - 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
-
---- a/Makefile
-+++ b/Makefile
-@@ -45,21 +45,21 @@
-
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= /usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
-
- TZDIR_BASENAME= zoneinfo
--TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME)
-+TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME)
-
- # Types to try, as an alternative to time_t. int64_t should be first.
- TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
-
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
-
--ETCDIR= $(TOPDIR)/etc
-+SBINDIR= $(TOPDIR)/sbin
-
- # If you "make INSTALL", the "date" command gets installed in. . .
-
-@@ -67,7 +67,7 @@
-
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-
-@@ -294,8 +294,10 @@
-
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
-
- TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c
- TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -338,14 +340,16 @@
-
- ALL: all date
-
--install: all $(DATA) $(REDO) $(DESTDIR)$(TZLIB) $(MANS)
-+install: all $(DATA) $(REDO) $(MANS)
- $(ZIC) -y $(YEARISTYPE) \
- -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- -rm -f $(DESTDIR)$(TZDIR)/iso3166.tab \
- $(DESTDIR)$(TZDIR)/zone.tab
- cp iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/.
-- -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(ETCDIR)
-- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
-+ -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(SBINDIR)
-+ cp zic zdump $(DESTDIR)$(SBINDIR)/.
-+ -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR)
-+ cp tzselect $(DESTDIR)$(BINDIR)/.
- -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(MANDIR) \
- $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
- $(DESTDIR)$(MANDIR)/man8
-@@ -356,8 +360,6 @@
- $(DESTDIR)$(MANDIR)/man8/zdump.8 \
- $(DESTDIR)$(MANDIR)/man8/zic.8
- cp newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
-- cp tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
-- cp tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
- -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR)
-@@ -405,17 +407,17 @@
- right_posix: right_only leapseconds
- rm -fr $(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)/right \
- -L leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
- -L /dev/null $(TDATA)
-
- posix_right: posix_only leapseconds
- rm -fr $(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)/right \
- -L leapseconds $(TDATA)
-
- zones: $(REDO)
-@@ -442,7 +442,7 @@
- <$? >$@
- chmod +x $@
-
--check: check_character_set check_tables check_web
-+check: check_character_set check_tables
-
- check_character_set: $(ENCHILADA)
- sharp='#'; ! grep -n $(INVALID_CHAR) $(ENCHILADA)
diff --git a/sys-libs/timezone-data/files/timezone-data-2013h-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2013h-makefile.patch
deleted file mode 100644
index 01335c90137..00000000000
--- a/sys-libs/timezone-data/files/timezone-data-2013h-makefile.patch
+++ /dev/null
@@ -1,112 +0,0 @@
- - 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
-
---- a/Makefile
-+++ b/Makefile
-@@ -45,21 +45,21 @@ POSIXRULES= America/New_York
-
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= /usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
-
- TZDIR_BASENAME= zoneinfo
--TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME)
-+TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME)
-
- # Types to try, as an alternative to time_t. int64_t should be first.
- TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
-
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
-
--ETCDIR= $(TOPDIR)/etc
-+SBINDIR= $(TOPDIR)/sbin
-
- # If you "make INSTALL", the "date" command gets installed in. . .
-
-@@ -67,7 +67,7 @@ BINDIR= $(TOPDIR)/bin
-
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-
-@@ -298,8 +298,10 @@ GZIPFLAGS= -9n
-
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
-
- AR= ar
-
-@@ -352,17 +354,14 @@ ALL: all date
- install: all $(DATA) $(REDO) $(MANS)
- mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
-- $(DESTDIR)$(LIBDIR) \
-+ $(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \
- $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
- $(DESTDIR)$(MANDIR)/man8
- $(ZIC) -y $(YEARISTYPE) \
- -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/.
-- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
-+ cp zic zdump $(DESTDIR)$(SBINDIR)/.
-+ cp tzselect $(DESTDIR)$(BINDIR)/.
-- cp libtz.a $(DESTDIR)$(LIBDIR)/.
-- $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
- cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
-- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
-- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
- mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
-@@ -406,18 +408,18 @@ right_only: zic leapseconds $(TDATA)
- # to using them, or vice versa.
- right_posix: right_only leapseconds
- rm -fr $(DESTDIR)$(TZDIR)-leaps
-- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
-+ ln -s . $(DESTDIR)$(TZDIR)/right || \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
- -L leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
- -L /dev/null $(TDATA)
-
- posix_right: posix_only leapseconds
- rm -fr $(DESTDIR)$(TZDIR)-posix
-- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+ ln -s . $(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)/right \
- -L leapseconds $(TDATA)
-
- zones: $(REDO)
-@@ -440,7 +442,7 @@ tzselect: tzselect.ksh
- <$? >$@
- chmod +x $@
-
--check: check_character_set check_tables check_web
-+check: check_character_set check_tables
-
- check_character_set: $(ENCHILADA)
- sharp='#'; ! grep -n $(INVALID_CHAR) $(ENCHILADA)
diff --git a/sys-libs/timezone-data/files/timezone-data-2014f-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2014f-makefile.patch
deleted file mode 100644
index 7f9efc8f5f3..00000000000
--- a/sys-libs/timezone-data/files/timezone-data-2014f-makefile.patch
+++ /dev/null
@@ -1,112 +0,0 @@
- - 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
-
---- a/Makefile
-+++ b/Makefile
-@@ -45,21 +45,21 @@ POSIXRULES= America/New_York
-
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= /usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
-
- TZDIR_BASENAME= zoneinfo
--TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME)
-+TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME)
-
- # Types to try, as an alternative to time_t. int64_t should be first.
- TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
-
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
-
--ETCDIR= $(TOPDIR)/etc
-+SBINDIR= $(TOPDIR)/sbin
-
- # If you "make INSTALL", the "date" command gets installed in. . .
-
-@@ -67,7 +67,7 @@ BINDIR= $(TOPDIR)/bin
-
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-
-@@ -298,8 +298,10 @@ GZIPFLAGS= -9n
-
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
-
- AR= ar
-
-@@ -352,17 +354,14 @@ ALL: all date
- install: all $(DATA) $(REDO) $(MANS)
- mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
-- $(DESTDIR)$(LIBDIR) \
-+ $(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \
- $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
- $(DESTDIR)$(MANDIR)/man8
- $(ZIC) -y $(YEARISTYPE) \
- -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
-- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
-+ cp zic zdump $(DESTDIR)$(SBINDIR)/.
-+ cp tzselect $(DESTDIR)$(BINDIR)/.
-- cp libtz.a $(DESTDIR)$(LIBDIR)/.
-- $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
- cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
-- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
-- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
- mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
-@@ -406,18 +408,18 @@ right_only: zic leapseconds $(TDATA)
- # to using them, or vice versa.
- right_posix: right_only leapseconds
- rm -fr $(DESTDIR)$(TZDIR)-leaps
-- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
-+ ln -s . $(DESTDIR)$(TZDIR)/right || \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
- -L leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
- -L /dev/null $(TDATA)
-
- posix_right: posix_only leapseconds
- rm -fr $(DESTDIR)$(TZDIR)-posix
-- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+ ln -s . $(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)/right \
- -L leapseconds $(TDATA)
-
- zones: $(REDO)
-@@ -440,7 +442,7 @@ tzselect: tzselect.ksh
- <$? >$@
- chmod +x $@
-
--check: check_character_set check_tables check_web
-+check: check_character_set check_tables
-
- check_character_set: $(ENCHILADA)
- sharp='#'; ! grep -n $(INVALID_CHAR) $(ENCHILADA)
diff --git a/sys-libs/timezone-data/files/timezone-data-2014g-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2014g-makefile.patch
deleted file mode 100644
index 82663751233..00000000000
--- a/sys-libs/timezone-data/files/timezone-data-2014g-makefile.patch
+++ /dev/null
@@ -1,113 +0,0 @@
- - 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
- - Do not run network based unittests
-
---- a/Makefile
-+++ b/Makefile
-@@ -45,21 +45,21 @@ POSIXRULES= America/New_York
-
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= /usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
-
- TZDIR_BASENAME= zoneinfo
--TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME)
-+TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME)
-
- # Types to try, as an alternative to time_t. int64_t should be first.
- TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
-
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
-
--ETCDIR= $(TOPDIR)/etc
-+SBINDIR= $(TOPDIR)/sbin
-
- # If you "make INSTALL", the "date" command gets installed in. . .
-
-@@ -67,7 +67,7 @@ BINDIR= $(TOPDIR)/bin
-
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-
-@@ -298,8 +298,10 @@ GZIPFLAGS= -9n
-
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
-
- AR= ar
-
-@@ -352,17 +354,14 @@ ALL: all date
- install: all $(DATA) $(REDO) $(MANS)
- mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
-- $(DESTDIR)$(LIBDIR) \
-+ $(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \
- $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
- $(DESTDIR)$(MANDIR)/man8
- $(ZIC) -y $(YEARISTYPE) \
- -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
-- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
-+ cp zic zdump $(DESTDIR)$(SBINDIR)/.
-+ cp tzselect $(DESTDIR)$(BINDIR)/.
-- cp libtz.a $(DESTDIR)$(LIBDIR)/.
-- $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
- cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
-- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
-- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
- mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
-@@ -406,18 +408,18 @@ right_only: zic leapseconds $(TDATA)
- # to using them, or vice versa.
- right_posix: right_only leapseconds
- rm -fr $(DESTDIR)$(TZDIR)-leaps
-- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
-+ ln -s . $(DESTDIR)$(TZDIR)/right || \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
- -L leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
- -L /dev/null $(TDATA)
-
- posix_right: posix_only leapseconds
- rm -fr $(DESTDIR)$(TZDIR)-posix
-- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+ ln -s . $(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)/right \
- -L leapseconds $(TDATA)
-
- posix_packrat: posix_only backzone
-@@ -440,7 +442,7 @@ tzselect: tzselect.ksh
- <$? >$@
- chmod +x $@
-
--check: check_character_set check_white_space check_tables check_web
-+check: check_character_set check_white_space check_tables
-
- check_character_set: $(ENCHILADA)
- LC_ALL=en_US.utf8 && export LC_ALL && \
diff --git a/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch
deleted file mode 100644
index 38af3bebc97..00000000000
--- a/sys-libs/timezone-data/files/timezone-data-2014h-makefile.patch
+++ /dev/null
@@ -1,113 +0,0 @@
- - 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
- - Do not run network based unittests
-
---- a/Makefile
-+++ b/Makefile
-@@ -45,21 +45,21 @@ POSIXRULES= America/New_York
-
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= /usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
-
- TZDIR_BASENAME= zoneinfo
--TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME)
-+TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME)
-
- # Types to try, as an alternative to time_t. int64_t should be first.
- TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
-
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
-
--ETCDIR= $(TOPDIR)/etc
-+SBINDIR= $(TOPDIR)/sbin
-
- # If you "make INSTALL", the "date" command gets installed in. . .
-
-@@ -67,7 +67,7 @@ BINDIR= $(TOPDIR)/bin
-
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-
-@@ -298,8 +298,10 @@ GZIPFLAGS= -9n
-
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CPPFLAGS+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CPPFLAGS+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
-
- AR= ar
-
-@@ -352,17 +354,14 @@ ALL: all date
- install: all $(DATA) $(REDO) $(MANS)
- mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
-- $(DESTDIR)$(LIBDIR) \
-+ $(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \
- $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
- $(DESTDIR)$(MANDIR)/man8
- $(ZIC) -y $(YEARISTYPE) \
- -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
-- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
-+ cp zic zdump $(DESTDIR)$(SBINDIR)/.
-+ cp tzselect $(DESTDIR)$(BINDIR)/.
-- cp libtz.a $(DESTDIR)$(LIBDIR)/.
-- $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
- cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
-- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
-- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
- mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
-@@ -406,18 +408,18 @@ right_only: zic leapseconds $(TDATA)
- # to using them, or vice versa.
- right_posix: right_only leapseconds
- rm -fr $(DESTDIR)$(TZDIR)-leaps
-- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \
-+ ln -s . $(DESTDIR)$(TZDIR)/right || \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \
- -L leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \
- -L /dev/null $(TDATA)
-
- posix_right: posix_only leapseconds
- rm -fr $(DESTDIR)$(TZDIR)-posix
-- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
-- $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \
-+ ln -s . $(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)/right \
- -L leapseconds $(TDATA)
-
- posix_packrat: posix_only backzone
-@@ -440,7 +442,7 @@ tzselect: tzselect.ksh
- chmod +x $@
-
- check: check_character_set check_white_space check_sorted \
-- check_tables check_web
-+ check_tables
-
- check_character_set: $(ENCHILADA)
- LC_ALL=en_US.utf8 && export LC_ALL && \