summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pagano <mpagano@gentoo.org>2008-04-27 01:46:26 +0000
committerMike Pagano <mpagano@gentoo.org>2008-04-27 01:46:26 +0000
commit33e3e56d89ff412da845a1bb76362fb897a88090 (patch)
tree2807a03f35177242041d5c329cd9f8ea4f001893 /sys-kernel/kccmp
parentSparc stable --- Bug #218669 --- working for 2 months now. (diff)
downloadgentoo-2-33e3e56d89ff412da845a1bb76362fb897a88090.tar.gz
gentoo-2-33e3e56d89ff412da845a1bb76362fb897a88090.tar.bz2
gentoo-2-33e3e56d89ff412da845a1bb76362fb897a88090.zip
Fix for bug #218490
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'sys-kernel/kccmp')
-rw-r--r--sys-kernel/kccmp/ChangeLog6
-rw-r--r--sys-kernel/kccmp/files/kccmp-0.2-r1-no-qt4-missing-include.patch10
-rw-r--r--sys-kernel/kccmp/kccmp-0.2-r1.ebuild5
3 files changed, 19 insertions, 2 deletions
diff --git a/sys-kernel/kccmp/ChangeLog b/sys-kernel/kccmp/ChangeLog
index cb7ee112d8bf..b103ee214b99 100644
--- a/sys-kernel/kccmp/ChangeLog
+++ b/sys-kernel/kccmp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-kernel/kccmp
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/ChangeLog,v 1.9 2008/04/11 12:56:35 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/ChangeLog,v 1.10 2008/04/27 01:46:25 mpagano Exp $
+
+ 27 Apr 2008; Michael Pagano <mpagano@gentoo.org>
+ +files/kccmp-0.2-r1-no-qt4-missing-include.patch, kccmp-0.2-r1.ebuild:
+ Fix for bug #218490
11 Apr 2008; Mike Pagano <mpagano@gentoo.org> kccmp-0.2-r1.ebuild:
RDEPEND fixes
diff --git a/sys-kernel/kccmp/files/kccmp-0.2-r1-no-qt4-missing-include.patch b/sys-kernel/kccmp/files/kccmp-0.2-r1-no-qt4-missing-include.patch
new file mode 100644
index 000000000000..7a3fdd52e8d3
--- /dev/null
+++ b/sys-kernel/kccmp/files/kccmp-0.2-r1-no-qt4-missing-include.patch
@@ -0,0 +1,10 @@
+--- main.cpp.orig 2008-04-26 21:00:28.000000000 -0400
++++ main.cpp 2008-04-26 21:00:53.000000000 -0400
+@@ -34,6 +34,7 @@
+
+ #include <iostream>
+ #include <stdexcept>
++#include <cstdlib>
+
+ using namespace std;
+
diff --git a/sys-kernel/kccmp/kccmp-0.2-r1.ebuild b/sys-kernel/kccmp/kccmp-0.2-r1.ebuild
index 3c0403427760..c8eed120aabf 100644
--- a/sys-kernel/kccmp/kccmp-0.2-r1.ebuild
+++ b/sys-kernel/kccmp/kccmp-0.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/kccmp-0.2-r1.ebuild,v 1.3 2008/04/11 12:56:35 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/kccmp-0.2-r1.ebuild,v 1.4 2008/04/27 01:46:25 mpagano Exp $
EAPI="1"
inherit qt3 qt4
@@ -32,6 +32,9 @@ src_unpack() {
#do not link to boost libs when not using qt4
sed -i 's/LIBS/#LIBS/' kccmp.pro \
|| die "Could not remove linking to boost library"
+
+ # fix for bug #218490, if no qt4, add additional include directive
+ epatch "${FILESDIR}"/${P}-${PR}-no-qt4-missing-include.patch
fi
}