Fixed compilation when using gcc 3.3.x. Closing bug #34936

5 files changed, 73 insertions, 39 deletions

diff --git a/app-i18n/kcc/ChangeLog b/app-i18n/kcc/ChangeLog
index cdc94f4916c2..63a146bfeb65 100644
--- a/app-i18n/kcc/ChangeLog
+++ b/app-i18n/kcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/kcc
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kcc/ChangeLog,v 1.3 2003/06/12 20:13:51 msterret Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kcc/ChangeLog,v 1.4 2004/01/07 09:46:07 usata Exp $
+
+  07 Jan 2004; <usata@gentoo.org> kcc-1.0.ebuild, files/kcc-gcc3-gentoo.diff,
+  files/kcc-1.0/gentoo.diff:
+  Fixed compilation when using gcc-3.3.x, closing bug #34936
 
   12 Jun 2003; <msterret@gentoo.org> kcc-1.0.ebuild:
   add Header
diff --git a/app-i18n/kcc/Manifest b/app-i18n/kcc/Manifest
index 32838593d523..b6d177ac060c 100644
--- a/app-i18n/kcc/Manifest
+++ b/app-i18n/kcc/Manifest
@@ -1,5 +1,5 @@
-MD5 0f66a90a10b4d839f99eb1f079ebe573 ChangeLog 547
-MD5 50716b395416cb8745efa05ab9a505e5 kcc-1.0.ebuild 777
+MD5 2096bd20ab7d061791c51067e19d0bfc kcc-1.0.ebuild 847
+MD5 cd0395079e0ed11df248e839335288e2 ChangeLog 713
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 b1c138bf5f5e98cdaf6ab142bc86fc0f files/digest-kcc-1.0 54
-MD5 24113a71a8621fc051fcc25412599374 files/kcc-1.0/gentoo.diff 562
+MD5 4cc7e1525e5c35b96c19c4dd97cf7d6b files/kcc-gcc3-gentoo.diff 1099
diff --git a/app-i18n/kcc/files/kcc-1.0/gentoo.diff b/app-i18n/kcc/files/kcc-1.0/gentoo.diff
deleted file mode 100644
index 26f3a92b37a9..000000000000
--- a/app-i18n/kcc/files/kcc-1.0/gentoo.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.orig	Sat Aug  3 18:44:55 2002
-+++ Makefile	Sat Aug  3 18:45:57 2002
-@@ -7,8 +7,8 @@
- 
- #	@(#)Makefile 2.3 (Y.Tonooka) 3/28/94
- 
--          BINPATH = /usr/local/bin
--          MANPATH = /usr/local/man
-+          BINPATH = $(DESTDIR)/usr/bin
-+          MANPATH = $(DESTDIR)/usr/man
-           JMANDIR = japanese
-            CFLAGS = -O
- 
-@@ -34,9 +34,11 @@
- 
- $(BINPATH)/kcc: kcc.c
- 	$(MAKE) kcc
-+	mkdir -p $(BINPATH)
- 	$(INSTALL) -s kcc $(BINPATH)
- 
- $(MANPATH)/$(JMANDIR)/man1/kcc.1: kcc.jman
-+	mkdir -p $@
- 	$(INSTALL) -m 644 kcc.jman $@
- 
- clean:
diff --git a/app-i18n/kcc/files/kcc-gcc3-gentoo.diff b/app-i18n/kcc/files/kcc-gcc3-gentoo.diff
new file mode 100644
index 000000000000..bf82c3096a13
--- /dev/null
+++ b/app-i18n/kcc/files/kcc-gcc3-gentoo.diff
@@ -0,0 +1,47 @@
+--- kcc.c.orig	1994-03-28 20:00:12.000000000 +0900
++++ kcc.c	2004-01-07 18:36:29.589293728 +0900
+@@ -134,7 +134,11 @@
+ extern unsigned short hiragana[];
+ unsigned short *kanatbl = katakana;
+ 
++#ifdef __STDC__
++void error(char *format, ...);
++#else
+ void error();
++#endif
+ 
+ /**********************************************************************
+  *                                                                    *
+@@ -364,14 +368,30 @@
+     NAME
+ 	error - print formatted error message on stderr and die
+  ---------------------------------------------------------------------*/
++#ifdef __STDC__
++#include <stdarg.h>
++#else
+ #include <varargs.h>
++#endif
+ 
+-void error(va_alist)
+-    va_dcl
++void
++#ifdef __STDC__
++error(char *format, ...)
++#else
++error(va_alist) va_dcl
++#endif
+ {
+     va_list args;
+ 
++#ifdef __STDC__
++    va_start(args, format);
++#else
++    char *format;
++
+     va_start(args);
++    /* extract the fixed argument */
++    format = va_arg(args, char *);
++#endif
+     fprintf(stderr, "%s: ", progname);
+     vfprintf(stderr, va_arg(args, char *), args);
+     putc('\n', stderr);
diff --git a/app-i18n/kcc/kcc-1.0.ebuild b/app-i18n/kcc/kcc-1.0.ebuild
index 730dfe640309..440dc3f7dd37 100644
--- a/app-i18n/kcc/kcc-1.0.ebuild
+++ b/app-i18n/kcc/kcc-1.0.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kcc/kcc-1.0.ebuild,v 1.5 2003/07/01 22:12:04 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kcc/kcc-1.0.ebuild,v 1.6 2004/01/07 09:46:07 usata Exp $
+
+inherit gcc
+
+IUSE=""
 
 KEYWORDS="x86"
 S="${WORKDIR}/${PN}"
 DESCRIPTION="A Kanji code converter"
 SRC_URI="ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/${PN}.tar.gz"
-HOMEPAGE=""  	#There doesn't seem to be a home page for this package!
+HOMEPAGE="" 	#There doesn't seem to be a home page for this package!
 LICENSE="GPL-2"
 
 DEPEND="virtual/glibc"
 
-SLOT=0
+SLOT="0"
 
 src_unpack() {
 
@@ -19,18 +23,22 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}/gentoo.diff || die
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "3" ]
+	then
+		epatch ${FILESDIR}/${PN}-gcc3-gentoo.diff
+	fi
 }
 
 src_compile() {
-	make
+
+	emake || die
 }
 
 src_install () {
 
-	# install libs, executables, dictionaries
-	make DESTDIR=${D} install     || die "installation failed"
+	dobin kcc || die
 
-	# install docs
 	dodoc README
+	insinto /usr/share/man/ja/man1
+	newins kcc.jman kcc.1 || die
 }