From 8aebb228036d5e2863b7eaa6e319ab41c1669269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 16 Apr 2018 16:47:37 +0100 Subject: gentoo resync : 16.04.2018 --- dev-libs/ucommon/Manifest | 23 ++-- .../ucommon/files/6.1/disable_rtf_gen_doxy.patch | 11 -- dev-libs/ucommon/files/6.1/gcrypt_autotools.patch | 58 ---------- .../ucommon/files/6.1/install_gcrypt.m4_file.patch | 128 --------------------- dev-libs/ucommon/files/disable_rtf_gen_doxy.patch | 18 --- dev-libs/ucommon/files/gcrypt_autotools.patch | 62 ---------- .../ucommon/files/install_gcrypt.m4_file.patch | 128 --------------------- .../files/ucommon-6.0.3-disable_rtf_gen_doxy.patch | 18 +++ .../files/ucommon-6.0.3-gcrypt_autotools.patch | 59 ++++++++++ .../ucommon-6.0.3-install_gcrypt.m4_file.patch | 126 ++++++++++++++++++++ .../ucommon-6.1.10-disable_rtf_gen_doxy.patch | 11 ++ .../files/ucommon-6.1.10-gcrypt_autotools.patch | 55 +++++++++ .../files/ucommon-6.3.1-gcrypt_autotools.patch | 8 +- dev-libs/ucommon/ucommon-6.0.3.ebuild | 12 +- dev-libs/ucommon/ucommon-6.1.10.ebuild | 10 +- dev-libs/ucommon/ucommon-6.3.1.ebuild | 8 +- dev-libs/ucommon/ucommon-6.5.2.ebuild | 4 +- dev-libs/ucommon/ucommon-6.5.7.ebuild | 4 +- 18 files changed, 306 insertions(+), 437 deletions(-) delete mode 100644 dev-libs/ucommon/files/6.1/disable_rtf_gen_doxy.patch delete mode 100644 dev-libs/ucommon/files/6.1/gcrypt_autotools.patch delete mode 100644 dev-libs/ucommon/files/6.1/install_gcrypt.m4_file.patch delete mode 100644 dev-libs/ucommon/files/disable_rtf_gen_doxy.patch delete mode 100644 dev-libs/ucommon/files/gcrypt_autotools.patch delete mode 100644 dev-libs/ucommon/files/install_gcrypt.m4_file.patch create mode 100644 dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch create mode 100644 dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch create mode 100644 dev-libs/ucommon/files/ucommon-6.0.3-install_gcrypt.m4_file.patch create mode 100644 dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch create mode 100644 dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch (limited to 'dev-libs/ucommon') diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest index 5c3691e658d1..43c75f16ff0c 100644 --- a/dev-libs/ucommon/Manifest +++ b/dev-libs/ucommon/Manifest @@ -1,18 +1,17 @@ -AUX 6.1/disable_rtf_gen_doxy.patch 297 BLAKE2B 320b53bf69495e6c6bd35091d57662af8b98cc02a03d1da8003361e4b4b59f057c46a968110628d0e820b9f6c2d845290c872afc83acdac179b26fe07e7b53db SHA512 a99d329f352c2b11a98b0ec7cacd235724e5a33ad817dbe1c9b23a7bfae01c250ae21beab6316ae5d1a86725445ce3ad39971da7d55bc765467e17abc8ca7e98 -AUX 6.1/gcrypt_autotools.patch 1788 BLAKE2B 3c33815dcd2b4752798eeb055ebb80c21c50cd198dcea098327100d313163d7eaa5fc6d95f83b900a5ae6e58124d6fb4d5f23937c20f9d1bf6601cb24151ac3f SHA512 56dfe413ee5f157304eb0f56f90120b15264b261043bbbe1874bbbff9c4fcfcade223aa9013d06a82e816ea9002a4552624f547aeb55c3db70762a3386ba31ed -AUX 6.1/install_gcrypt.m4_file.patch 4970 BLAKE2B c77ff5fdf94a96e3d65934c25c9ee3ec160d27cb7803228b6259c18897b2401137c59c14afec4be1295fa6080f92c0d7d69d69a81c1ffc2491393e8afce5d77e SHA512 03039a04a8fafe4b23e74efc89ee1391caf0c4172ff3f2176cb47fea3777061382e756b81c01d1413cdbf5d7715c85194842ff7e17d1b679e2db4ac5de14d683 -AUX disable_rtf_gen_doxy.patch 446 BLAKE2B 04140a2aae2115737197b01d1e02a147a6e091bd5264c800755d96a1a01425b979dde6e84b6946df417719d1b0eef5c34085020fd1eb1693dd36c9d4f1c3c3ad SHA512 fe4168b313b5eca78fe8787b758c789c4b91df8355e380acd71c32735ad5c6984a3d6c06747e0215326870eba05d38ca015c88e5ca4166f42b3213ecfb1ad793 -AUX gcrypt_autotools.patch 1843 BLAKE2B d8aed2b459abe4da1fbf3b12f760e4cf1c99ef5e4415d8d5f749b7c84dcbb8d10affb1407d109b2031f5add29963e81d0f7cb1ba28d75b68092d2f5e31fbda15 SHA512 019cbd580b7da5097a8de595fce2585cb9c84636260452ad8f03d03f8ce5b157a655f21724799689a94cc8eef70c1e0445aca5f458a659c301eaeb490f86aa83 -AUX install_gcrypt.m4_file.patch 4970 BLAKE2B c77ff5fdf94a96e3d65934c25c9ee3ec160d27cb7803228b6259c18897b2401137c59c14afec4be1295fa6080f92c0d7d69d69a81c1ffc2491393e8afce5d77e SHA512 03039a04a8fafe4b23e74efc89ee1391caf0c4172ff3f2176cb47fea3777061382e756b81c01d1413cdbf5d7715c85194842ff7e17d1b679e2db4ac5de14d683 -AUX ucommon-6.3.1-gcrypt_autotools.patch 1306 BLAKE2B 9374d4914af5aae342a4be48f881d370b3971025fbf0fbe85ce03e45e3df354fcfec5ba5d074e1a18f5aa1296ebe0b20aa5cf4bf6064a1147a42b7258fa06230 SHA512 54fb48fcf9c4c579a9c9439b679f10306c595fcf9b3a5b25e3d9c71668a009023f31e650cc84113ed72a474e27555f674e557a471263290c86b0aad067cedfd8 +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 -EBUILD ucommon-6.0.3.ebuild 1506 BLAKE2B 0c6b6b43e3e0eea3a65d69ba90cfa2850d7fa071de6d1321887383a3a33cef40544e4363e4389b42ad164d52189dc31132b82121122a4077d65bc69d4eed6433 SHA512 6f16fb40eecdc2347d111a798e27dffdc5777569f66b5e850aa365c860ebe05a6e7a1b2ff43b82b8a35d769baea83bd264b18fbd5ea998b67e70577be4cfaac1 -EBUILD ucommon-6.1.10.ebuild 1635 BLAKE2B ba7bcd1284f16d10bfd96eb89f59e430ea5a87fefc3d6e4e27be8ebd1e7293814ef28a161f056b69054d26bfa80158f5997d27020b98ce8a29f751ef649aefac SHA512 49e3a34dafb78cd913465266c345859ad7ab7c9c5da9f4709014c283adc80c92aeefabf62130fb81ef0b21a0a039d8fb425172c2a60742fd1d52b86b25c2aa4c -EBUILD ucommon-6.3.1.ebuild 1729 BLAKE2B 22a778c2b72be4d73bc4d3fee57fcadd6b2b26154d76759d798f6db422c307605d41b0bb25eaac45ee077f1a6fefd294100326e57c4727976465c71b6d20c252 SHA512 e2c954c5adca3c864b0bcde009bf640b635e94d051710366597ebf57cf7e9b2fa32c723e4681f4967e91843efa36a0c6961259e96fcdc9def2ced1362d5bfb49 -EBUILD ucommon-6.5.2.ebuild 1727 BLAKE2B c5aedb98f695bf6d2e529d1b4062877f65827499dde7915abc7dac71d5392cfa9c2e2536b263cff9d26aece8c191c75fd8f326851931cabe6123b941271ab0b4 SHA512 77b60008f137d52e9fa61f2ba4a95d99bbe7f1929b62c809010de2b1146988e433907cc304c92c4b0f0d2ea105dbcb6d4524e6c431a304dc3515b388b3f89c51 -EBUILD ucommon-6.5.7.ebuild 1727 BLAKE2B c5aedb98f695bf6d2e529d1b4062877f65827499dde7915abc7dac71d5392cfa9c2e2536b263cff9d26aece8c191c75fd8f326851931cabe6123b941271ab0b4 SHA512 77b60008f137d52e9fa61f2ba4a95d99bbe7f1929b62c809010de2b1146988e433907cc304c92c4b0f0d2ea105dbcb6d4524e6c431a304dc3515b388b3f89c51 +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 MISC metadata.xml 316 BLAKE2B 8c4be49ccdfcd5353854b5b44e7cab7917695d50af5cb0e539b4a5d58fc31d3d6a98e77af95d0254324ba49f39d64d05a28adf2edbc9a71512c1f8e14bd2f78c SHA512 8095298e0382cc3e245df76d9b5bd4f27c9cf803aafc5b3fe9a9d63c94733192287a0d0348904320f07ec3a24edc9c437f09065b12dc3226f7acbe1e055c774c 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 deleted file mode 100644 index 1aaf478ed320..000000000000 --- a/dev-libs/ucommon/files/6.1/disable_rtf_gen_doxy.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 2ec0858245d9..000000000000 --- a/dev-libs/ucommon/files/6.1/gcrypt_autotools.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index 5fb0cc3b878d..000000000000 --- a/dev-libs/ucommon/files/6.1/install_gcrypt.m4_file.patch +++ /dev/null @@ -1,128 +0,0 @@ -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 deleted file mode 100644 index 2fca1f7bcad7..000000000000 --- a/dev-libs/ucommon/files/disable_rtf_gen_doxy.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index 8a5b93ffbdcd..000000000000 --- a/dev-libs/ucommon/files/gcrypt_autotools.patch +++ /dev/null @@ -1,62 +0,0 @@ -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 deleted file mode 100644 index 5fb0cc3b878d..000000000000 --- a/dev-libs/ucommon/files/install_gcrypt.m4_file.patch +++ /dev/null @@ -1,128 +0,0 @@ -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.0.3-disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch new file mode 100644 index 000000000000..a872f54ffe23 --- /dev/null +++ b/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch @@ -0,0 +1,18 @@ +--- a/Doxyfile ++++ b/Doxyfile +@@ -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/ucommon-6.0.3-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch new file mode 100644 index 000000000000..ff69e836a9d9 --- /dev/null +++ b/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch @@ -0,0 +1,59 @@ +--- 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 \ +--- 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 + ;; +--- 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/ucommon-6.0.3-install_gcrypt.m4_file.patch b/dev-libs/ucommon/files/ucommon-6.0.3-install_gcrypt.m4_file.patch new file mode 100644 index 000000000000..502a27b1844b --- /dev/null +++ b/dev-libs/ucommon/files/ucommon-6.0.3-install_gcrypt.m4_file.patch @@ -0,0 +1,126 @@ +--- /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.1.10-disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch new file mode 100644 index 000000000000..e9b581f7eb99 --- /dev/null +++ b/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..916df95576ce --- /dev/null +++ b/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch @@ -0,0 +1,55 @@ +--- 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/files/ucommon-6.3.1-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch index fb04130a0a85..7221890a9b7c 100644 --- a/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch +++ b/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch @@ -1,5 +1,5 @@ ---- ucommon-6.3.1/configure.ac -+++ ucommon-6.3.1/configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -38,8 +38,12 @@ OPENSSL_LINK="" MODULE_FLAGS="-module -shared -avoid-version" @@ -23,8 +23,8 @@ SECURE="gnutls" fi ;; ---- ucommon-6.3.1/utils/Makefile.am -+++ ucommon-6.3.1/utils/Makefile.am +--- a/utils/Makefile.am ++++ b/utils/Makefile.am @@ -10,9 +10,9 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/dev-libs/ucommon/ucommon-6.0.3.ebuild b/dev-libs/ucommon/ucommon-6.0.3.ebuild index ebb3b72e66aa..9c0884fe1ca6 100644 --- a/dev-libs/ucommon/ucommon-6.0.3.ebuild +++ b/dev-libs/ucommon/ucommon-6.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -17,7 +17,7 @@ KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux" IUSE="doc static-libs socks +cxx debug ssl gnutls" RDEPEND="ssl? ( - !gnutls? ( dev-libs/openssl ) + !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0 @@ -29,9 +29,11 @@ DEPEND="virtual/pkgconfig ${RDEPEND}" DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) -PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch - "${FILESDIR}"/install_gcrypt.m4_file.patch - "${FILESDIR}"/gcrypt_autotools.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-6.0.3-disable_rtf_gen_doxy.patch + "${FILESDIR}"/${PN}-6.0.3-install_gcrypt.m4_file.patch + "${FILESDIR}"/${PN}-6.0.3-gcrypt_autotools.patch +) AUTOTOOLS_IN_SOURCE_BUILD=1 diff --git a/dev-libs/ucommon/ucommon-6.1.10.ebuild b/dev-libs/ucommon/ucommon-6.1.10.ebuild index bfc145701395..e032afde5db3 100644 --- a/dev-libs/ucommon/ucommon-6.1.10.ebuild +++ b/dev-libs/ucommon/ucommon-6.1.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -33,9 +33,11 @@ DEPEND="virtual/pkgconfig ${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 ) +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 diff --git a/dev-libs/ucommon/ucommon-6.3.1.ebuild b/dev-libs/ucommon/ucommon-6.3.1.ebuild index 944b7d802562..8dd276b800f0 100644 --- a/dev-libs/ucommon/ucommon-6.3.1.ebuild +++ b/dev-libs/ucommon/ucommon-6.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -33,8 +33,10 @@ DEPEND="virtual/pkgconfig ${RDEPEND}" DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) -PATCHES=( "${FILESDIR}"/6.1/install_gcrypt.m4_file.patch - "${FILESDIR}"/${PN}-6.3.1-gcrypt_autotools.patch ) +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 diff --git a/dev-libs/ucommon/ucommon-6.5.2.ebuild b/dev-libs/ucommon/ucommon-6.5.2.ebuild index 2e70ce834e37..e8e90402975e 100644 --- a/dev-libs/ucommon/ucommon-6.5.2.ebuild +++ b/dev-libs/ucommon/ucommon-6.5.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -34,7 +34,7 @@ DEPEND="virtual/pkgconfig DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) PATCHES=( - "${FILESDIR}/6.1/install_gcrypt.m4_file.patch" + "${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch" "${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch" ) diff --git a/dev-libs/ucommon/ucommon-6.5.7.ebuild b/dev-libs/ucommon/ucommon-6.5.7.ebuild index 2e70ce834e37..e8e90402975e 100644 --- a/dev-libs/ucommon/ucommon-6.5.7.ebuild +++ b/dev-libs/ucommon/ucommon-6.5.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -34,7 +34,7 @@ DEPEND="virtual/pkgconfig DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) PATCHES=( - "${FILESDIR}/6.1/install_gcrypt.m4_file.patch" + "${FILESDIR}/${PN}-6.0.3-install_gcrypt.m4_file.patch" "${FILESDIR}/${PN}-6.3.1-gcrypt_autotools.patch" ) -- cgit v1.2.3