Fix build with GCC 4.7 wrt bug #421691. Remove old.

(Portage version: 2.1.10.65/cvs/Linux x86_64)

4 files changed, 20 insertions, 26 deletions

diff --git a/kde-misc/kio-locate/ChangeLog b/kde-misc/kio-locate/ChangeLog
index 9481cb2cfe7a..39616fb75233 100644
--- a/kde-misc/kio-locate/ChangeLog
+++ b/kde-misc/kio-locate/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kio-locate
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/ChangeLog,v 1.38 2012/01/11 20:44:26 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/ChangeLog,v 1.39 2012/06/21 08:27:22 kensington Exp $
+
+  21 Jun 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/kio-locate-0.5.3-gcc-4.7.patch, -kio-locate-0.5.2.ebuild,
+  kio-locate-0.5.3.ebuild:
+  Fix build with GCC 4.7 wrt bug #421691. Remove old.
 
 *kio-locate-0.5.3 (11 Jan 2012)
 
diff --git a/kde-misc/kio-locate/files/kio-locate-0.5.3-gcc-4.7.patch b/kde-misc/kio-locate/files/kio-locate-0.5.3-gcc-4.7.patch
new file mode 100644
index 000000000000..9af2bc1e8bd5
--- /dev/null
+++ b/kde-misc/kio-locate/files/kio-locate-0.5.3-gcc-4.7.patch
@@ -0,0 +1,11 @@
+--- locater.h
++++ locater.h
+@@ -31,6 +31,8 @@
+ #ifndef LOCATER_H
+ #define LOCATER_H
+ 
++#include <unistd.h>
++
+ #include <QObject>
+ #include <QStringList>
+ #include <KProcess>
diff --git a/kde-misc/kio-locate/kio-locate-0.5.2.ebuild b/kde-misc/kio-locate/kio-locate-0.5.2.ebuild
deleted file mode 100644
index 24b5708cd642..000000000000
--- a/kde-misc/kio-locate/kio-locate-0.5.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/kio-locate-0.5.2.ebuild,v 1.2 2011/10/29 00:36:39 abcd Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="Locate KIO slave for KDE"
-HOMEPAGE="http://www.kde-apps.org/content/show.php/kio-locate?content=120965"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/120965-${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DOCS=(AUTHORS ChangeLog)
-
-RDEPEND="${RDEPEND}
-	sys-apps/mlocate
-"
diff --git a/kde-misc/kio-locate/kio-locate-0.5.3.ebuild b/kde-misc/kio-locate/kio-locate-0.5.3.ebuild
index 7741f227d74d..7bf72ed76666 100644
--- a/kde-misc/kio-locate/kio-locate-0.5.3.ebuild
+++ b/kde-misc/kio-locate/kio-locate-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/kio-locate-0.5.3.ebuild,v 1.1 2012/01/11 20:44:26 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kio-locate/kio-locate-0.5.3.ebuild,v 1.2 2012/06/21 08:27:22 kensington Exp $
 
 EAPI=4
 
@@ -17,7 +17,8 @@ SLOT="4"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DOCS=(AUTHORS ChangeLog)
+DOCS=( AUTHORS ChangeLog )
+PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
 
 RDEPEND="${RDEPEND}
 	sys-apps/mlocate