Version bump (fixes bug #179520)

(Portage version: 2.1.2.10)

4 files changed, 67 insertions, 3 deletions

diff --git a/dev-cpp/commoncpp2/files/1.5.7-as-needed.patch b/dev-cpp/commoncpp2/files/1.5.7-as-needed.patch
new file mode 100644
index 000000000000..a1d20c610198
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.5.7-as-needed.patch
@@ -0,0 +1,35 @@
+diff -Naur commoncpp2-1.5.7.orig/configure.ac commoncpp2-1.5.7/configure.ac
+--- commoncpp2-1.5.7.orig/configure.ac	2007-06-16 15:23:05.000000000 +0200
++++ commoncpp2-1.5.7/configure.ac	2007-06-16 15:24:39.000000000 +0200
+@@ -357,6 +357,9 @@
+ darwin*)
+ 	MODULE_FLAGS="-dynamic -bundle -undefined suppress -flat_namespace -read_only_relocs suppress"
+ 	;;
++linux*)
++	BASE_LIB="../src/libccgnu2.la"
++	;;
+ esac
+ 
+ AC_SUBST(COMMON_FLAGS)
+diff -Naur commoncpp2-1.5.7.orig/src/Makefile.am commoncpp2-1.5.7/src/Makefile.am
+--- commoncpp2-1.5.7.orig/src/Makefile.am	2007-06-16 15:23:05.000000000 +0200
++++ commoncpp2-1.5.7/src/Makefile.am	2007-06-16 15:23:32.000000000 +0200
+@@ -32,7 +32,7 @@
+ scriptdir = $(bindir)
+ script_DATA = ccgnu2-config
+ 
+-libccgnu2_la_LIBADD = @THREAD_LIBS@
++libccgnu2_la_LIBADD = @THREAD_LIBS@ @DYN_LOADER@
+ libccgnu2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+ noinst_DATA = @STAGE2@
+ 
+@@ -45,7 +45,8 @@
+ 	cidr.cpp private.h nat.h
+ 
+ if EXTRAS
+-libccext2_la_LDFLAGS = @BASE_LIB@ @THREAD_LIBS@ @SSL_LIBS@ @ZSTREAM_LIBS@ $(RELEASE) $(SHARED_FLAGS)
++libccext2_la_LIBADD = @THREAD_LIBS@ @BASE_LIB@ @SSL_LIBS@ @ZSTREAM_LIBS@
++libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
+ 
+ if GETOPT_LONG
+ optincludedir=$(includedir)/cc++2
diff --git a/dev-cpp/commoncpp2/files/1.5.7-ssl_config.patch b/dev-cpp/commoncpp2/files/1.5.7-ssl_config.patch
new file mode 100644
index 000000000000..675e99960721
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.5.7-ssl_config.patch
@@ -0,0 +1,29 @@
+--- configure.ac.orig	2006-10-22 18:02:57.000000000 +0200
++++ configure.ac	2006-10-22 18:06:17.000000000 +0200
+@@ -247,6 +247,7 @@
+ 	ost_cv_extras=yes
+ 	AC_DEFINE(HAVE_EXTRAS, [1], [Enable extras])
+ 
++	AC_ARG_WITH(gnutls, [  --with-gnutls         Enable gnutls support], [
+ 	AC_CHECK_HEADER(gnutls/gnutls.h,[
+ 		AC_CHECK_LIB(gnutls, gnutls_init, [
+                         SSL_LIBS="-lgnutls -lgcrypt"
+@@ -254,13 +255,12 @@
+                         AC_DEFINE(CCXX_SSL, [GNUTLS], [defines ssl])
+                         AC_DEFINE(CCXX_GNUTLS, [1], [define gnutls])
+ 		])
+-
+-	],[
+-		AC_ARG_WITH(openssl, [  --with-openssl       Enable openssl support],
+-			[OST_LIB_SSL],
+-			[OST_LIB_NOSSL])
++	],[])
++	], [
++	AC_ARG_WITH(openssl, [  --with-openssl       Enable openssl support],
++		[OST_LIB_SSL],
++		[OST_LIB_NOSSL])
+ 	])
+-
+ 	AC_ARG_WITH(compression, [  --without-compression   Disable libz compression],
+         	[OST_LIB_NOZLIB],
+         	[OST_LIB_ZLIB])
diff --git a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.1 b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.1
deleted file mode 100644
index d9c6b02e1e54..000000000000
--- a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f2b1f011029de128496c33424f145864 commoncpp2-1.5.1.tar.gz 862555
-RMD160 ebfc941ea65bbf10f8d6485945748066280719b9 commoncpp2-1.5.1.tar.gz 862555
-SHA256 32e37df5f089c63d95a150b465d925ea33609c1fe3de952efbdca91add8c45d0 commoncpp2-1.5.1.tar.gz 862555
diff --git a/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.7 b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.7
new file mode 100644
index 000000000000..e4388dad2c83
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/digest-commoncpp2-1.5.7
@@ -0,0 +1,3 @@
+MD5 bd85e157e1f4f457e9137c59d40a13fb commoncpp2-1.5.7.tar.gz 858598
+RMD160 897076e80a9d6acca1c7f11dd1dc94c3a32fc73b commoncpp2-1.5.7.tar.gz 858598
+SHA256 95b0e86c27db1ec0b79abe4097f4449f1e15dde1870202ead0551c506269a504 commoncpp2-1.5.7.tar.gz 858598