Add patch to build with GCC 4.x, thanks to Patrick Lauer for reporting in bug #151276.

(Portage version: 2.1.2_pre3-r5)

4 files changed, 41 insertions, 18 deletions

diff --git a/app-i18n/kon2/ChangeLog b/app-i18n/kon2/ChangeLog
index bb54d68d4c31..1211ad6399a0 100644
--- a/app-i18n/kon2/ChangeLog
+++ b/app-i18n/kon2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/kon2
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kon2/ChangeLog,v 1.10 2005/04/21 18:55:04 blubb Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kon2/ChangeLog,v 1.11 2006/10/21 00:26:49 flameeyes Exp $
+
+  21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kon2-0.3.9b-gcc4.patch, kon2-0.3.9b-r1.ebuild:
+  Add patch to build with GCC 4.x, thanks to Patrick Lauer for reporting in
+  bug #151276.
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> kon2-0.3.9b-r1.ebuild:
   stable on amd64
diff --git a/app-i18n/kon2/files/digest-kon2-0.3.9b-r1 b/app-i18n/kon2/files/digest-kon2-0.3.9b-r1
index 28a53cb89d1b..3fc90521cf87 100644
--- a/app-i18n/kon2/files/digest-kon2-0.3.9b-r1
+++ b/app-i18n/kon2/files/digest-kon2-0.3.9b-r1
@@ -1 +1,3 @@
 MD5 f9f4da5d95f0010972a85d73a3b3addb kon2-0.3.9b.tar.gz 86458
+RMD160 03c6a3855d19f25d7fe32c85c41967496d586bfa kon2-0.3.9b.tar.gz 86458
+SHA256 47481728b469c2238e6a32329e0ecdddc1f557095547477032b5dd548d59c2ec kon2-0.3.9b.tar.gz 86458
diff --git a/app-i18n/kon2/files/kon2-0.3.9b-gcc4.patch b/app-i18n/kon2/files/kon2-0.3.9b-gcc4.patch
new file mode 100644
index 000000000000..81f53e446b33
--- /dev/null
+++ b/app-i18n/kon2/files/kon2-0.3.9b-gcc4.patch
@@ -0,0 +1,17 @@
+Index: kon2-0.3.9b/src/vt.c
+===================================================================
+--- kon2-0.3.9b.orig/src/vt.c
++++ kon2-0.3.9b/src/vt.c
+@@ -248,10 +248,11 @@ SetWinSize()
+     ioctl(masterPty, TIOCSWINSZ, &win);
+ }
+ 
++static void EscBracket(u_char);
++
+ static void
+ EscStatusLine(u_char mode)
+ {
+-    static void EscBracket(u_char);
+     static struct attrStack *asp;
+ 
+     switch(mode) {
diff --git a/app-i18n/kon2/kon2-0.3.9b-r1.ebuild b/app-i18n/kon2/kon2-0.3.9b-r1.ebuild
index e4d4ffcebbcc..8ae3592c43d7 100644
--- a/app-i18n/kon2/kon2-0.3.9b-r1.ebuild
+++ b/app-i18n/kon2/kon2-0.3.9b-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kon2/kon2-0.3.9b-r1.ebuild,v 1.11 2005/04/21 18:55:04 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kon2/kon2-0.3.9b-r1.ebuild,v 1.12 2006/10/21 00:26:49 flameeyes Exp $
 
 inherit eutils
 
 DESCRIPTION="KON Kanji ON Linux console"
-HOMEPAGE=""
+HOMEPAGE="none"
 SRC_URI="ftp://ftp.linet.gr.jp/pub/KON/${P}.tar.gz"
 
 LICENSE="as-is"
@@ -13,18 +13,17 @@ SLOT="0"
 KEYWORDS="x86 amd64"
 IUSE=""
 
-DEPEND="virtual/libc"
-RDEPEND="${DEPEND}
-	>=media-fonts/konfont-0.1"
+RDEPEND=">=media-fonts/konfont-0.1"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	epatch ${FILESDIR}/${P}-exec.patch
-	epatch ${FILESDIR}/${P}-bufover-fix.patch
-	epatch ${FILESDIR}/${P}-racecondition-fix3.patch
-	epatch ${FILESDIR}/${P}-gcc34.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-exec.patch"
+	epatch "${FILESDIR}/${P}-bufover-fix.patch"
+	epatch "${FILESDIR}/${P}-racecondition-fix3.patch"
+	epatch "${FILESDIR}/${P}-gcc34.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
 }
 
 src_compile() {
@@ -34,10 +33,10 @@ src_compile() {
 }
 
 src_install() {
-	make LIBDIR=${D}/etc \
-		MANDIR=${D}/usr/share/man/ja/man1 \
-		BINDIR=${D}/usr/bin install || die
+	make LIBDIR="${D}"/etc \
+		MANDIR="${D}"/usr/share/man/ja/man1 \
+		BINDIR="${D}"/usr/bin install || die
 
 	dodir /usr/share/terminfo
-	tic terminfo.kon -o${D}/usr/share/terminfo
+	tic terminfo.kon -o"${D}"/usr/share/terminfo
 }