Simplify qt deps. Drop old ebuild.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 11 insertions, 62 deletions

diff --git a/sys-kernel/kccmp/ChangeLog b/sys-kernel/kccmp/ChangeLog
index 1ba125c84206..762fc827ca6e 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.14 2008/12/11 01:08:14 mpagano Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/ChangeLog,v 1.15 2009/06/25 18:08:44 yngwin Exp $
+
+  25 Jun 2009; Ben de Groot <yngwin@gentoo.org> -kccmp-0.2.ebuild,
+  kccmp-0.2-r1.ebuild:
+  Simplify qt deps. Drop old ebuild.
 
   11 Dec 2008; Michael Pagano <mpagano@gentoo.org> kccmp-0.2-r1.ebuild:
   Adding boost dependency. Thanks to xlion.
diff --git a/sys-kernel/kccmp/kccmp-0.2-r1.ebuild b/sys-kernel/kccmp/kccmp-0.2-r1.ebuild
index 75cbba725b67..5489738075b0 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
+# Copyright 1999-2009 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.7 2008/12/11 01:08:14 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kccmp/kccmp-0.2-r1.ebuild,v 1.8 2009/06/25 18:08:44 yngwin Exp $
 
 EAPI="1"
 inherit qt3 qt4
@@ -14,11 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 IUSE="qt4"
-RDEPEND="!qt4? ( >=x11-libs/qt-3.3.8-r4:3 )
-	qt4? ( || ( ( x11-libs/qt-core:4
-			x11-libs/qt-gui:4 )
-			=x11-libs/qt-4.3*:4 )
-			>=dev-libs/boost-1.34.1-r2 )"
+RDEPEND="!qt4? ( x11-libs/qt:3 )
+	qt4? ( x11-libs/qt-gui:4
+		>=dev-libs/boost-1.34.1-r2 )"
 DEPEND="${RDEPEND}"
 
 src_unpack() {
diff --git a/sys-kernel/kccmp/kccmp-0.2.ebuild b/sys-kernel/kccmp/kccmp-0.2.ebuild
deleted file mode 100644
index 89aa39745ab7..000000000000
--- a/sys-kernel/kccmp/kccmp-0.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.ebuild,v 1.10 2008/08/16 01:46:14 mpagano Exp $
-
-EAPI=1
-
-inherit qt3 qt4
-
-DESCRIPTION="A simple tool for comparing two linux kernel .config files"
-HOMEPAGE="http://stoopidsimple.com/kccmp/"
-SRC_URI="http://stoopidsimple.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="qt4"
-DEPEND="qt4? ( >=x11-libs/qt-4.3:4 >=dev-libs/boost-1.33.1-r1 )
-	!qt4? (  x11-libs/qt:3 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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
-		eqmake4
-	else
-		eqmake3
-	fi
-
-	sed -i -e "/^CFLAGS =/s:-g:${CFLAGS}:" \
-		Makefile || die "sed Makefile failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin kccmp || die "installing binary failed"
-	dodoc README
-}