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

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

4 files changed, 44 insertions, 44 deletions

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 \