From 745efc4ad21e44fb6efac4d97453a2180baaaa27 Mon Sep 17 00:00:00 2001
From: Wulf Krueger <philantrop@gentoo.org>
Date: Mon, 21 Apr 2008 17:44:10 +0000
Subject: Added a patch for gcc 4.3 compatibility as kindly provided by Peter
 Alfredsen on bug 218690. (Portage version: 2.1.5_rc4)

---
 kde-misc/kaptain/ChangeLog                      |  9 +++++++--
 kde-misc/kaptain/files/kaptain-0.72-gcc43.patch | 19 +++++++++++++++++++
 kde-misc/kaptain/kaptain-0.72.ebuild            | 11 +++++++----
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 kde-misc/kaptain/files/kaptain-0.72-gcc43.patch

(limited to 'kde-misc')

diff --git a/kde-misc/kaptain/ChangeLog b/kde-misc/kaptain/ChangeLog
index d59a1714cad9..92c0d979c6a4 100644
--- a/kde-misc/kaptain/ChangeLog
+++ b/kde-misc/kaptain/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kaptain
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kaptain/ChangeLog,v 1.10 2006/10/22 01:38:20 tcort Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kaptain/ChangeLog,v 1.11 2008/04/21 17:44:09 philantrop Exp $
+
+  21 Apr 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kaptain-0.72-gcc43.patch, kaptain-0.72.ebuild:
+  Added a patch for gcc 4.3 compatibility as kindly provided by Peter
+  Alfredsen on bug 218690.
 
   22 Oct 2006; Thomas Cort <tcort@gentoo.org> kaptain-0.72.ebuild:
   Added ~amd64 keyword wrt Bug #147089.
diff --git a/kde-misc/kaptain/files/kaptain-0.72-gcc43.patch b/kde-misc/kaptain/files/kaptain-0.72-gcc43.patch
new file mode 100644
index 000000000000..dff520c6eff8
--- /dev/null
+++ b/kde-misc/kaptain/files/kaptain-0.72-gcc43.patch
@@ -0,0 +1,19 @@
+--- kaptain-0.72.orig/kaptain/communication.cpp
++++ kaptain-0.72/kaptain/communication.cpp
+@@ -1,3 +1,4 @@
++#include <cstdlib>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <errno.h>
+--- kaptain-0.72.orig/kaptain/kaptain.h
++++ kaptain-0.72/kaptain/kaptain.h
+@@ -8,7 +8,7 @@
+ #include <qlineedit.h>
+ #include <qtabwidget.h>
+ #include <qlayout.h>
+-#include <qlist.h>
++#include <qptrlist.h>
+ #include <qcombobox.h>
+ #include <qlistbox.h>
+ #include <qpushbutton.h>
+
diff --git a/kde-misc/kaptain/kaptain-0.72.ebuild b/kde-misc/kaptain/kaptain-0.72.ebuild
index 257a9fd8d196..e25bda37d380 100644
--- a/kde-misc/kaptain/kaptain-0.72.ebuild
+++ b/kde-misc/kaptain/kaptain-0.72.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kaptain/kaptain-0.72.ebuild,v 1.5 2006/10/22 01:38:20 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kaptain/kaptain-0.72.ebuild,v 1.6 2008/04/21 17:44:09 philantrop Exp $
 
 inherit kde-functions eutils
 
@@ -20,9 +20,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-ggc4.patch
+
+	# Fixes bug 218690.
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog README TODO
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README TODO || die "installing docs failed."
 }
-- 
cgit v1.2.3-65-gdbad