app-misc/wcd: Version Bump

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 144 insertions, 96 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/Manifest b/app-misc/wcd/Manifest
index 1d6c80ca566e..b4866582c77c 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,26 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX wcd-5.2.3-gentoo.patch 1885 SHA256 7f2799adbf0e9c88de0ce32daf82f2de2a01e09d54213ae10c92dcfa9348bde8 SHA512 c15c296ad479026c86b00d455a64821ece75a0a93cbfcc9a48974c99927a50d112ca5078bf308025ccd32febde347146c2cd5ac6fcb36328055d7159968c3df7 WHIRLPOOL 635411c22b811c70790c4b37e33fca88967108759620270a3faafe8fe1663ea0ae0103d60751df36289cdfb7104f6020aef1b4de10d5b849f241483a6f54081f
 AUX wcd-5.2.4-gentoo.patch 1356 SHA256 099bef9f499d1a27df6319fb10b977eea5175cecc14a67b0e9a06ef51fa8c526 SHA512 e1a019d3e089775e2ecfa28cadf5dcbee1ceebb12cde216587f62ec6ed043dad7a61c98b2b826dd550cf011508b2ada37f75e8b85b7e19eb659d7fe9171cbd6d WHIRLPOOL ef4c3096f3668b6357fc858d04123b9a1df5b0f7966e2295e4f143d53c8300d4efd5c752a665d11e59798f9e735fc7795a73af5bd8051ac5b0ed7d3dec84060d
+AUX wcd-5.2.5-gentoo.patch 1468 SHA256 9921cc3e90e0bf7a31120dea46b416bf6bd6b715a8a538cb6797a9726a40463c SHA512 427befe8be99ca4dc633f4c0e3cb130924027e452d87f3d9463d4edd7418f0864d6b5bd1cd3526734a55e28745db3e93a101c45255bc285c9abd324a6bd27108 WHIRLPOOL 760d43c83a33f20e10cd66ade8befa34929d4838883cacdd4578b47af7e55f75e645374355f112c8260b5ebe05bcd41fdf7986cb7d6b8f0b6078bc31bd213600
 DIST wcd-5.2.4-src.tar.gz 192124 SHA256 e0e99e8300bb32163a89eafebe75f3f66658113ea4e50391c5f5c16ac5b945b5 SHA512 b4beba3c285fbc0cafe8a145da1e42bf4764e6b5c8e153f34453a1d31578b06ce3db1bb2461c003538999b6b089cca587013d82a30be78a6a5cd1c49b59a9bb4 WHIRLPOOL bf2a7d27db56db6fedfe7f715512ca6a9e5a12e24a2d8df90db688740477c3d9854d912301a0c9b7874610f695fd96ead0121ac486c160a89aa4cd50b485568b
+DIST wcd-5.2.5.tar.gz 622544 SHA256 e2b32766c100355b6b31c61a1ebf480b7d5785928cf4bc915b626b0f9a611648 SHA512 c77955a6e6cc04b4cadb063c99c49023884dc046717ffd0b2873622731bd2acb6381b0ce24a9980221030215cab2eb2f9ab7cb28e4e768c0675d9782930834c6 WHIRLPOOL 5384890d51c7547c42260b45ad70e621ebd35f6fb3447edd1373d0941515b0dbb60631b2776b68a11d0ec95c270c78b8ec355783fa7feebdb77424252fdea80a
 EBUILD wcd-5.2.4.ebuild 1031 SHA256 87e51a680cf1c65a60c398b1e7b14f09dda16cf55b71b4934dc4c9fde8b7889b SHA512 f0ea08dfe433326665819fa4a047e9b6caca573cd2c76f73e3620e25d0b0073a8fd3b1c728bc9b8a6cfda0ec947fd043c2b35cbbc32fc97352dde3cb517f0a06 WHIRLPOOL 0b8391f164e59aba5965f8ab28b4948685d70293ea247686523c5ab398bf56ce2fd715f60bc254b3d6166ed36412e398d9466a9288869aabaafe36480c96f182
-MISC ChangeLog 2747 SHA256 a6b6ffa3e0da09bce85cb4e5faa3fc6a412c6db070b335506145be9252cfe81a SHA512 31f7df410afc37a04b72ce0591f48800713e7049287273c79c54c8a3786c82b159782b8adb2c29acde59e8b84d0bd7f8cfe8e4ee30a0699f4c02404aa345fe88 WHIRLPOOL 964e2b2f0b58fea76c575d540e69e7d6015aee01df7d3043a7b42e77993047ebb8dad933a123c6c39ac2bad18c7d9ea1577d3046abf09149c87c0584812ca83d
+EBUILD wcd-5.2.5.ebuild 1030 SHA256 d25c0d8b08b17e939f6edf2e3b1288d3d61666f69d676d947c6d4903b7c6b7ce SHA512 65099fc057b951866231501dfe24e8793c60d905af0de414fe209c3302ae93ce595d7271ce9ae4d2ba72cba6b198db560191a1928aa23498b359e0959f7ad49d WHIRLPOOL ab4c4562774198989e29b6b64fcb231b0e19f533b95dd859345724bddd1c7ecf8042f49cd374e66bf136b7e157ff192c8661399eb45612513ad3f24ca852f0c1
+MISC ChangeLog 2919 SHA256 2154fcc0feb9eaee657f1b84a47dcf9ef12ccb8e3edcf7502db8d08d793c62da SHA512 e3e6decf7a66de1eb7edfaa4e944d71be0903d638b8ffe40bdf118541d336b5b85f920acb1d6142e48aae3265b51bf188a309e5e02ee219aa6fd8e259a19648d WHIRLPOOL 12c6f6825545cf9cb65feac2ecb66650333c3ad7e5c4b8819e92660e7cc802e5cd5fc054e6294ee623d4f1fc32d92286be67f916f706fc4520ca634ff9ea67ff
 MISC metadata.xml 232 SHA256 6f45c1eba43862805c2a76535213dd0e23d5cfc0725ab5ac775409515adbb3b9 SHA512 23d7724bdbc23902f2379e2d1ccb223d80d0ff30bf50e5c5b10a9c2e626a7d7560d768b2365542c5a895590a73c443691637f269ae6cbd63d60035952df89957 WHIRLPOOL 413742721e1712959ed7fa91332d869851260d62ec8e6fb63d981e343022b2911a714da187b8a259ec71e4ff10f8772ee67e76a7f39126b6f64b9d6209887efc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJSuZ/WAAoJELnU8jG9FVirERAP/3yCx/7MTyDf4Xkb7tRcTCRw
-v45NcGC2vbRrw/BIsp8gpVhfgeDr+6bz4jDgKEly9cGmG8fc0oX3nb+yOhmHsFlP
-BXhxlH4SjzrxXwMoNkUA3EaeOI4PGTiiwPxsdZ2kGL6BPseu1FjBStxnjppXvoPI
-K5D79O5QdWqXDC1/b0Q0O+PtRsYBYqGKLv1yH7N5flyIQprznH1lpV6CrqjCrjKZ
-9SPg9kHGj3p61Q3G5g4xxRDeUuFLJRVkkGEJcEiafaGdf68sgYgbbAIJJ7mPMZPT
-qvXAFvW6QKe/zMtdHL0sKnf0WWpxiEoMc1ZeLn1EHKRBSWofnYeHB0tR5DwxkEDQ
-eIXljj56U2PhaY7wzkXCXdm/B6QG76khx4j0za+SDygagBcKhGyQUorQ6n+v+DX7
-ScvG5l9tYn2owJqyC4qKaXGAgjN3wjqVyAnS5WVHqo2I542z3jyP+vczB+0L82ms
-mLuj9GLh9lxE/IEQlfDUASPhXo03/E5k+gqvm7z1KjZCZ+ok/wZ1gfgDoXKbySFQ
-jO1/ATqe9WvVYpT8B6CrclyUvYTt56aHaT+EnBvAoTwcLli/lTTtU8CdC3+IKDW5
-6twBc49a8QXC66NJYCcRCefc7U6j+plb/2rFg44TnH0X4FAdFyW3diu8bNYs2LO5
-2/mAr91AcF3ilAYsFCvi
-=EWv8
+iQJ8BAEBCgBmBQJTnDefXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirS+MP/3VfD4Ktrv8fneavMNhBBB1D
+YqEJA/+8RCaZkCbJtfIeQKKm+VS9lU5QWXF9n85dUZMrVPLSn5LuWRE7r7Z8rS+N
+LE9IFR4XcDj3kNIdukxgqlj28sMXjZwni2cmWvLOvoO1rDtNq5Lqmc9Lrc9PiehK
+9P3POOWBSqngjbcaJYsKf7gyI/RLEKIi/egLueOIITeQiaY/S5+oCaGHKPsF1KV/
+djMIbuUc+GvGFygb9jtM1QKYEsH9fkZZ79eMkZtLgS5+jV/378kpZeFZ85OR98TY
+xEZZA3i3ytT8M1kJowj+UQXd119bTj51z5O8fP2UkDdH3cL6Y/XxSsXS4ctBnC7t
+QOpgPY/uKSulOizfAKXAJ/UrXhzyPZO6i2DasnGF/gqjTfHg9aFeQFiIeJotYqZ6
+Ps70Mg6uDiw1bA+zST+z+8cf9rAq+yeEoSAPnUg2b8vA7LfUSufdGnAVYS856tsU
+QwXycLW67XjFEn2cgtY3xJJaVwyCB9BNRU+B206Vhv3nFJBaMm3xYzgA/A/uTXpe
+3VQGZn2cX7mURsN964krHlvJd9SrR4GfX5yvIrb6DIMxhLE7m9JOoUyHbvNTPdQc
+qyfKLSsjCF1PUH82XSAnHx14y/Xcu6ABO2YxG1wNGS4vLEIEUa1QPmjTrlYji1ww
+cAuWJ/4QAIbL1KebSe2m
+=LMYj
 -----END PGP SIGNATURE-----
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"
+}