added patch to comopile against newer kernels, fixed with gcc3.4, gcc.eclass to toolchain-funcs.eclass (#92745)

(Portage version: 2.0.51.21-r1)

5 files changed, 54 insertions, 4 deletions

diff --git a/app-i18n/jmcce/ChangeLog b/app-i18n/jmcce/ChangeLog
index b90135710113..5490f122607a 100644
--- a/app-i18n/jmcce/ChangeLog
+++ b/app-i18n/jmcce/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/jmcce
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/jmcce/ChangeLog,v 1.5 2005/01/01 14:31:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/jmcce/ChangeLog,v 1.6 2005/05/17 11:16:36 liquidx Exp $
+
+  17 May 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/jmcce-1.4_rc2-gcc3.4.patch, +files/jmcce-1.4_rc2-kernel.patch,
+  jmcce-1.4_rc2.ebuild:
+  added patch to comopile against newer kernels, fixed with gcc3.4, gcc.eclass
+  to toolchain-funcs.eclass (#92745)
 
   13 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> jmcce-1.4_rc2.ebuild:
   Force automake-1.4 in genconf.sh. This closes bug #54466.
diff --git a/app-i18n/jmcce/Manifest b/app-i18n/jmcce/Manifest
index dfc42fdfaee8..c8305ad322f4 100644
--- a/app-i18n/jmcce/Manifest
+++ b/app-i18n/jmcce/Manifest
@@ -1,5 +1,7 @@
 MD5 14a80bff8d975e7f58b6724aa97b82bd ChangeLog 649
-MD5 6f0e43aeca298dccd4a7c4c921aed13e jmcce-1.4_rc2.ebuild 1103
+MD5 635ff843670718a9675676124887850d jmcce-1.4_rc2.ebuild 1244
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 e77919af8495197697785325e0809b82 files/digest-jmcce-1.4_rc2 65
 MD5 69726c3d942600fbd25f0e519a26dfff files/jmcce-1.4_rc2-gcc3-gentoo.diff 568
+MD5 2dbee8375c75291111d233488b2e789a files/jmcce-1.4_rc2-kernel.patch 581
+MD5 0aefe68977e4a9cee1bfd895d4bea529 files/jmcce-1.4_rc2-gcc3.4.patch 348
diff --git a/app-i18n/jmcce/files/jmcce-1.4_rc2-gcc3.4.patch b/app-i18n/jmcce/files/jmcce-1.4_rc2-gcc3.4.patch
new file mode 100644
index 000000000000..f903b319ea5d
--- /dev/null
+++ b/app-i18n/jmcce/files/jmcce-1.4_rc2-gcc3.4.patch
@@ -0,0 +1,11 @@
+--- jmcce-1.4RC2/util/tit2tui.c	2002-05-15 14:44:30.000000000 +0100
++++ jmcce-1.4RC2/util/tit2tui.c	2005-05-17 11:58:23.788480553 +0100
+@@ -24,7 +24,7 @@
+ #include <stdarg.h>
+ int average( int first, ... );
+ #else                   //* UNIX compatible version          
+-#include <varargs.h>
++#include <stdarg.h>
+ int average( va_list );
+ #endif
+ 
diff --git a/app-i18n/jmcce/files/jmcce-1.4_rc2-kernel.patch b/app-i18n/jmcce/files/jmcce-1.4_rc2-kernel.patch
new file mode 100644
index 000000000000..392d9b186745
--- /dev/null
+++ b/app-i18n/jmcce/files/jmcce-1.4_rc2-kernel.patch
@@ -0,0 +1,27 @@
+--- jmcce-1.4RC2/src/jmcce.c	2002-05-17 19:09:14.000000000 +0100
++++ jmcce-1.4RC2/src/jmcce.c	2005-05-17 11:56:53.529200009 +0100
+@@ -33,6 +33,24 @@
+ #include <linux/major.h>
+ #include <linux/keyboard.h>
+ 
++#ifndef MINORBITS
++#define MINORBITS       20
++#endif
++
++#ifndef MINORMASK
++#define MINORMASK       ((1U << MINORBITS) - 1)
++#endif
++
++#ifndef MAJOR
++#define MAJOR(dev)      ((unsigned int) ((dev) >> MINORBITS))
++#endif
++
++#ifndef MINOR
++#define MINOR(dev)      ((unsigned int) ((dev) & MINORMASK))
++#endif
++
++
++
+ #include "jmcce.h"
+ #include "draw.h"
+ #include "hbffont.h"
diff --git a/app-i18n/jmcce/jmcce-1.4_rc2.ebuild b/app-i18n/jmcce/jmcce-1.4_rc2.ebuild
index 599fec3f01c1..ee9bc020546d 100644
--- a/app-i18n/jmcce/jmcce-1.4_rc2.ebuild
+++ b/app-i18n/jmcce/jmcce-1.4_rc2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/jmcce/jmcce-1.4_rc2.ebuild,v 1.9 2005/01/01 14:31:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/jmcce/jmcce-1.4_rc2.ebuild,v 1.10 2005/05/17 11:16:36 liquidx Exp $
 
-inherit gcc eutils
+inherit toolchain-funcs eutils
 
 MY_P=${P/_rc/RC}
 S=${WORKDIR}/${MY_P}
@@ -28,9 +28,13 @@ src_unpack() {
 	if [ `gcc-version` = "3.3" ] ; then
 		epatch ${FILESDIR}/${P}-gcc3-gentoo.diff
 	fi
+	epatch ${FILESDIR}/${P}-gcc3.4.patch
+	epatch ${FILESDIR}/${P}-kernel.patch
 }
 
 src_compile() {
+	export WANT_AUTOMAKE=1.4 
+	export WANT_AUTOCONF=2.5
 	sed -i "s:automake:automake-1.4:g" genconf.sh || die "sed"
 	./genconf.sh || die "genconf.sh failed"
 	econf --sysconfdir=/etc/jmcce || die "econf failed"