gentoo resync : 12.03.2021

4 files changed, 2 insertions, 102 deletions

diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 9621ca15018b..669c595eb740 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -1,6 +1,3 @@
-AUX datefudge-1.22-bsd.patch 2839 BLAKE2B 995dcdf0b03346ffc8dfa2b119ab9f2c2e4a9db1d56738cb152aead17d1ad079977e3ca0853ecfcb23cf9ee7cff10114e96d5d7201923861beaebe9d11d77168 SHA512 4ee404f54ecb4f7128fa77423f4773fc0e85120ef4f5335ad742b7b5eb7339cb6150241c943ce56967e451a97dda0461b62ff0612a542f4b88278a77ddcb6f43
-DIST datefudge_1.22.tar.xz 12964 BLAKE2B 2f76647a3f7c73e43ff6b4fd57d57d21cae75fd8bc304a5cab7c66d9798795e2386f6219a51d71f57e13463e88a3e518160d90ae01bae5253cbcb7c8a3acf763 SHA512 ed67d334ca8296ae1c7b5ee1efc6ec7aafaad0aeb9f0f0387245c2eeea94ccc59ab804778b93ab8b34a512b83a3ec81d10f341d4f4f22b4a07fccdadaefb6d8b
 DIST datefudge_1.24.tar.xz 14152 BLAKE2B c0a386193e6761abade4643e2f56520738baf4bb739d4c94cec3e47a8feb5ebdf32a6e8b4a0c3dbb9584136b9855abcc68f5134e082083dfb61e977ae45c0bc7 SHA512 cd548a7e8ff10189e101fa339b2845cdd19a59354e43b02cf47e466855ec192dc2084951f7663a94da56a580dd24524047651d8bcb41aa478fe94b24dffaedeb
-EBUILD datefudge-1.22.ebuild 963 BLAKE2B 3403f48efb1cbfc56ddd831a4d1b06f367a204556f61da5bb41a46f06dc9ea37b73fd8b5e26feaefa615b15856a2ea19a355fb2606e0b3236221eaf3799aff4f SHA512 11df349d8feb7d9f59ee2aafcd571212453011aa543437b24335c15d41dceaa431e6d4742713f16ede51961c11465ab21e7221af15c72f4b38069ddbfda34324
-EBUILD datefudge-1.24.ebuild 800 BLAKE2B bc9d5e12acbe9bc702b6c541818f0ca314b037e77e0cd4f86b41ef0a1af14fe8a6f74c9a76d4674ac76e90b3153c6a463b5695a69eb883fe396f280c5b27bce0 SHA512 668afe5747d7e3cbf40781544d1efa4cc0bb645ad8d96a68c7c2d37f75235f6323c073c439bcfb871a5c895e22b6179a2cb989a99a8ca3808deec026c34ea7d9
+EBUILD datefudge-1.24.ebuild 793 BLAKE2B 52e73296bc57723a9a05e0bb8f2f6ae66b7874885bf37fa05cd523413b58e9915c8b511d7ebc764098ae0b1ac220ade7fd1f39622f3ce34fc7abcea11fc2f71a SHA512 97e02b7a7364c8ebf5240f9d9671d86581f60a049827dbf68a7024ec64d9dea568674b6c58eb8c3a9ac5fd381169bf8c467b07d626da9005e48e06822230bce0
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/datefudge/datefudge-1.22.ebuild b/app-misc/datefudge/datefudge-1.22.ebuild
deleted file mode 100644
index f0df9cfaaeab..000000000000
--- a/app-misc/datefudge/datefudge-1.22.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=()
-
-pkg_setup() {
-	use userland_BSD && PATCHES+=( "${FILESDIR}"/${P}-bsd.patch )
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/dpkg-parsechangelog/d' \
-		Makefile || die
-	use prefix && sed -i -e '/-o root -g root/d' Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" libdir="/usr/$(get_libdir)" VERSION="${PV}"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" CC="$(tc-getCC)" libdir="/usr/$(get_libdir)" install
-	einstalldocs
-}
diff --git a/app-misc/datefudge/datefudge-1.24.ebuild b/app-misc/datefudge/datefudge-1.24.ebuild
index 3f5a06b1b0ee..34bdcbffa6cc 100644
--- a/app-misc/datefudge/datefudge-1.24.ebuild
+++ b/app-misc/datefudge/datefudge-1.24.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="A program (and preload library) to fake system date"
@@ -11,7 +12,6 @@ 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
 src_prepare() {
 	default
diff --git a/app-misc/datefudge/files/datefudge-1.22-bsd.patch b/app-misc/datefudge/files/datefudge-1.22-bsd.patch
deleted file mode 100644
index 87ce6ddb9586..000000000000
--- a/app-misc/datefudge/files/datefudge-1.22-bsd.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 3731c2da347dfffef34209fd779e67738b34ec88 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 24 Jul 2018 22:58:34 +0300
-Subject: [PATCH] bsd support
-
----
- Makefile | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 8855b49..5526cbf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,11 +20,11 @@ all compile: datefudge datefudge.so datefudge.1
- 
- install: datefudge datefudge.so datefudge.1
- 	install -d $(DESTDIR)$(libdir)/$(libarch)/datefudge
--	$(INSTALL_PROGRAM) -o root -g root -m 644 datefudge.so $(DESTDIR)$(libdir)/$(libarch)/datefudge/datefudge.so
-+	$(INSTALL_PROGRAM) -o root -g wheel -m 644 datefudge.so $(DESTDIR)$(libdir)/$(libarch)/datefudge/datefudge.so
- 	install -d $(DESTDIR)$(bindir)
--	$(INSTALL_PROGRAM) -o root -g root -m 755 datefudge $(DESTDIR)$(bindir)
-+	$(INSTALL_PROGRAM) -o root -g wheel -m 755 datefudge $(DESTDIR)$(bindir)
- 	install -d $(DESTDIR)$(mandir)/man1
--	install -o root -g root -m 644 datefudge.1 $(DESTDIR)$(mandir)/man1
-+	install -o root -g wheel -m 644 datefudge.1 $(DESTDIR)$(mandir)/man1
- 
- datefudge: datefudge.sh
- datefudge.1: datefudge.man
-@@ -34,7 +34,7 @@ datefudge datefudge.1:
- 	< $< > $@
- 
- datefudge.so: datefudge.o
--	$(CC) $(LDFLAGS) -o $@ -shared $< -ldl -lc
-+	$(CC) $(LDFLAGS) -o $@ -shared $< -lc
- 
- datefudge.o: datefudge.c
- 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-@@ -48,8 +48,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"                    ;\
-@@ -58,7 +58,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; }          ;\
--- 
-2.16.4
-