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

[Lars Wendler]

commit:     450e46bbd95e420d7beb9e25308861cb1f0c30ed
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 12:13:07 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 12:13:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=450e46bb

app-misc/wcd: Bump to version 6.0.1

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-misc/wcd/Manifest                     |  1 +
 app-misc/wcd/files/wcd-6.0.1-gentoo.patch | 67 +++++++++++++++++++++++++++++++
 app-misc/wcd/wcd-6.0.1.ebuild             | 44 ++++++++++++++++++++
 3 files changed, 112 insertions(+)

diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index 6e10ca91bfd..04c8fd5159a 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,3 +1,4 @@
 DIST wcd-5.2.7.tar.gz 622613 SHA256 e5f56824e054c6726186271b20a5de3c5b167116b97785a925907981cf3e3b39 SHA512 9f5b89d8160f685b729234cc8c03f16b795797dd6eaf2d9e1bbf1949b27ef971908b78642679d3bf1d99b128b390cd5dbd211e4ff03b0539dd287c578088e02e WHIRLPOOL 3354e380dceaed394e0eb9bac3f474edc819270a117baf5812a1e7252b2cef207862746af2b21dd71de837459bc6281a45a9099f5a6351def49e3c1ce780960d
 DIST wcd-5.3.4.tar.gz 610630 SHA256 8c56a76016ff6b5a4be656dd563bf8f58c7be3a6101cef5485e544b12211dae6 SHA512 fdb6e000876fffbc7bce6e6157282c2b8ef9929c896e5dbd8533314d575cf31656df76cd5c408bb2e495a1fda7f179b122ea2a58da94d5d55d1e2b9c658adc94 WHIRLPOOL adb42aae240fd3ae40fc03418d2ace7ea9d72f0aaec38ab37a231b27ba630dd3a00d0e0af3bca8d05932cfb29019bfeed1ad0dcbbb1998c86b324c20d211d87b
 DIST wcd-6.0.0.tar.gz 615838 SHA256 3f9090fff08a2a57f747471bfd9229a411229b41347488729da8d2c2b3eaa156 SHA512 965a6e52324605e6de5bb26ee0abc927a5e06a9f843ce1c4b65359b52418973bf84278c2f5f24fabbfa7342f40f79f4648d616df9a6ce0e9eca5c108ee49f50d WHIRLPOOL 221b5a907982baaff18bc2a6e2d23aff5326a4fad57f38c6c17f1bbe873e058e2f0bdf24084dfb7dd11af1a18d6bcb3a0792278102616b425678d1585f6e0b28
+DIST wcd-6.0.1.tar.gz 705577 SHA256 dfb26abe9e8c1b90687ff3cc679ed3ef1f87b0f17cfbbb90fc8d45102ba009fc SHA512 7a1a97b1dee220f2a425fcd7669ee9a3ca144992fe18444866269499b10bdea1671a5fca13eaa77c12c807d901e7831701e00a35c766021533a922b84b68247e WHIRLPOOL 9e48e491556959080064365ccfacdaa950dff2e5d52a8720bfa090f6958884e1851d1b66ac6ee5ad3c65dcdd64eea0d2667872e51253929280b92346f19f81fc

diff --git a/app-misc/wcd/files/wcd-6.0.1-gentoo.patch b/app-misc/wcd/files/wcd-6.0.1-gentoo.patch
new file mode 100644
index 00000000000..eca95856ca3
--- /dev/null
+++ b/app-misc/wcd/files/wcd-6.0.1-gentoo.patch
@@ -0,0 +1,67 @@
+--- wcd-6.0.1/src/Makefile
++++ wcd-6.0.1/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)
+ 
+@@ -329,9 +329,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
+ 
+ 
+@@ -361,7 +361,7 @@
+ 
+ ifneq (,$(CURSES))
+         DEFS_CURSES = -DWCD_USECURSES
+-        LIB_CURSES  = -l$(CURSES)
++        LIB_CURSES  = $(CURSES)
+ ifeq (os/2,$(OS))
+         LIB_CURSES  += -ltinfo
+ endif
+@@ -455,15 +455,15 @@
+ endif
+ 
+ LDFLAGS_USER   =
+-LDFLAGS         = $(RPM_OPT_FLAGS) \
++LIBS            = $(RPM_OPT_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)
+@@ -520,7 +520,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.1.ebuild b/app-misc/wcd/wcd-6.0.1.ebuild
new file mode 100644
index 00000000000..2cf0a5de0ec
--- /dev/null
+++ b/app-misc/wcd/wcd-6.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 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.1-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}
+}
+
+src_install() {
+	local DOCS=( ../README.txt )
+	default
+	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}