Sync with main tree: gnutls-2.8.0 -> gnutls-2.8.1 and gnutls-2.9.0 -> gnutls-2.9.1

3 files changed, 12 insertions, 12 deletions

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 7c451f02c..863e1bb8c 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -6,8 +6,8 @@ AUX gnutls-2.3.11+gcc-4.3.patch 349 RMD160 192c663f741c6a2b6681b3873c199c64996d0
 AUX gnutls-2.6.0-cxx-configure.in.patch 502 RMD160 fdd7f402f2a9122f8d7db9b165670c42d83abeb8 SHA1 748b7a0f0b689169054970993d7b4a6331f52c33 SHA256 c7a3ff932c467d08b27eee7e8b5bd1ce97b200328fc90478dee5ea3a59b18f71
 AUX gnutls-2.6.0-openpgp-selftest.patch 508 RMD160 dcd254a8078c4ab21662377e4f53176a541292e4 SHA1 f73103e1aa5dcccd4449b42123c00b0e782cac67 SHA256 235e0a1e588548eb52627d9fae528c680aeaf260e6cb87afa86a624f134fbd08
 DIST gnutls-2.6.6.tar.bz2 5116385 RMD160 dc6e717e38741628508208244f07fed8faedb13c SHA1 d1693e611aa7270f14bc500bd56ef529ffcb1703 SHA256 03d85b8b51ca7885740c69b87663963c58fe7c9672da0a43e45732078fabdc9e
-DIST gnutls-2.8.0.tar.bz2 6177498 RMD160 ad9d356ab55567ffc65c7fa4f48d8594a1cd5981 SHA1 7c102253bb4e817f393b9979a62c647010312eac SHA256 18a85a54aa2a26969e7bc91af06166a831182496c0cc215a032e7376f7b5129b
-DIST gnutls-2.9.0.tar.bz2 6104030 RMD160 5d6c02af24a62e0f9880720c9ab0233e7e4f58d6 SHA1 a52397f6f52970f51f8f6e49732a0290c59bbb0d SHA256 64f87ab21820452f9efa042a99b16a744fbd570cad1f67806ca5dc01e2afd707
+DIST gnutls-2.8.1.tar.bz2 6178662 RMD160 3b0d7a80a60dfc3222357d2c83a7ec32bd2c8e33 SHA1 b5fd364848709393d05def7e926caddd27169525 SHA256 a0300966a9761444b1e583c676f6c5c81e916897ea7d2e44d0c732c9d6e9c1ea
+DIST gnutls-2.9.1.tar.bz2 6116679 RMD160 e219ca10a3918340c4defe71391af552b48739e4 SHA1 51ec5ed5670593e7a9f9d2c07da4086eef733970 SHA256 6207114a7c476187c9498ca5cf952e5e815932af87cd304eadf0ddf2d4496e7d
 EBUILD gnutls-2.6.6.ebuild 2374 RMD160 d4594eed275109d48fbfeeadee29681caaaaf16d SHA1 7af67dd641113f7ca15c72e72067678fcb2825de SHA256 c8c8470ecfa132dea43d846222dce59ecd79c636a2ac126def61f6b7d095f5c5
-EBUILD gnutls-2.8.0.ebuild 2289 RMD160 3075086b186f1d538cb0a4dc52c762aceee72d00 SHA1 3550387b55f71e1bccb6334c6a8ad25fbd2e008f SHA256 ee6dc2cf352c36a3aa87e69581b8bea7c4d44e999f029245755d733e69ecf4ba
-EBUILD gnutls-2.9.0.ebuild 2289 RMD160 347f63843a3f8fdd0209407a7ad159fcb9ba1f7e SHA1 34e4a27d6371afd1e98a47c52e36410cf6ef4f5b SHA256 59b9eca953384b9963b2c7eb9c2366c1619450b25ec8c6264ab9c35ea3a5bfe0
+EBUILD gnutls-2.8.1.ebuild 2248 RMD160 d52f5229511fb4cd6fcd108412635928e1d30287 SHA1 057531567e7e57c7ba2ad738db466bfef6e7c465 SHA256 a25794deb0ea4783f3baec20355ae62c16735ccf31ae67459033200903394aef
+EBUILD gnutls-2.9.1.ebuild 2248 RMD160 148237210afb12262985a933d86cb6eaf1e03519 SHA1 1c7cb5ac2845b93c5fd4508f28a104496f320dad SHA256 c1a886f9811d09e1561f012eebaaca6193a080eb7e71e033631fe6dd421746cd
diff --git a/net-libs/gnutls/gnutls-2.8.0.ebuild b/net-libs/gnutls/gnutls-2.8.1.ebuild
index f9d837c25..8b7de41de 100644
--- a/net-libs/gnutls/gnutls-2.8.0.ebuild
+++ b/net-libs/gnutls/gnutls-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.8.0.ebuild,v 1.1 2009/05/28 17:33:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.8.1.ebuild,v 1.1 2009/06/10 17:16:16 arfrever Exp $
 
 EAPI="2"
 
@@ -23,7 +23,7 @@ unset MINOR_VERSION
 LICENSE="LGPL-2.1 GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bindist +cxx doc guile lzo nls zlib"
+IUSE="bindist +cxx doc examples guile lzo nls zlib"
 
 RDEPEND="dev-libs/libgpg-error
 	>=dev-libs/libgcrypt-1.4.0
@@ -60,7 +60,7 @@ src_prepare() {
 	elibtoolize # for sane .so versioning on FreeBSD
 }
 
-multilib-native_src_configure_internal() {
+src_configure() {
 	local myconf
 	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
 	econf  \
@@ -72,7 +72,7 @@ multilib-native_src_configure_internal() {
 		${myconf}
 }
 
-multilib-native_src_install_internal() {
+src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
 	dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO
diff --git a/net-libs/gnutls/gnutls-2.9.0.ebuild b/net-libs/gnutls/gnutls-2.9.1.ebuild
index b3420eb42..e24006890 100644
--- a/net-libs/gnutls/gnutls-2.9.0.ebuild
+++ b/net-libs/gnutls/gnutls-2.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.9.0.ebuild,v 1.1 2009/05/28 17:33:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.9.1.ebuild,v 1.1 2009/06/09 09:34:29 arfrever Exp $
 
 EAPI="2"
 
@@ -23,7 +23,7 @@ unset MINOR_VERSION
 LICENSE="LGPL-2.1 GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bindist +cxx doc guile lzo nls zlib"
+IUSE="bindist +cxx doc examples guile lzo nls zlib"
 
 RDEPEND="dev-libs/libgpg-error
 	>=dev-libs/libgcrypt-1.4.0
@@ -60,7 +60,7 @@ src_prepare() {
 	elibtoolize # for sane .so versioning on FreeBSD
 }
 
-multilib-native_src_configure_internal() {
+src_configure() {
 	local myconf
 	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
 	econf  \
@@ -72,7 +72,7 @@ multilib-native_src_configure_internal() {
 		${myconf}
 }
 
-multilib-native_src_install_internal() {
+src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
 	dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO