[gentoo-commits] repo/gentoo:master commit in: app-misc/wcd/files/, app-misc/wcd/

[Lars Wendler]

commit:     f820eff8bf92cdc55898df2dfb3d83d2aae2568d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May 11 15:48:56 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri May 11 15:48:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f820eff8

app-misc/wcd: Bump to version 6.0.2

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-misc/wcd/Manifest                     |  1 +
 app-misc/wcd/files/wcd-6.0.2-gentoo.patch | 67 +++++++++++++++++++++++++++++++
 app-misc/wcd/wcd-6.0.2.ebuild             | 43 ++++++++++++++++++++
 3 files changed, 111 insertions(+)

diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index 7829e18eca3..9b7caadcc21 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -2,3 +2,4 @@ DIST wcd-5.2.7.tar.gz 622613 BLAKE2B 85c473ad607022953338872a46251b2010504608d03
 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

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 00000000000..ecd7c530f15
--- /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.2.ebuild b/app-misc/wcd/wcd-6.0.2.ebuild
new file mode 100644
index 00000000000..a5b1dabb2ee
--- /dev/null
+++ b/app-misc/wcd/wcd-6.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
+SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	unicode? ( dev-libs/libunistring )"
+DEPEND="${CDEPEND}
+	app-text/ghostscript-gpl"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
+	eapply_user
+	tc-export CC
+}
+
+src_compile() {
+	local mycompile="LFS=1"
+	use nls || mycompile+=" ENABLE_NLS="
+	use unicode && mycompile+=" UCS=1 UNINORM=1"
+	emake ${mycompile}
+}
+
+src_install() {
+	local DOCS=( ../README.txt )
+	default
+	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}