gentoo resync : 22.10.2018

6 files changed, 20 insertions, 261 deletions

diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index 43c75f16ff0c..79d0495b3e9e 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1,17 +1,11 @@
 AUX ucommon-6.0.3-disable_rtf_gen_doxy.patch 373 BLAKE2B 40496f603ec50786007fc97ac0390ecf29b2a296ac77f16d91c8861e7b98725c03aff488697ed9e7492c56bd298b920aab8eae0425e1bfaca574860517c33f46 SHA512 e486d3fc9d6235979d0d1e75aa1f90b5d525d3b7806de2a80737a825c62e1b6b94ef5976609a9a7654ea82bc5620ad62232ce61310da393617c5e5d98e6362c0
 AUX ucommon-6.0.3-gcrypt_autotools.patch 1712 BLAKE2B b1c8a0385c931fd1284c4cbe7ec412367566b360b4befc1fe75dee6f489215f86dff84c0612b0535204d83b89aa220b8082fcdab521023c83dfa466215b74298 SHA512 57c2d80c6795fa890e3ece384f92da3d8f7d216c91e72920ebccd5fcb1358e41932cd6fc6861ce009305f90a00ed11fdabf6df7b5c7e216ddbb0a6916e163f69
 AUX ucommon-6.0.3-install_gcrypt.m4_file.patch 4902 BLAKE2B 5c56eb0d9e397a653eb1a932e49cdce0c30fbe52f98f8d1b7403c27f53f5371da6f0bde83dff18250bfec5c9d3817bedb803d49344183e0dc5cb117e688dea6a SHA512 13604093ed0dba4064a8868785309d1de645dc0d010940febbf29166f69302c7272293bf161514396064d4f2ef0805dc6bb30336773568b0e5959ef76c1a0aad
-AUX ucommon-6.1.10-disable_rtf_gen_doxy.patch 224 BLAKE2B 241b6e1e94d7ad9067534a4cb6dd5e76fea92fd8cff5ffc819b7aa379bd05fa8d15079afb9860cc2f3e08739f340915b0c057fe9c095a03950ff14b75fd91080 SHA512 7bf2dc2e398eb3be86ec2593024953828db272ad19010b43e1c71658e474cb321f86265611c874781f9c6adfb68919ba1f44cb1efcc3d6d3711a09fdfcf2abe8
-AUX ucommon-6.1.10-gcrypt_autotools.patch 1657 BLAKE2B 3d6076aa2f4ef32e44d3ee471ceb547d352da42e361e18e6c17dfb718723dc5f73b4a4375e7cef2ad7662420bb14498979ae599976bcfff20a19af4427af68a2 SHA512 f9749158710aaf1dfce05f8b204e3f0463e71cbd06fe2c34dff1d675e9f5abf14fd33de4e4d46f0482524532abd378b81d1cf98f2b9a0371ba760872469ba5a9
 AUX ucommon-6.3.1-gcrypt_autotools.patch 1258 BLAKE2B 894f22a1755bf0d41fc3148a9c4ae8721ae7cc6307ba925493fa1c7896142219f6738f5d403a62ffacb5f0b44e95a9d8fd78528e5e7c3d470129b4391e8cfe0b SHA512 7bb6ce14558c9aec961b83fbba7efa38eeff6bb165d0d66a68436eda10e2d209e7d340e13fdc1e5e453f1a091a045aece50ead78ad5634a81d2d123d1a166e78
 DIST ucommon-6.0.3.tar.gz 806841 BLAKE2B 08e384f535529dbd27271861c473e18624d81029f7fecc08057b646f9c22d9bda956da2655114ec693a17f20764e4635701d1a932eeff2cdc8e82ad0fefd6496 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762
-DIST ucommon-6.1.10.tar.gz 833384 BLAKE2B 790d47b529550ab02651ed41954d1f6c171154d9ced01eee61d9789495e6d5b66599d3f12925f2cde1c432deb3414931a359d237572904f6ab1e17793b3bce9e SHA512 6d6e716dcb71d6a4e49307baa0e9e62b4b50f3dbe8301eb93e3b562d94eb9ccee73a733928059a5ed97deba55c00308af0326a32cec6a73dbf7884c322177050
-DIST ucommon-6.3.1.tar.gz 830661 BLAKE2B be97174c44ad79ed3e526f263da085dbc112c8f5f0b4f8415a5d30ff7f919fea65e1468aeaaf301940ce060952842fc0e59184539c63ba965c01a0cb598dce30 SHA512 6f4832ac53aaf1456f2d913730b66588a89a3c1292fb79f3f56da466a2542af9c836579c0a3c4daf3f896a0c3e35f861b71514f960052adcb4e3abb872b781ec
-DIST ucommon-6.5.2.tar.gz 847128 BLAKE2B a4bd6975ad0a83a109a85b5654fbf176957df0bad8edf1a519438c49af00a5523258e97a231021f9a3a3492746b6b6b88aa79600e58bf47b60ac6466b2f4fa12 SHA512 dc6dc048bad52d117edd1936ad31fd9fc6dba418fea3f7fd1578a96909c1eb53d2a42c4773a168db38ff24fc73b467ab30ec9b5ad5132ae473c36cea0e77b341
 DIST ucommon-6.5.7.tar.gz 855822 BLAKE2B 56b5eb5f8372f983e0f348e5fc494c15bea57dc711e88a9a9f4ceeb8abf03680a82948ea080053a9d4c846172b64443a3947b3774b50c6d0a60c1f2ced63e69d SHA512 9927c9726252cdf050f217fa5993d34dcf9f76fab8399ee3a4c91cf087d9409947ed486a21e8448cb57ea95b52826682120f99d39287983c306434f9121b4d24
+DIST ucommon-7.0.0.tar.gz 837905 BLAKE2B ddc82d5d1a88d66f353d9e69eacd7cfaaa0204acb8b9c4152559a009d287f2ffdb7feedc6fc0303c93a39d607498dd15bf83798d088857582f79be435d010ca7 SHA512 d32f8603d920eb98b5d4bc75224a7a8bb8bf2001a8dd3152626a8438ea4c39503a7446dec3aa90cf464b7abb68a6e42bac488ef9705517bd333b64bce219915b
 EBUILD ucommon-6.0.3.ebuild 1540 BLAKE2B 6b8a686eec4fe95ac91d5a6e0f00a0a5ae848ce27939c332a1c2fc093b19492e444c3af325bc14b7e1cfb6cff7331fa68fc6ed8147e68f83c33d8bdc2e52a2c6 SHA512 6b56d6e4f20d048881783366276a09820a9c0bb269f8d65acd3e4b4b968a9e966b49bc3cf7564ad5da53eb7268e6af9336c5d7d23df7a10cd86f1b58ee64a71c
-EBUILD ucommon-6.1.10.ebuild 1656 BLAKE2B 3bb2de5faad0c10aaac113ca9a6673b42585c60ba62e0e21a22a7d24776f8fa18e1a0fe73baad048d4d1884b953b7e0c24fc28f117f35240e841fe7f2a6d0cd2 SHA512 b6ad95d01aab30ef78e7e4a70334811dc25cd894a05e2c26cc60a270336daf9924d9d771aae36f193651c88ea870768350ec63b3a9f276949749aaa8d53ec34e
-EBUILD ucommon-6.3.1.ebuild 1735 BLAKE2B d94b09b08954f972ddcb28c43a266b2a65324ab88941cfc220f05dfa2e8d9775322bafdb0b958540d956c61a83d6b41663ac90e750c5a570db85ed270c8c4a8e SHA512 f5d698b80b6eac598e7e94ceeb0e1eccef801bfdc27f0c40905aeec7253cd3e764054629bd2a9238d4f7875146f7bf221eabe942ebdfa06525fc00143e7bb8d8
-EBUILD ucommon-6.5.2.ebuild 1735 BLAKE2B 77d03ce5dd28a014e1e1124b3ee657a95745f57a7b9510b624473b2932bf70539ed08fe3e4b318fba937cc405bfcdbfb47ef77cd2c5f3dee8736dd1bf3b411e8 SHA512 ddf5899ea21b6f1c631fad60d41ef17c30150f832a398c01f231cd249c4b226274e0486b0658f5fc63fbc6d5444da2515359a67cc043cd96767ed1db92f17377
 EBUILD ucommon-6.5.7.ebuild 1735 BLAKE2B 77d03ce5dd28a014e1e1124b3ee657a95745f57a7b9510b624473b2932bf70539ed08fe3e4b318fba937cc405bfcdbfb47ef77cd2c5f3dee8736dd1bf3b411e8 SHA512 ddf5899ea21b6f1c631fad60d41ef17c30150f832a398c01f231cd249c4b226274e0486b0658f5fc63fbc6d5444da2515359a67cc043cd96767ed1db92f17377
+EBUILD ucommon-7.0.0.ebuild 1486 BLAKE2B 442b3bbf9aff5faadc4eaaad23c996db7c15799b7b3c830d741a211062c31c43ca25e5c80bbcb1c08b87ed6f7952a90bb3aa59e804a0c144470ed54dac0b9391 SHA512 e87f63f6d663054718dbcf93367d3bf1da5293d708423685b0dfddbf50415621cac061c2640459d2e9d5ede70a737e7077123ed4c2fa2b9ffa14410b14490431
 MISC metadata.xml 316 BLAKE2B 8c4be49ccdfcd5353854b5b44e7cab7917695d50af5cb0e539b4a5d58fc31d3d6a98e77af95d0254324ba49f39d64d05a28adf2edbc9a71512c1f8e14bd2f78c SHA512 8095298e0382cc3e245df76d9b5bd4f27c9cf803aafc5b3fe9a9d63c94733192287a0d0348904320f07ec3a24edc9c437f09065b12dc3226f7acbe1e055c774c
diff --git a/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch
deleted file mode 100644
index e9b581f7eb99..000000000000
--- a/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Doxyfile
-+++ b/Doxyfile
-@@ -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/ucommon-6.1.10-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch
deleted file mode 100644
index 916df95576ce..000000000000
--- a/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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 \
---- 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
-     ;;
---- 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/ucommon-6.1.10.ebuild b/dev-libs/ucommon/ucommon-6.1.10.ebuild
deleted file mode 100644
index e032afde5db3..000000000000
--- a/dev-libs/ucommon/ucommon-6.1.10.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 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}"/${PN}-6.1.10-disable_rtf_gen_doxy.patch
-	"${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch
-	"${FILESDIR}"/${PN}-6.1.10-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
deleted file mode 100644
index 8dd276b800f0..000000000000
--- a/dev-libs/ucommon/ucommon-6.3.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 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}"/${PN}-6.0.3-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-7.0.0.ebuild
index e8e90402975e..77953319a895 100644
--- a/dev-libs/ucommon/ucommon-6.5.2.ebuild
+++ b/dev-libs/ucommon/ucommon-7.0.0.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils
+EAPI=7
+inherit autotools
 
 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"
+SLOT="0/8" # soname version
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc static-libs socks +cxx debug libressl ssl gnutls"
+IUSE="doc static-libs +cxx debug libressl ssl gnutls"
 
 RDEPEND="
 	ssl? (
@@ -28,20 +25,20 @@ RDEPEND="
 		)
 	)"
 
-DEPEND="virtual/pkgconfig
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
-	${RDEPEND}"
+"
 
 DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
+
 PATCHES=(
 	"${FILESDIR}/${PN}-6.0.3-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() {
+	default
+
 	# Aclocal 1.13 deprecated error BGO #467674
 	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
 
@@ -49,7 +46,7 @@ src_prepare() {
 	sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \
 		-i Doxyfile.in || die
 
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_configure() {
@@ -61,23 +58,20 @@ src_configure() {
 	fi
 
 	local myeconfargs=(
-		$(use_enable  socks)
-		$(use_enable  cxx stdcpp)
+		$(use_enable cxx stdcpp)
 		${myconf}
 		--enable-atomics
 		--with-pkg-config
 	)
-	autotools-utils_src_configure
+	econf "${myeconfargs}"
 }
 
 src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doxy
+	default
+	use doc && emake doxy
 }
 
 src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		dohtml doc/html/*
-	fi
+	use doc && HTML_DOCS="doc/html/*"
+	default
 }