Add LC_CTYPE patch by Михаил (bug #200875). Drop unused eclasses. Call epatch once.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 70 insertions, 22 deletions

diff --git a/net-analyzer/gnu-netcat/ChangeLog b/net-analyzer/gnu-netcat/ChangeLog
index ffb5f4a76d62..48d67609de99 100644
--- a/net-analyzer/gnu-netcat/ChangeLog
+++ b/net-analyzer/gnu-netcat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/gnu-netcat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/ChangeLog,v 1.20 2010/05/26 16:08:57 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/ChangeLog,v 1.21 2010/07/26 22:42:46 jer Exp $
+
+*gnu-netcat-0.7.1-r3 (26 Jul 2010)
+
+  26 Jul 2010; Jeroen Roovers <jer@gentoo.org> +gnu-netcat-0.7.1-r3.ebuild,
+  +files/gnu-netcat-LC_CTYPE.patch:
+  Add LC_CTYPE patch by Михаил (bug #200875). Drop unused eclasses.
+  Call epatch once.
 
   26 May 2010; Jonathan Callen <abcd@gentoo.org> gnu-netcat-0.7.1-r2.ebuild:
   Bump to EAPI=3, add prefix keywords
diff --git a/net-analyzer/gnu-netcat/Manifest b/net-analyzer/gnu-netcat/Manifest
index 7e92fb529641..d0177fcbeae5 100644
--- a/net-analyzer/gnu-netcat/Manifest
+++ b/net-analyzer/gnu-netcat/Manifest
@@ -1,27 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX gnu-netcat-LC_CTYPE.patch 479 RMD160 e3829c1982c5dee355e472885da034ed72f8a311 SHA1 2dcae62e8df8c37d932e3af6ab5d39890cfe54f9 SHA256 d23dc965eaf9564e04fe2c03b51053945265b77504d92f343a3c0f0280afd299
 AUX gnu-netcat-close.patch 440 RMD160 3976fe9ac1d70276e70d5aadf2e0f24a5cc87cf7 SHA1 5157e881505a7119e1e03ab726c04bcc3d105942 SHA256 a952e9304789f781968f372f2823b68f5ec48b4a6188a4d77571713048e52a9b
 AUX gnu-netcat-flagcount.patch 582 RMD160 d3129895f6f18610fa86d8a51089f7b2d0fab035 SHA1 a7a4fc46a13a11853da48e97a922956e960efc0e SHA256 9fd0ef40815a42515ae68f41479a2f475fdd1b4126b33b0ea5b64f1b6882a21e
 DIST netcat-0.7.1.tar.bz2 325687 RMD160 fd5343b11849ea8b12f7c0b02b6fe3c093475ec0 SHA1 b761d70fe9e3e8b3fe33a329b9bc31300dc04d11 SHA256 b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb
 EBUILD gnu-netcat-0.7.1-r1.ebuild 921 RMD160 26b86dfb6947d089316761fbb09d49c578e95987 SHA1 f9fdaa02f09cb9b208c449d1b179575cf8f20be9 SHA256 83be97084c793d8fb00483d224d7245efffdeb70954676a23e2670c0c4644e86
 EBUILD gnu-netcat-0.7.1-r2.ebuild 989 RMD160 8a350b2c707654a99d064568d01f7986cc686727 SHA1 af4c43400b1e087df59b2bd4c51b6b02c17342e6 SHA256 93d302c1ced74104fd210758b82a05f207cd1e09edb87e9960a63fde0e584e9e
-MISC ChangeLog 2434 RMD160 8c394683ba457c259561cde8cfef86f3f97e9100 SHA1 7dd72af42bae21fd34634630abd65472ac9d31a3 SHA256 5f1c2db285e432031808b81ed9abcc51a87f8c755fca46465752d3a184be7fe9
+EBUILD gnu-netcat-0.7.1-r3.ebuild 995 RMD160 b82626e391c3d650bbd0e753c65cfe000cfa2256 SHA1 8ac5c03ee780aa1fc960c91b3949fe6d760e4d38 SHA256 b953a8f4d992339f184f22fb9548da032f8782d18d71d2d0837437b8d473ad74
+MISC ChangeLog 2676 RMD160 228540951ed3d0a23e48e7e2dbc6f9f59db3450d SHA1 3f65ba2da814ac140ef985a05a5cc2bbd44815f2 SHA256 e18da37aa1f8f4011e578459c092527c9adbda30c982a17751c068cd37ff299b
 MISC metadata.xml 227 RMD160 9df39213f17a663a862c0cea4de042a2684fc9c8 SHA1 802652e7a5d529bdc20ea6f6acf5526a89f5165f SHA256 d91bb529a0025f5eb41c7c8385d58ef58848fa368e786238b48cc9e7176c4867
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQIcBAEBCAAGBQJL/UeiAAoJELHSF2kinlg4ZbQP/iqO0uzEg7uyvNEiAQ0+trxs
-rt4S2rfniSfP9hIoJGHHdB9l1YrurDDD5MutyN3O0fGWjSxYxC3KD+/rurGZ/5J6
-gqBG/Ow2T6SLKbJqgRo+LTndiNnPi2VlWxE7IWsu3RVIYciWfGmiuI5EGLrpx42O
-oJQrJPcC5QknG7bRGn/d0zD/3WzYOCkVEuXCop6D19A9P7lZpBI3zxd1ICLgyrjM
-B4acj/UUbCdj5ZVuFTBEECg4USAPKh/WLS5kRfUG7A+hVBbYOfXi8p/OxE4HTfmX
-AYCtF8SzS+Ya4N3VReA/L+n4kFGh7yTAr7uva/q2JCBik58xlnuKVTTonKRgV7NP
-z+SsAdjjIKrY6fkrfJCZfDewUgkwPJUDmH2FT2x4GBXtZA3jNf/tmU+EGfOdHxyp
-/OWTq+3OHgTb33UxFrsmPMlPv0f1LAJ9Z6KJjCIgqZfX+y3MZH045CrPbSBRn1HJ
-Trrq2+auwOwIILfFJx6ZZqECsVACD1DTpgqaKrYiCZOBA/zaps73v+RBGepjTweC
-Y+83X/je6WyTdsYrl9Mz6iZym3dgemLvvibMjPlQ3y1wUh6Cey3RkUu1/3uWzgAI
-OF9DaLt18q8gF4T1DYr8zKjbFWkPkob//oz5lVnOXTZmV9DoNbV4UvlqiWprM4x7
-DKfrQZ35Hv32dYLtIOk9
-=W1iY
------END PGP SIGNATURE-----
diff --git a/net-analyzer/gnu-netcat/files/gnu-netcat-LC_CTYPE.patch b/net-analyzer/gnu-netcat/files/gnu-netcat-LC_CTYPE.patch
new file mode 100644
index 000000000000..1c67f92e6c2a
--- /dev/null
+++ b/net-analyzer/gnu-netcat/files/gnu-netcat-LC_CTYPE.patch
@@ -0,0 +1,19 @@
+In russian locale, netcat error messages display as '???????'
+
+Need to set LC_CTYPE along with LC_MESSAGES to correctly display messages in
+locales other then C/POSIX
+Required for correct i18n support in glibc.
+
+(bug #200875 by Михаил)
+
+
+--- a/src/netcat.c
++++ b/src/netcat.c
+@@ -157,6 +157,7 @@
+   connect_sock.domain = PF_INET;
+ 
+ #ifdef ENABLE_NLS
++  setlocale(LC_CTYPE, "");
+   setlocale(LC_MESSAGES, "");
+   bindtextdomain(PACKAGE, LOCALEDIR);
+   textdomain(PACKAGE);
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
new file mode 100644
index 000000000000..ca15c7f80624
--- /dev/null
+++ b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild,v 1.1 2010/07/26 22:42:46 jer Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="the GNU network swiss army knife"
+HOMEPAGE="http://netcat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/netcat/netcat-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls debug"
+
+DEPEND=""
+
+S=${WORKDIR}/netcat-${PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-flagcount.patch \
+		"${FILESDIR}"/${PN}-close.patch \
+		"${FILESDIR}"/${PN}-LC_CTYPE.patch
+
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm "${ED}"usr/bin/nc
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}