diff options
| -rw-r--r-- | dev-libs/libgcrypt/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/files/libgcrypt-1.6.0-serial-tests.patch | 11 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/files/libgcrypt-1.6.1-x32-compat.patch | 19 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/files/libgcrypt-1.6.3-freebsd-mpi.patch | 49 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/libgcrypt-1.6.1-r2.ebuild | 63 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/libgcrypt-1.6.2.ebuild | 62 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild (renamed from dev-libs/libgcrypt/libgcrypt-1.6.3-r2.ebuild) | 3 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/libgcrypt-1.6.3.ebuild | 62 |
8 files changed, 61 insertions, 219 deletions
diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog index 3578f861a77d..5351c345f5f7 100644 --- a/dev-libs/libgcrypt/ChangeLog +++ b/dev-libs/libgcrypt/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-libs/libgcrypt # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.236 2015/06/14 18:00:36 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.237 2015/06/28 19:19:39 k_f Exp $ + +*libgcrypt-1.6.3-r3 (28 Jun 2015) + + 28 Jun 2015; Kristian Fiskerstrand <k_f@gentoo.org> + +files/libgcrypt-1.6.3-freebsd-mpi.patch, +libgcrypt-1.6.3-r3.ebuild, + -files/libgcrypt-1.6.0-serial-tests.patch, + -files/libgcrypt-1.6.1-x32-compat.patch, -libgcrypt-1.6.1-r2.ebuild, + -libgcrypt-1.6.2.ebuild, -libgcrypt-1.6.3-r2.ebuild, -libgcrypt-1.6.3.ebuild: + Fix compile issue on fbsd (bug #494740). Cleanup old. 14 Jun 2015; Michał Górny <mgorny@gentoo.org> libgcrypt-1.6.3-r2.ebuild: Build the PDF only for native ABI, bug #552110. diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.0-serial-tests.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.0-serial-tests.patch deleted file mode 100644 index 05c40fbe52ab..000000000000 --- a/dev-libs/libgcrypt/files/libgcrypt-1.6.0-serial-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac 2014-01-23 12:16:46.291335724 +0100 -+++ configure.ac 2014-01-23 17:25:50.021776443 +0100 -@@ -73,7 +73,7 @@ - VERSION=$PACKAGE_VERSION - - AC_CONFIG_SRCDIR([src/libgcrypt.vers]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([serial-tests]) - AC_CONFIG_HEADER(config.h) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_LIBOBJ_DIR([compat]) diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-x32-compat.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.1-x32-compat.patch deleted file mode 100644 index 7e8047219944..000000000000 --- a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-x32-compat.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -r 9dc4a391dd6d mpi/generic/mpi-asm-defs.h ---- a/mpi/generic/mpi-asm-defs.h Tue Jul 29 16:44:47 2014 +0200 -+++ b/mpi/generic/mpi-asm-defs.h Tue Jul 29 16:47:43 2014 +0200 -@@ -1,7 +1,12 @@ --/* This file defines some basic constants for the MPI machinery. We -- * need to define the types on a per-CPU basis, so it is done with -- * this file here. */ -+/* AMD64 compiled with x32 fails in assembly due to incorrect -+ * size of long detected. Using compiler information to detect -+ * this since it is no longer per-architecture -+ */ -+#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && defined(__ILP32__) -+#define BYTES_PER_MPI_LIMB 8 -+#else - #define BYTES_PER_MPI_LIMB (SIZEOF_UNSIGNED_LONG) -+#endif - - - diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.3-freebsd-mpi.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.3-freebsd-mpi.patch new file mode 100644 index 000000000000..121caca56cbb --- /dev/null +++ b/dev-libs/libgcrypt/files/libgcrypt-1.6.3-freebsd-mpi.patch @@ -0,0 +1,49 @@ +From a36ee7501f68ad7ebcfe31f9659430b9d2c3ddd1 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Thu, 11 Jun 2015 16:19:49 +0900 +Subject: [PATCH 1/1] mpi: Support FreeBSD 10 or later. + +* mpi/config.links: Include FreeBSD 10 to 29. + +-- + +Thanks to Yuta SATOH. + +GnuPG-bug-id: 1936, 1974 +--- + mpi/config.links | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/mpi/config.links b/mpi/config.links +index 2fb5e8a..3ead4f0 100644 +--- a/mpi/config.links ++++ b/mpi/config.links +@@ -50,11 +50,12 @@ case "${host}" in + path="" + mpi_cpu_arch="x86" + ;; +- i[3467]86*-*-openbsd* | \ +- i[3467]86*-*-freebsd*-elf | \ +- i[3467]86*-*-freebsd[3-9]* | \ +- i[3467]86*-*-freebsdelf* | \ +- i[3467]86*-*-netbsd* | \ ++ i[3467]86*-*-openbsd* | \ ++ i[3467]86*-*-freebsd*-elf | \ ++ i[3467]86*-*-freebsd[3-9]* | \ ++ i[3467]86*-*-freebsd[12][0-9]*| \ ++ i[3467]86*-*-freebsdelf* | \ ++ i[3467]86*-*-netbsd* | \ + i[3467]86*-*-k*bsd*) + echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h + cat $srcdir/mpi/i386/syntax.h >>./mpi/asm-syntax.h +@@ -64,6 +65,7 @@ case "${host}" in + i586*-*-openbsd* | \ + i586*-*-freebsd*-elf | \ + i586*-*-freebsd[3-9]* | \ ++ i586*-*-freebsd[12][0-9]*| \ + i586*-*-freebsdelf* | \ + i586*-*-netbsd* | \ + i586*-*-k*bsd* | \ +-- +2.1.4 + diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.1-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.1-r2.ebuild deleted file mode 100644 index 2de13d847a3f..000000000000 --- a/dev-libs/libgcrypt/libgcrypt-1.6.1-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.1-r2.ebuild,v 1.2 2014/08/08 08:57:41 alonbl Exp $ - -EAPI=5 -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-multilib flag-o-matic - -DESCRIPTION="General purpose crypto library based on the code used in GnuPG" -HOMEPAGE="http://www.gnupg.org/" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1 MIT" -SLOT="0/20" # subslot = soname major version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}"/${P}-uscore.patch - "${FILESDIR}"/${PN}-multilib-syspath.patch - "${FILESDIR}"/${PN}-1.6.0-serial-tests.patch - "${FILESDIR}"/${PN}-1.6.1-x32-compat.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/libgcrypt-config -) - -multilib_src_configure() { - if [[ ${CHOST} == *86*-solaris* ]] ; then - # ASM code uses GNU ELF syntax, divide in particular, we need to - # allow this via ASFLAGS, since we don't have a flag-o-matic - # function for that, we'll have to abuse cflags for this - append-cflags -Wa,--divide - fi - local myeconfargs=( - --disable-padlock-support # bug 201917 - --disable-dependency-tracking - --enable-noexecstack - --disable-O-flag-munging - $(use_enable static-libs static) - - # disabled due to various applications requiring privileges - # after libgcrypt drops them (bug #468616) - --without-capabilities - - # http://trac.videolan.org/vlc/ticket/620 - # causes bus-errors on sparc64-solaris - $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") - $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") - ) - autotools-utils_src_configure -} diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.2.ebuild deleted file mode 100644 index afe324d3fc79..000000000000 --- a/dev-libs/libgcrypt/libgcrypt-1.6.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.2.ebuild,v 1.1 2014/08/21 16:50:30 k_f Exp $ - -EAPI=5 -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-multilib flag-o-matic - -DESCRIPTION="General purpose crypto library based on the code used in GnuPG" -HOMEPAGE="http://www.gnupg.org/" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1 MIT" -SLOT="0/20" # subslot = soname major version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.1-uscore.patch - "${FILESDIR}"/${PN}-multilib-syspath.patch - "${FILESDIR}"/${PN}-1.6.0-serial-tests.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/libgcrypt-config -) - -multilib_src_configure() { - if [[ ${CHOST} == *86*-solaris* ]] ; then - # ASM code uses GNU ELF syntax, divide in particular, we need to - # allow this via ASFLAGS, since we don't have a flag-o-matic - # function for that, we'll have to abuse cflags for this - append-cflags -Wa,--divide - fi - local myeconfargs=( - --disable-padlock-support # bug 201917 - --disable-dependency-tracking - --enable-noexecstack - --disable-O-flag-munging - $(use_enable static-libs static) - - # disabled due to various applications requiring privileges - # after libgcrypt drops them (bug #468616) - --without-capabilities - - # http://trac.videolan.org/vlc/ticket/620 - # causes bus-errors on sparc64-solaris - $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") - $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") - ) - autotools-utils_src_configure -} diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild index a5f6d0af1939..622fed856eb2 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.6.3-r2.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.3-r2.ebuild,v 1.2 2015/06/14 18:00:36 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild,v 1.1 2015/06/28 19:19:39 k_f Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -30,6 +30,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) PATCHES=( "${FILESDIR}"/${PN}-1.6.1-uscore.patch "${FILESDIR}"/${PN}-multilib-syspath.patch + "${FILESDIR}"/${P}-freebsd-mpi.patch ) MULTILIB_CHOST_TOOLS=( diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.3.ebuild deleted file mode 100644 index 251beaa9a3c0..000000000000 --- a/dev-libs/libgcrypt/libgcrypt-1.6.3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.3.ebuild,v 1.2 2015/03/01 13:37:22 k_f Exp $ - -EAPI=5 -AUTOTOOLS_AUTORECONF=1 -WANT_AUTOMAKE=1.14 - -inherit autotools-multilib flag-o-matic - -DESCRIPTION="General purpose crypto library based on the code used in GnuPG" -HOMEPAGE="http://www.gnupg.org/" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1 MIT" -SLOT="0/20" # subslot = soname major version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.1-uscore.patch - "${FILESDIR}"/${PN}-multilib-syspath.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/libgcrypt-config -) - -multilib_src_configure() { - if [[ ${CHOST} == *86*-solaris* ]] ; then - # ASM code uses GNU ELF syntax, divide in particular, we need to - # allow this via ASFLAGS, since we don't have a flag-o-matic - # function for that, we'll have to abuse cflags for this - append-cflags -Wa,--divide - fi - local myeconfargs=( - --disable-padlock-support # bug 201917 - --disable-dependency-tracking - --enable-noexecstack - --disable-O-flag-munging - $(use_enable static-libs static) - - # disabled due to various applications requiring privileges - # after libgcrypt drops them (bug #468616) - --without-capabilities - - # http://trac.videolan.org/vlc/ticket/620 - # causes bus-errors on sparc64-solaris - $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm") - $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm") - ) - autotools-utils_src_configure -} |