fix nls support as per bug #148778 thanks to Timo Kamph

Package-Manager: portage-2.1.2_pre1

3 files changed, 30 insertions, 15 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 6092bac6f725..189dd6633a5c 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.110 2006/09/23 00:01:39 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.111 2006/09/23 22:20:27 dragonheart Exp $
+
+  23 Sep 2006; Daniel Black <dragonheart@gentoo.org> gnutls-1.4.4-r1.ebuild:
+  fix nls support as per bug #148778 thanks to Timo Kamph
 
   22 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> gnutls-1.4.4-r1.ebuild:
   Stable on Alpha + ia64, bug 147682.
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index e51aec2caaa9..51f9a8e84422 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnutls-1.2.10-as-needed.patch 1418 RMD160 0c2b7c1984c886e44956d5b31672ae10ad23421b SHA1 6920685847e67cfb0e6859ecc12876effe4960ea SHA256 a573a7cc02c67b86bef3ada98d62a9b4e3d21767e31844c5dd837fc2c67fca3c
 MD5 aeb37fd93438092e982743c59ca5feea files/gnutls-1.2.10-as-needed.patch 1418
 RMD160 0c2b7c1984c886e44956d5b31672ae10ad23421b files/gnutls-1.2.10-as-needed.patch 1418
@@ -30,14 +33,14 @@ EBUILD gnutls-1.4.1.ebuild 1468 RMD160 47af0e82fa9b128d6255f80043c95e6ce3c58474
 MD5 e1bd943b030b2733afdb1de20a8213e7 gnutls-1.4.1.ebuild 1468
 RMD160 47af0e82fa9b128d6255f80043c95e6ce3c58474 gnutls-1.4.1.ebuild 1468
 SHA256 89b0c973352da16292da172d31f5347ed3dcde7de2746859d6680b92a5d89e7e gnutls-1.4.1.ebuild 1468
-EBUILD gnutls-1.4.4-r1.ebuild 1782 RMD160 db8fb640c08a9be4bb3a028f20dec07c59a489b1 SHA1 2ccedab0eb9b43e6c6ba621d695bf07c0532d6d7 SHA256 e527cbd26bb9b251a250a5e7880f62f972ee79fdb5ee04aceb2e43044b8aecbf
-MD5 503c96440a9babf1b005a85aa0fc0b61 gnutls-1.4.4-r1.ebuild 1782
-RMD160 db8fb640c08a9be4bb3a028f20dec07c59a489b1 gnutls-1.4.4-r1.ebuild 1782
-SHA256 e527cbd26bb9b251a250a5e7880f62f972ee79fdb5ee04aceb2e43044b8aecbf gnutls-1.4.4-r1.ebuild 1782
-MISC ChangeLog 16508 RMD160 bb1157dace7e72bc183ff2637115dbf3d560306a SHA1 a88695c58c53af6c1ae08a98e6b7788cd8bd1fe0 SHA256 6b96978e8c0aea22b577c2e8db8849f037879313c6e4892ab27a160583ca1948
-MD5 f9b86b2ea456b0093927eb7b0f13a51e ChangeLog 16508
-RMD160 bb1157dace7e72bc183ff2637115dbf3d560306a ChangeLog 16508
-SHA256 6b96978e8c0aea22b577c2e8db8849f037879313c6e4892ab27a160583ca1948 ChangeLog 16508
+EBUILD gnutls-1.4.4-r1.ebuild 1848 RMD160 7b637b7d2f84a27b6175032db3ec2ec34fe6c1db SHA1 9511abb707b4d8d9d6fc245f12dd77b12ad21e56 SHA256 4fe903d3c714aaec6e7d06563164ca8d981e0535a09b3cc9c0503d97ec7df75b
+MD5 973d9be91477157a43c030b8601c5bcd gnutls-1.4.4-r1.ebuild 1848
+RMD160 7b637b7d2f84a27b6175032db3ec2ec34fe6c1db gnutls-1.4.4-r1.ebuild 1848
+SHA256 4fe903d3c714aaec6e7d06563164ca8d981e0535a09b3cc9c0503d97ec7df75b gnutls-1.4.4-r1.ebuild 1848
+MISC ChangeLog 16649 RMD160 c772fd446a69da954cf1901387332df23a4f2566 SHA1 002d979427f2689bf3fa968e26e578553bade59a SHA256 f83dcc9d02700640e25d866160df24bbef4024ada53ef8569713c7e96abfaa14
+MD5 3be9cde22a11228b9f7c667453077dd4 ChangeLog 16649
+RMD160 c772fd446a69da954cf1901387332df23a4f2566 ChangeLog 16649
+SHA256 f83dcc9d02700640e25d866160df24bbef4024ada53ef8569713c7e96abfaa14 ChangeLog 16649
 MISC metadata.xml 276 RMD160 99eb13264f3656e33d5cbc95ed9319ba50a1e58c SHA1 1f70a3ead5de1eb0d62a59c084b3a06147256e2f SHA256 abd952a77edadf769a821e7210a01f38850cada9a7677a1561f6aa0ce954f480
 MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
 RMD160 99eb13264f3656e33d5cbc95ed9319ba50a1e58c metadata.xml 276
@@ -57,3 +60,10 @@ SHA256 9b90f6154d6e62a7ca293a0952da6a9981722382f5f90b8af55fa46db7846dc0 files/di
 MD5 be730be5feb0bac389fb036a33c1c42b files/digest-gnutls-1.4.4-r1 244
 RMD160 3ac7f1b8772d3ed3329629f22c09773ecded01b1 files/digest-gnutls-1.4.4-r1 244
 SHA256 314e2cbd832d1f021e946afb2adbbf21fdd1946d5724eb8a623934aa0c8cd999 files/digest-gnutls-1.4.4-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFFbWzmdTrptrqvGERAuj5AJ9tqEkgSzPYbZpxUu1/spOCATTVVACgiVXS
+yPy9UQdt807K0/Sn/vISmXE=
+=sv4U
+-----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-1.4.4-r1.ebuild b/net-libs/gnutls/gnutls-1.4.4-r1.ebuild
index 7b5845a0a49f..33bd499b7b9d 100644
--- a/net-libs/gnutls/gnutls-1.4.4-r1.ebuild
+++ b/net-libs/gnutls/gnutls-1.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.4.4-r1.ebuild,v 1.7 2006/09/23 00:01:39 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.4.4-r1.ebuild,v 1.8 2006/09/23 22:20:27 dragonheart Exp $
 
 inherit eutils autotools
 
@@ -12,7 +12,7 @@ SRC_URI="http://josefsson.org/gnutls/releases/${P}.tar.bz2"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ~ppc-macos ppc64 ~s390 ~sh ~sparc x86"
-IUSE="zlib doc"
+IUSE="zlib doc nls"
 
 RDEPEND=">=dev-libs/libgcrypt-1.2.2
 	>=app-crypt/opencdk-0.5.5
@@ -21,12 +21,13 @@ RDEPEND=">=dev-libs/libgcrypt-1.2.2
 	>=dev-libs/lzo-2
 	dev-libs/libgpg-error
 	>=dev-libs/libtasn1-0.3.4
-	sys-devel/gettext"
-#>=sys-devel/gettext-0.14.5" autoconf indicates this version but it works
-# without it
+	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	sys-devel/libtool
-	doc? ( dev-util/gtk-doc )"
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )"
+#>=sys-devel/gettext-0.14.5" autoconf indicates this version but it works
+# without it
 
 src_unpack() {
 	unpack ${A}
@@ -41,6 +42,7 @@ src_compile() {
 
 	econf  \
 		$(use_with zlib) \
+		$(use_enable nls) \
 		--without-included-minilzo \
 		--without-included-opencdk \
 		$(use_enable doc gtk-doc) \