summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-11-24 19:16:35 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-11-24 19:16:35 +0000
commita1e692de21a483a65ffc09bb0ccfb5ba78fee2c2 (patch)
treea7074d2da62ac97d30adef120e6c7bb944c0746c /net-libs
parentSynchronize sys-fs/udev and virtual/udev USE defaults for the desktop profile. (diff)
downloadgentoo-2-a1e692de21a483a65ffc09bb0ccfb5ba78fee2c2.tar.gz
gentoo-2-a1e692de21a483a65ffc09bb0ccfb5ba78fee2c2.tar.bz2
gentoo-2-a1e692de21a483a65ffc09bb0ccfb5ba78fee2c2.zip
Version bump; remove 3.1.4 and its patch.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/gnutls/ChangeLog8
-rw-r--r--net-libs/gnutls/files/gnutls-3.1.4-nodane.patch16
-rw-r--r--net-libs/gnutls/gnutls-3.1.5.ebuild (renamed from net-libs/gnutls/gnutls-3.1.4.ebuild)3
3 files changed, 8 insertions, 19 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index b3983ed09fb4..9995e76532cb 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-libs/gnutls
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.390 2012/11/10 01:41:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.391 2012/11/24 19:16:35 flameeyes Exp $
+
+*gnutls-3.1.5 (24 Nov 2012)
+
+ 24 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> +gnutls-3.1.5.ebuild,
+ -files/gnutls-3.1.4-nodane.patch, -gnutls-3.1.4.ebuild:
+ Version bump; remove 3.1.4 and its patch.
*gnutls-3.1.4 (10 Nov 2012)
diff --git a/net-libs/gnutls/files/gnutls-3.1.4-nodane.patch b/net-libs/gnutls/files/gnutls-3.1.4-nodane.patch
deleted file mode 100644
index 048f1ae9ca09..000000000000
--- a/net-libs/gnutls/files/gnutls-3.1.4-nodane.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: gnutls-3.1.4/tests/cert-tests/Makefile.am
-===================================================================
---- gnutls-3.1.4.orig/tests/cert-tests/Makefile.am
-+++ gnutls-3.1.4/tests/cert-tests/Makefile.am
-@@ -25,6 +25,10 @@ EXTRA_DIST = ca-no-pathlen.pem no-ca-or-
-
- dist_check_SCRIPTS = pathlen aki template-test pem-decoding dane
-
--TESTS = pathlen aki template-test pem-decoding dane
-+TESTS = pathlen aki template-test pem-decoding
-+
-+if ENABLE_DANE
-+TESTS += dane
-+endif
-
- TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
diff --git a/net-libs/gnutls/gnutls-3.1.4.ebuild b/net-libs/gnutls/gnutls-3.1.5.ebuild
index 57a3ab3e7cce..726ce2aa912d 100644
--- a/net-libs/gnutls/gnutls-3.1.4.ebuild
+++ b/net-libs/gnutls/gnutls-3.1.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.4.ebuild,v 1.1 2012/11/10 01:41:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.5.ebuild,v 1.1 2012/11/24 19:16:35 flameeyes Exp $
EAPI=4
@@ -67,7 +67,6 @@ src_prepare() {
done
epatch "${FILESDIR}"/${PN}-3.1.3-guile-parallelmake.patch
- epatch "${FILESDIR}"/${P}-nodane.patch
# support user patches
epatch_user