app-misc/wcd: Version Bump

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 124 insertions, 80 deletions

diff --git a/app-misc/wcd/ChangeLog b/app-misc/wcd/ChangeLog
index bb5863858581..9260116ea4c2 100644
--- a/app-misc/wcd/ChangeLog
+++ b/app-misc/wcd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/wcd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/wcd/ChangeLog,v 1.21 2013/12/24 14:53:09 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wcd/ChangeLog,v 1.22 2014/06/14 11:52:38 jlec Exp $
+
+*wcd-5.2.5 (14 Jun 2014)
+
+  14 Jun 2014; Justin Lecher <jlec@gentoo.org> +wcd-5.2.5.ebuild,
+  -files/wcd-5.2.3-gentoo.patch, +files/wcd-5.2.5-gentoo.patch:
+  Version Bump
 
   24 Dec 2013; Justin Lecher <jlec@gentoo.org> -wcd-5.2.3-r1.ebuild:
   Drop old
diff --git a/app-misc/wcd/files/wcd-5.2.3-gentoo.patch b/app-misc/wcd/files/wcd-5.2.3-gentoo.patch
deleted file mode 100644
index 068b1309e3b7..000000000000
--- a/app-misc/wcd/files/wcd-5.2.3-gentoo.patch
+++ /dev/null
@@ -1,78 +0,0 @@
- src/Makefile | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index d0a273e..06a0a57 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -48,14 +48,14 @@ endif
- 
- include version.mk
- 
--CC		= gcc
-+CC		?= gcc
- STATIC		=
--STRIP		= strip
-+STRIP		= 
- 
- ENABLE_NLS = 1
- 
- PACKAGE		= wcd
--EXT		= .exe
-+EXT		= 
- PROGRAM         = $(PACKAGE)$(EXT)
- BIN		= $(PROGRAM)
- 
-@@ -183,14 +183,14 @@ endif
- # 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
- 
- ifneq (,$(CURSES))
- 	DEFS_CURSES = -DWCD_USECURSES
--	LIB_CURSES  = -l$(CURSES)
-+	LIB_CURSES  = $(CURSES)
- endif
- 
- 
-@@ -337,7 +337,7 @@ endif
- # (often found as /usr/lib/libncurses.a) to the OBJS1 list.
- 
- CFLAGS_USER	=
--CFLAGS	= -O2 -Wall -Wextra -Wno-unused-parameter -Wconversion $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER)
-+CFLAGS	+= -Wall -Wextra -Wno-unused-parameter -Wconversion $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER)
- 
- EXTRA_CFLAGS	= -Ic3po \
- 		  $(CFLAGS_VERSION) \
-@@ -365,7 +365,7 @@ ifdef ASCII_TREE
- endif
- 
- LDFLAGS_USER   =
--LDFLAGS		= $(RPM_OPT_FLAGS) \
-+LIBS		= $(RPM_OPT_FLAGS) \
- 	          $(LIB_CURSES) \
- 	          $(LIB_UNISTRING) \
- 	          $(LDFLAGS_EXTRA) \
-@@ -418,6 +418,7 @@ status:
- 	@echo "DEFS_CURSES   = $(DEFS_CURSES)"
- 	@echo "EXTRA_DEFS    = $(EXTRA_DEFS)"
- 	@echo "LDFLAGS       = $(LDFLAGS)"
-+	@echo "LIBS          = $(LIBS)"
- 	@echo "LDFLAGS_EXTRA = $(LDFLAGS_EXTRA)"
- 	@echo "CFLAGS        = $(CFLAGS)"
- 	@echo "CFLAGS_OS     = $(CFLAGS_OS)"
-@@ -426,7 +427,7 @@ status:
- 
- $(BIN): $(OBJS1)
- 	$(MAKE) status
--	$(CC) $(OBJS1) $(LDFLAGS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/files/wcd-5.2.5-gentoo.patch b/app-misc/wcd/files/wcd-5.2.5-gentoo.patch
new file mode 100644
index 000000000000..c838e131aa5f
--- /dev/null
+++ b/app-misc/wcd/files/wcd-5.2.5-gentoo.patch
@@ -0,0 +1,72 @@
+ src/Makefile | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index d4120cc..4505b8d 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -46,12 +46,12 @@ include version.mk
+ 
+ CC		?= gcc
+ STATIC		=
+-STRIP		= strip
++STRIP		=
+ 
+ ENABLE_NLS = 1
+ 
+ PACKAGE		= wcd
+-EXT		= .exe
++EXT		=
+ PROGRAM         = $(PACKAGE)$(EXT)
+ BIN		= $(PROGRAM)
+ 
+@@ -188,9 +188,9 @@ endif
+ # 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
+ 
+ ifdef CURSES
+@@ -201,7 +201,7 @@ endif
+ 
+ ifneq (,$(CURSES))
+ 	DEFS_CURSES = -DWCD_USECURSES
+-	LIB_CURSES  = -l$(CURSES)
++	LIB_CURSES  = $(CURSES)
+ endif
+ 
+ 
+@@ -406,15 +406,15 @@ ifdef ASCII_TREE
+ 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)
+@@ -470,7 +470,7 @@ status:
+ 
+ $(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-5.2.5.ebuild b/app-misc/wcd/wcd-5.2.5.ebuild
new file mode 100644
index 000000000000..75e818f8384c
--- /dev/null
+++ b/app-misc/wcd/wcd-5.2.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wcd/wcd-5.2.5.ebuild,v 1.1 2014/06/14 11:52:38 jlec Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR"
+SRC_URI="http://waterlan.home.xs4all.nl/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+	sys-libs/ncurses[unicode?]
+	unicode? ( dev-libs/libunistring )"
+DEPEND="${CDEPEND}
+	app-text/ghostscript-gpl"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}"/${P}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	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"
+}