* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ucommon/, dev-libs/ucommon/files/6.1/, dev-libs/ucommon/files/
@ 2018-04-14 0:12 Aaron Bauman
0 siblings, 0 replies; only message in thread
From: Aaron Bauman @ 2018-04-14 0:12 UTC (permalink / raw
To: gentoo-commits
commit: 4e548d33fb7ee416a87d971675e8e70dba7b0a44
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Mon Apr 9 01:22:56 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 00:11:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e548d33
dev-libs/ucommon: remove duplicate patch
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7905
.../ucommon/files/6.1/install_gcrypt.m4_file.patch | 128 ---------------------
...ch => ucommon-6.0.3-disable_rtf_gen_doxy.patch} | 4 +-
....patch => ucommon-6.0.3-gcrypt_autotools.patch} | 3 -
... => ucommon-6.0.3-install_gcrypt.m4_file.patch} | 2 -
...h => ucommon-6.1.10-disable_rtf_gen_doxy.patch} | 4 +-
...patch => ucommon-6.1.10-gcrypt_autotools.patch} | 3 -
.../files/ucommon-6.3.1-gcrypt_autotools.patch | 8 +-
dev-libs/ucommon/ucommon-6.0.3.ebuild | 10 +-
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 +-
12 files changed, 29 insertions(+), 159 deletions(-)
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 5fb0cc3b878..00000000000
--- 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/ucommon-6.0.3-disable_rtf_gen_doxy.patch
similarity index 76%
rename from dev-libs/ucommon/files/disable_rtf_gen_doxy.patch
rename to dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch
index 2fca1f7bcad..a872f54ffe2 100644
--- a/dev-libs/ucommon/files/disable_rtf_gen_doxy.patch
+++ b/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch
@@ -1,5 +1,5 @@
---- Doxyfile.orig 2010-03-14 04:33:22.303087693 +0200
-+++ Doxyfile 2010-03-14 04:34:34.495254330 +0200
+--- a/Doxyfile
++++ b/Doxyfile
@@ -37,13 +37,13 @@
GENERATE_HTMLHELP = YES
GENERATE_TREEVIEW = YES
diff --git a/dev-libs/ucommon/files/gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch
similarity index 92%
rename from dev-libs/ucommon/files/gcrypt_autotools.patch
rename to dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch
index 8a5b93ffbdc..ff69e836a9d 100644
--- a/dev-libs/ucommon/files/gcrypt_autotools.patch
+++ b/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch
@@ -1,4 +1,3 @@
-diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,8 @@
@@ -10,7 +9,6 @@ diff --git a/Makefile.am b/Makefile.am
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 @@
@@ -36,7 +34,6 @@ diff --git a/configure.ac b/configure.ac
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 @@
diff --git a/dev-libs/ucommon/files/install_gcrypt.m4_file.patch b/dev-libs/ucommon/files/ucommon-6.0.3-install_gcrypt.m4_file.patch
similarity index 98%
rename from dev-libs/ucommon/files/install_gcrypt.m4_file.patch
rename to dev-libs/ucommon/files/ucommon-6.0.3-install_gcrypt.m4_file.patch
index 5fb0cc3b878..502a27b1844 100644
--- a/dev-libs/ucommon/files/install_gcrypt.m4_file.patch
+++ b/dev-libs/ucommon/files/ucommon-6.0.3-install_gcrypt.m4_file.patch
@@ -1,5 +1,3 @@
-diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
-new file mode 100644
--- /dev/null
+++ m4/libgcrypt.m4
@@ -0,0 +1,123 @@
diff --git a/dev-libs/ucommon/files/6.1/disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch
similarity index 65%
rename from dev-libs/ucommon/files/6.1/disable_rtf_gen_doxy.patch
rename to dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch
index 1aaf478ed32..e9b581f7eb9 100644
--- a/dev-libs/ucommon/files/6.1/disable_rtf_gen_doxy.patch
+++ b/dev-libs/ucommon/files/ucommon-6.1.10-disable_rtf_gen_doxy.patch
@@ -1,5 +1,5 @@
---- Doxyfile.orig 2014-06-26 23:56:45.724303475 +0300
-+++ Doxyfile 2014-06-26 23:57:12.875021734 +0300
+--- a/Doxyfile
++++ b/Doxyfile
@@ -40,7 +40,7 @@
GENERATE_HTMLHELP = YES
GENERATE_TREEVIEW = NO
diff --git a/dev-libs/ucommon/files/6.1/gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch
similarity index 92%
rename from dev-libs/ucommon/files/6.1/gcrypt_autotools.patch
rename to dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch
index 2ec0858245d..916df95576c 100644
--- a/dev-libs/ucommon/files/6.1/gcrypt_autotools.patch
+++ b/dev-libs/ucommon/files/ucommon-6.1.10-gcrypt_autotools.patch
@@ -1,4 +1,3 @@
-diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,8 @@
@@ -10,7 +9,6 @@ diff --git a/Makefile.am b/Makefile.am
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 @@
@@ -32,7 +30,6 @@ diff --git a/configure.ac b/configure.ac
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 @@
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 fb04130a0a8..7221890a9b7 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 ebb3b72e66a..d2d255a9997 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"
@@ -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 bfc14570139..e032afde5db 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 944b7d80256..8dd276b800f 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 2e70ce834e3..e8e90402975 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 2e70ce834e3..e8e90402975 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"
)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-04-14 0:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-14 0:12 [gentoo-commits] repo/gentoo:master commit in: dev-libs/ucommon/, dev-libs/ucommon/files/6.1/, dev-libs/ucommon/files/ Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox