reinit the tree, so we can have metadata

14 files changed, 883 insertions, 0 deletions

diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
new file mode 100644
index 000000000000..fab0cde6d9c1
--- /dev/null
+++ b/dev-libs/ucommon/Manifest
@@ -0,0 +1,20 @@
+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-6.3.1-gcrypt_autotools.patch 1306 SHA256 b65366f04e75bf3b00cc692aca03ea48d6a18a3e8966f2658a60f1577a36b7a5 SHA512 54fb48fcf9c4c579a9c9439b679f10306c595fcf9b3a5b25e3d9c71668a009023f31e650cc84113ed72a474e27555f674e557a471263290c86b0aad067cedfd8 WHIRLPOOL 0441e0f4d061aa89c9fb20fea864da58baefd8861584c8d7e93560bf16a99cf745664187ef602286d722b09c54fd32ca01e4f4d18bd259a1bdb317e51eeafe3f
+DIST ucommon-6.0.3.tar.gz 806841 SHA256 228f3a0fa78173e9fa43e154250a7ed4f1e5be720a81fd2768506c088190c432 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762 WHIRLPOOL 93135ae4ec3c0e6d5203ebed6c6736b9b768d623d99a20674ee0a0ce48622d783efea6b8ca4eb22d5c2653b5059ff9626a35bf0ccfbad7d422a5cdf6c190c7c8
+DIST ucommon-6.1.10.tar.gz 833384 SHA256 d7a15ed31e3c418b41d95d5ff5e1bc24dfc4c2a465a099c6fd30e0b6c9f7be92 SHA512 6d6e716dcb71d6a4e49307baa0e9e62b4b50f3dbe8301eb93e3b562d94eb9ccee73a733928059a5ed97deba55c00308af0326a32cec6a73dbf7884c322177050 WHIRLPOOL 31666dc7e4c00b9acc7ba9d7a26033ec7ff28674722597e9677ba426b79fae45a170c5caaaa4066738d072090c2dacd465dc861aebbbd50cde36877b3b1a1e59
+DIST ucommon-6.3.1.tar.gz 830661 SHA256 b59aa5414e756935ef9c479ece837f5700e4a5f39b0a016daa90528b175f59d5 SHA512 6f4832ac53aaf1456f2d913730b66588a89a3c1292fb79f3f56da466a2542af9c836579c0a3c4daf3f896a0c3e35f861b71514f960052adcb4e3abb872b781ec WHIRLPOOL 0bad6d56c0f1111a1aa15f7532ce6507be897a2b7ce27e452e71c08064f3f854b6864d3f7ed58ed476edf6777fc256374ab08e9c89bbb4f4abfcef8486969fed
+DIST ucommon-6.5.2.tar.gz 847128 SHA256 fbc929cafd5099a78978acde274849d70f4da554cee0d86865591b784f424622 SHA512 dc6dc048bad52d117edd1936ad31fd9fc6dba418fea3f7fd1578a96909c1eb53d2a42c4773a168db38ff24fc73b467ab30ec9b5ad5132ae473c36cea0e77b341 WHIRLPOOL d172311f7a13e48d99be5567f6f8ec2d806feea5b0a858fe7372cd024a10c676748c2533f9e1ac00093dbc3838fbf69c3c34e7d4a20709f1156c566ceabdf819
+DIST ucommon-6.5.7.tar.gz 855822 SHA256 3dedf94afe35e63b44a9a17cbc77a229e090fde1c56cd3476d936c44462404db SHA512 9927c9726252cdf050f217fa5993d34dcf9f76fab8399ee3a4c91cf087d9409947ed486a21e8448cb57ea95b52826682120f99d39287983c306434f9121b4d24 WHIRLPOOL b0c558eaff56e7f27b10b3ec6aeef514fe3c0898804953946f613449fbf4face8a421a2a047898f9ff1e1af96cb4b21a9064f8850a5df6b91213d4ec56afa98d
+EBUILD ucommon-6.0.3.ebuild 1506 SHA256 5eaff1ab997d407ba436af7b1de3d108ada63f493b0a6c9eec18b2405452f5e0 SHA512 6f16fb40eecdc2347d111a798e27dffdc5777569f66b5e850aa365c860ebe05a6e7a1b2ff43b82b8a35d769baea83bd264b18fbd5ea998b67e70577be4cfaac1 WHIRLPOOL 7a9b28f1c98842bb8c5405846fa7ee39e32e04c9d7a78a14dee24448609e0b5c30bc2f4f0eaa850606391cae562499a88e78220592381d2c90aafc7974fed897
+EBUILD ucommon-6.1.10.ebuild 1635 SHA256 7a2c99a84170953f9d45eddca7b5fab2a601d06696a166c3861494a9cfaf00bd SHA512 49e3a34dafb78cd913465266c345859ad7ab7c9c5da9f4709014c283adc80c92aeefabf62130fb81ef0b21a0a039d8fb425172c2a60742fd1d52b86b25c2aa4c WHIRLPOOL 020dd1e7b260f9e36e4ab4b7f0d87269e1d5a9bf069e7e9f8150ef5a617a19dc22662da9451937c8a988848e8662798634e4ead9ac6088ea9dcb59981a2f9044
+EBUILD ucommon-6.3.1.ebuild 1729 SHA256 238cb4dfef01a77f7fbf371ba75667c6ecd7984bcd8da885f2952f7c7a95e605 SHA512 e2c954c5adca3c864b0bcde009bf640b635e94d051710366597ebf57cf7e9b2fa32c723e4681f4967e91843efa36a0c6961259e96fcdc9def2ced1362d5bfb49 WHIRLPOOL 81fea8ed388a81712282c6e1c2c77a4be5e21b09981f6b3cd66a55e3f50f9e0f6f8711ba43dad15f760e7a425d3e2289558022d43e6b876f965a29b8eef1cceb
+EBUILD ucommon-6.5.2.ebuild 1727 SHA256 5fc1eb4d1dd2209359a6decfe527f717211f689ebb0d9574ca5bf99f6016af02 SHA512 77b60008f137d52e9fa61f2ba4a95d99bbe7f1929b62c809010de2b1146988e433907cc304c92c4b0f0d2ea105dbcb6d4524e6c431a304dc3515b388b3f89c51 WHIRLPOOL 013f84e7003d4e65e584cb84cbb71960c12c45ba2c7000a84db85c7889912e21d8f140946d3278da1850e36e51c7871791c22072593ecbca79c1fb8c7308c5ba
+EBUILD ucommon-6.5.7.ebuild 1727 SHA256 5fc1eb4d1dd2209359a6decfe527f717211f689ebb0d9574ca5bf99f6016af02 SHA512 77b60008f137d52e9fa61f2ba4a95d99bbe7f1929b62c809010de2b1146988e433907cc304c92c4b0f0d2ea105dbcb6d4524e6c431a304dc3515b388b3f89c51 WHIRLPOOL 013f84e7003d4e65e584cb84cbb71960c12c45ba2c7000a84db85c7889912e21d8f140946d3278da1850e36e51c7871791c22072593ecbca79c1fb8c7308c5ba
+MISC ChangeLog 4833 SHA256 febf3fc0370c9a4a4e25ebc1a1a0b35568612a697a88c8eed99d5537e81aa37d SHA512 af7386bb21f00bcc002c1924f4775ece41a1eee05ec23ef6ffefe05c94ffd80f193491b636a40fcbebc7c14a4d4f02899972a6ca981710953decdbde8123f63b WHIRLPOOL dae7485112a6717d0c3313891f47def3b268204cd750a5a5453acc08ac4f664e2b984179e702e94dd37b03e2c00538db2a2c1ccbc489b2f61c9d7c284dc80b40
+MISC ChangeLog-2015 4001 SHA256 a9973e89ead1244683cfa4205ec742a7d7a47b054692845e55ba7202fbc98f49 SHA512 b3d10a2631a2692855fdce3f6d0d5a268e34a61fd0f8619f960841cbadd3390c9cf45c88df2ef77823d149e2bf14248789b0846ff01d1e25270b29d6e98da1a1 WHIRLPOOL 3970706efb499a13089bdc5189d3360179f4ea42569746d7026a8740160f7d06b41d64b32eaf19896f31ecf205b0b2ea8b64970054ae70e082efc6005ca10128
+MISC metadata.xml 316 SHA256 2e624f5e2cc04e091cd340c50a094ad73999cf4ec19850104599871876b6e3de SHA512 8095298e0382cc3e245df76d9b5bd4f27c9cf803aafc5b3fe9a9d63c94733192287a0d0348904320f07ec3a24edc9c437f09065b12dc3226f7acbe1e055c774c WHIRLPOOL 82aa6c3d70be8f928a1c158c20656b929a3b788437d9cfe463523ae0d7ca58fe2de4f984c9f7a5995cb95c427a94e217f9e159d6d11b105ef2ab59bf3e5370ba
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/files/disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/disable_rtf_gen_doxy.patch
new file mode 100644
index 000000000000..2fca1f7bcad7
--- /dev/null
+++ b/dev-libs/ucommon/files/disable_rtf_gen_doxy.patch
@@ -0,0 +1,18 @@
+--- Doxyfile.orig	2010-03-14 04:33:22.303087693 +0200
++++ Doxyfile	2010-03-14 04:34:34.495254330 +0200
+@@ -37,13 +37,13 @@
+ GENERATE_HTMLHELP = YES
+ GENERATE_TREEVIEW = YES
+ TREEVIEW_WIDTH = 256
+-GENERATE_LATEX = YES
++GENERATE_LATEX = NO
+ COMPACT_LATEX = YES
+ PDF_HYPERLINKS = YES
+ USE_PDFLATEX = NO
+ LATEX_BATCHMODE = YES
+ LATEX_HIDE_INDICES = NO
+-GENERATE_RTF = YES
++GENERATE_RTF = NO
+ COMPACT_RTF = YES
+ RTF_HYPERLINKS = NO
+ GENERATE_MAN = NO
diff --git a/dev-libs/ucommon/files/gcrypt_autotools.patch b/dev-libs/ucommon/files/gcrypt_autotools.patch
new file mode 100644
index 000000000000..8a5b93ffbdcd
--- /dev/null
+++ b/dev-libs/ucommon/files/gcrypt_autotools.patch
@@ -0,0 +1,62 @@
+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
++
+ AUTOMAKE_OPTIONS = no-dependencies dist-zip
+ EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \
+     *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,8 +37,12 @@
+ UCOMMON_LIBS=""
+ OPENSSL_LINK=""
+ 
++AM_SILENT_RULES([yes])
++
+ CHECKFLAGS="$CHECKFLAGS"
+ 
++m4_include([m4/libgcrypt.m4])
++
+ case "$with_crypto" in
+ ssl|openssl)
+     ssl="openssl"
+@@ -664,7 +668,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@
+ INCLUDES = -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 pdetach.1
+@@ -27,7 +27,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/install_gcrypt.m4_file.patch b/dev-libs/ucommon/files/install_gcrypt.m4_file.patch
new file mode 100644
index 000000000000..5fb0cc3b878d
--- /dev/null
+++ b/dev-libs/ucommon/files/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/files/ucommon-6.3.1-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch
new file mode 100644
index 000000000000..fb04130a0a85
--- /dev/null
+++ b/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch
@@ -0,0 +1,48 @@
+--- ucommon-6.3.1/configure.ac
++++ ucommon-6.3.1/configure.ac
+@@ -38,8 +38,12 @@
+ OPENSSL_LINK=""
+ MODULE_FLAGS="-module -shared -avoid-version"
+ 
++AM_SILENT_RULES([yes])
++
+ CHECKFLAGS="$CHECKFLAGS"
+ 
++m4_include([m4/libgcrypt.m4])
++
+ case "$with_crypto" in
+ ssl|openssl)
+     ssl="openssl"
+@@ -598,7 +602,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
+     ;;
+--- ucommon-6.3.1/utils/Makefile.am
++++ ucommon-6.3.1/utils/Makefile.am
+@@ -10,9 +10,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@
++LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @LIBGCRYPT_LIBS@
+ EXTRA_DIST = *.1 CMakeLists.txt
+ 
+ man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 \
+@@ -21,7 +21,7 @@
+ 
+ noinst_PROGRAMS = demoSSL
+ demoSSL_SOURCES = ssl.cpp
+-demoSSL_LDFLAGS = @SECURE_LOCAL@
++demoSSL_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@
+ 
+ args_SOURCES = args.cpp
+ 
diff --git a/dev-libs/ucommon/metadata.xml b/dev-libs/ucommon/metadata.xml
new file mode 100644
index 000000000000..72a1c4cf8f6f
--- /dev/null
+++ b/dev-libs/ucommon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>maksbotan@gentoo.org</email>
+	<name>Maxim Koltsov</name>
+</maintainer>
+<use>
+	<flag name="socks">Build with socks proxy support</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-libs/ucommon/ucommon-6.0.3.ebuild b/dev-libs/ucommon/ucommon-6.0.3.ebuild
new file mode 100644
index 000000000000..ebb3b72e66aa
--- /dev/null
+++ b/dev-libs/ucommon/ucommon-6.0.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Portable C++ runtime for threads and sockets"
+HOMEPAGE="https://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:0
+		)
+	)"
+
+DEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	${RDEPEND}"
+
+DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
+PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
+		  "${FILESDIR}"/install_gcrypt.m4_file.patch
+		  "${FILESDIR}"/gcrypt_autotools.patch )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+
+	# Aclocal 1.13 deprecated error #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
+}
diff --git a/dev-libs/ucommon/ucommon-6.1.10.ebuild b/dev-libs/ucommon/ucommon-6.1.10.ebuild
new file mode 100644
index 000000000000..bfc145701395
--- /dev/null
+++ b/dev-libs/ucommon/ucommon-6.1.10.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Portable C++ runtime for threads and sockets"
+HOMEPAGE="https://www.gnu.org/software/commoncpp"
+SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
+
+RDEPEND="
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=
+			dev-libs/libgcrypt:0=
+		)
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+
+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 )
+
+# Needed for doxygen, bug #526726
+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
+}
diff --git a/dev-libs/ucommon/ucommon-6.3.1.ebuild b/dev-libs/ucommon/ucommon-6.3.1.ebuild
new file mode 100644
index 000000000000..944b7d802562
--- /dev/null
+++ b/dev-libs/ucommon/ucommon-6.3.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Portable C++ runtime for threads and sockets"
+HOMEPAGE="https://www.gnu.org/software/commoncpp"
+SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
+
+RDEPEND="
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=
+			dev-libs/libgcrypt:0=
+		)
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+
+DEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	${RDEPEND}"
+
+DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
+PATCHES=( "${FILESDIR}"/6.1/install_gcrypt.m4_file.patch
+		  "${FILESDIR}"/${PN}-6.3.1-gcrypt_autotools.patch )
+
+# Needed for doxygen, bug #526726
+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
+
+	# don't install latex and rtf documents
+	sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
+		-i Doxyfile.in || 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
+}
diff --git a/dev-libs/ucommon/ucommon-6.5.2.ebuild b/dev-libs/ucommon/ucommon-6.5.2.ebuild
new file mode 100644
index 000000000000..2e70ce834e37
--- /dev/null
+++ b/dev-libs/ucommon/ucommon-6.5.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Portable C++ runtime for threads and sockets"
+HOMEPAGE="https://www.gnu.org/software/commoncpp"
+SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
+
+RDEPEND="
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=
+			dev-libs/libgcrypt:0=
+		)
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+
+DEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	${RDEPEND}"
+
+DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
+PATCHES=(
+	"${FILESDIR}/6.1/install_gcrypt.m4_file.patch"
+	"${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch"
+)
+
+# Needed for doxygen, bug #526726
+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
+
+	# don't install latex and rtf documents
+	sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
+		-i Doxyfile.in || 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
+}
diff --git a/dev-libs/ucommon/ucommon-6.5.7.ebuild b/dev-libs/ucommon/ucommon-6.5.7.ebuild
new file mode 100644
index 000000000000..2e70ce834e37
--- /dev/null
+++ b/dev-libs/ucommon/ucommon-6.5.7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Portable C++ runtime for threads and sockets"
+HOMEPAGE="https://www.gnu.org/software/commoncpp"
+SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
+
+RDEPEND="
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=
+			dev-libs/libgcrypt:0=
+		)
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+
+DEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	${RDEPEND}"
+
+DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
+PATCHES=(
+	"${FILESDIR}/6.1/install_gcrypt.m4_file.patch"
+	"${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch"
+)
+
+# Needed for doxygen, bug #526726
+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
+
+	# don't install latex and rtf documents
+	sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
+		-i Doxyfile.in || 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
+}