gentoo resync : 04.08.2018

3 files changed, 100 insertions, 0 deletions

diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 7e6d06778afe..6bd8516fb40a 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -1,4 +1,7 @@
 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 972 BLAKE2B de096b081d3d0f8050ae187b7206caed8385c4f024b6254cf7953cef65de367effac0b933d0514446058bd59cbae873cdba4e2c0d46974f3d469dc8719a24a74 SHA512 5490d0eeed9d1c2ac6a1f2aff174f8b5411876983bbcf1e8194f8d882617563d3a2ffac14e5e0b4d4a72727ea0b85b08c5461a90366626f264667fb049e67b86
+EBUILD datefudge-1.22.ebuild 1011 BLAKE2B 4054e31fb2d326c829659adce961be253c41c39c835e12dc6f5073e0fa8664f1738479dddbae7dc4ea3674068f170a20459c086ceb6e55b38ec5b308ba274cfc SHA512 bb12d1583f021703bf2f7567808c72c92124788751bd12fff40613dca2bec9964a717dc4188cc78d86254bfcd383fe3e9b194e89d11ef3c6da8ef124588dfb67
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-misc/datefudge/datefudge-1.22.ebuild b/app-misc/datefudge/datefudge-1.22.ebuild
new file mode 100644
index 000000000000..82e8be0176c4
--- /dev/null
+++ b/app-misc/datefudge/datefudge-1.22.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/files/datefudge-1.22-bsd.patch b/app-misc/datefudge/files/datefudge-1.22-bsd.patch
new file mode 100644
index 000000000000..87ce6ddb9586
--- /dev/null
+++ b/app-misc/datefudge/files/datefudge-1.22-bsd.patch
@@ -0,0 +1,60 @@
+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
+