From 76dfef0cec9170000357d2f354e412daf48941fc Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 30 Dec 2017 01:11:30 +0000
Subject: gentoo resync : 30.12.2017

---
 app-backup/cpdup/Manifest                      |  4 +--
 app-backup/cpdup/cpdup-1.18.ebuild             | 34 ++++++++++++++------------
 app-backup/cpdup/files/cpdup-1.11-unused.patch |  4 +--
 3 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'app-backup/cpdup')

diff --git a/app-backup/cpdup/Manifest b/app-backup/cpdup/Manifest
index cb74df0fa96a..c9ca4f8aba9f 100644
--- a/app-backup/cpdup/Manifest
+++ b/app-backup/cpdup/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile.linux 304 BLAKE2B afeb5a8233955b43ff84e8c79fbf0ab09cc85849b4c771a72dcae7834bc68da0ade3be52743fcad2dfa0a38a775037d9fd82cab8fe5da3a7e1726a045b67a538 SHA512 595d56d4b25168e2426176c36cece12edc5388c58251d3c235611c40349a16f098ab7a17e0ad55435a499ded1cdad9b328f6ad3193bf09eadf5bd6778710b0d8
-AUX cpdup-1.11-unused.patch 325 BLAKE2B 81dff5bb87b9e6b174efbc7f311270f54b892adce5d2c600151209461554a397e2ff5bbfdbfa89c50f3c34bb9f891c6d571289fffbc2154234abfe0b2ee0ed00 SHA512 55f410d3d849a08e90bb7a9b2a695adf1f351a413e0a0a977a98aa8dbd7f3b5afea9ff886310e632bb2f5e264e44ddafdf97a934121717cea08a85e41c1d53d1
+AUX cpdup-1.11-unused.patch 252 BLAKE2B b2b3b7f008921342ff35bed0256a9f9681e4a2eb9840398b21bd8347172b2a78e626569211c42a97b0f0b5340d037f0aa80f33cedc449fe63232f8adb836c2e2 SHA512 1041685c7762a113e38ac8420bfa961bad3987318432140092702847571ebad082a7bea0e485b3a08349eb1d2844d171caf4e17e69d273e4ada2aaf847c37ce7
 DIST cpdup-1.18.tgz 42841 BLAKE2B ebf18fd13b465be8483b9aad7af5353343e89e6960da967ddf59e7186bd199604a0d2b2d637efbb4d4d4f57611a3c600c5586861ef9780342d0ebed5de1ca3c8 SHA512 5c57be20951005d731866629a601b6dae91e112067f103d6cfc3f668fbd88b3b7b65990d9fad55f18c0e8238c2642a7b85aea543a0787f21084bda35e0da0e26
-EBUILD cpdup-1.18.ebuild 958 BLAKE2B 9a18cfbeb60cc79162b61b71ccb7d5086836eb111f5a99b765be3ada1e26f590ba170c46f21d9672cddd750970024e716653ff9355271bf4b02663693f438d28 SHA512 194fb0c3f844e315bf5d83254814da33a0774c9d4c0898c3d47249bb0135a4cbc7612e709288ffe49f35af25f88f16b119326cc8ed8eb07bc7ec2fde9b7977a2
+EBUILD cpdup-1.18.ebuild 938 BLAKE2B b840ebca830c4b3c18c15b17123f006eefd70efec4cd675da18ba559044a34845cc6cbdbad6561166f5b94fc887bd5615ad7c8120b4427c298c7eae8fd9279bb SHA512 1413eb8f9f8fa92bfe2e3a1551bfc76dcbdec12cefa60b8450aed2a372a23933bc38003efc85df69a40e50fd0f51d33f54aa770c5f430a7f853dfa014bf440af
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/app-backup/cpdup/cpdup-1.18.ebuild b/app-backup/cpdup/cpdup-1.18.ebuild
index b3cd0a45df5e..cf88a6bfd530 100644
--- a/app-backup/cpdup/cpdup-1.18.ebuild
+++ b/app-backup/cpdup/cpdup-1.18.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
 DESCRIPTION="A comprehensive filesystem mirroring program"
 HOMEPAGE="http://apollo.backplane.com/FreeSrc/"
@@ -16,30 +18,30 @@ DEPEND=""
 RDEPEND=""
 
 S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${PN}-1.11-unused.patch )
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.11-unused.patch
+src_prepare() {
+	default
 
 	if use userland_GNU; then
-		cp "${FILESDIR}"/Makefile.linux Makefile
+		cp "${FILESDIR}"/Makefile.linux Makefile || die
 		# bits/stat.h has __unused too
-		sed -i 's/__unused/__cpdup_unused/' *.c
-		echo "#define strlcpy(a,b,c) strncpy(a,b,c)" >> cpdup.h
+		sed -i 's/__unused/__cpdup_unused/' *.c || die
+		echo "#define strlcpy(a,b,c) strncpy(a,b,c)" >> cpdup.h || die
 	fi
 }
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	use threads || MAKEOPTS="$MAKEOPTS NOPTHREADS=1"
-	MAKE=make emake || die "emake failed"
+	use threads || EXTRA_MAKE_OPTS="NOPTHREADS=1"
+}
+
+src_compile() {
+	MAKE=make emake ${EXTRA_MAKE_OPTS}
 }
 
 src_install() {
-	dobin cpdup || die "cannot install cpdup"
+	dobin cpdup
 	doman cpdup.1
-	docinto scripts
-	dodoc scripts/*
+	dodoc -r scripts
 }
diff --git a/app-backup/cpdup/files/cpdup-1.11-unused.patch b/app-backup/cpdup/files/cpdup-1.11-unused.patch
index 1757cb441adc..5544afbeddf9 100644
--- a/app-backup/cpdup/files/cpdup-1.11-unused.patch
+++ b/app-backup/cpdup/files/cpdup-1.11-unused.patch
@@ -1,5 +1,5 @@
---- cpdup.c.orig	2009-02-05 12:22:10.000000000 +0100
-+++ cpdup.c	2009-02-05 12:23:23.000000000 +0100
+--- a/cpdup.c
++++ b/cpdup.c
 @@ -1543,7 +1543,11 @@
   */
  
-- 
cgit v1.2.3