gentoo resync : 13.05.2018

3 files changed, 77 insertions, 16 deletions

diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index d181243720d5..c24851403f9e 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,12 +1,13 @@
 AUX wcd-5.2.5-gentoo.patch 1468 BLAKE2B 4c1e0998173ca2104fef5f44e206f37c2f7685a518af162f61a6e1aa30ca5f8687bb3a5f1c8cf91279f2865016bedbe676ddf4d21f0c9a7700abaab0551e9a14 SHA512 427befe8be99ca4dc633f4c0e3cb130924027e452d87f3d9463d4edd7418f0864d6b5bd1cd3526734a55e28745db3e93a101c45255bc285c9abd324a6bd27108
 AUX wcd-5.3.4-gentoo.patch 1293 BLAKE2B e60a4da12941d78e4f94ae2e12ddbe2828dea13ebb1ad97fc54b2ec44799446d3fe464e2380086016843f13c8431c0b9d3fbbce1914bba7fb107ba1ebf93ced7 SHA512 2a5508ce61475dff6606a81df9de609d8ff270914ae1b40ffd831dee49d643afbb9654fb807ae6536531c95bfdb5f76a194bed250986b4881504b63e2fb21ddf
 AUX wcd-6.0.1-gentoo.patch 1503 BLAKE2B 0c17f6085ad12b7eccd768ac394ac7965f7fb299aaa7fc3ce2a15341dffc420321534083e253dab3ff673bbee983a063d4698121ab41e7de271de02f99dc8ebc SHA512 0d99727b6b5ae3c665d122ed84fcd3f2a57de3740564acab765cc075c7e05ff9c00e27bc0644eb6e49a7e02b56fd988921b68a5d05894f4ae77d544d6502d952
+AUX wcd-6.0.2-gentoo.patch 1476 BLAKE2B 3c94e459733592c0d90c4fca6cdad936333cdfa7f1347df5780baa667e17ece877318225f818b3cd2a488322e2b78dfec58c08969232378e359e8ca14fab1c16 SHA512 ee464b51e508e863d9cefe22179a39aeed8bafd7dfc6bb435ba1d9e01ca5e254e1121d47f50d9119684fb28d904ea5746b8f433bf52ec82bc221c7778f089f48
 DIST wcd-5.2.7.tar.gz 622613 BLAKE2B 85c473ad607022953338872a46251b2010504608d0385a17c6188e76975058af7370fbc393b0a9a1911b6c200f7397fcf45c4426aaa48f5a3f31a696657c444e SHA512 9f5b89d8160f685b729234cc8c03f16b795797dd6eaf2d9e1bbf1949b27ef971908b78642679d3bf1d99b128b390cd5dbd211e4ff03b0539dd287c578088e02e
 DIST wcd-5.3.4.tar.gz 610630 BLAKE2B f460de38b0ded0da592df31c12d8f28f890555750f972e395b5178665bdd2bf0514b258f5c2c1338e6a7699224c04153e67d088642626b5611abb9b685d305fd SHA512 fdb6e000876fffbc7bce6e6157282c2b8ef9929c896e5dbd8533314d575cf31656df76cd5c408bb2e495a1fda7f179b122ea2a58da94d5d55d1e2b9c658adc94
-DIST wcd-6.0.0.tar.gz 615838 BLAKE2B d4ccb766736ed6c63339089ff2303f63530a769ce76e400b50b10203e297a4471dea3b2693bb6482ce67ceadbc4e4efacbe13cef0f313c45c94a05d7c2e94586 SHA512 965a6e52324605e6de5bb26ee0abc927a5e06a9f843ce1c4b65359b52418973bf84278c2f5f24fabbfa7342f40f79f4648d616df9a6ce0e9eca5c108ee49f50d
 DIST wcd-6.0.1.tar.gz 705577 BLAKE2B 9af2c14bae8cce50ad69b230897f2ae18c6ce899e9ed5d2f9b014ffb5b104c9fd136aa0d8a14110ae08fb1b9d4cc5f7819f42f5f23f5adf34780d16adf801790 SHA512 7a1a97b1dee220f2a425fcd7669ee9a3ca144992fe18444866269499b10bdea1671a5fca13eaa77c12c807d901e7831701e00a35c766021533a922b84b68247e
+DIST wcd-6.0.2.tar.gz 713062 BLAKE2B 13a745fd698b009aedb19e688a5deec7d62c42acf2dc430b7f586f300712ad684e8530a9b2477cf2d7a6540769efc98c245215cbe756b78c3902d03430b034d9 SHA512 587a52efaf0a585e4fc8a04a0eb08445cf4c78d38abd7592658f61827aa6cc0f1e8af8643c411d22d74145479c9970b018b11fc7a2a08b4ba7c850097813b06f
 EBUILD wcd-5.2.7.ebuild 942 BLAKE2B 9ee88dbe9fe9bb3ab1f1810a9f4897a06e18fff8f35b21201fd2b1369592f6e22f5aee66634dc65a5244c3c7df9bb5820cc8c9190edd7ea098fa58874704e4ee SHA512 49cac153d0cb70845500bd789ba3b0927730518abec498767a4d3f9fadc6d333bebe76f72ba86f1d5fd06daaef1fbb1680fbc694649977b46de4ca8ccfe0bc0c
 EBUILD wcd-5.3.4.ebuild 1054 BLAKE2B c0beec9a9b544f6d25492cf17e2e1397ba1d0d0f554cc21c85c9811c1bf2300bec6f2be1085f927efabb48d59d05ab4f293370edebe3f27e73b0428c703bcd12 SHA512 264a5eafe29249dc3d063f4de88e0270cfbed1312e5e3d6f564cd8b1f6e6eb609df52638bbe154d121a53dc65c90df2a2da9819d9df16edc6c66ab1d487eec12
-EBUILD wcd-6.0.0.ebuild 1054 BLAKE2B c0beec9a9b544f6d25492cf17e2e1397ba1d0d0f554cc21c85c9811c1bf2300bec6f2be1085f927efabb48d59d05ab4f293370edebe3f27e73b0428c703bcd12 SHA512 264a5eafe29249dc3d063f4de88e0270cfbed1312e5e3d6f564cd8b1f6e6eb609df52638bbe154d121a53dc65c90df2a2da9819d9df16edc6c66ab1d487eec12
 EBUILD wcd-6.0.1.ebuild 963 BLAKE2B 365293927af0deb49ae842696e610d5e5f061ebbc888bf34f8286ec2d449a2680e63c0da50216bf56cc5718a146ce16240cb8dc97e91c5f5d1c36250ed10125d SHA512 11cdef28a30d7fc63b23e9ba423af74d3f71d9bf4dd28f468a9c4ba2c263defe0bc8b6b3440c28c12a46e9892d4e013ecd67a466067d5d651e17cc1e73b39e63
+EBUILD wcd-6.0.2.ebuild 937 BLAKE2B 203a297cca3c7da36cba1f6c2a62052c80b071dbfff23be95b0bceefe592a9dde79a039de47631eeb29e6b1cbe92eb1ec45309f06c8bab6a8252eab8bb27cacf SHA512 22b0db024a63aa5e30ca1e52771191bd7af8669ead3dfafcdbb76dd8cbbe0da4831cefb6c36f20bf16fa60f37530b444569ef704028061b3cc7f481107d4b522
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/wcd/files/wcd-6.0.2-gentoo.patch b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
new file mode 100644
index 000000000000..ecd7c530f156
--- /dev/null
+++ b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
@@ -0,0 +1,67 @@
+--- wcd-6.0.2/src/Makefile
++++ wcd-6.0.2/src/Makefile
+@@ -45,12 +45,12 @@
+ 
+ CC              ?= gcc
+ STATIC          =
+-STRIP           = strip
++STRIP           =
+ 
+ ENABLE_NLS = 1
+ 
+ PACKAGE         = wcd
+-EXT             = .exe
++EXT             =
+ PROGRAM         = $(PACKAGE)$(EXT)
+ BIN             = $(PROGRAM)
+ 
+@@ -328,9 +328,9 @@
+ # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
+ 
+ ifdef UCS
+-        CURSES = ncursesw
++        CURSES = $(shell pkg-config --libs ncursesw)
+ else
+-        CURSES = ncurses
++        CURSES = $(shell pkg-config --libs ncurses)
+ endif
+ 
+ 
+@@ -360,7 +360,7 @@
+ 
+ ifneq (,$(CURSES))
+         DEFS_CURSES = -DWCD_USECURSES
+-        LIB_CURSES  = -l$(CURSES)
++        LIB_CURSES  = $(CURSES)
+ ifeq (os/2,$(OS))
+         LIB_CURSES  += -ltinfo
+ endif
+@@ -458,15 +458,15 @@
+ 
+ LDFLAGS_USER   =
+ LDFLAGS ?=
+-LDFLAGS += $(RPM_LD_FLAGS) \
++LIBS 	 = $(RPM_LD_FLAGS) \
+            $(LDFLAGS_EXTRA) \
+            $(NLFLAG) \
+            $(LDFLAG_STATIC) \
+            $(LDFLAGS_USER)
+ 
+-LIBS = $(LIB_CURSES) \
+-       $(LIB_UNISTRING) \
+-       $(LIBS_EXTRA)
++LIBS += $(LIB_CURSES) \
++        $(LIB_UNISTRING) \
++        $(LIBS_EXTRA)
+ 
+ DEFS_USER   =
+ DEFS            = $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
+@@ -523,7 +523,7 @@
+ 
+ $(BIN): $(OBJS1)
+ 	$(MAKE) status
+-	$(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
++	$(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/wcd-6.0.0.ebuild b/app-misc/wcd/wcd-6.0.2.ebuild
index 01d10fdcc1d4..a5b1dabb2ee3 100644
--- a/app-misc/wcd/wcd-6.0.0.ebuild
+++ b/app-misc/wcd/wcd-6.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,26 +21,19 @@ DEPEND="${CDEPEND}
 	app-text/ghostscript-gpl"
 RDEPEND="${CDEPEND}"
 
-S="${WORKDIR}"/${P}/src
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.4-gentoo.patch
-)
+S="${WORKDIR}/${P}/src"
 
 src_prepare() {
-	# Required for stupid eapply function
-	pushd .. &>/dev/null || die
-	default
-	popd &>/dev/null || die
+	eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
+	eapply_user
 	tc-export CC
 }
 
 src_compile() {
 	local mycompile="LFS=1"
-	use nls || mycompile="${mycompile} ENABLE_NLS="
-	use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
-	emake \
-		${mycompile}
+	use nls || mycompile+=" ENABLE_NLS="
+	use unicode && mycompile+=" UCS=1 UNINORM=1"
+	emake ${mycompile}
 }
 
 src_install() {