Version bump and remove old. Add static-libs and unicode USE flags.

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

8 files changed, 103 insertions, 136 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/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 \