Version bump. Removed old files

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

5 files changed, 122 insertions, 123 deletions

diff --git a/app-misc/wcd/ChangeLog b/app-misc/wcd/ChangeLog
index 59930319b782..1a8cb7438c26 100644
--- a/app-misc/wcd/ChangeLog
+++ b/app-misc/wcd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2013/05/20 15:53:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wcd/ChangeLog,v 1.18 2013/09/06 11:15:29 polynomial-c Exp $
+
+*wcd-5.2.4 (06 Sep 2013)
+
+  06 Sep 2013; Lars Wendler <polynomial-c@gentoo.org> +wcd-5.2.4.ebuild,
+  -files/5.1.4-gentoo.patch, -files/wcd-5.2.1-gentoo.patch,
+  +files/wcd-5.2.4-gentoo.patch:
+  Non-maintainer commit: Version bump. Removed old files.
 
   20 May 2013; Justin Lecher <jlec@gentoo.org> -wcd-5.2.1-r1.ebuild:
   Drop old
diff --git a/app-misc/wcd/files/5.1.4-gentoo.patch b/app-misc/wcd/files/5.1.4-gentoo.patch
deleted file mode 100644
index 982b249d673d..000000000000
--- a/app-misc/wcd/files/5.1.4-gentoo.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 15a889a..ecd68cf 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -46,18 +46,18 @@ 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)
- 
--PREFIX		= /usr/local
-+PREFIX		= /usr/
- prefix		= $(PREFIX)
- exec_prefix	= $(prefix)
- bindir		= $(exec_prefix)/bin
-@@ -283,7 +283,7 @@ endif
- # dynamically) comment the LDFLAGS line and add the 'libncurses.a' file
- # (often found as /usr/lib/libncurses.a) to the OBJS1 list.
- 
--CFLAGS	= -O2 -Wall
-+CFLAGS	+= -Wall
- 
- EXTRA_CFLAGS	= -Ic3po \
- 		  $(CFLAGS_VERSION) \
-@@ -302,7 +302,7 @@ ifdef ASCII_TREE
- 	EXTRA_CFLAGS += -DASCII_TREE
- endif
- 
--LDFLAGS		= $(LIB_CURSES) \
-+LIBS		= $(LIB_CURSES) \
- 	          $(LDFLAGS_EXTRA) \
- 		  $(NLFLAG)
- 
-@@ -346,6 +346,7 @@ status:
- 	@echo "DEFS          = $(DEFS)"
- 	@echo "DEFS_CURSES   = $(DEFS_CURSES)"
- 	@echo "EXTRA_DEFS    = $(EXTRA_DEFS)"
-+	@echo "LIBS          = $(LIBS)"
- 	@echo "LDFLAGS       = $(LDFLAGS)"
- 	@echo "LDFLAGS_EXTRA = $(LDFLAGS_EXTRA)"
- 	@echo "CFLAGS        = $(CFLAGS)"
-@@ -355,7 +356,7 @@ status:
- 
- $(BIN): $(OBJS1)
- 	$(MAKE) status
--	$(CC) $(OBJS1) $(LDFLAGS) -o $@
-+	$(CC) $(OBJS1) $(LDFLAGS) -o $@ $(LIBS)
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/files/wcd-5.2.1-gentoo.patch b/app-misc/wcd/files/wcd-5.2.1-gentoo.patch
deleted file mode 100644
index 67794bc3d0c4..000000000000
--- a/app-misc/wcd/files/wcd-5.2.1-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
- src/Makefile |   13 +++++++------
- 1 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 9a37e3b..7aac6eb 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -46,14 +46,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)
- 
-@@ -310,7 +310,7 @@ endif
- # dynamically) comment the LDFLAGS line and add the 'libncurses.a' file
- # (often found as /usr/lib/libncurses.a) to the OBJS1 list.
- 
--CFLAGS	= -O2 -Wall -Wextra -Wno-unused-parameter -Wconversion $(RPM_OPT_FLAGS)
-+CFLAGS	+= -Wall
- 
- EXTRA_CFLAGS	= -Ic3po \
- 		  $(CFLAGS_VERSION) \
-@@ -337,7 +337,7 @@ ifdef ASCII_TREE
- 	EXTRA_CFLAGS += -DASCII_TREE
- endif
- 
--LDFLAGS		= $(RPM_OPT_FLAGS) \
-+LIBS		= $(RPM_OPT_FLAGS) \
- 	          $(LIB_CURSES) \
- 	          $(LIB_UNISTRING) \
- 	          $(LDFLAGS_EXTRA) \
-@@ -387,6 +387,7 @@ status:
- 	@echo "DEFS          = $(DEFS)"
- 	@echo "DEFS_CURSES   = $(DEFS_CURSES)"
- 	@echo "EXTRA_DEFS    = $(EXTRA_DEFS)"
-+	@echo "LIBS          = $(LIBS)"
- 	@echo "LDFLAGS       = $(LDFLAGS)"
- 	@echo "LDFLAGS_EXTRA = $(LDFLAGS_EXTRA)"
- 	@echo "CFLAGS        = $(CFLAGS)"
-@@ -396,7 +397,7 @@ status:
- 
- $(BIN): $(OBJS1)
- 	$(MAKE) status
--	$(CC) $(OBJS1) $(LDFLAGS) -o $@
-+	$(CC) $(OBJS1) $(LDFLAGS) -o $@ $(LIBS)
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/files/wcd-5.2.4-gentoo.patch b/app-misc/wcd/files/wcd-5.2.4-gentoo.patch
new file mode 100644
index 000000000000..27cc2ddd3d75
--- /dev/null
+++ b/app-misc/wcd/files/wcd-5.2.4-gentoo.patch
@@ -0,0 +1,70 @@
+ Makefile |   20 ++++++++++----------
+  1 file changed, 10 insertions(+), 10 deletions(-)
+
+--- wcd-5.2.4/src/Makefile
++++ wcd-5.2.4/src/Makefile
+@@ -50,12 +50,12 @@
+ 
+ CC		?= gcc
+ STATIC		=
+-STRIP		= strip
++STRIP		=
+ 
+ ENABLE_NLS = 1
+ 
+ PACKAGE		= wcd
+-EXT		= .exe
++EXT		=
+ PROGRAM         = $(PACKAGE)$(EXT)
+ BIN		= $(PROGRAM)
+ 
+@@ -184,9 +184,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
+ 
+ ifdef CURSES
+@@ -197,7 +197,7 @@
+ 
+ ifneq (,$(CURSES))
+ 	DEFS_CURSES = -DWCD_USECURSES
+-	LIB_CURSES  = -l$(CURSES)
++	LIB_CURSES  = $(CURSES)
+ endif
+ 
+ 
+@@ -381,15 +381,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)
+@@ -446,7 +446,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-5.2.4.ebuild b/app-misc/wcd/wcd-5.2.4.ebuild
new file mode 100644
index 000000000000..efecc702a6dc
--- /dev/null
+++ b/app-misc/wcd/wcd-5.2.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wcd/wcd-5.2.4.ebuild,v 1.1 2013/09/06 11:15:29 polynomial-c Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/#WCD_ANCHOR"
+SRC_URI="http://www.xs4all.nl/~waterlan/${P}-src.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"
+}