9 files changed, 115 insertions, 148 deletions
diff --git a/dev-libs/cdk/ChangeLog b/dev-libs/cdk/ChangeLog
index ba87f3ab4598..47d9dd4957d2 100644
--- a/dev-libs/cdk/ChangeLog
+++ b/dev-libs/cdk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/cdk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cdk/ChangeLog,v 1.70 2011/03/25 20:08:37 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cdk/ChangeLog,v 1.71 2011/06/09 07:33:47 radhermit Exp $
+
+*cdk-5.0.20110517 (09 Jun 2011)
+
+  09 Jun 2011; Tim Harder <radhermit@gentoo.org> -cdk-5.0.20060507.ebuild,
+  -files/cdk-5.0.20060507-as-needed.patch, -cdk-5.0.20081105.ebuild,
+  -files/cdk-5.0.20081105-ldflags.patch, +cdk-5.0.20110517.ebuild,
+  +files/cdk-5.0.20110517-ldflags.patch,
+  +files/cdk-5.0.20110517-makefile.patch:
+  Version bump and remove old. Add static-libs and unicode USE flags.
 
   25 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> cdk-5.0.20090215.ebuild:
   ppc stable wrt #299479
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index 0193a3bb1a17..d16c27f96d0f 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX cdk-5.0.20060507-as-needed.patch 358 RMD160 5b28af5e2cf96976d363c524a7151e1722fcdbc6 SHA1 98972fa8df584b9cca126c90e3bc634ec91c9d9d SHA256 6e6a2d8e0fa875b72a70f80b38ab4fa3c9fd1109228cc2c44016bb30d94aa99b
-AUX cdk-5.0.20081105-ldflags.patch 1496 RMD160 f5c5f580540950d0a32c44e0212bfac1a9fd14a2 SHA1 bda7b576529437b05eb72395612f7ed275c463b3 SHA256 67ffbaf379251fb9d783d6187ac73d1fb731daa7e89a76aac02f8ff8d8a4a678
 AUX cdk-5.0.20090215-ldflags.patch 1574 RMD160 06a6759128e81ab378f41eb08b23e8962c2fb94c SHA1 439d655226f7dea8e9c9cf5f59ed157bdaaa881c SHA256 8555bc33b9f8eda41d52746829635627a632e420aa3b8f645d5219dc222cc7ca
-DIST cdk-5.0-20060507.tgz 396514 RMD160 c541f758299d64218ea0ae2bfe22a43bccebb46c SHA1 529d235032814725cf0b389732c39a3728c2840c SHA256 e823bfcce52916727cb23d6d549a64347c45c364b3c628d6a352c407fce8f4b4
-DIST cdk-5.0-20081105.tgz 412160 RMD160 00f5dd49e71f295e397c404b80e56e007b5d8317 SHA1 7e96dae47f8cb48c39810ce77c42aa3df7fe6822 SHA256 1bbb1f973cd12046be493ee583e3d1e3ee1b0feac7f143e692f8732527382194
+AUX cdk-5.0.20110517-ldflags.patch 1426 RMD160 39c81d9f16fff3512987fd155d6f95ed5187cd18 SHA1 c82354843a4e78dcaa43ffae22e89c66f40a6822 SHA256 9111f19e271036ab7b9d47906d9e2e1ac184798727b2788d666ae483a92dd2c1
+AUX cdk-5.0.20110517-makefile.patch 432 RMD160 2f534e06d1ac048661a24c9b2fc52b4dd6a88e99 SHA1 36e222e358ace76a2a376fc7dc8cbc926e78dae0 SHA256 29ebc57ab9eecd4c0292c83a4932a3352d258e59b0bf07e15daf9cca4b68e035
 DIST cdk-5.0-20090215.tgz 429288 RMD160 8be6be4f4ca1f0b775272717178932ebb3917fce SHA1 8d42695d3a0fa9f36b3add0e05bebc20b34cbf63 SHA256 b388c3a91a86153dfb2e0e583e213457859e61b228959145dffd102eb42ffb9d
-EBUILD cdk-5.0.20060507.ebuild 926 RMD160 8e5b25d0ad6dc3ce16ff230e7fb17110e7144ae7 SHA1 aea9ed0393bce2148ef378a3e0ddfde3ed2d33e8 SHA256 90ffd13deada8e0907ef5485fe31b582598cc3ead1eb1805f1240db5f74aaf6b
-EBUILD cdk-5.0.20081105.ebuild 1100 RMD160 a67ac2b8f259d80fcd33e086f48faafac3d8ab42 SHA1 cd45995348dac6eb3f16af3d3a8b46b1ea9c2528 SHA256 567beba294c961ac995e619b5a9e1623aae9b7cb5aa470069303f8c9cfc7ea92
+DIST cdk-5.0-20110517.tgz 463106 RMD160 5af732bde633126e7c198f6ee7936c55726fbe20 SHA1 8d216aeb6aeacf9ba8075c0ba05e14a0604704d3 SHA256 bccb66392e1ced3446134a41356a0fee54f4932afe5392d2349ec4bb582e6021
 EBUILD cdk-5.0.20090215.ebuild 1179 RMD160 d838920ef1594391d7ceee1da1ca254f0ced15bc SHA1 e9255aa14b657b579baea34ee8b5795ada03db77 SHA256 c042e507797fa55ec3a67dd8981b6c0b2afb61023773636ad2277af700174d28
-MISC ChangeLog 9208 RMD160 5364d055a7402f7c9167a76c0043ac4972f722eb SHA1 b7fe3b0e315fa3dc85733b8e0cf33feece0eeaff SHA256 f9751adf452a0a9f11eb19122a49795018f7401ce75a7616fe2a59685a51738f
+EBUILD cdk-5.0.20110517.ebuild 1293 RMD160 d3eeb1f3e0d7f9b0858ae37f9ced07c5366e05c9 SHA1 ba3d7a9e56265cb19c2b2cae32670dfa29c04dab SHA256 599bef8450432502d8a13ca1e765591369431b546f84eb26372ebafc72dabdd4
+MISC ChangeLog 9605 RMD160 655898cc3f666507e49c4612e0123039757dc239 SHA1 bf1b97be74a30b900291675c2547fae1ddb42bff SHA256 f7c86e6b902711c603a79707b57365aca9a79f344efc656a9d59aaad5951515a
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2M9koACgkQIiMqcbOVdxTtowP/f2IxGcOOEdq0ldyPkrypK4Ue
-Y/l5GyepZf+6HVSO9e5HWlIUybaFwrbGamgxkAEWXzCKizB4orML8s9yqs13LN7x
-ntRvhOWjCz3V+1ZnC0MmTpeDt+kK0MsQOEXBww4e7Vew6cwNROLApsBx85bSNVSs
-q7UxZMq/eWuoTDjjneQ=
-=0VYX
+iQEcBAEBAgAGBQJN8HdgAAoJEEqz6FtPBkyjDwEH/jpxIEP1lo/z8Gs4HgwzQsjL
+iCxctRFCMCHT7ZSM8GeO6QwhVT8mvcQZNLf618epXmXI/9Bc1F9wBCoGXn4ZX8aH
+BCo71m2XjbzaJIuy3ptdMv39RNRcaaf/3hDFi8aj/V8vqVXT++LYp0Z2yGQSTPX8
+4gA5no5wCLvICyjyrUhh3ZQeLoj/GMWprrLZZFLQdwFq0tYiSjgkvNb0Zn9TYgIh
+JwG3V7tVuB2D0/xR3VhtIvnnMaqkA+HsMM3Y0jp6viCXDNR9fA+fE6ugp6nfbkf4
+DGMO03OVc1YXw2AdPgs+llqNoJYCZ37AK3Ozrh7gO+DPxg6KderAFMn/USsLotA=
+=UaLc
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cdk/cdk-5.0.20060507.ebuild b/dev-libs/cdk/cdk-5.0.20060507.ebuild
deleted file mode 100644
index d5c915504e06..000000000000
--- a/dev-libs/cdk/cdk-5.0.20060507.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cdk/cdk-5.0.20060507.ebuild,v 1.13 2009/11/26 18:11:11 vostorga Exp $
-
-inherit eutils versionator toolchain-funcs
-
-MY_P="${PN}-$(replace_version_separator 2 -)"
-DESCRIPTION="A library of curses widgets"
-HOMEPAGE="http://dickey.his.com/cdk/cdk.html"
-SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.2
-	sys-devel/libtool"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-}
-
-src_compile() {
-	tc-export CC
-	econf \
-		--with-ncurses --with-libtool \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		DOCUMENT_DIR="${D}/usr/share/doc/${PF}" install \
-		|| die
-}
diff --git a/dev-libs/cdk/cdk-5.0.20081105.ebuild b/dev-libs/cdk/cdk-5.0.20081105.ebuild
deleted file mode 100644
index aa6789ae69cd..000000000000
--- a/dev-libs/cdk/cdk-5.0.20081105.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cdk/cdk-5.0.20081105.ebuild,v 1.9 2009/12/15 19:08:03 armin76 Exp $
-
-inherit eutils versionator toolchain-funcs
-
-MY_P="${PN}-$(replace_version_separator 2 -)"
-DESCRIPTION="A library of curses widgets"
-HOMEPAGE="http://dickey.his.com/cdk/cdk.html"
-SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
-IUSE="examples"
-
-DEPEND=">=sys-libs/ncurses-5.2"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_compile() {
-	tc-export CC
-	econf \
-		--with-ncurses --with-libtool \
-		|| die
-
-	emake || die
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		DOCUMENT_DIR="${D}/usr/share/doc/${PF}" install \
-		|| die
-
-	if $(use examples); then
-		for x in include c++ demos examples cli cli/utils cli/samples; do
-			docinto $x
-			find $x -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc
-		done
-	fi
-}
diff --git a/dev-libs/cdk/cdk-5.0.20110517.ebuild b/dev-libs/cdk/cdk-5.0.20110517.ebuild
new file mode 100644
index 000000000000..07effa1267f6
--- /dev/null
+++ b/dev-libs/cdk/cdk-5.0.20110517.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cdk/cdk-5.0.20110517.ebuild,v 1.1 2011/06/09 07:33:47 radhermit Exp $
+
+EAPI=4
+
+inherit eutils versionator
+
+MY_P="${PN}-$(replace_version_separator 2 -)"
+DESCRIPTION="A library of curses widgets"
+HOMEPAGE="http://dickey.his.com/cdk/cdk.html"
+SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="examples static-libs unicode"
+
+DEPEND=">=sys-libs/ncurses-5.2[unicode?]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-makefile.patch
+}
+
+src_configure() {
+	local ncursesw
+	use unicode && ncursesw="w"
+
+	econf --with-ncurses${ncursesw} --with-libtool
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		DOCUMENT_DIR="${ED}/usr/share/doc/${P}" install
+
+	if use examples ; then
+		for x in include c++ demos examples cli cli/utils cli/samples; do
+			docinto $x
+			find $x -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc
+		done
+	fi
+
+	use static-libs || find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete
+}
diff --git a/dev-libs/cdk/files/cdk-5.0.20060507-as-needed.patch b/dev-libs/cdk/files/cdk-5.0.20060507-as-needed.patch
deleted file mode 100644
index 93469592ec4a..000000000000
--- a/dev-libs/cdk/files/cdk-5.0.20060507-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2006-09-24 00:27:27.799270048 +0200
-+++ Makefile.in	2006-09-24 00:28:10.258815216 +0200
-@@ -265,7 +265,7 @@
- all cdklib :: $(DEFAULT)
- 
- $(CDKLIB) :: $(OBJECTS)
--	@echo creating $@; $(LIBTOOL_CREATE) $@ $(LIB_OBJECT)
-+	@echo creating $@; $(LIBTOOL_CREATE) $@ $(LIB_OBJECT) $(LIBS)
- 	@$(RANLIB) $@
- 
- cdkshlib $(CDKSHLIB) :: $(CDKSHOBJS)
diff --git a/dev-libs/cdk/files/cdk-5.0.20081105-ldflags.patch b/dev-libs/cdk/files/cdk-5.0.20081105-ldflags.patch
deleted file mode 100644
index b4cf4ddc9758..000000000000
--- a/dev-libs/cdk/files/cdk-5.0.20081105-ldflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.in.orig	2008-10-31 00:40:47.000000000 +0100
-+++ Makefile.in	2009-02-02 19:14:59.892008198 +0100
-@@ -267,7 +267,7 @@
- all cdklib :: $(DEFAULT)
- 
- $(CDKLIB) :: $(OBJECTS)
--	@echo creating $@; $(LIBTOOL_CREATE) $@ $(LIB_OBJECT)
-+	@echo creating $@; $(LIBTOOL_CREATE) $@ $(LIB_OBJECT) $(LIBS)
- 	@$(RANLIB) $@
- 
- cdkshlib $(CDKSHLIB) :: $(CDKSHOBJS)
---- aclocal.m4.orig	2009-02-02 19:13:54.256006211 +0100
-+++ aclocal.m4	2009-02-02 19:14:39.332007971 +0100
-@@ -2344,7 +2344,7 @@
-  		AC_MSG_ERROR(Cannot find libtool)
-  	fi
- ])dnl
--	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
-+	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LDFLAGS} ${LIBTOOL_OPTS} -o'
- 	LIB_OBJECT='${OBJECTS:.o=.lo}'
- 	LIB_SUFFIX=.la
- 	LIB_CLEAN='${LIBTOOL} --mode=clean'
---- configure.orig	2009-02-02 19:30:01.000000000 +0100
-+++ configure	2009-02-02 19:30:50.000000000 +0100
-@@ -2904,7 +2904,7 @@
-  	if test -z "$LIBTOOL" ; then
-  		{ echo "configure: error: Cannot find libtool" 1>&2; exit 1; }
-  	fi
--	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
-+	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LDFLAGS} ${LIBTOOL_OPTS} -o'
- 	LIB_OBJECT='${OBJECTS:.o=.lo}'
- 	LIB_SUFFIX=.la
- 	LIB_CLEAN='${LIBTOOL} --mode=clean'
diff --git a/dev-libs/cdk/files/cdk-5.0.20110517-ldflags.patch b/dev-libs/cdk/files/cdk-5.0.20110517-ldflags.patch
new file mode 100644
index 000000000000..8d0efa046634
--- /dev/null
+++ b/dev-libs/cdk/files/cdk-5.0.20110517-ldflags.patch
@@ -0,0 +1,33 @@
+--- cdk-5.0-20110517.orig/aclocal.m4
++++ cdk-5.0-20110517/aclocal.m4
+@@ -2786,7 +2786,7 @@
+ 		AC_MSG_ERROR(Cannot find libtool)
+ 	fi
+ ])dnl
+-	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
++	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LDFLAGS} ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+ 	LIB_SUFFIX=.la
+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
+--- cdk-5.0-20110517.orig/configure
++++ cdk-5.0-20110517/configure
+@@ -4510,7 +4510,7 @@
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+-	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
++	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LDFLAGS} ${LIBTOOL_OPTS} ${LT_UNDEF} -o'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+ 	LIB_SUFFIX=.la
+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
+--- cdk-5.0-20110517.orig/Makefile.in
++++ cdk-5.0-20110517/Makefile.in
+@@ -272,7 +272,7 @@
+ all cdklib :: $(DEFAULT)
+ 
+ $(CDKLIB) :: $(OBJECTS)
+-	@echo creating $@; $(LIBTOOL_CREATE) $@ $(LIB_OBJECT)
++	@echo creating $@; $(LIBTOOL_CREATE) $@ $(LIB_OBJECT) $(LIBS)
+ 	@$(RANLIB) $@
+ 
+ cdkshlib $(CDKSHLIB) :: $(CDKSHOBJS)
diff --git a/dev-libs/cdk/files/cdk-5.0.20110517-makefile.patch b/dev-libs/cdk/files/cdk-5.0.20110517-makefile.patch
new file mode 100644
index 000000000000..608ee73c3fc4
--- /dev/null
+++ b/dev-libs/cdk/files/cdk-5.0.20110517-makefile.patch
@@ -0,0 +1,11 @@
+--- cdk-5.0-20110517/Makefile.in.orig
++++ cdk-5.0-20110517/Makefile.in
+@@ -402,7 +402,7 @@
+ installCDKHeaderFiles \
+ installCDKLibrary :: $(BIN_DIR) cdk-config
+ 	@echo "Installing script $(CFG_ROOTNAME)$(VERSION_MAJOR)-config"
+-	@$(INSTALL_DATA) cdk-config $(BIN_DIR)/$(CFG_ROOTNAME)$(VERSION_MAJOR)-config
++	@$(INSTALL_PROGRAM) cdk-config $(BIN_DIR)/$(CFG_ROOTNAME)$(VERSION_MAJOR)-config
+ 
+ uninstall \
+ uninstallCDKHeaderFiles \