From 4204fcc528ff93dfef4076c7c70f548607f105e8 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sun, 29 Mar 2015 17:20:58 +0000 Subject: [PATCH] Version bump Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC --- dev-libs/ucommon/ChangeLog | 10 ++- dev-libs/ucommon/Manifest | 25 ++++-- .../ucommon-6.3.1-gcrypt_autotools.patch | 48 +++++++++++ dev-libs/ucommon/ucommon-6.3.1.ebuild | 79 +++++++++++++++++++ 4 files changed, 152 insertions(+), 10 deletions(-) create mode 100644 dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch create mode 100644 dev-libs/ucommon/ucommon-6.3.1.ebuild diff --git a/dev-libs/ucommon/ChangeLog b/dev-libs/ucommon/ChangeLog index acde6cc543b6..1af6def53932 100644 --- a/dev-libs/ucommon/ChangeLog +++ b/dev-libs/ucommon/ChangeLog @@ -1,6 +1,12 @@ # 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.22 2014/10/27 20:03:03 maksbotan Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ChangeLog,v 1.23 2015/03/29 17:20:56 polynomial-c Exp $ + +*ucommon-6.3.1 (29 Mar 2015) + + 29 Mar 2015; Lars Wendler +ucommon-6.3.1.ebuild, + +files/ucommon-6.3.1-gcrypt_autotools.patch: + Version bump. 27 Oct 2014; Maxim Koltsov ucommon-6.1.10.ebuild: Enable in source build, fixes bug #526726. diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest index 395e781a3088..3924af6002fd 100644 --- a/dev-libs/ucommon/Manifest +++ b/dev-libs/ucommon/Manifest @@ -8,24 +8,33 @@ AUX disable_rtf_gen_doxy.patch 446 SHA256 19742ff3a149ca50d7397f9ffafc5c70fb3328 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 +AUX ucommon-6.3.1-gcrypt_autotools.patch 1306 SHA256 b65366f04e75bf3b00cc692aca03ea48d6a18a3e8966f2658a60f1577a36b7a5 SHA512 54fb48fcf9c4c579a9c9439b679f10306c595fcf9b3a5b25e3d9c71668a009023f31e650cc84113ed72a474e27555f674e557a471263290c86b0aad067cedfd8 WHIRLPOOL 0441e0f4d061aa89c9fb20fea864da58baefd8861584c8d7e93560bf16a99cf745664187ef602286d722b09c54fd32ca01e4f4d18bd259a1bdb317e51eeafe3f 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.10.tar.gz 833384 SHA256 d7a15ed31e3c418b41d95d5ff5e1bc24dfc4c2a465a099c6fd30e0b6c9f7be92 SHA512 6d6e716dcb71d6a4e49307baa0e9e62b4b50f3dbe8301eb93e3b562d94eb9ccee73a733928059a5ed97deba55c00308af0326a32cec6a73dbf7884c322177050 WHIRLPOOL 31666dc7e4c00b9acc7ba9d7a26033ec7ff28674722597e9677ba426b79fae45a170c5caaaa4066738d072090c2dacd465dc861aebbbd50cde36877b3b1a1e59 DIST ucommon-6.1.8.tar.gz 833017 SHA256 9a2b3eb0b71198adcccd74303df59551fdd016c3a2848fb8be003fb1ac2e7fc5 SHA512 86fcd9b2fbafd06d87470a16bc3d377716e7040f29ccb91bf1fbe9ce66ef88e936141bd7c388d4bb63b9d4dea5e22ec9a0aae39cf3cf58e8a0e3ac9cb9b546b4 WHIRLPOOL a87ae7a929920710ad601d04bbf907c626ca4ade92d19c18ac0cba004428505d52082742ff65a0ce00862f04507e69a31012a365ababdc9bbbf5b0866c557047 +DIST ucommon-6.3.1.tar.gz 830661 SHA256 b59aa5414e756935ef9c479ece837f5700e4a5f39b0a016daa90528b175f59d5 SHA512 6f4832ac53aaf1456f2d913730b66588a89a3c1292fb79f3f56da466a2542af9c836579c0a3c4daf3f896a0c3e35f861b71514f960052adcb4e3abb872b781ec WHIRLPOOL 0bad6d56c0f1111a1aa15f7532ce6507be897a2b7ce27e452e71c08064f3f854b6864d3f7ed58ed476edf6777fc256374ab08e9c89bbb4f4abfcef8486969fed 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 EBUILD ucommon-6.1.10.ebuild 1683 SHA256 ac1d1d5147f4db96ce15f3bce93984428155aea9d147bdab6f3283836b667c1b SHA512 9c6de09cf3cffcc75ce4918939739b42f327a09892b6b44c39005a8a66f630b6a6db823aab1c0b5a57fe87a42d7138ddee6c07f7ba79cffd551c5d4fd0e1b9d4 WHIRLPOOL 68508ecef091be93183489c4c161cf867fff7d96e8278e0cc244340a2b66160dfa00fa7f3cb4a78e8ebdbee1f196c8a9b36f286e111c727d3250067234758125 EBUILD ucommon-6.1.8.ebuild 1638 SHA256 3bb4e473a7d32b02a616ec390edd0e76eafeb3f7e4ee2d8cd9946c571dc46f8b SHA512 d3e60e29bf470fb050adf3077698a79df9d78cdb7fb60af1338dea40876783c4a1207213947afbfa505fb15d84f5f7e8bd29bd6548b1da4c58d6bce72610d253 WHIRLPOOL 7ccdba3334ce0ec6c8e8704c9c19f6b2eb92b2a9d09d23e32a5583981334b8b3715b6d59e94a1b89ccdd44ece80ffa6b9ef8cda3842312197ffdf4f0daf57063 -MISC ChangeLog 3827 SHA256 ecbd874f87c1c494619f015c00fc5da07e2780c8fa2a546d82a63c9b7dd43174 SHA512 d7ac9764f02c72c448158699dc53456daf1f1f78c0526cbba559cb4e27e4f0d53325d13a454c80d589f836af8c300fa713bfefd1eca438657ef1d82202f9bbd1 WHIRLPOOL afdc61b25d30b4ed78608bfa0fb28dada467da24871849d9d08718db9f546e56c05989f3619e4b6986ede9f509fdc985d703521056418a66b6cfd0ebc16109fb +EBUILD ucommon-6.3.1.ebuild 1779 SHA256 e48b1a3044b0e111d154b44011a4f42b76a031a6e584b71442169b6e30ee3b4e SHA512 847734393ebeab55d2915848a81e9c58ad729356408f8cb080640f8c45debab5a5f5e8269df36eff8949d8d140ea8347f4529a129a6836d2a8b8506ad822b51d WHIRLPOOL 37b3faf95dd5df4d26baa270fb6ff19e4a6783cc4e5848ae228c46119f79868a6ce8e6cadb1d01a5483bb229d43549f2929ff509a9df07f54550ef789aca6593 +MISC ChangeLog 4001 SHA256 a9973e89ead1244683cfa4205ec742a7d7a47b054692845e55ba7202fbc98f49 SHA512 b3d10a2631a2692855fdce3f6d0d5a268e34a61fd0f8619f960841cbadd3390c9cf45c88df2ef77823d149e2bf14248789b0846ff01d1e25270b29d6e98da1a1 WHIRLPOOL 3970706efb499a13089bdc5189d3360179f4ea42569746d7026a8740160f7d06b41d64b32eaf19896f31ecf205b0b2ea8b64970054ae70e082efc6005ca10128 MISC metadata.xml 438 SHA256 a8ececfa37303e2e3822d69cacd23567fb9813b6fb0f319b08b6676808a26484 SHA512 c39973823d63c3506f0f572f4187aa000fa57dca64d96d3d5f5baf9b0e00bed2f1cc6fd116fff8e802b71bdfefbf527d6bf99051ad23136d9b6f91be6db55451 WHIRLPOOL 24719f9882adcf8bed378d899117a817b678f6b79623db49b9a833bc85cadb240f31ff61c0fc798772e7395ec9b3df9dfeeb27a7c47cde7a91a34a883e95a050 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUTqT5AAoJEAmJmMX429refTgIAIAgb/aPybVBvu0rTyMFEHEx -paNPBpplSsGu1JvoBFNUCJETcvnv+Lgg5rPmqOLtzWnF6iVADpL2ETF1ULn3BFkZ -5GgvE0TMDkSwSfSz4rWYw9XaXaPnlRpkK2uZKYegnW6N3ICoV8OKMuYoXg458lhH -d0+brhp7R+TyN9mRoXOt9Nt9YWHgMNP9qTgCp2qfuzIfSer6gMbBcV4uWUz8S+KK -3fKx+Hcp0UFXXqC+0ueOQV7JfyosAJHct+XstQmeIsBzY0dMqe8naQL0symx8gBz -uIOqykFoD5UslRhhTVs+Y1YISa544HlFeMAc7T/eSw6pzyTktGIygT7fYfB3TJQ= -=eMSD +iQIcBAEBCAAGBQJVGDR6AAoJEPiazRVxLXTFzEUP/1jk3jkHbSvziEvn6JC+gznL +0ltLsJVwiiSbbiQkqsjDcX2ANQhbRwpFA8UKBXXjZgyxCXepiEPyx4SHrTNqeT10 +kSmzwLLjG3V0mD3LiI7VuUp3Ps1fRHy7g11xnO+Io5oJDXiTdTOxszLZgvW6PYJd +R17NiCrh2j0RJ7/UJhcMFtob3McDgUMiGk4EVV1iZXT764/ON/CbmxdBsH3c1NXa +n7N3zt1ZB5L72WU+BPtJDIQtwuPc515p37m78XHNFZ0wOabd1Gm4bLlVXD1ISm+d +1YWzucR8Hj2kkrgdfeYMlTRkcsMq4DFmIHHE1Rd6l+XngQ9G9nrPzTP7O9NoHxfK +7Bu1DWtzCWeq8xHKQCCH+brwnMChQ4qlShBfEve/63zja9EThO3X/tgiDOceoYn/ +T5YV28eRYcrBo97cHmhNOv55zU8xwav5N3ZR2Gn4+ocm9UNaK3EHhDMXAYpAerfx +NWVgx2NgsOIeJnODrfmFAYY2HRlG4ernqjtNTUFMpZBjPPzM6tEN5L32fmFpXpbc +G17z0y7uXDcCagsp/Qg+/wTU81iL0+gYmpX5Ii5JPDJlkn1r11wUR/wrLweq3fHm +h+wbhSlYPiMlya188fEhYDtGfYyidBc/JN74uh7C25CbmM91yylPot4co79LpTGw +ELxP547r9focl0yGmxr4 +=6K8T -----END PGP SIGNATURE----- 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/ucommon-6.3.1.ebuild b/dev-libs/ucommon/ucommon-6.3.1.ebuild new file mode 100644 index 000000000000..8a4ebeadfd53 --- /dev/null +++ b/dev-libs/ucommon/ucommon-6.3.1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.3.1.ebuild,v 1.1 2015/03/29 17:20:56 polynomial-c 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/6" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" +IUSE="doc static-libs socks +cxx debug ssl gnutls" + +RDEPEND=" + ssl? ( + !gnutls? ( dev-libs/openssl:0= ) + gnutls? ( + net-libs/gnutls:0= + dev-libs/libgcrypt: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 +} -- 2.26.2