Fix building with GCC 4.4 wrt #274219.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

8 files changed, 23 insertions, 119 deletions

diff --git a/x11-libs/libsynaptics/ChangeLog b/x11-libs/libsynaptics/ChangeLog
index 960c93f00c50..0d85ff88eadf 100644
--- a/x11-libs/libsynaptics/ChangeLog
+++ b/x11-libs/libsynaptics/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libsynaptics
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsynaptics/ChangeLog,v 1.12 2009/02/26 14:39:30 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsynaptics/ChangeLog,v 1.13 2009/07/25 22:12:32 ssuominen Exp $
+
+  25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  libsynaptics-0.14.6c-r1.ebuild, +files/libsynaptics-0.14.6c-gcc44.patch:
+  Fix building with GCC 4.4 wrt #274219.
 
   26 Feb 2009; Joseph Jezak <josejx@gentoo.org>
   libsynaptics-0.14.6c-r1.ebuild:
diff --git a/x11-libs/libsynaptics/files/libsynaptics-0.14.6c-gcc44.patch b/x11-libs/libsynaptics/files/libsynaptics-0.14.6c-gcc44.patch
new file mode 100644
index 000000000000..1d1445d9d933
--- /dev/null
+++ b/x11-libs/libsynaptics/files/libsynaptics-0.14.6c-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur libsynaptics-0.14.6c.orig/pad.cpp libsynaptics-0.14.6c/pad.cpp
+--- libsynaptics-0.14.6c.orig/pad.cpp	2007-01-10 23:15:15.000000000 +0200
++++ libsynaptics-0.14.6c/pad.cpp	2009-07-26 01:10:38.000000000 +0300
+@@ -2,6 +2,8 @@
+ #include "synparam.h"
+ #include "pad.h"
+ #include <pthread.h>
++#include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/shm.h>
+ 
diff --git a/x11-libs/libsynaptics/files/libsynaptics-0.14.6c-r1-gcc-4-3-0.patch b/x11-libs/libsynaptics/files/libsynaptics-0.14.6c-r1-gcc-4-3-0.patch
deleted file mode 100644
index 454804de9c79..000000000000
--- a/x11-libs/libsynaptics/files/libsynaptics-0.14.6c-r1-gcc-4-3-0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pad.cpp~	2007-04-02 12:38:12.000000000 +0000
-+++ pad.cpp	2007-04-02 12:38:21.000000000 +0000
-@@ -2,6 +2,7 @@
- #include "synparam.h"
- #include "pad.h"
- #include <pthread.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <sys/shm.h>
-
diff --git a/x11-libs/libsynaptics/libsynaptics-0.14.4d.ebuild b/x11-libs/libsynaptics/libsynaptics-0.14.4d.ebuild
deleted file mode 100644
index 5cfd0b90a906..000000000000
--- a/x11-libs/libsynaptics/libsynaptics-0.14.4d.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsynaptics/libsynaptics-0.14.4d.ebuild,v 1.4 2009/05/05 08:12:45 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="library for accessing synaptics touchpads"
-HOMEPAGE="http://qsynaptics.sourceforge.net/"
-SRC_URI="http://qsynaptics.sourceforge.net/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-#RESTRICT=""
-
-DEPEND=""
-RDEPEND=""
-#S=${WORKDIR}/${P}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}
diff --git a/x11-libs/libsynaptics/libsynaptics-0.14.6a.ebuild b/x11-libs/libsynaptics/libsynaptics-0.14.6a.ebuild
deleted file mode 100644
index 80a85cbdce81..000000000000
--- a/x11-libs/libsynaptics/libsynaptics-0.14.6a.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsynaptics/libsynaptics-0.14.6a.ebuild,v 1.3 2009/05/05 08:12:45 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="library for accessing synaptics touchpads"
-HOMEPAGE="http://qsynaptics.sourceforge.net/"
-SRC_URI="http://qsynaptics.sourceforge.net/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-#RESTRICT=""
-
-DEPEND=""
-RDEPEND=""
-#S=${WORKDIR}/${P}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}
diff --git a/x11-libs/libsynaptics/libsynaptics-0.14.6b.ebuild b/x11-libs/libsynaptics/libsynaptics-0.14.6b.ebuild
deleted file mode 100644
index e32e94150795..000000000000
--- a/x11-libs/libsynaptics/libsynaptics-0.14.6b.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsynaptics/libsynaptics-0.14.6b.ebuild,v 1.3 2009/05/05 08:12:45 ssuominen Exp $
-
-inherit eutils
-
-DESCRIPTION="library for accessing synaptics touchpads"
-HOMEPAGE="http://qsynaptics.sourceforge.net/"
-SRC_URI="http://qsynaptics.sourceforge.net/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-#RESTRICT=""
-
-DEPEND=""
-RDEPEND=""
-#S=${WORKDIR}/${P}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}
diff --git a/x11-libs/libsynaptics/libsynaptics-0.14.6c-r1.ebuild b/x11-libs/libsynaptics/libsynaptics-0.14.6c-r1.ebuild
index 1471adc54a33..a737f866eba0 100644
--- a/x11-libs/libsynaptics/libsynaptics-0.14.6c-r1.ebuild
+++ b/x11-libs/libsynaptics/libsynaptics-0.14.6c-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsynaptics/libsynaptics-0.14.6c-r1.ebuild,v 1.4 2009/02/26 14:39:30 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsynaptics/libsynaptics-0.14.6c-r1.ebuild,v 1.5 2009/07/25 22:12:32 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="library for accessing synaptics touchpads"
@@ -14,14 +15,13 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=x11-drivers/synaptics-0.14.4"
+DEPEND=""
 
-src_unpack() {
-	unpack ${A} || die
-	cd "${S}" || die
-	epatch "${FILESDIR}/libsynaptics-0.14.6c-r1-gcc-4-3-0.patch" || die
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc ChangeLog README TODO
 }
diff --git a/x11-libs/libsynaptics/libsynaptics-0.14.6c.ebuild b/x11-libs/libsynaptics/libsynaptics-0.14.6c.ebuild
deleted file mode 100644
index dbdd040938bd..000000000000
--- a/x11-libs/libsynaptics/libsynaptics-0.14.6c.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libsynaptics/libsynaptics-0.14.6c.ebuild,v 1.6 2008/01/20 18:50:16 angelos Exp $
-
-inherit eutils
-
-DESCRIPTION="library for accessing synaptics touchpads"
-HOMEPAGE="http://qsynaptics.sourceforge.net/"
-SRC_URI="http://qsynaptics.sourceforge.net/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=x11-drivers/synaptics-0.14.4"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README TODO
-}