Respect LINGUAS, per bug#402683.

Remove unused myconf usage.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64

3 files changed, 132 insertions, 16 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 9995e76532cb..ed63505222f0 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,11 @@
 # 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.391 2012/11/24 19:16:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.392 2012/12/22 22:24:10 alonbl Exp $
+
+*gnutls-3.1.5-r1 (22 Dec 2012)
+
+  22 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.1.5-r1.ebuild:
+  Respect LINGUAS, per bug#402683. Remove unused myconf usage.
 
 *gnutls-3.1.5 (24 Nov 2012)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 4cc58db7e7fa..bd5e3f79dd7e 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gnutls-2.12.20-AF_UNIX.patch 1041 SHA256 bd56d19bd1713ef3ddfca7768c2528aacb0c7425cd21f87d69b3d674504562a1 SHA512 a1564ace509fed3b0608ae66859979a364b173006fd43d77678dccb70577bbfd54953aa8c706aca77540ec28c3426a332e86c40722bbc7b4a23f9f50bee0478b WHIRLPOOL 9e27f8e7e82fdd53a11f1f7dfd10790f4d2c67d74bc68d9ce55718a57ef80d391f8fadab93f6186597c52ecedcef2d3f1ff16a77778aedd50545e5829e626baf
 AUX gnutls-2.12.20-glibc-2.16.patch 938 SHA256 9e0383563d5a358680aab3ddf1464d207fa9ea40baeb4d970017730abb7b97aa SHA512 d4216cc1ace84dfab32ac524cd7acc35b14f5c488d1b3716984894c5408667c82d0a4d494149c6a3c5805a6a901831d8df62d12de61d7b93d183520c9b6d93c3 WHIRLPOOL 71e268ab79ff0ad5d7bc0148b37a1070bc3b2ef09fe01e24eb060d04a6f2d03e209750a3853386f53f2d84c9843a6e66c49aab33fbdc6ef645ef2bb3c4882676
 AUX gnutls-2.12.20-guile-parallelmake.patch 349 SHA256 f6c81df63b3dce52df7754cffe9dfae0b94fcb1bedd68cf99d5546b4f00a8c37 SHA512 2c92817e1ac43e301f0c39edca0991e832a875204e9232106f660157f1db91ce942569ef16193f6b1e80038f3a000836f4ac2bb3d728d4bbb602e09f46ba5efd WHIRLPOOL d578f81a0d645c7430301aa35fb15cc4fde3acc044758f28d6046742053965c0b27c0a2d738794bfb6ce27164331b11387402413b40abac8d95192741f1d710c
@@ -12,17 +9,7 @@ DIST gnutls-3.1.3.tar.xz 4890796 SHA256 fcb236c663489d3dba5a3f41486810f3889eb450
 DIST gnutls-3.1.5.tar.xz 4959212 SHA256 2f095984dd9cbbf4dce417ecd81640fe47732322d025062b2c9a189d022de0d3 SHA512 388581faf377ea38b2050f70b2051f252fe6f2ac6c021f317e4ad0444a083ef89ae41779faf2f75a221368a24fc7e000123499a4045dd93cb7d0eea33b9f7a84 WHIRLPOOL 69e5e4a29d227ae8e8d2ba9accce7f8eafbf165a28cd08b7d71b4fe4a544aacf7bf747c4b5ac33902e8916320ffe5f5b1d409fe42988d99b0c726184e87bbfa8
 EBUILD gnutls-2.12.20.ebuild 3610 SHA256 785c319b735c8536cb34683fa863a6768cd04900dd83f5d1bfbcd69a11549e55 SHA512 6aa65bd7b955de2d84119c1d78d2c112bae99f90ff568b30ec2fa6c31fd659a2b8df7ec3a37fa11697d32d14bc8a7e12c2177b002863d272ee2c751adc259275 WHIRLPOOL 2f5547bab0891526543100f41e54eab92fbd4244f087e4e4ffa6014a6e0489930ae246583807402f510b1a262f79f00839153cb8a76d95773e7354f8da743528
 EBUILD gnutls-3.1.3.ebuild 2925 SHA256 46c0da1da60ca1d2d120a0c5f7a3c008db94c4b9a60fdffcbbf3e782ac504dd8 SHA512 2c1622b33c9d10ab591725a0b95d0407ff786d8175eb83768d2a5d583a18e911bcc846a74868c553c50076c6727e80e5010abc81ed526546a66194ce00c9f5fb WHIRLPOOL c3fa6a3ca84a2946a74c8edd182c9ad21c8d92cf6a1732db0cc4e018d0fa7d11a19292b7ffad01632bfec880445cdd7ce994fa03d2a0dfa61e8f34d46b76c309
+EBUILD gnutls-3.1.5-r1.ebuild 3102 SHA256 c4fdc223d930a24278080b946db15d5a33758240ef89474b4705f05dc0b84129 SHA512 f3d19311ecb865661f5000c09cf31ee276009bc3ee6da20d84a17197f6059a86ccc3af4e982086c21ed6e0127c196df377a03ab42268f76ba3938f24c1911cb0 WHIRLPOOL f2c34b7b852548e3c475c6e79ba9e132388ce692ab2c7107bc45fe8bfadb2255726908801ea4797c31dea5cee98fda06f93d85b444793e48618e9c59d19e350f
 EBUILD gnutls-3.1.5.ebuild 2932 SHA256 3e4c4589db3257d362fccd10bc1812f82202a31d7a302d39eb411d857920eeaa SHA512 2d8c628764cb17a94c883f92bd9bbd45218eaf49789a3b24f9d5a99401c7ce89bfdbb15d719090511a35cbd5967c0b349fcef557a8bc5db1c8f15e17b8d43e56 WHIRLPOOL a70324a288c1183fb82c72492d6736fd7ec1ef345a31bb56da5428cc120544caec5672c267dab8e6afaf0e8539aea1b505a97265a4fdadde4f250c5d5697f36d
-MISC ChangeLog 58387 SHA256 a5f687079dc52c98d45eb5580263728d989f73719f2fa841c5b4d9512239063d SHA512 933e5f42db31fe49d3b32683934e52bf0afc505b860791fe4b4cf80b76f451e354808077a91a734579273722859a46afb3c44595117a9c0789d884bb6170cc4a WHIRLPOOL ba47cc24b67212bf4d672404af2511d07739107014746d162dd46316e1b9623cef8509446154579a0361161fbffe7451384607942d612a44e061e0791f8f4402
+MISC ChangeLog 58553 SHA256 afd9a87e3c06f8ea7d68eccd6cb2cf430d9038d43ebc4714c49d961c4c8e5a05 SHA512 795bc711cd743b01386afb4519573e569e265a8ef55bd190040806141fdf46c6fa64120838092e76fddc37f1a0973e0dfc13427392dfaf93161b0ab0971249f3 WHIRLPOOL 83b0470c975c6cf247bc250eac03b27cea3af7130a48bb0867886906c7307afb3508daff3caebfc772b31d7b2981b635f2983d41c832c236b9176a1730580828
 MISC metadata.xml 608 SHA256 358aeb9effbe98a9a7b7107b17a6d88d3c81365c2e87e5378a622d85e40d89eb SHA512 704b47d97a7decd410a31f71199b44b2bd6c6bd370dd6280120346426bfe568ab5e70f37404bc02c20c009d0f262d3c2629d289ef0c89556482d6a143a4e2f9c WHIRLPOOL f6f1528d14bb711e7da63c4960b865815ce3a242a13e64526bc01e74e48ebb8bd099895537921e94e8586eb12e7827dfc4dfdecc6e0c61946f167a624e24b991
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQsR0dAAoJEBzRPIrUMBNCe3IH/jaglYQXvmWJ/GO/ueaWmMjV
-lXTrJ+UD053GJHZGpgessGgx8Yb9byfmY2R1YdBLmdQ8HJ9Qmz9o/TZKU1reDdm5
-6J5ocbOCPWIPtK/e74y1qHlH9b7hNMwaBwjdpaoGmMMTtA0P/c/3xc73ImShAv98
-FSKOWWxeJL1RALM7cr4FXda+o5SVSAcHYlRffOTZIXRyLLb0+FFc5e93iODTbuI7
-JV8aKBPcfeqgvGcezQVc4bw0I2RyJsHMkTW5O9s3LCWF5NuSiFiEKaSyXCXbTvwS
-3LLxvrH8WR8cmExEAQDulJza5CphKnoPDljuxl9MBWSmyd+BbVgBA6h3QXReWqM=
-=nir0
------END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.1.5-r1.ebuild b/net-libs/gnutls/gnutls-3.1.5-r1.ebuild
new file mode 100644
index 000000000000..7ea327c18c1b
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.1.5-r1.ebuild
@@ -0,0 +1,124 @@
+# 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.5-r1.ebuild,v 1.1 2012/12/22 22:24:10 alonbl Exp $
+
+EAPI=4
+
+inherit autotools libtool eutils
+
+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
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+fi
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+cxx dane doc examples guile nls pkcs11 static-libs test zlib"
+IUSE_LINGUAS="en cs de fi fr it ms nl pl sv uk vi zh_CN"
+for lingua in ${IUSE_LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+unset lingua
+
+RDEPEND=">=dev-libs/libtasn1-2.14
+	>=dev-libs/nettle-2.5[gmp]
+	sys-devel/autogen
+	dane? ( net-dns/unbound )
+	guile? ( >=dev-scheme/guile-1.8[networking] )
+	nls? ( virtual/libintl )
+	pkcs11? ( >=app-crypt/p11-kit-0.11 )
+	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/libtool
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+S=${WORKDIR}/${P%_pre*}
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+src_prepare() {
+	local dir file
+
+	# tests/suite directory is not distributed.
+	sed -i \
+		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
+		-e '/^AM_INIT_AUTOMAKE/s/-Werror//' \
+		configure.ac || die
+
+	sed -i \
+		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+		doc/Makefile.am || die
+
+	for dir in m4 gl/m4; do
+		rm -f "${dir}/lt"* "${dir}/libtool.m4"
+	done
+	find . -name ltmain.sh -exec rm {} \;
+
+	# use system libopts
+	sed -i -e "/^enable_local_libopts/s/yes/no/" configure.ac || die
+
+	# force regeneration of autogen-ed files
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	epatch "${FILESDIR}"/${PN}-3.1.3-guile-parallelmake.patch
+
+	# support user patches
+	epatch_user
+
+	eautoreconf
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# TPM needs to be tested before being enabled
+	econf \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--disable-silent-rules \
+		--disable-valgrind-tests \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable doc gtk-doc-pdf) \
+		$(use_enable guile) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		--without-tpm
+}
+
+src_test() {
+	# let it build in parallel
+	emake check
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	if use doc; then
+		dodoc doc/gnutls.pdf
+		dohtml doc/gnutls.html
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}