gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 99 deletions

diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index f843c4ee0f69..dc2fcbf0250e 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -1,7 +1,4 @@
-AUX datefudge-1.17-bsd.patch 2751 BLAKE2B d6d5bd6048126bb4f95dfba76eb538b555829c16272e846f3c470ee882ab9313b5d5974d29b6e73835278c61c032ba3d6acaf2026e9d3e91c5cac825bc4006c6 SHA512 390ff54428a4ffbdf5cc383aa6229f3ed7be7070d62567a0a04bf169efb6e7fe21c756d34d7865f51523a26204e6014edf936800523723d5f8370997f06dd858
 AUX datefudge-1.22-bsd.patch 2839 BLAKE2B 995dcdf0b03346ffc8dfa2b119ab9f2c2e4a9db1d56738cb152aead17d1ad079977e3ca0853ecfcb23cf9ee7cff10114e96d5d7201923861beaebe9d11d77168 SHA512 4ee404f54ecb4f7128fa77423f4773fc0e85120ef4f5335ad742b7b5eb7339cb6150241c943ce56967e451a97dda0461b62ff0612a542f4b88278a77ddcb6f43
-DIST datefudge_1.17.tar.gz 12606 BLAKE2B 5aef2bab1b434f66bb761dc6858984c4b555aff55f5cf076a6a66af2f17ff7677501ef9a6d9a8aedc7cd531093e7efe59b9146abe250fe2a1fc44e05bbedf313 SHA512 6d335f2c1f42792756d3a81264be0bdf4cde5efab86bec5b62de9ccb2488deaff67e4a4f6c7984fa7a5336156df2d76e366bf486436052d2c5ee5ff88067335e
 DIST datefudge_1.22.tar.xz 12964 BLAKE2B 2f76647a3f7c73e43ff6b4fd57d57d21cae75fd8bc304a5cab7c66d9798795e2386f6219a51d71f57e13463e88a3e518160d90ae01bae5253cbcb7c8a3acf763 SHA512 ed67d334ca8296ae1c7b5ee1efc6ec7aafaad0aeb9f0f0387245c2eeea94ccc59ab804778b93ab8b34a512b83a3ec81d10f341d4f4f22b4a07fccdadaefb6d8b
-EBUILD datefudge-1.17.ebuild 948 BLAKE2B 87f803238f977fbae01f66c8f34ad55ff36295b903ec4c784257340d8f2bbe2e932e46704dd96e9df620cf9b5b1ddf8444213ca5f3d1ee261e2100a042fbc3f2 SHA512 9340de4fbdfae896e68f8ae716a936f99c8914e2539aff89040cebe7ac24f1bb0ec9231f9fcaaf14a3b14c13bef6dd8b578827a883a3d6d59a5d60211455ed7f
-EBUILD datefudge-1.22.ebuild 976 BLAKE2B 2378144ecf8ca51493f777bebd0f15a798cb37aad7e9bc329465f7d1ae138672b1c71c477e36747fb1a1bbc44877ca2fd4b1d82f1f414108093286cddc2d0844 SHA512 c2b0bdfabf8e2d30f939be8b98bd1e2af7106ef7086196f0b8d66fa58e65284142c95cd405f17a56857e20027368bf53a9fe07077749511a996e9b4f0f4697b1
+EBUILD datefudge-1.22.ebuild 972 BLAKE2B 90a74afdd3aed0e24664363a97e3705562e87ba7b36a3cb89a289a2c283d974dc9fa1d05fdfa96cace72d0465477b5714abf4037b70d4d74a9c8fe19bb421142 SHA512 2f0751972056f2a749b4371762e0e5a987a700e874b159dc72790d34af017b5a8159ae4c9393104238257d3bc34e3c0ff75594611f2b00bd7068e61abb763b37
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/datefudge/datefudge-1.17.ebuild b/app-misc/datefudge/datefudge-1.17.ebuild
deleted file mode 100644
index cf9c3d191796..000000000000
--- a/app-misc/datefudge/datefudge-1.17.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="A program (and preload library) to fake system date"
-HOMEPAGE="https://packages.qa.debian.org/d/datefudge.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
-	use userland_BSD && epatch "${FILESDIR}"/${P}-bsd.patch
-	sed -i \
-		-e '/dpkg-parsechangelog/d' \
-		-e "s:usr/lib:usr/$(get_libdir):" \
-		Makefile || die
-
-	if use prefix; then
-		sed -i -e '/-o root -g root/d' Makefile || die
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" VERSION="${PV}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" VERSION="${PV}" install
-	dodoc debian/changelog README
-}
diff --git a/app-misc/datefudge/datefudge-1.22.ebuild b/app-misc/datefudge/datefudge-1.22.ebuild
index f7408d7a331d..fc70d16658cd 100644
--- a/app-misc/datefudge/datefudge-1.22.ebuild
+++ b/app-misc/datefudge/datefudge-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 PATCHES=()
diff --git a/app-misc/datefudge/files/datefudge-1.17-bsd.patch b/app-misc/datefudge/files/datefudge-1.17-bsd.patch
deleted file mode 100644
index 2f2a7dac9be3..000000000000
--- a/app-misc/datefudge/files/datefudge-1.17-bsd.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b2f81bb..35da75e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,17 +12,17 @@ compile all: datefudge datefudge.so
- 
- install: datefudge datefudge.so datefudge.1
- 	install -d $(DESTDIR)/usr/lib/datefudge/
--	$(INSTALL_PROGRAM) -o root -g root -m 644 datefudge.so $(DESTDIR)/usr/lib/datefudge/datefudge.so
-+	$(INSTALL_PROGRAM) -o root -g wheel -m 644 datefudge.so $(DESTDIR)/usr/lib/datefudge/datefudge.so
- 	install -d $(DESTDIR)/usr/bin/
--	$(INSTALL_PROGRAM) -o root -g root -m 755 datefudge $(DESTDIR)/usr/bin
-+	$(INSTALL_PROGRAM) -o root -g wheel -m 755 datefudge $(DESTDIR)/usr/bin
- 	install -d $(DESTDIR)/usr/share/man/man1
--	install -o root -g root -m 644 datefudge.1 $(DESTDIR)/usr/share/man/man1
-+	install -o root -g wheel -m 644 datefudge.1 $(DESTDIR)/usr/share/man/man1
- 
- datefudge: datefudge.sh
- 	sed -e 's,@VERSION@,$(VERSION),g' < $< > $@
- 
- datefudge.so: datefudge.o
--	$(CC) $(LDFLAGS) -o $@ -shared $< -ldl -lc
-+	$(CC) $(LDFLAGS) -o $@ -shared $< -lc
- 
- datefudge.o: datefudge.c
- 	$(CC) $(CFLAGS) -c -o $@ $<
-@@ -39,8 +39,8 @@ test: compile
- 	export TZ=UTC								 ;\
- 	ret1=1; ret2=1                                                           ;\
- 	for i in 1 2; do                                                         \
--	        export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00'  +%s`   ;\
--	        dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date --date=12:15 +%F.%T` ;\
-+	        export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s`   ;\
-+	        dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date -v12H -v15M +%F.%T` ;\
- 	        exp="1970-01-02.12:15:00"                                       ;\
- 	        [ "$$dt" != "$$exp" ] || { echo "OK"; ret1=0; break; }          ;\
- 	        echo "failed: expected: $$exp, actual: $$dt"                    ;\
-@@ -49,7 +49,7 @@ test: compile
- 	echo -n "Running a simple perl localtime() test... "                    ;\
- 	pscr='@t=localtime(time);$$t[5]+=1900;$$t[4]++;printf "%04d-%02d-%02d\n",$$t[5],$$t[4],$$t[3];';\
- 	for i in 1 2; do                                                         \
--	        export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00'  +%s`   ;\
-+	        export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s`   ;\
- 	        dt=`LD_PRELOAD=$(CURDIR)/datefudge.so perl -e "$$pscr"`         ;\
- 	        exp="1970-01-02"                                                ;\
- 	        [ "$$dt" != "$$exp" ] || { echo "OK"; ret2=0; break; }          ;\
-diff --git a/datefudge.c b/datefudge.c
-index 8c86652..fc7e3d6 100644
---- a/datefudge.c
-+++ b/datefudge.c
-@@ -14,7 +14,6 @@
- #include <stdlib.h>
- #include <dlfcn.h>
- #include <assert.h>
--#include <features.h>
- #include <unistd.h>
- #include <time.h>
- #include <sys/time.h>