Fix building with gcc4. Use proper compiler.

Package-Manager: portage-2.0.51.20-r4

4 files changed, 56 insertions, 11 deletions

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index 97b855f4637d..fb395d6d21f1 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/acpid
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.3 2005/04/24 16:21:45 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.4 2005/04/26 10:32:12 azarah Exp $
+
+  26 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/acpid-1.0.4-gcc4.patch, acpid-1.0.4-r1.ebuild:
+  Fix building with gcc4.  Use proper compiler.
 
 *acpid-1.0.4-r1 (24 Apr 2005)
 
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 34007df6e952..60903f568a1b 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,16 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 654e4d9f11e2426ef5c34104b48e18f0 acpid-1.0.1.ebuild 1192
 MD5 915127f5fb100f20a8aae1c6c7c0188e acpid-1.0.2-r1.ebuild 1305
-MD5 d36477c8a92ef24c2e1407e249dfc39a acpid-1.0.4-r1.ebuild 1547
-MD5 ce05bd37ab42ef4cc366d050e05271f4 ChangeLog 3118
-MD5 3578a40c7c46ffaf7ab9449dff570641 acpid-1.0.4.ebuild 1524
-MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 MD5 a15ebede7a8bd47be9c5cd838cc9a47f acpid-1.0.2-r2.ebuild 1443
-MD5 747fc9ab0e7a041ea461b8f0ecab9132 files/acpid-1.0.4-default.sh 560
-MD5 3cc2de9822a0f65e061e31184ad2e91f files/default.sh-gentoo.patch 550
+MD5 328d1e402f371fc14e790fd9d7355a5a ChangeLog 3277
+MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
+MD5 bb26cfdbcb1b4b552817dac3964e2570 acpid-1.0.4-r1.ebuild 1705
+MD5 3578a40c7c46ffaf7ab9449dff570641 acpid-1.0.4.ebuild 1524
 MD5 13412c1fef605768fd76a97fd7e92162 files/acpid-1.0.4-default 858
+MD5 747fc9ab0e7a041ea461b8f0ecab9132 files/acpid-1.0.4-default.sh 560
 MD5 93f4357c4993442069a86bd9b6a6f6a7 files/acpid.rc6 646
+MD5 3cc2de9822a0f65e061e31184ad2e91f files/default.sh-gentoo.patch 550
 MD5 1ad4b7deead64fc207ea20bd1c340973 files/digest-acpid-1.0.1 62
-MD5 e193d813bbbabf9aceb89ba3c612e58e files/digest-acpid-1.0.4 62
 MD5 4bf4b207e7f3c9f7a966c62236dd73be files/digest-acpid-1.0.2-r1 62
 MD5 4bf4b207e7f3c9f7a966c62236dd73be files/digest-acpid-1.0.2-r2 62
+MD5 e193d813bbbabf9aceb89ba3c612e58e files/digest-acpid-1.0.4 62
+MD5 faf93dd3ae4cc7973d7375beea0738a3 files/acpid-1.0.4-gcc4.patch 670
 MD5 e193d813bbbabf9aceb89ba3c612e58e files/digest-acpid-1.0.4-r1 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCbhm41ZcsMnZjRyIRAk/2AKCddQX/LFpUPtMmNSXLRWYNoV2UzgCghESZ
+6CV2OXdqhPkWmcRxlxaDzIA=
+=IuGw
+-----END PGP SIGNATURE-----
diff --git a/sys-power/acpid/acpid-1.0.4-r1.ebuild b/sys-power/acpid/acpid-1.0.4-r1.ebuild
index b6c213063377..05514b0c0bfc 100644
--- a/sys-power/acpid/acpid-1.0.4-r1.ebuild
+++ b/sys-power/acpid/acpid-1.0.4-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-1.0.4-r1.ebuild,v 1.1 2005/04/24 16:21:45 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-1.0.4-r1.ebuild,v 1.2 2005/04/26 10:32:12 azarah Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
 HOMEPAGE="http://acpid.sourceforge.net"
@@ -15,18 +17,26 @@ DEPEND="virtual/libc
 		virtual/linux-sources"
 RDEPEND="virtual/libc"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Fix building with gcc4
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
 src_compile() {
 	# DO NOT COMPILE WITH OPTIMISATIONS (bug #22365)
 	# That is a note to the devs.  IF you are a user, go ahead and optimise
 	# if you want, but we won't support bugs associated with that.
-	make INSTPREFIX=${D} || die
+	make CC="$(tc-getCC)" INSTPREFIX="${D}" || die
 }
 
 src_install() {
 	# needed since the Makefile doesn't do 'mkdir -p $(BINDIR)'
 	dodir /usr/bin
 
-	make INSTPREFIX=${D} install || die
+	make INSTPREFIX="${D}" install || die
 
 	exeinto /etc/acpi
 	newexe ${FILESDIR}/${P}-default.sh default.sh || die
diff --git a/sys-power/acpid/files/acpid-1.0.4-gcc4.patch b/sys-power/acpid/files/acpid-1.0.4-gcc4.patch
new file mode 100644
index 000000000000..b56901d21b11
--- /dev/null
+++ b/sys-power/acpid/files/acpid-1.0.4-gcc4.patch
@@ -0,0 +1,20 @@
+--- acpid-1.0.4/ud_socket.c	2005-04-26 10:26:29.000000000 +0000
++++ acpid-1.0.4.az/ud_socket.c	2005-04-26 10:27:09.000000000 +0000
+@@ -60,7 +60,7 @@
+ 		struct sockaddr_un cliaddr;
+ 		int len = sizeof(struct sockaddr_un);
+ 
+-		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
++		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, (socklen_t *)&len);
+ 		if (newsock < 0) {
+ 			if (errno == EINTR) {
+ 				continue; /* signal */
+@@ -71,7 +71,7 @@
+ 
+ 		if (cred) {
+ 			len = sizeof(struct ucred);
+-			getsockopt(newsock, SOL_SOCKET, SO_PEERCRED,cred,&len);
++			getsockopt(newsock, SOL_SOCKET, SO_PEERCRED,cred,(socklen_t *)&len);
+ 		}
+ 
+ 		return newsock;