added workaround for non-ascii charsets (#56113) thanks to keiichi

8 files changed, 28 insertions, 155 deletions

diff --git a/dev-util/fenris/ChangeLog b/dev-util/fenris/ChangeLog
index ed045a4bad3d..c32cbd6826c5 100644
--- a/dev-util/fenris/ChangeLog
+++ b/dev-util/fenris/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/fenris
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/fenris/ChangeLog,v 1.12 2004/07/09 22:00:08 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fenris/ChangeLog,v 1.13 2004/07/24 17:35:30 liquidx Exp $
+
+  24 Jul 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/fenris-0.07m-nls.patch, -fenris-0.07m-r1.ebuild,
+  fenris-0.07m-r2.ebuild, -fenris-0.07m.ebuild:
+  added workaround for non-ascii charsets (#56113) thanks to keiichi
 
   09 Jul 2004; Travis Tilley <lv@gentoo.org> fenris-0.07m-r1.ebuild,
   fenris-0.07m-r2.ebuild:
diff --git a/dev-util/fenris/Manifest b/dev-util/fenris/Manifest
index 44cc4d715059..9aedab19452d 100644
--- a/dev-util/fenris/Manifest
+++ b/dev-util/fenris/Manifest
@@ -1,14 +1,11 @@
-MD5 cf8789bcfeaea20a931c8020a73c1ba7 fenris-0.07m.ebuild 1689
-MD5 4bc4a130dce393ab63fd48fde1e67e27 fenris-0.07m-r1.ebuild 1987
-MD5 c3c91717300b9373c98f78090b09dce6 fenris-0.07m-r2.ebuild 2230
-MD5 58c5a5468ea3733be6e4ad6484c89228 ChangeLog 2692
+MD5 b37a2193eb7291596ac9d973eb2cbd05 fenris-0.07m-r2.ebuild 2312
+MD5 582d0e64f1ad4dc72b49b0d45d76b6ba ChangeLog 2922
 MD5 a68b50d823b5d7af1ca8d201e13e9e96 metadata.xml 391
 MD5 87fb79e339f64e43a0ee10454f651982 files/fenris-0.07m-noansiart.patch 288
 MD5 c9aaf6abd2e9315787187e7bd3ebbaec files/fenris-0.07m-debian.patch 5239
 MD5 0d20b590e32e457303946a42ef320780 files/fenris-0.07m-fnprints.patch 277
 MD5 27c81d7bec94238ba277b4794d7d8314 files/build.diff 480
-MD5 e7aec05d088e447c23766b41773761d9 files/digest-fenris-0.07m 56
-MD5 07c202fb85035e970b3ef1445b67eff0 files/digest-fenris-0.07m-r1 65
+MD5 8847631044e80f4c49aaab7a5c47d2fc files/fenris-0.07m-nls.patch 521
 MD5 07c202fb85035e970b3ef1445b67eff0 files/digest-fenris-0.07m-r2 65
 MD5 fe38a3e8879043faeb58b390b9cb28ee files/fenris-0.07m-dress.c.patch 644
 MD5 d2326864923773f19d29c3f47f05b3d2 files/fenris-0.07m-speedup.patch 281
diff --git a/dev-util/fenris/fenris-0.07m-r1.ebuild b/dev-util/fenris/fenris-0.07m-r1.ebuild
deleted file mode 100644
index 53a969ba47c6..000000000000
--- a/dev-util/fenris/fenris-0.07m-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/fenris/fenris-0.07m-r1.ebuild,v 1.5 2004/07/09 22:00:08 lv Exp $
-
-inherit eutils
-
-DESCRIPTION="Fenris is a tracer, GUI debugger, analyzer, partial decompiler and much more"
-HOMEPAGE="http://razor.bindview.com/tools/fenris/"
-# dev-snapshot: http://lcamtuf.coredump.cx/fenris/fenris.tgz (2004/01/08)
-SRC_URI="mirror://gentoo/${P}-r1.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=sys-apps/portage-2.0.47-r10
-	sys-libs/libtermcap-compat
-	app-misc/screen
-	sys-libs/ncurses
-	dev-libs/openssl
-	virtual/os-headers
-	sys-devel/gdb"
-RDEPEND="sys-apps/gawk"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/makefile.diff
-	epatch ${FILESDIR}/build.diff
-	epatch ${FILESDIR}/${P}-debian.patch
-	epatch ${FILESDIR}/${P}-noansiart.patch # disable ascii art
-	epatch ${FILESDIR}/${P}-dress.c.patch # update for latest binutils
-	epatch ${FILESDIR}/${P}-speedup.patch # to speed up makefile
-}
-
-src_compile() {
-	# We need to obtain libc version, this should be a reliable way :)
-	# because internal script doesn't detect libc version during the emerge
-	LIBC=`ls /lib/libc-* | awk -F- '{print $2}' | awk -F.so '{print $1}'`
-
-	make all CFLAGS="$CFLAGS" LIBCVER=${LIBC} || die
-}
-
-src_install() {
-
-	# We are doing make install by hand
-	cd ${S}
-	dodir /usr/share/fenris
-
-	# Man pages
-	doman doc/man/*
-
-	# Documents
-	dodir /usr/share/fenris/doc
-	insinto /usr/share/fenris/doc
-	doins doc/*
-
-	# Fingeprints
-	insinto /etc
-	doins fnprints.dat
-
-	# Executables
-	into /usr
-	dobin fenris fprints getfprints ragnarok fenris-bug \
-		ragsplit dress aegir nc-aegir spliter.pl
-}
-
-pkg_postinst() {
-	einfo "These new tools are installed in /usr/bin:"
-	einfo "fenris fprints getfprints ragnarok fenris-bug ragsplit "
-	einfo "dress aegir nc-aegir spliter.pl"
-	einfo "Please refer to the manpage for fenris for further information"
-}
diff --git a/dev-util/fenris/fenris-0.07m-r2.ebuild b/dev-util/fenris/fenris-0.07m-r2.ebuild
index b469e2b6457e..8d8dd2e7c16c 100644
--- a/dev-util/fenris/fenris-0.07m-r2.ebuild
+++ b/dev-util/fenris/fenris-0.07m-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/fenris/fenris-0.07m-r2.ebuild,v 1.6 2004/07/09 22:00:08 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fenris/fenris-0.07m-r2.ebuild,v 1.7 2004/07/24 17:35:30 liquidx Exp $
 
 inherit eutils
 
@@ -35,6 +35,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-dress.c.patch # update for latest binutils
 	epatch ${FILESDIR}/${P}-speedup.patch # to speed up makefile
 	epatch ${FILESDIR}/${P}-fnprints.patch # move fnprints to /etc/fenris
+	epatch ${FILESDIR}/${P}-nls.patch # allow build to run on non-ascii locales
 
 	cd ${S}/doc/man
 	sed -i 's:/etc/fnprints.dat:/etc/fenris/fnprints.dat:' -i *
diff --git a/dev-util/fenris/fenris-0.07m.ebuild b/dev-util/fenris/fenris-0.07m.ebuild
deleted file mode 100644
index 05d38f3bf04b..000000000000
--- a/dev-util/fenris/fenris-0.07m.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/fenris/fenris-0.07m.ebuild,v 1.8 2004/06/25 02:31:31 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Fenris is a tracer, GUI debugger, analyzer, partial decompiler and much more"
-HOMEPAGE="http://razor.bindview.com/tools/fenris/"
-SRC_URI="http://razor.bindview.com/tools/fenris/${PN}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=sys-apps/portage-2.0.47-r10
-	sys-libs/libtermcap-compat
-	app-misc/screen
-	sys-libs/ncurses
-	sys-devel/gdb"
-RDEPEND="sys-apps/gawk"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/makefile.diff
-	epatch ${FILESDIR}/build.diff
-	epatch ${FILESDIR}/${P}-debian.patch
-}
-
-src_compile() {
-
-	# We need to obtain libc version, this should be a reliable way :)
-	# because internal script doesn't detect libc version during the emerge
-	LIBC=`ls /lib/libc-* | awk -F- '{print $2}' | awk -F.so '{print $1}'`
-
-	make all CFLAGS="$CFLAGS" LIBCVER=${LIBC} || die
-}
-
-src_install() {
-
-	# We are doing make install by hand
-	cd ${S}
-	dodir /usr/share/fenris
-
-	# Man pages
-	doman doc/man/*
-
-	# Documents
-	dodir /usr/share/fenris/doc
-	insinto /usr/share/fenris/doc
-	doins doc/*
-
-	# Fingeprints
-	insinto /etc
-	doins fnprints.dat
-
-	# Executables
-	into /usr
-	dobin fenris fprints getfprints ragnarok fenris-bug \
-		ragsplit dress aegir nc-aegir spliter.pl
-
-	einfo "These new tools are installed in /usr/bin:"
-	einfo "fenris fprints getfprints ragnarok fenris-bug ragsplit "
-	einfo "dress aegir nc-aegir spliter.pl"
-	einfo "Please refer to the manpage for fenris for further information"
-}
diff --git a/dev-util/fenris/files/digest-fenris-0.07m b/dev-util/fenris/files/digest-fenris-0.07m
deleted file mode 100644
index 2a43d528685d..000000000000
--- a/dev-util/fenris/files/digest-fenris-0.07m
+++ /dev/null
@@ -1 +0,0 @@
-MD5 14c1fe47e00fd5fc1f7e72f12c056334 fenris.tgz 1122934
diff --git a/dev-util/fenris/files/digest-fenris-0.07m-r1 b/dev-util/fenris/files/digest-fenris-0.07m-r1
deleted file mode 100644
index 0f0767d2b77b..000000000000
--- a/dev-util/fenris/files/digest-fenris-0.07m-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c5d8079bd95aaf61fb13a5a4e4ac8d82 fenris-0.07m-r1.tgz 1084157
diff --git a/dev-util/fenris/files/fenris-0.07m-nls.patch b/dev-util/fenris/files/fenris-0.07m-nls.patch
new file mode 100644
index 000000000000..b28ba8155b76
--- /dev/null
+++ b/dev-util/fenris/files/fenris-0.07m-nls.patch
@@ -0,0 +1,17 @@
+--- fenris/build~	2004-07-15 21:36:44.695070960 +0200
++++ fenris/build	2004-07-15 21:37:06.658731976 +0200
+@@ -50,6 +50,14 @@
+   exit 1
+ fi
+ 
++# NLS nuisances (code from autoconfig)
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  eval $as_var=C; export $as_var
++done
+ 
+ CFLAGS="-O9 -fomit-frame-pointer -funroll-loops -fexpensive-optimizations \
+         -ffast-math -Wall"