From: Christian Faulhammer Date: Fri, 12 Jan 2007 12:36:13 +0000 (+0000) Subject: fix the following bugs (for GCC 4.1 and other issues): 121477, 152134, 146978. Thank... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03fd4ed6d899cd556a84e5e165c63f2d5c07c839;p=gentoo.git fix the following bugs (for GCC 4.1 and other issues): 121477, 152134, 146978. Thanks to Sandro Package-Manager: portage-2.1.1-r2 --- 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 + +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 13 Jun 2006; Roy Marples toshiba-utils-2.0.1-r1.ebuild: diff --git a/app-laptop/toshiba-utils/Manifest b/app-laptop/toshiba-utils/Manifest index 7c5f645b2814..6d6587a208c1 100644 --- a/app-laptop/toshiba-utils/Manifest +++ b/app-laptop/toshiba-utils/Manifest @@ -1,24 +1,45 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX toshiba-modules.d 160 RMD160 fd8d6fffaf3d4063eef9624e4dea09301734cc09 SHA1 b70943a14caaba22a23e96086b45ffeaf4cc729c SHA256 39e14694a3e3804417c4725e590f39f4f128ec38af5ba4464e73580ef2eb15fe MD5 ccabc1b4b01e5698f3b89b75106c97f0 files/toshiba-modules.d 160 RMD160 fd8d6fffaf3d4063eef9624e4dea09301734cc09 files/toshiba-modules.d 160 SHA256 39e14694a3e3804417c4725e590f39f4f128ec38af5ba4464e73580ef2eb15fe files/toshiba-modules.d 160 +AUX toshiba-utils-2.0.1-arg-fix.diff 1122 RMD160 41609316a631dfc45ee78a6b056f911d3edfa3c8 SHA1 6406f78726ea69bd253664101a29b93717160b47 SHA256 7923f04ca746b9b0115527778fee897d532cf0041d2f911d5ce1066c9d9f3464 +MD5 e4c58bea11dad0cd942b1eaca96ba936 files/toshiba-utils-2.0.1-arg-fix.diff 1122 +RMD160 41609316a631dfc45ee78a6b056f911d3edfa3c8 files/toshiba-utils-2.0.1-arg-fix.diff 1122 +SHA256 7923f04ca746b9b0115527778fee897d532cf0041d2f911d5ce1066c9d9f3464 files/toshiba-utils-2.0.1-arg-fix.diff 1122 AUX toshiba-utils-2.0.1-gentoo.diff 1037 RMD160 7462f24c930846dd95c9a024eb92d46335ca7743 SHA1 daaf2ed0438cfc737a56f6f3b79bdc952880fb2b SHA256 0152514170f72556b8f4f7f327c54261c1a4072184eeb9b8e1c32468910a522c MD5 eba354581685a783dfbeac94292cb28d files/toshiba-utils-2.0.1-gentoo.diff 1037 RMD160 7462f24c930846dd95c9a024eb92d46335ca7743 files/toshiba-utils-2.0.1-gentoo.diff 1037 SHA256 0152514170f72556b8f4f7f327c54261c1a4072184eeb9b8e1c32468910a522c files/toshiba-utils-2.0.1-gentoo.diff 1037 -DIST toshutils-2.0.1.tar.gz 385389 +DIST toshutils-2.0.1.tar.gz 385389 RMD160 2505b9635ce18e7ed0ada129baad978287053d84 SHA1 18f327e20aa478f9d36c0841ec32ac98367e67b9 SHA256 cb66e83b8d93fe5a4a9a872051a4ed96322c64d07b068e036494a355d440696c EBUILD toshiba-utils-2.0.1-r1.ebuild 1596 RMD160 9322c5ba76e7ad6e3633b5c4d72f7f58f10ecf23 SHA1 915efeabc5c0335cc3dd8fe79f8c983f3e7d11d4 SHA256 eecf970b10c3b9d9ad4e1880bfa54a4cad58deaadf855548de75e6b524da8276 MD5 1bb842ec2a09bcf135d15ca7826a9324 toshiba-utils-2.0.1-r1.ebuild 1596 RMD160 9322c5ba76e7ad6e3633b5c4d72f7f58f10ecf23 toshiba-utils-2.0.1-r1.ebuild 1596 SHA256 eecf970b10c3b9d9ad4e1880bfa54a4cad58deaadf855548de75e6b524da8276 toshiba-utils-2.0.1-r1.ebuild 1596 -MISC ChangeLog 1086 RMD160 9fe1b7c9dcd9c2ac15da01343d5662318111959a SHA1 a60228c60a35fb510d4bd3b565664e49f4a8fa72 SHA256 db5537008526b8c963ace382795d9ac717f477c09d24a0843fbc948893e9cb67 -MD5 c06e834d4e1f04186ade2c706996fd69 ChangeLog 1086 -RMD160 9fe1b7c9dcd9c2ac15da01343d5662318111959a ChangeLog 1086 -SHA256 db5537008526b8c963ace382795d9ac717f477c09d24a0843fbc948893e9cb67 ChangeLog 1086 +EBUILD toshiba-utils-2.0.1-r2.ebuild 1822 RMD160 b6457b64a764a7b43419fb1a1a39cce0f1711727 SHA1 afe261cb1fd0066ac5e1f4a31e9cd4f5ce051812 SHA256 34fcfed2bade57e8ab04a24f546c4efe79e47bdd4531864923fa3173867f75fb +MD5 7e3034cb3ae144cd24bddac856a84ae3 toshiba-utils-2.0.1-r2.ebuild 1822 +RMD160 b6457b64a764a7b43419fb1a1a39cce0f1711727 toshiba-utils-2.0.1-r2.ebuild 1822 +SHA256 34fcfed2bade57e8ab04a24f546c4efe79e47bdd4531864923fa3173867f75fb toshiba-utils-2.0.1-r2.ebuild 1822 +MISC ChangeLog 1374 RMD160 24e24ab0d54f34c43e82ae2d06e89216b03525fb SHA1 86b3956d07ba205f46635f5d3bdfb61cdd9a797a SHA256 fc16319f141dd9ffaf9f25d51ffe6b4f1bd01dc1a1a328f63537b5113c018e45 +MD5 6733d538d49913f4e533a09302fb8cf3 ChangeLog 1374 +RMD160 24e24ab0d54f34c43e82ae2d06e89216b03525fb ChangeLog 1374 +SHA256 fc16319f141dd9ffaf9f25d51ffe6b4f1bd01dc1a1a328f63537b5113c018e45 ChangeLog 1374 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159 SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f metadata.xml 159 -MD5 13479a47a47561e9b8fd367a66dfe019 files/digest-toshiba-utils-2.0.1-r1 67 -RMD160 4045687186a6285ce717c592a196cfd2bad33316 files/digest-toshiba-utils-2.0.1-r1 67 -SHA256 b0ebd04fcb2fb0b8a21597a9eba5e4c607ec93232570c2f0b887327d9744fd53 files/digest-toshiba-utils-2.0.1-r1 67 +MD5 21f59d06d8dd179e6335789cdae22480 files/digest-toshiba-utils-2.0.1-r1 247 +RMD160 f09fbf316fbdc1eb924ea576074beb91e028a9eb files/digest-toshiba-utils-2.0.1-r1 247 +SHA256 626c2b7fb08ebc1a9ab80b16bef03aaa7af51ae9d94020f47fdb3f0cba21afc1 files/digest-toshiba-utils-2.0.1-r1 247 +MD5 21f59d06d8dd179e6335789cdae22480 files/digest-toshiba-utils-2.0.1-r2 247 +RMD160 f09fbf316fbdc1eb924ea576074beb91e028a9eb files/digest-toshiba-utils-2.0.1-r2 247 +SHA256 626c2b7fb08ebc1a9ab80b16bef03aaa7af51ae9d94020f47fdb3f0cba21afc1 files/digest-toshiba-utils-2.0.1-r2 247 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFFp4C0NQqtfCuFneMRAqwHAKCPum8fbp2veUsmVTyeE/c/vjhW2ACaAtOW +bYxPZ8+U7TgjklW8NfNu8z8= +=7J0o +-----END PGP SIGNATURE----- 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 +}