summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/libgcrypt')
-rw-r--r--dev-libs/libgcrypt/ChangeLog6
-rw-r--r--dev-libs/libgcrypt/files/libgcrypt-1.6.0-serial-tests.patch11
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.6.0.ebuild5
3 files changed, 19 insertions, 3 deletions
diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index 557e2c477e83..fe8123b64e58 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libgcrypt
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.198 2014/01/18 05:07:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.199 2014/01/24 21:26:08 alonbl Exp $
+
+ 24 Jan 2014; Alon Bar-Lev <alonbl@gentoo.org>
+ +files/libgcrypt-1.6.0-serial-tests.patch, libgcrypt-1.6.0.ebuild:
+ enable automake >= 1.14, bug#498718, thanks to wojtek
18 Jan 2014; Mike Frysinger <vapier@gentoo.org> libgcrypt-1.5.3.ebuild,
libgcrypt-1.6.0.ebuild:
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
new file mode 100644
index 000000000000..05c40fbe52ab
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.6.0-serial-tests.patch
@@ -0,0 +1,11 @@
+--- 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/libgcrypt-1.6.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.0.ebuild
index 7a305ae94ab5..d31588053e30 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.0.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.0.ebuild
@@ -1,10 +1,10 @@
# 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.0.ebuild,v 1.5 2014/01/18 05:07:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.0.ebuild,v 1.6 2014/01/24 21:26:08 alonbl Exp $
EAPI=5
AUTOTOOLS_AUTORECONF=1
-WANT_AUTOMAKE=1.12
+WANT_AUTOMAKE=1.13
inherit autotools-utils flag-o-matic
@@ -26,6 +26,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
PATCHES=(
"${FILESDIR}"/${PN}-1.5.0-uscore.patch
"${FILESDIR}"/${PN}-multilib-syspath.patch
+ "${FILESDIR}"/${P}-serial-tests.patch
)
src_configure() {