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

Package-Manager: portage-2.1.2_pre3-r5

5 files changed, 86 insertions, 22 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/Manifest b/app-i18n/kon2/Manifest
index 11152c401967..7b7097f48deb 100644
--- a/app-i18n/kon2/Manifest
+++ b/app-i18n/kon2/Manifest
@@ -1,9 +1,50 @@
-MD5 fb72bc80547a167a4b7a0a69a482354b ChangeLog 1306
-MD5 d2eb1a617818e9986e6a6878d02121c2 kon2-0.3.9b-r1.ebuild 970
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 268b505189bf4dd55aff6e0b30dfeea3 files/digest-kon2-0.3.9b-r1 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kon2-0.3.9b-bufover-fix.patch 12484 RMD160 fe96901256ca5fb999a521f128e936ec188cf83d SHA1 9b1ea91aa3551f30bea44a59654f12b71c433a81 SHA256 3e810d10aef2be1a9e534f0960ae438ce45515fa522de6b6e2f0da27f04508a0
 MD5 9e4e986dd5532bde4b8217ed84c4436a files/kon2-0.3.9b-bufover-fix.patch 12484
+RMD160 fe96901256ca5fb999a521f128e936ec188cf83d files/kon2-0.3.9b-bufover-fix.patch 12484
+SHA256 3e810d10aef2be1a9e534f0960ae438ce45515fa522de6b6e2f0da27f04508a0 files/kon2-0.3.9b-bufover-fix.patch 12484
+AUX kon2-0.3.9b-exec.patch 1299 RMD160 5fe4f57d1fe796bdcd8eed0665ced4d9653be367 SHA1 6bc0fc82ff12a5ee6df268b498015dcc999ece8c SHA256 bef2eee51b845f4109d43c685e77950a662c129e74b24c56fe18611c683dae87
 MD5 83430dbe7bd7d9f2f2d91339ce4b1045 files/kon2-0.3.9b-exec.patch 1299
+RMD160 5fe4f57d1fe796bdcd8eed0665ced4d9653be367 files/kon2-0.3.9b-exec.patch 1299
+SHA256 bef2eee51b845f4109d43c685e77950a662c129e74b24c56fe18611c683dae87 files/kon2-0.3.9b-exec.patch 1299
+AUX kon2-0.3.9b-gcc34.patch 312 RMD160 bf4926eaaeb5fe9576c5221447286c7dbe469bb1 SHA1 e7ccdab899bf0bd4534d2a8ab2828863e3197194 SHA256 b1ff15677ea4d622868b610eebdc0ac290af21bb886f0c8b2a5df16ce99f7077
 MD5 96f449ea2481d031b0028c0138ff3b95 files/kon2-0.3.9b-gcc34.patch 312
+RMD160 bf4926eaaeb5fe9576c5221447286c7dbe469bb1 files/kon2-0.3.9b-gcc34.patch 312
+SHA256 b1ff15677ea4d622868b610eebdc0ac290af21bb886f0c8b2a5df16ce99f7077 files/kon2-0.3.9b-gcc34.patch 312
+AUX kon2-0.3.9b-gcc4.patch 405 RMD160 c26a6c9b6918a53ef764e7ef17fbc4513e71abab SHA1 f7cc04840bd74e9bcf67f9464d9a87152c896d9f SHA256 7bb0b1e6a46c9b2c65ae50109885e84a23b1bc479accfb01e170b234ea7ba873
+MD5 ed8d6ed0b667f82ede3efa82d7190478 files/kon2-0.3.9b-gcc4.patch 405
+RMD160 c26a6c9b6918a53ef764e7ef17fbc4513e71abab files/kon2-0.3.9b-gcc4.patch 405
+SHA256 7bb0b1e6a46c9b2c65ae50109885e84a23b1bc479accfb01e170b234ea7ba873 files/kon2-0.3.9b-gcc4.patch 405
+AUX kon2-0.3.9b-gentoo.patch 1122 RMD160 113586875bbd8bdb7925297e477dd9731dd85bb0 SHA1 1df6c170e85bfc4a9b89b3bc45640022351afb3a SHA256 6f2382cb95e40022f14aa8065532362ff107969f33dc6088d96f9fe733407526
 MD5 8df98c680c022f4f44624702dbe8dc42 files/kon2-0.3.9b-gentoo.patch 1122
+RMD160 113586875bbd8bdb7925297e477dd9731dd85bb0 files/kon2-0.3.9b-gentoo.patch 1122
+SHA256 6f2382cb95e40022f14aa8065532362ff107969f33dc6088d96f9fe733407526 files/kon2-0.3.9b-gentoo.patch 1122
+AUX kon2-0.3.9b-racecondition-fix3.patch 1855 RMD160 1cc0fc9495f96bc53ca7fbdb21a0f5af14cf30bf SHA1 ee2de9034b7ce5c82e0eea857cb20eee49a75995 SHA256 b5cc1339749c9d10aaca59955fc0994356477922a3e6de1c423910a3744122e1
 MD5 8a4b1178e184ad64b33d3f376b6ad33e files/kon2-0.3.9b-racecondition-fix3.patch 1855
+RMD160 1cc0fc9495f96bc53ca7fbdb21a0f5af14cf30bf files/kon2-0.3.9b-racecondition-fix3.patch 1855
+SHA256 b5cc1339749c9d10aaca59955fc0994356477922a3e6de1c423910a3744122e1 files/kon2-0.3.9b-racecondition-fix3.patch 1855
+DIST kon2-0.3.9b.tar.gz 86458 RMD160 03c6a3855d19f25d7fe32c85c41967496d586bfa SHA1 86afa976c253c15ea156a659492d6e6a5a486a6c SHA256 47481728b469c2238e6a32329e0ecdddc1f557095547477032b5dd548d59c2ec
+EBUILD kon2-0.3.9b-r1.ebuild 1003 RMD160 30f059e5d20a5ec6157d612bda28c49eea4a772b SHA1 f782f965949cde6e02a3a8c06fdaedf079d8d079 SHA256 aeb9579df1f0942397a248194b82aa902131dbb779325908bb8db429594b86d0
+MD5 138f342c06a7e7a681b6e607ad3d474a kon2-0.3.9b-r1.ebuild 1003
+RMD160 30f059e5d20a5ec6157d612bda28c49eea4a772b kon2-0.3.9b-r1.ebuild 1003
+SHA256 aeb9579df1f0942397a248194b82aa902131dbb779325908bb8db429594b86d0 kon2-0.3.9b-r1.ebuild 1003
+MISC ChangeLog 1511 RMD160 8e33fb059243af792ee795c40f67965b96f01635 SHA1 397ec2558f928aca47aec927c485b966d0d5d464 SHA256 021b281c2ce75c8f6b077cf212ffaf58f9b9c43b95c781683a9eda0fc3a20b74
+MD5 2740453415be83b3d31b0556c660eb5e ChangeLog 1511
+RMD160 8e33fb059243af792ee795c40f67965b96f01635 ChangeLog 1511
+SHA256 021b281c2ce75c8f6b077cf212ffaf58f9b9c43b95c781683a9eda0fc3a20b74 ChangeLog 1511
+MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
+SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
+MD5 c2be77430e5fd38c0bf8ecf9aadea828 files/digest-kon2-0.3.9b-r1 232
+RMD160 b0dad0fe3e227024c5bca8059dfd99c161b2d427 files/digest-kon2-0.3.9b-r1 232
+SHA256 e349a717b39f4c4dc8b86dbedcc025f5312cc40474ffeefc9d2cdf909dc992ec files/digest-kon2-0.3.9b-r1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFOWlQAiZjviIA2XgRAkMnAKCT7n1QJekm5Onb2a8AIKc/b06JuwCgjLxb
+zTDRMxcaRG/8HDn2DltqsII=
+=fqg+
+-----END PGP SIGNATURE-----
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
 }