Revbumps for 2.10.2 and 2.11.4 wrt bug 333403. New valgrind use flag added.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux i686

5 files changed, 163 insertions, 18 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index bb84df4ecd2b..5cfab6e8d387 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.276 2010/11/06 17:40:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.277 2010/11/10 20:23:59 c1pher Exp $
+
+*gnutls-2.11.4-r1 (10 Nov 2010)
+*gnutls-2.10.2-r1 (10 Nov 2010)
+
+  10 Nov 2010; Dane Smith <c1pher@gentoo.org> -gnutls-2.10.1-r1.ebuild,
+  +gnutls-2.10.2-r1.ebuild, +gnutls-2.11.4-r1.ebuild, metadata.xml:
+  *Revision bumps for 2.10.2 and 2.11.4 include new valgrind use flag to fix
+  automahic dependency wrt bug 333403. 
+  *Small QA fixes in both.
+  *Removed keywords for alpha ia64 m68k s390 sh sparc in 2.10.2-r1 as
+  datefudge
+  is not keyworded for those archs. I will be opening a keyword req for
+  datefudge.
+  *Removed 2.10.1-r1 as it contained an ~alpha keyword when datefudge was
+  not
+  keyworded for alpha.
 
   06 Nov 2010; Markus Meier <maekke@gentoo.org> gnutls-2.10.2.ebuild:
   arm stable, bug #343755
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index a78c652e0c30..d697eb6ce360 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -12,21 +12,32 @@ DIST gnutls-2.11.3.tar.bz2 7748520 RMD160 f84c87d5bbe57c4b1c169b6d93c6b787c2cf09
 DIST gnutls-2.11.4.tar.bz2 7843686 RMD160 07a67f0c0e452619ed11c99bad7481d9374238f8 SHA1 1453de9b004640e6284dddaf47653c35324b36bc SHA256 1d13befbac6425a40ea945b199265e2b1391e5dc753b2c1e8f17a9b561f0e5cb
 DIST gnutls-2.8.6.tar.bz2 6469369 RMD160 1cfda29a60df3b032b8b611e4341c2e834bb26b2 SHA1 bff911d4fd7389aa6698a644b3748eb2d23715bc SHA256 d6f846a7064af3ee2c9aebd65dcee76953b767170cbcd719e990ed6b9688a356
 EBUILD gnutls-2.10.0.ebuild 2498 RMD160 bde262a32d044cd508e51e955e122e1b1f14c100 SHA1 1903a8688365d35dd75ccfd13d004fb948611717 SHA256 f8b6da91b8f4beed9b2bb6be55721912fea102d754002b0ed637a4f7db792592
-EBUILD gnutls-2.10.1-r1.ebuild 2524 RMD160 f187ebaa1b622f2f68dabb888835aaaabeea613e SHA1 be871099fcb067c91a18d7c624dad3b99637756f SHA256 94ad932bc1570d9debe05408faf0c553f9e9ea5e31c56c317902ae666bf329da
 EBUILD gnutls-2.10.1.ebuild 2508 RMD160 6cbaeebb8db55138199fae4462e372ffa5d3dc3a SHA1 b313a9ac66371e961b7a1d0b92e2dc644c12c82f SHA256 541059b15d37fb1c5d412d4efd54365d28ddd888431430f6a47d5e6d5243358d
+EBUILD gnutls-2.10.2-r1.ebuild 2817 RMD160 01c6df6520905861be17e8c252ccc0fa0784c6ae SHA1 297bbe884e47ba5b56ec8ff73bcaac5851ad7a16 SHA256 659b9478d865d1854a6b4abf0504d8284ae33a34c081637bf623d21837cc14af
 EBUILD gnutls-2.10.2.ebuild 2470 RMD160 f3c6f676942ec538fdad346d6de7d955fb6e62c9 SHA1 c9806acba1f6b4b674d07c7effdb33bcb8aee2a6 SHA256 809bf8bdb5233092dbfa1830e05b215bb1ec04d9118435ff9fd0e70a8db9c71c
 EBUILD gnutls-2.11.0.ebuild 2578 RMD160 fc2961655b31b472be97ef37572ff34facd13828 SHA1 b9d550ea691f3de569cb7f20cdff522f3ff5e9f6 SHA256 23ce9ad7fc9cd9b1b076d4c637d44e2591abd69294108b3ac117cbacd54535cc
 EBUILD gnutls-2.11.1.ebuild 2678 RMD160 50b8fb9898cc7ec0b44938588a1d8f0a40989f77 SHA1 7fa1361be3ee110e3cc2e25a3bf16f0d6a35732a SHA256 0893195092c53e0793c53af72a4b196d9b1766765bdfe5d62bb40646bd312d05
 EBUILD gnutls-2.11.2.ebuild 2644 RMD160 1a0d6be8d2b6cb73b31085778a254f08d44a37d0 SHA1 58d930fa1fd727d09fc2ba410c012801dd088bf7 SHA256 92b867b1a9fd4a3da6846a9a529fbd67f641032f32fcdb74221d5a7d73cb26cc
 EBUILD gnutls-2.11.3.ebuild 2644 RMD160 b6b54909abf8c38abbd5ea1c869ea3897ba7e592 SHA1 0599c948739b5fae9121fe6dabcf784d445af8aa SHA256 ec696055c745008cc404ae3146c853aa6e43d0e52258f63d23c6016b52bf0b48
+EBUILD gnutls-2.11.4-r1.ebuild 2985 RMD160 07e596b480dbe0d932e53f0a348d080d1509bcca SHA1 a6dea6e78af0afe31ab732d0e8fe0059b6f77ab0 SHA256 6f7f10be38b510f23ac951c901ad9827ce24c33453db3a432e08153b12de4c9c
 EBUILD gnutls-2.11.4.ebuild 2644 RMD160 8093e9b24c21e57a1e24ceb11e353e26983a3014 SHA1 ba63cd2383511953f597e4134b5be5d636fe73cf SHA256 c3a9287d481fce012f95d66367d3f4a18484bdd95923edb3dd2867f067776304
 EBUILD gnutls-2.8.6.ebuild 2502 RMD160 d9ead3a80eab35c1f8db333ef82642fce6d4c842 SHA1 91e9de156089c1d10410c2ec8546f1d36b9569f5 SHA256 4a849cc8ee7358b34e2ca592cb596ad0ddc590cf5032bc6485464f9b7aa1d630
-MISC ChangeLog 40682 RMD160 1f9ed16dbcbfe59521cd214c543b9a2e4532fc41 SHA1 917c2b6c6c336c33eab5192e17e29cab4e62c082 SHA256 5da15248ff934cdd609b13d412dd055b25836682d9fb7d1ebf2416ada020f778
-MISC metadata.xml 253 RMD160 d29cff22b196e16cfd1725a25b1e9334167d38cf SHA1 2122cdcae7f58713b95483c3da76f35dd15e8aef SHA256 98ed95679982db831ecd5feaea09ada3657c97d63a97c41aa6c894487bca5a30
+MISC ChangeLog 41302 RMD160 8c473c5befef00462e1d6f09a87e34bec427a8cd SHA1 f6a9b45ad8c2f8c82ebb1253a5fe688b45c9b83b SHA256 691c55813309238ad7cded4e6e942bc2171646b3ff2ec183cf5cc8274050f0da
+MISC metadata.xml 350 RMD160 5a195410cfec360554b39b5ed5af5ca9d983eb82 SHA1 6e5596d896b21ced6dfb8925be135dfaae2f98c6 SHA256 a8b8266694bd56790b5b568feabec29b705a9fc78a9fd260761ab14f0303f406
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzVk3cACgkQkKaRLQcq0GKORQCgqpeB5rvgpbP/IU+C6ox/fi0o
-fewAnj+jD5K6w675ekgggbTKnXQT7rIs
-=alCm
+iQIcBAEBAgAGBQJM2v9QAAoJEEsurZwMLhUxyhMP/20tHm/tiCpaZT6TBMxUSMz6
+oZ2AN949yfAzAH8ANVPl49hryJOOU6h1Zn5Qqbrf+t0O+Rx0amAGa83FpNDMBNxp
+zbt/7cPJv4cTboA6DHDdNO4LqELUXObmrFJGKzD00vbtYi0fYqr5wq4CwDl+ymWy
+4rOF/JNCdvfSnELbz1y2fk3LkdrCNNB9VVezDZRtXDbYPYY0tjisEFyuk3zGd7as
+IlYI6svtyd6HbKC76X33V7tXOtLkaamq5zEUrArl1zXqitRZp3RBpcsfG6wNATuq
+ffsWSIf7RpZ1xbgZhg+fadKvWct8cWdt0I0wYh9XxW6AX9isY3+WLzGlvgAQQjzV
+soKvFANJ0bPKq8RELDtu4oFOSDCQjtcwYOfZHqZh7hCMTfQ+TtyRzZwcRxWHnw8M
+5AJXREtN8AquSBUZzDGnJtnsZR4IpdMVQ0j3NhsMR9evilpwXR6IlacIhpvN7sMy
+FaFhbDJFvVTms/6r9yBhi+SzMovj5AF4JwxQpeveX9upjtmg1psGz6eJDiF5XUsk
+VKwCM90NgOhNMzvD6BiTERvdnSxzKFeXuY9bygR6fWYYAEH5aBPjpYKZeyAhVYoh
+wtqVEi4aBWgwqdNO7xk0vnEhZoj83G20/sIpWRX+G9pZZWtLFPVb5baD09eVwR1r
+2LXTFocd6IpaL+pTcIUz
+=v0RF
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-2.10.1-r1.ebuild b/net-libs/gnutls/gnutls-2.10.2-r1.ebuild
index 3de1eb80aa24..642d400dc224 100644
--- a/net-libs/gnutls/gnutls-2.10.1-r1.ebuild
+++ b/net-libs/gnutls/gnutls-2.10.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.10.1-r1.ebuild,v 1.2 2010/10/10 16:07:40 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.10.2-r1.ebuild,v 1.1 2010/11/10 20:23:59 c1pher Exp $
 
 EAPI="3"
 
@@ -26,8 +26,8 @@ fi
 # GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
 LICENSE="LGPL-2.1 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist +cxx doc examples guile lzo nls test zlib"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist +cxx doc examples guile lzo nls test valgrind zlib"
 
 RDEPEND="dev-libs/libgpg-error
 	>=dev-libs/libgcrypt-1.4.0
@@ -40,14 +40,18 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
+	test? ( valgrind? ( dev-util/valgrind ) app-misc/datefudge )"
 
 S="${WORKDIR}/${P%_pre*}"
 
 pkg_setup() {
 	if use lzo && use bindist; then
-		ewarn "lzo support was disabled for binary distribution of GnuTLS"
-		ewarn "due to licensing issues. See Bug #202381 for details."
+		ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
+	fi
+
+	if use valgrind && ! use test; then
+		ewarn "Valgrind is part of the test suite and which is not currently \
+		being used. Disabling valgrind."
 	fi
 }
 
@@ -65,12 +69,16 @@ src_prepare() {
 		popd > /dev/null
 	done
 
-	elibtoolize # for sane .so versioning on FreeBSD
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
 }
 
 src_configure() {
 	local myconf
 	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
+	use test && myconf="${myconf} $(use_enable valgrind valgrind-tests)" || \
+	myconf="${myconf} --disable-valgrind-tests"
+
 	econf --htmldir=/usr/share/doc/${P}/html \
 		$(use_enable cxx) \
 		$(use_enable doc gtk-doc) \
@@ -83,15 +91,15 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO
+	dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die
 
 	if use doc; then
-		dodoc doc/gnutls.{pdf,ps}
-		dohtml doc/gnutls.html
+		dodoc doc/gnutls.{pdf,ps} || die
+		dohtml doc/gnutls.html || die
 	fi
 
 	if use examples; then
 		docinto examples
-		dodoc doc/examples/*.c
+		dodoc doc/examples/*.c || die
 	fi
 }
diff --git a/net-libs/gnutls/gnutls-2.11.4-r1.ebuild b/net-libs/gnutls/gnutls-2.11.4-r1.ebuild
new file mode 100644
index 000000000000..b36f83e07695
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.11.4-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.11.4-r1.ebuild,v 1.1 2010/11/10 20:23:59 c1pher Exp $
+
+EAPI="3"
+
+inherit autotools libtool
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+
+if [[ "${PV}" == *pre* ]]; then
+	SRC_URI="http://daily.josefsson.org/${P%.*}/${P%.*}-${PV#*pre}.tar.gz"
+else
+	MINOR_VERSION="${PV#*.}"
+	MINOR_VERSION="${MINOR_VERSION%.*}"
+	if [[ $((MINOR_VERSION % 2)) == 0 ]]; then
+		#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+	else
+		SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
+	fi
+	unset MINOR_VERSION
+fi
+
+# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
+LICENSE="LGPL-2.1 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist +cxx doc examples guile lzo +nettle nls test valgrind zlib"
+
+# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
+RDEPEND=">=dev-libs/libtasn1-0.3.4
+	nls? ( virtual/libintl )
+	guile? ( dev-scheme/guile[networking] )
+	nettle? ( >=dev-libs/nettle-2.1[gmp] )
+	!nettle? ( >=dev-libs/libgcrypt-1.4.0 )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	test? ( valgrind? ( dev-util/valgrind ) app-misc/datefudge )"
+
+S="${WORKDIR}/${P%_pre*}"
+
+pkg_setup() {
+	if use lzo && use bindist; then
+		ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
+	fi
+
+	if use valgrind && ! use test; then
+		ewarn "Valgrind is part of the test suite and which is not currently \
+		being used. Disabling valgrind."
+	fi
+}
+
+src_prepare() {
+	sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
+
+	local dir
+	for dir in m4 lib/m4 libextra/m4; do
+		rm -f "${dir}/lt"* "${dir}/libtool.m4"
+	done
+	find . -name ltmain.sh -exec rm {} \;
+	for dir in . lib libextra; do
+		pushd "${dir}" > /dev/null
+		eautoreconf
+		popd > /dev/null
+	done
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+src_configure() {
+	local myconf
+	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
+	use test && myconf="${myconf} $(use_enable valgrind valgrind-tests)" || \
+	myconf="${myconf} --disable-valgrind-tests"
+
+	econf --htmldir=/usr/share/doc/${P}/html \
+		$(use_enable cxx) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable guile) \
+		$(use_with !nettle libgcrypt) \
+		$(use_enable nls) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die
+
+	if use doc; then
+		dodoc doc/gnutls.{pdf,ps} || die
+		dohtml doc/gnutls.html || die
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c || die
+	fi
+}
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 6f279968eaa1..a7f757cbfdf8 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -5,4 +5,7 @@
 	<use>
 		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> as crypto backend</flag>
 	</use>
+	<use>
+		<flag name="valgrind">Enable testing using <pkg>dev-util/valgrind</pkg>.</flag>
+	</use>
 </pkgmetadata>