fix the following bugs (for GCC 4.1 and other issues): 121477, 152134, 146978. Thanks to Sandro <sanchan@gentoo.org>

(Portage version: 2.1.1-r2)

5 files changed, 114 insertions, 2 deletions

diff --git a/app-laptop/toshiba-utils/ChangeLog b/app-laptop/toshiba-utils/ChangeLog
index b359801d575e..f6b35afa8b5e 100644
--- a/app-laptop/toshiba-utils/ChangeLog
+++ b/app-laptop/toshiba-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/toshiba-utils
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/ChangeLog,v 1.8 2006/06/13 10:04:33 uberlord Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/ChangeLog,v 1.9 2007/01/12 12:36:12 opfer Exp $
+
+*toshiba-utils-2.0.1-r2 (12 Jan 2007)
+
+  12 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/toshiba-utils-2.0.1-arg-fix.diff, +toshiba-utils-2.0.1-r2.ebuild:
+  fix the following bugs (for GCC 4.1 and other issues): 121477, 152134,
+  146978. Thanks to Sandro <sanchan@gentoo.org>
 
   13 Jun 2006; Roy Marples <uberlord@gentoo.org>
   toshiba-utils-2.0.1-r1.ebuild:
diff --git a/app-laptop/toshiba-utils/files/digest-toshiba-utils-2.0.1-r1 b/app-laptop/toshiba-utils/files/digest-toshiba-utils-2.0.1-r1
index 62b3c625f793..6930bf8ecde3 100644
--- a/app-laptop/toshiba-utils/files/digest-toshiba-utils-2.0.1-r1
+++ b/app-laptop/toshiba-utils/files/digest-toshiba-utils-2.0.1-r1
@@ -1 +1,3 @@
 MD5 3a029dac7cc66e21cb3413736e5145c7 toshutils-2.0.1.tar.gz 385389
+RMD160 2505b9635ce18e7ed0ada129baad978287053d84 toshutils-2.0.1.tar.gz 385389
+SHA256 cb66e83b8d93fe5a4a9a872051a4ed96322c64d07b068e036494a355d440696c toshutils-2.0.1.tar.gz 385389
diff --git a/app-laptop/toshiba-utils/files/digest-toshiba-utils-2.0.1-r2 b/app-laptop/toshiba-utils/files/digest-toshiba-utils-2.0.1-r2
new file mode 100644
index 000000000000..6930bf8ecde3
--- /dev/null
+++ b/app-laptop/toshiba-utils/files/digest-toshiba-utils-2.0.1-r2
@@ -0,0 +1,3 @@
+MD5 3a029dac7cc66e21cb3413736e5145c7 toshutils-2.0.1.tar.gz 385389
+RMD160 2505b9635ce18e7ed0ada129baad978287053d84 toshutils-2.0.1.tar.gz 385389
+SHA256 cb66e83b8d93fe5a4a9a872051a4ed96322c64d07b068e036494a355d440696c toshutils-2.0.1.tar.gz 385389
diff --git a/app-laptop/toshiba-utils/files/toshiba-utils-2.0.1-arg-fix.diff b/app-laptop/toshiba-utils/files/toshiba-utils-2.0.1-arg-fix.diff
new file mode 100644
index 000000000000..010a3eec58bd
--- /dev/null
+++ b/app-laptop/toshiba-utils/files/toshiba-utils-2.0.1-arg-fix.diff
@@ -0,0 +1,33 @@
+--- src/Makefile.in.orig	2006-12-18 22:51:29.928889751 +0100
++++ src/Makefile.in	2006-12-18 22:51:37.706703197 +0100
+@@ -83,8 +83,7 @@
+ WALL = @WALL@
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -DBINDIR=\"$(BINDESTDIR)\"\
+-	-DXMESSAGE=\"$(XMESSAGE)\" -DWALL=\"$(WALL)\" -c $<
++	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -DBINDIR=\"$(BINDESTDIR)\" -DXMESSAGE=\"$(XMESSAGE)\" -DWALL=\"$(WALL)\" -c $<
+ 
+ 
+ all: $(PROGRAMS)
+@@ -96,8 +95,7 @@
+ 	$(LEX) -i parsetime.l
+ 
+ wmtuxtime.o: wmtuxtime.c
+-	$(CC) $(CFLAGS)  -DVERSION=\"$(VERSION)\"\
+-	-DBINDIR=\"$(BINDESTDIR)\" -DXMESSAGE=\"$(XMESSAGE)\" -c $<
++	$(CC) $(CFLAGS)  -DVERSION=\"$(VERSION)\" -DBINDIR=\"$(BINDESTDIR)\" -DXMESSAGE=\"$(XMESSAGE)\" -c $<
+ 
+ 
+ fan: $(FANOBJS)
+--- src/machine.h.orig	2006-12-18 22:53:14.001012896 +0100
++++ src/machine.h	2006-12-18 22:58:20.279288225 +0100
+@@ -23,8 +23,6 @@
+ #ifndef MACHINE_H
+ #define MACHINE_H
+ 
+-extern int powermode;
+-
+ void MachineOkCallback(GtkWidget *widget, GtkWidget *dialog);
+ void MachineCancelCallback(GtkWidget *widget, GtkWidget *dialog);
+ void MachineDefaultsCallback(GtkWidget *widget, gpointer *data);
diff --git a/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild b/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild
new file mode 100644
index 000000000000..bb149d44a81c
--- /dev/null
+++ b/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/toshiba-utils/toshiba-utils-2.0.1-r2.ebuild,v 1.1 2007/01/12 12:36:13 opfer Exp $
+
+inherit eutils autotools
+
+S=${WORKDIR}/toshutils-${PV}
+DESCRIPTION="Toshiba Laptop Utilities"
+HOMEPAGE="http://www.buzzard.org.uk/toshiba/"
+SRC_URI="http://www.buzzard.org.uk/toshiba/downloads/toshutils-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-ppc ~x86"
+IUSE="X gtk"
+
+DEPEND="gtk? ( =x11-libs/gtk+-1* )"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	rm -f config.{cache,log,status} src/*.o
+
+	sed -i -e "s:-m486 -O2::" \
+		-e "s:\(^CFLAGS =.*\):\1 ${CFLAGS}:" \
+		-e "s:^install\:.*:install\: all install-prog:" \
+		-e "s:-fwritable-strings::g" \
+		src/Makefile.in \
+		|| die "sed failed"
+	epatch ${FILESDIR}/${P}-arg-fix.diff
+	use X || epatch ${FILESDIR}/${P}-gentoo.diff
+	eautoconf || die "autoconf failed"
+}
+
+src_compile() {
+	econf \
+		$(use_with X) \
+		|| die "econf failed"
+	make depend || die "make depend failed"
+	make -C src || die "make src failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	make -C src DESTDIR=${D} install || die "make install failed"
+
+	dodoc README* TODO CONTRIBUTE FAQ ChangeLog
+	doman doc/*.{1x,1,8}
+	docinto pdf ; dodoc doc/*.pdf
+
+	insinto /etc/modules.d
+	newins ${FILESDIR}/toshiba-modules.d toshiba
+}
+
+pkg_postinst() {
+	ewarn "Dont forget Toshiba Laptop Support for your kernel."
+	ewarn "(under Processor Type and Features, CONFIG_TOSHIBA)"
+	[[ ${ROOT} == / ]] && /sbin/modules-update || return 0
+}
+
+pkg_config() {
+	# use this only if you dont have devfs... the driver is already devfs aware.
+	if [ "`ls -l ${ROOT}/dev/toshiba 2>/dev/null | awk '{print $$6}'`" != "181" ]
+	then
+		rm -f ${ROOT}/dev/toshiba
+		mknod -m 666 ${ROOT}/dev/toshiba c 10 181
+	fi
+}