Bump to 6.1.8, thanks to slepnoga

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

6 files changed, 294 insertions, 18 deletions

diff --git a/dev-libs/ucommon/ChangeLog b/dev-libs/ucommon/ChangeLog
index 080e3073d88b..e983df99a7ea 100644
--- a/dev-libs/ucommon/ChangeLog
+++ b/dev-libs/ucommon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/ucommon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.19 2014/03/01 22:19:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.20 2014/06/27 08:46:59 maksbotan Exp $
+
+*ucommon-6.1.8 (27 Jun 2014)
+
+  27 Jun 2014; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/6.1/disable_rtf_gen_doxy.patch, +files/6.1/gcrypt_autotools.patch,
+  +files/6.1/install_gcrypt.m4_file.patch, +ucommon-6.1.8.ebuild:
+  Bump to 6.1.8, thanks to slepnoga
 
   01 Mar 2014; Michał Górny <mgorny@gentoo.org> ucommon-5.2.2-r3.ebuild,
   ucommon-6.0.3.ebuild:
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index d2388bec5310..eee7572d6200 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,32 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 6.1/disable_rtf_gen_doxy.patch 297 SHA256 7d8541fa94ef7c913af5fc120ad7a77f198e62dd1f97a923463c85dd5b14ee25 SHA512 a99d329f352c2b11a98b0ec7cacd235724e5a33ad817dbe1c9b23a7bfae01c250ae21beab6316ae5d1a86725445ce3ad39971da7d55bc765467e17abc8ca7e98 WHIRLPOOL 518b17acf584ecf922627dde983b82745abca86feab3b88613b190f47da630d7735e710df77c9f61307afe75e79b8aa25ac15c6eb2276d03337c138de5c2e630
+AUX 6.1/gcrypt_autotools.patch 1788 SHA256 5897afa8cd01e60cb5ee485bff4f6dc21555a2ac3da11f0e6d41a5a0686e3eae SHA512 56dfe413ee5f157304eb0f56f90120b15264b261043bbbe1874bbbff9c4fcfcade223aa9013d06a82e816ea9002a4552624f547aeb55c3db70762a3386ba31ed WHIRLPOOL 411d871490065e6312af86d311e71bb2534b33f0729c2b7f1970b5008bf4440251d7889e939238bce87a2d2c3d13600ef1e049bb0b02f6119b00e8a069240038
+AUX 6.1/install_gcrypt.m4_file.patch 4970 SHA256 9a161813addb5be01b411539a65fc0c2848fa109624986b81be861f8b044df6c SHA512 03039a04a8fafe4b23e74efc89ee1391caf0c4172ff3f2176cb47fea3777061382e756b81c01d1413cdbf5d7715c85194842ff7e17d1b679e2db4ac5de14d683 WHIRLPOOL 4db79a5ac8086cca33c88b902a1bc91cbd9bbaed66138761779d72455b4233751469ce268d6f9b4fd7855723af9a13ed4b3152c641cdb8ea6d3e822f079a53d1
 AUX disable_rtf_gen_doxy.patch 446 SHA256 19742ff3a149ca50d7397f9ffafc5c70fb332837e2eae81b914e47cf9e8b1f20 SHA512 fe4168b313b5eca78fe8787b758c789c4b91df8355e380acd71c32735ad5c6984a3d6c06747e0215326870eba05d38ca015c88e5ca4166f42b3213ecfb1ad793 WHIRLPOOL 3bb313489028b0e0098e6338fa563327ecfd0cdd3f3e0e410d0c07d532ffe0572e742e4e81b4a9e8e94730211a0b3c4bd473302700f6cb78cd93a5998076796f
 AUX gcrypt_autotools.patch 1843 SHA256 9c449f270645e4809ea629533529e60297fd408606a126e4063d0685d6ed1a7d SHA512 019cbd580b7da5097a8de595fce2585cb9c84636260452ad8f03d03f8ce5b157a655f21724799689a94cc8eef70c1e0445aca5f458a659c301eaeb490f86aa83 WHIRLPOOL 1817daa10642c183dc30872368e20494dac5ef7c794584940b9074a788e1576c69abb2805c3eda80a3af7603ef64cc1ce615e7a675057d598839d21e3852cb41
 AUX install_gcrypt.m4_file.patch 4970 SHA256 9a161813addb5be01b411539a65fc0c2848fa109624986b81be861f8b044df6c SHA512 03039a04a8fafe4b23e74efc89ee1391caf0c4172ff3f2176cb47fea3777061382e756b81c01d1413cdbf5d7715c85194842ff7e17d1b679e2db4ac5de14d683 WHIRLPOOL 4db79a5ac8086cca33c88b902a1bc91cbd9bbaed66138761779d72455b4233751469ce268d6f9b4fd7855723af9a13ed4b3152c641cdb8ea6d3e822f079a53d1
 AUX ucommon-5.2.2-address.patch 1289 SHA256 1185931d42376bf3b980eff21a255b4a1bad5f61a97bf9129711afbbecbbd8ad SHA512 22950b7c5adc3af05e21e8324dd46665ac197f1de4c988fd2b28096d3bd18f00c5e4ab275e02571251607bdd3661caae950a2397e253293b62097e9cfce8847c WHIRLPOOL 73c616b7dc99074c95241a50bd2a0aa63d0322412588674431988004a27372c0df25df7a69a96d0fcc08bcc29c96b550097c08c717f143425d912bc750e357c8
 DIST ucommon-5.2.2.tar.gz 792081 SHA256 9d5f3f4d1ef897482fe470b0dd65b0df516aaeb874eac3a33a455abca13f39e9 SHA512 5d5e526675cb39dffea48c38a14dff4eb1316a59c60e2352cfdbb0727ff4db00417e9704026f106da5d34f92ec2be3385b0763d66196f345f0b775bf62eb0125 WHIRLPOOL f857c4b06aff4bbb1ff84edc810d674c7d77a92bb4bcdb62fed64e77e9979c7d736b93596166de6c5fb848745aa7efc1b666231bdb6a33c3b959953b4b114ac2
 DIST ucommon-6.0.3.tar.gz 806841 SHA256 228f3a0fa78173e9fa43e154250a7ed4f1e5be720a81fd2768506c088190c432 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762 WHIRLPOOL 93135ae4ec3c0e6d5203ebed6c6736b9b768d623d99a20674ee0a0ce48622d783efea6b8ca4eb22d5c2653b5059ff9626a35bf0ccfbad7d422a5cdf6c190c7c8
+DIST ucommon-6.1.8.tar.gz 833017 SHA256 9a2b3eb0b71198adcccd74303df59551fdd016c3a2848fb8be003fb1ac2e7fc5 SHA512 86fcd9b2fbafd06d87470a16bc3d377716e7040f29ccb91bf1fbe9ce66ef88e936141bd7c388d4bb63b9d4dea5e22ec9a0aae39cf3cf58e8a0e3ac9cb9b546b4 WHIRLPOOL a87ae7a929920710ad601d04bbf907c626ca4ade92d19c18ac0cba004428505d52082742ff65a0ce00862f04507e69a31012a365ababdc9bbbf5b0866c557047
 EBUILD ucommon-5.2.2-r3.ebuild 1387 SHA256 55d16ecc1340979a917c9f8c189dca98be20d16692348979231e82c083807cdd SHA512 b43e3cdb3a2d2841559c1abf286e7cbd23a93fd7a063036608ec9e974eec6d53ea44d1558f5e5682d38bace6c2c32f6d5b4dbefa85befbbeb0cf54446552386e WHIRLPOOL eecab7044bceec583d1457ce2bfa20f1f3e97d78fd2c71433f3ec027e9f8547e085b735011d3d55c912838ea34f2efb86f887b267ee7caf58b601cc73cc0e1d2
 EBUILD ucommon-6.0.3.ebuild 1618 SHA256 c3728659586bd6cac57b132b4adc1514ab8c3a243fd461f177f4cc412ea0d299 SHA512 0fb750f5cebae45299e09ac5f05e277c97817e75c7dcd534b6369d0bcac51a90fb7e0cbf6d2a0d61762512ec61dfa2ddfa3c01aee42c14f4dd8348812506532b WHIRLPOOL 645dadf8db8ce5c71f98d241b5f16abe1f311e50071f76c2d659db4354418db1c538f557952af7621eea4983fbd989fdb7596c2abe79dbe56308eba9bb63057f
-MISC ChangeLog 3285 SHA256 4e03c53851e92d8447cd01149beef8748ecde6ae95f6aa2ac02681e3698dd2fe SHA512 787bb065fe48643099f618d7b93aa25a6a95a5ac365fb3a83e43583bab286ac364f38a88d7c406d9eec6dd05a29a0a30a773d1a77d263244649a0ed33adede68 WHIRLPOOL 21e3cb8f250766950f5b1ebdd7e4dbf053575710291ebd585190da4d1bbae437878475207d095f99d05b9440905f332895c481188f473bad2a39e4f7bed22f98
+EBUILD ucommon-6.1.8.ebuild 1638 SHA256 3bb4e473a7d32b02a616ec390edd0e76eafeb3f7e4ee2d8cd9946c571dc46f8b SHA512 d3e60e29bf470fb050adf3077698a79df9d78cdb7fb60af1338dea40876783c4a1207213947afbfa505fb15d84f5f7e8bd29bd6548b1da4c58d6bce72610d253 WHIRLPOOL 7ccdba3334ce0ec6c8e8704c9c19f6b2eb92b2a9d09d23e32a5583981334b8b3715b6d59e94a1b89ccdd44ece80ffa6b9ef8cda3842312197ffdf4f0daf57063
+MISC ChangeLog 3549 SHA256 26b39ff4b4a5dc797e3d2719604b6ad2eca534e9a27819b82dc1bc233113dd7c SHA512 8d261983ec2cc7c65b2e7adb0b5f6bda9a6fb6e558297e1e7fed0410f31feda4268a2c98bc787d6d7e9edc5b05054ac1e25925b0a59740be1a7468b329dff647 WHIRLPOOL d890af921855da14fd32227f14606018bdab21612527ff489de7d6374f47d041815511bc1c8249483f512c532344ea3a92346260d3ff028fc0a5b24db93b06f1
 MISC metadata.xml 438 SHA256 a8ececfa37303e2e3822d69cacd23567fb9813b6fb0f319b08b6676808a26484 SHA512 c39973823d63c3506f0f572f4187aa000fa57dca64d96d3d5f5baf9b0e00bed2f1cc6fd116fff8e802b71bdfefbf527d6bf99051ad23136d9b6f91be6db55451 WHIRLPOOL 24719f9882adcf8bed378d899117a817b678f6b79623db49b9a833bc85cadb240f31ff61c0fc798772e7395ec9b3df9dfeeb27a7c47cde7a91a34a883e95a050
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTElz4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZONJEP/1dzvwWXW11h+CZE1Ra6HwM3
-fLlB8jKQTg4jnF/5MRdyK/Bbnaj2hd/5DTesJbeesOjHUVweqvFVBwBOoZTYUeOS
-rHZohDMD6x3+Fke5EDP/2OB1MmfoVASr5GZul7aRGwouJiMXvKveoL3vrDZbjjpV
-M48KLUF7pZjRS1FF03cbRHz0OfrqIGmw8oOEh5m0OW4Bem4/2ZyM5kicchuwdR40
-KycpfBCDrytbLRZR0E1SSwYBOkHs4NxrC2jQTSP2Ln/J8kQ2q2cFqRTYJexe3Twb
-cyLy9+BOomx06WQP1E8EL6LZFpMy5UkYkyEqTcBewz4/DosmHI6xB9KWi29wTBk9
-wif0zZZ3zwiGX8z2588JC+I6mDhdOgQltNzjwbC1KYyZ6LqjiqY7MQ5sSnQWCp86
-XMLyvYTMxC3pZF69zDsMjdL6dbJ+1CRMMwJv7bRNW3SCHG+W4R4KWJ2TmYSyfmKA
-7JlV5R9tYZPEie2n01Ao+tO/yNmDhuNbmKoAdKIBKp0qo6X0nfHxzOk3KGoDu7NN
-ZnibR7skoujKXEhXjqufTo9UVOuMwlYppq6zaOmmGskUCiEBs+hLD0XjpvG2t1jc
-70m7jnxTXa+FlG4lC1qGiGkIbabYohnl1JyCROXnzJoE6bRfz2SKUTIZnmOYVaZQ
-Jh5d42nyETofwAeFpIpR
-=TDaV
+iQEcBAEBCAAGBQJTrS8bAAoJEAmJmMX429reqKsH/0e5tKaTf5I1dLETRYnWo7P4
+QgabizWU0P3FG7Im1NDAeq8izQaBHy5FvNyRvcmRq38Uv9xWeCtXDZJ6mYrCrLsI
+emMTwvjilvv7fbre60EqYqYKM1rRmUFtNs3fbf5HDeoodKvxAJGt4cb4mM1a+25v
+wPm2/1fmMHFhSybt8qtjJ/CNkxtOAu4wvODApD7kmaQeHreSbAwMKLNkK9wjXvBk
+kf4MIrwk2DLNVjDixiMl871ilK5W9E2tD+VjRi84DiLIF/cbY2gimGxbZzS6SlJN
+C2vY4AEUamkwEI5VpMK2VCTln7X6OwxnybCN1FB/IZMRolK6umQuQTteX1v6x/I=
+=7fIK
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/ucommon/files/6.1/disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/6.1/disable_rtf_gen_doxy.patch
new file mode 100644
index 000000000000..1aaf478ed320
--- /dev/null
+++ b/dev-libs/ucommon/files/6.1/disable_rtf_gen_doxy.patch
@@ -0,0 +1,11 @@
+--- Doxyfile.orig	2014-06-26 23:56:45.724303475 +0300
++++ Doxyfile	2014-06-26 23:57:12.875021734 +0300
+@@ -40,7 +40,7 @@
+ GENERATE_HTMLHELP = YES
+ GENERATE_TREEVIEW = NO
+ TREEVIEW_WIDTH = 256
+-GENERATE_LATEX = YES
++GENERATE_LATEX = NO
+ COMPACT_LATEX = YES
+ PDF_HYPERLINKS = YES
+ USE_PDFLATEX = NO
diff --git a/dev-libs/ucommon/files/6.1/gcrypt_autotools.patch b/dev-libs/ucommon/files/6.1/gcrypt_autotools.patch
new file mode 100644
index 000000000000..2ec0858245d9
--- /dev/null
+++ b/dev-libs/ucommon/files/6.1/gcrypt_autotools.patch
@@ -0,0 +1,58 @@
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,6 +8,8 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \
+     *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \
+     CMakeLists.txt ucommon-config.cmake ucommon.pc.cmake cmake-abi.sh \
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,9 @@
+ 
+ CHECKFLAGS="$CHECKFLAGS"
+ 
++m4_include([m4/libgcrypt.m4])
++
++
+ case "$with_crypto" in
+ ssl|openssl)
+     ssl="openssl"
+@@ -698,6 +701,8 @@
+ gnutls|gnu)
+     if test ! -z "$GNUTLS_LIBS" ; then
+         SECURE_LIBS="$GNUTLS_LIBS"
++	AM_PATH_LIBGCRYPT
++	SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS"
+         SECURE="gnutls"
+     fi
+     ;;
+diff --git a/utils/Makefile.am b/utils/Makefile.am
+--- a/utils/Makefile.am
++++ b/utils/Makefile.am
+@@ -9,9 +9,9 @@
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 
+ MAINTAINERCLEANFILES = Makefile.in Makefile
+-AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@
++AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@
+ AM_CPPFLAGS = -I$(top_srcdir)/inc
+-LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@
++LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ @LIBGCRYPT_LIBS@
+ EXTRA_DIST = *.1
+ 
+ man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 \
+@@ -30,7 +30,7 @@
+ scrub_files_LDFLAGS = @SECURE_LOCAL@
+ 
+ mdsum_SOURCES = mdsum.cpp
+-mdsum_LDFLAGS = @SECURE_LOCAL@
++mdsum_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@
+ 
+ zerofill_SOURCES = zerofill.cpp
+ zerofill_LDFLAGS = @SECURE_LOCAL@
diff --git a/dev-libs/ucommon/files/6.1/install_gcrypt.m4_file.patch b/dev-libs/ucommon/files/6.1/install_gcrypt.m4_file.patch
new file mode 100644
index 000000000000..5fb0cc3b878d
--- /dev/null
+++ b/dev-libs/ucommon/files/6.1/install_gcrypt.m4_file.patch
@@ -0,0 +1,128 @@
+diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
+new file mode 100644
+--- /dev/null
++++ m4/libgcrypt.m4
+@@ -0,0 +1,123 @@
++dnl Autoconf macros for libgcrypt
++dnl       Copyright (C) 2002, 2004 Free Software Foundation, Inc.
++dnl
++dnl This file is free software; as a special exception the author gives
++dnl unlimited permission to copy and/or distribute it, with or without
++dnl modifications, as long as this notice is preserved.
++dnl
++dnl This file is distributed in the hope that it will be useful, but
++dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
++dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++
++dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
++dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
++dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
++dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
++dnl with the API version to also check the API compatibility. Example:
++dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
++dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
++dnl this features allows to prevent build against newer versions of libgcrypt
++dnl with a changed API.
++dnl
++AC_DEFUN([AM_PATH_LIBGCRYPT],
++[ AC_ARG_WITH(libgcrypt-prefix,
++            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
++                           [prefix where LIBGCRYPT is installed (optional)]),
++     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
++  if test x$libgcrypt_config_prefix != x ; then
++     if test x${LIBGCRYPT_CONFIG+set} != xset ; then
++        LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
++     fi
++  fi
++
++  AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
++  tmp=ifelse([$1], ,1:1.2.0,$1)
++  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
++     req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
++     min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
++  else
++     req_libgcrypt_api=0
++     min_libgcrypt_version="$tmp"
++  fi
++
++  AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
++  ok=no
++  if test "$LIBGCRYPT_CONFIG" != "no" ; then
++    req_major=`echo $min_libgcrypt_version | \
++               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
++    req_minor=`echo $min_libgcrypt_version | \
++               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
++    req_micro=`echo $min_libgcrypt_version | \
++               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
++    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
++    major=`echo $libgcrypt_config_version | \
++               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
++    minor=`echo $libgcrypt_config_version | \
++               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
++    micro=`echo $libgcrypt_config_version | \
++               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
++    if test "$major" -gt "$req_major"; then
++        ok=yes
++    else
++        if test "$major" -eq "$req_major"; then
++            if test "$minor" -gt "$req_minor"; then
++               ok=yes
++            else
++               if test "$minor" -eq "$req_minor"; then
++                   if test "$micro" -ge "$req_micro"; then
++                     ok=yes
++                   fi
++               fi
++            fi
++        fi
++    fi
++  fi
++  if test $ok = yes; then
++    AC_MSG_RESULT([yes ($libgcrypt_config_version)])
++  else
++    AC_MSG_RESULT(no)
++  fi
++  if test $ok = yes; then
++     # If we have a recent libgcrypt, we should also check that the
++     # API is compatible
++     if test "$req_libgcrypt_api" -gt 0 ; then
++        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
++        if test "$tmp" -gt 0 ; then
++           AC_MSG_CHECKING([LIBGCRYPT API version])
++           if test "$req_libgcrypt_api" -eq "$tmp" ; then
++             AC_MSG_RESULT([okay])
++           else
++             ok=no
++             AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
++           fi
++        fi
++     fi
++  fi
++  if test $ok = yes; then
++    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
++    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
++    ifelse([$2], , :, [$2])
++    if test x"$host" != x ; then
++      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
++      if test x"$libgcrypt_config_host" != xnone ; then
++        if test x"$libgcrypt_config_host" != x"$host" ; then
++  AC_MSG_WARN([[
++***
++*** The config script $LIBGCRYPT_CONFIG was
++*** built for $libgcrypt_config_host and thus may not match the
++*** used host $host.
++*** You may want to use the configure option --with-libgcrypt-prefix
++*** to specify a matching config script.
++***]])
++        fi
++      fi
++    fi
++  else
++    LIBGCRYPT_CFLAGS=""
++    LIBGCRYPT_LIBS=""
++    ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(LIBGCRYPT_CFLAGS)
++  AC_SUBST(LIBGCRYPT_LIBS)
++])
diff --git a/dev-libs/ucommon/ucommon-6.1.8.ebuild b/dev-libs/ucommon/ucommon-6.1.8.ebuild
new file mode 100644
index 000000000000..858c5a1c74d8
--- /dev/null
+++ b/dev-libs/ucommon/ucommon-6.1.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.1.8.ebuild,v 1.1 2014/06/27 08:46:59 maksbotan Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Portable C++ runtime for threads and sockets"
+HOMEPAGE="http://www.gnu.org/software/commoncpp"
+SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="doc static-libs socks +cxx debug ssl gnutls"
+
+RDEPEND="ssl? (
+		!gnutls? ( dev-libs/openssl )
+		gnutls? (
+			net-libs/gnutls
+			dev-libs/libgcrypt
+		)
+	)"
+
+DEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	${RDEPEND}"
+
+DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
+PATCHES=( "${FILESDIR}"/6.1/disable_rtf_gen_doxy.patch
+		  "${FILESDIR}"/6.1/install_gcrypt.m4_file.patch
+		  "${FILESDIR}"/6.1/gcrypt_autotools.patch )
+
+#AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+
+	# Aclocal 1.13 deprecated error BGO #467674	
+	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+	if use ssl; then
+		myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
+	else
+		myconf+=" --with-sslstack=nossl ";
+	fi
+
+	local myeconfargs=(
+		$(use_enable  socks)
+		$(use_enable  cxx stdcpp)
+		${myconf}
+		--enable-atomics
+		--with-pkg-config
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile doxy
+}
+
+src_install() {
+	autotools-utils_src_install
+	if use doc; then
+		dohtml doc/html/*
+	fi
+}