Fix for bug #197410, removing linking to boost for not use qt4

Package-Manager: portage-2.1.3.16

4 files changed, 25 insertions, 27 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/Manifest b/sys-kernel/kccmp/Manifest
index 19363d27b11f..a31c5af132a7 100644
--- a/sys-kernel/kccmp/Manifest
+++ b/sys-kernel/kccmp/Manifest
@@ -1,16 +1,12 @@
-AUX kccmp-0.2-qt4.patch 290 RMD160 afd5c9fee2242d82f67bcfab0251cddae1836abf SHA1 702a158b04dffeea5bd4195f3c1ca5400cca1300 SHA256 934090017d669400cdde683d0de015274b324a6f024429ff193205d5744357f0
-MD5 cba774ee39ef312d73dcfda7e5a64adf files/kccmp-0.2-qt4.patch 290
-RMD160 afd5c9fee2242d82f67bcfab0251cddae1836abf files/kccmp-0.2-qt4.patch 290
-SHA256 934090017d669400cdde683d0de015274b324a6f024429ff193205d5744357f0 files/kccmp-0.2-qt4.patch 290
 DIST kccmp-0.2.tar.gz 13178 RMD160 6515af57412d6b9118b909d17b0af0fb43481146 SHA1 f8a1fb76cf596f6b770722f3e7b25e00c2c59d3e SHA256 59ad67a5688ba759f5d69f11cfc7e0c9e80d17680b2891bb4c280239ff16ee4e
-EBUILD kccmp-0.2.ebuild 960 RMD160 e0084be4ab0142cb8427469ff76f06de1afb0e38 SHA1 d082481ebb7c6eebfe69d1f85e26c40402f4de9e SHA256 632e102e3efea132ac234987484f475c7b554c62afe9abd2d90a87cb43da1009
-MD5 84cffcfa47c74ebd3a79498162f486f3 kccmp-0.2.ebuild 960
-RMD160 e0084be4ab0142cb8427469ff76f06de1afb0e38 kccmp-0.2.ebuild 960
-SHA256 632e102e3efea132ac234987484f475c7b554c62afe9abd2d90a87cb43da1009 kccmp-0.2.ebuild 960
-MISC ChangeLog 558 RMD160 46231f8b5dcbd43039eead670cfb98db51c15a5d SHA1 dbf3e34ce350d012a926f4de3932d83761fb28bd SHA256 a28505f84d6ad05481d3ebe54f5dde16c7637333610a362aec8fe78db274ca3d
-MD5 587481cf7778b89df75afe7fd4af5203 ChangeLog 558
-RMD160 46231f8b5dcbd43039eead670cfb98db51c15a5d ChangeLog 558
-SHA256 a28505f84d6ad05481d3ebe54f5dde16c7637333610a362aec8fe78db274ca3d ChangeLog 558
+EBUILD kccmp-0.2.ebuild 1236 RMD160 917babcb6ff6efaa59950aa22feab44e40208d96 SHA1 0c66f0a89cd6bc72a5b885593f4abaacac87e95a SHA256 acd78a430b258129999388b5f3e14b1377f1f926d91368f1a47bc3be637fd931
+MD5 c335a1704c78f03e6b2b9dd9148d27a2 kccmp-0.2.ebuild 1236
+RMD160 917babcb6ff6efaa59950aa22feab44e40208d96 kccmp-0.2.ebuild 1236
+SHA256 acd78a430b258129999388b5f3e14b1377f1f926d91368f1a47bc3be637fd931 kccmp-0.2.ebuild 1236
+MISC ChangeLog 685 RMD160 16f9ef989f49d23983fd69f13bc7711886abc45f SHA1 22022ff222cd50793e69db153cb325afbe7e6891 SHA256 410ea78acc08a185e028a2c8185e3ec8a88c92d8a3d9709bb962c1202413a14a
+MD5 dc07120cd49ae50f55eaf8b7df5d3bd4 ChangeLog 685
+RMD160 16f9ef989f49d23983fd69f13bc7711886abc45f ChangeLog 685
+SHA256 410ea78acc08a185e028a2c8185e3ec8a88c92d8a3d9709bb962c1202413a14a ChangeLog 685
 MISC metadata.xml 222 RMD160 a2ab9a8133ed2a7ee78cd0231bb964237f006467 SHA1 79dd978649775c9982877d64bd1d8e584a782385 SHA256 6137c2ad51139a7fb1aca8e746f1aaf92724e5edb4c81341d8a4294c08c56655
 MD5 37a7f377dcc89c904e7ef49259cdae17 metadata.xml 222
 RMD160 a2ab9a8133ed2a7ee78cd0231bb964237f006467 metadata.xml 222
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