diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2007-10-30 00:54:52 +0000 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2007-10-30 00:54:52 +0000 |
| commit | 51a63ee495b7a2033ca48d88765517cd9143a82d (patch) | |
| tree | 5dbbcc9dc8b110682dc6ae6e54e0e396ec194b9e /sys-kernel/kccmp | |
| parent | Version bump. (diff) | |
| download | gentoo-2-51a63ee495b7a2033ca48d88765517cd9143a82d.tar.gz gentoo-2-51a63ee495b7a2033ca48d88765517cd9143a82d.tar.bz2 gentoo-2-51a63ee495b7a2033ca48d88765517cd9143a82d.zip | |
Fix for bug #197410, removing linking to boost for not use qt4
(Portage version: 2.1.3.16)
Diffstat (limited to 'sys-kernel/kccmp')
| -rw-r--r-- | sys-kernel/kccmp/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-kernel/kccmp/files/kccmp-0.2-qt4.patch | 10 | ||||
| -rw-r--r-- | sys-kernel/kccmp/kccmp-0.2.ebuild | 17 |
3 files changed, 17 insertions, 15 deletions
diff --git a/sys-kernel/kccmp/ChangeLog b/sys-kernel/kccmp/ChangeLog index 2bfdfb8b15de..b055ffc15866 100644 --- a/sys-kernel/kccmp/ChangeLog +++ b/sys-kernel/kccmp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-kernel/kccmp # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/ChangeLog,v 1.3 2007/10/29 00:10:38 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/ChangeLog,v 1.4 2007/10/30 00:54:51 mpagano Exp $ + + 30 Oct 2007; Michael Pagano <mpagano@gentoo.org> ChangeLog: + Fix for bug 197410, removing linking to boost for not use qt4 29 Oct 2007; Michael Pagano <mpagano@gentoo.org> ChangeLog: Fixed QT dependancy as noted in bug #197271. Thank-you, Jakub. diff --git a/sys-kernel/kccmp/files/kccmp-0.2-qt4.patch b/sys-kernel/kccmp/files/kccmp-0.2-qt4.patch deleted file mode 100644 index c26be0e2db9d..000000000000 --- a/sys-kernel/kccmp/files/kccmp-0.2-qt4.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/kccmp.pro 2007-10-07 17:00:02.000000000 -0400 -+++ b/kccmp.pro 2007-10-07 17:00:12.000000000 -0400 -@@ -4,6 +4,6 @@ - CONFIG += warn_on debug - OBJECTS_DIR = obj - # Uncomment the following for Qt 4 support --#DEFINES += KCCMP_QT_4 -+DEFINES += KCCMP_QT_4 - LIBS += -lboost_regex - #MOC_DIR = diff --git a/sys-kernel/kccmp/kccmp-0.2.ebuild b/sys-kernel/kccmp/kccmp-0.2.ebuild index d9b190c7f142..2d0ee35dabb4 100644 --- a/sys-kernel/kccmp/kccmp-0.2.ebuild +++ b/sys-kernel/kccmp/kccmp-0.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/kccmp-0.2.ebuild,v 1.3 2007/10/29 00:10:38 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/kccmp-0.2.ebuild,v 1.4 2007/10/30 00:54:51 mpagano Exp $ -inherit eutils qt3 qt4 +inherit qt3 qt4 DESCRIPTION="A simple tool for comparing two linux kernel .config files" HOMEPAGE="http://stoopidsimple.com/kccmp/" @@ -19,12 +19,21 @@ DEPEND="qt4? ( $(qt4_min_version 4.3.1-r1) >=dev-libs/boost-1.33.1-r1 ) src_unpack() { unpack "${A}" cd "${S}" - use qt4 && epatch "${FILESDIR}"/${P}-qt4.patch + + if use qt4 ; then + #uncomment define for qt4 support + sed -i 's/#DEFINES += KCCMP_QT_4/DEFINES += KCCMP_QT_4/' kccmp.pro \ + || die "Could not uncomment define for qt support" + else + #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" + fi } src_compile() { # Generates top-level Makefile - if use qt4; then + if use qt4 ; then eqmake4 else eqmake3 |