Reorganize qt/kde dependencies

5 files changed, 11 insertions, 58 deletions

diff --git a/app-text/kbedic/ChangeLog b/app-text/kbedic/ChangeLog
index bc52d6803885..de509ea0b47b 100644
--- a/app-text/kbedic/ChangeLog
+++ b/app-text/kbedic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/kbedic
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kbedic/ChangeLog,v 1.9 2003/08/11 20:36:49 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbedic/ChangeLog,v 1.10 2004/01/04 02:17:10 caleb Exp $
+
+  03 Jan 2004; Caleb Tennis <caleb@gentoo.org> kbedic-3.1.ebuild,
+  kbedic-4.0.ebuild:
+  Move the deps around just a little bit
 
 *kbedic-4.0 (11 Aug 2003)
 
diff --git a/app-text/kbedic/Manifest b/app-text/kbedic/Manifest
index b3611db11302..7021db725a57 100644
--- a/app-text/kbedic/Manifest
+++ b/app-text/kbedic/Manifest
@@ -1,9 +1,7 @@
-MD5 7c6b49b629bf4a3eb3439a2a5ff51165 kbedic-3.1.ebuild 1003
-MD5 da39f3a2c209681b0a4a1e81a9f88a0e kbedic-4.0.ebuild 686
-MD5 84c3f73c4bd7cf6a7ab5ab90a2764112 ChangeLog 1362
+MD5 36778fb0653b2622157502f2ded7f22e kbedic-4.0.ebuild 799
+MD5 452c8f7e3f87932efbdf869883fc862c ChangeLog 1492
 MD5 c2322def158170019bfeb4b68f5950e4 metadata.xml 350
 MD5 fc90d2bd7719168f5821f02e64af3a6f files/kbedic-3.1-location.diff 1189
 MD5 0dabffe05e0bc4a604d72cd1ef91a574 files/kbedic.desktop 361
-MD5 2b59c5d0b88e59010fbb1f2b6052edba files/digest-kbedic-3.1 63
 MD5 1b395c5dbddbb7f8c6d2db891b80c3cd files/digest-kbedic-4.0 63
 MD5 dc706f56c46025d45cdf6918bde9fd7e files/kbedic-3.1-gcc3.diff 4009
diff --git a/app-text/kbedic/files/digest-kbedic-3.1 b/app-text/kbedic/files/digest-kbedic-3.1
deleted file mode 100644
index 52440031987e..000000000000
--- a/app-text/kbedic/files/digest-kbedic-3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9dc7cc763558637f342039c2184d505d kbedic-3.1.tar.gz 3037137
diff --git a/app-text/kbedic/kbedic-3.1.ebuild b/app-text/kbedic/kbedic-3.1.ebuild
deleted file mode 100644
index d770cbff4ab2..000000000000
--- a/app-text/kbedic/kbedic-3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kbedic/kbedic-3.1.ebuild,v 1.5 2003/09/05 22:37:22 msterret Exp $
-inherit kde
-
-S=${WORKDIR}/${P}
-DESCRIPTION="English <-> Bulgarian Dictionary"
-SRC_URI="mirror://sourceforge/kbedic/$P.tar.gz"
-HOMEPAGE="http://kbedic.sourceforge.net"
-KEYWORDS="x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="kde"
-
-need-qt 3
-[ -n "`use kde`" ] && need-kde 3
-
-# -gcc3 is a typical "default value present in both definition and declaration" fix.
-# -location makes it isntall the dictionary datafiles in /usr/share/kbedic,
-# and not directly in /usr/share. Both sent upstream.
-PATCHES="$FILESDIR/$P-gcc3.diff $FILESDIR/$P-location.diff"
-
-src_compile() {
-
-	local myopts
-	if [ -n "`use kde`" ]
-	then
-		myopts="--with-kde"
-		set-kdedir 3
-	fi
-
-	need-automake 1.6
-	need-autoconf 2.5
-
-	aclocal
-
-	./configure --prefix=/usr \
-		--host=${CHOST} \
-		${myopts} || die
-
-	emake || die
-
-}
-
diff --git a/app-text/kbedic/kbedic-4.0.ebuild b/app-text/kbedic/kbedic-4.0.ebuild
index af7a4ce9690d..3dca2a58e660 100644
--- a/app-text/kbedic/kbedic-4.0.ebuild
+++ b/app-text/kbedic/kbedic-4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbedic/kbedic-4.0.ebuild,v 1.2 2004/01/04 02:17:10 caleb Exp $
 
 IUSE="kde"
 inherit kde
@@ -13,20 +13,16 @@ KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-use kde && need-kde 3 || need-qt 3
+DEPEND=">=x11-libs/qt-3
+	kde? ( >=kde-base/kdelibs-3 )"
 
 src_compile() {
-
 	use kde && myconf="$myconf --with-kde" || myconf="$myconf --prefix=/usr"
 	use kde && kde_src_compile myconf
-
 	kde_src_compile configure make
-
 }
 
 src_install() {
-
 	kde_src_install
 	use kde && install -m 644 -D ${FILESDIR}/kbedic.desktop ${D}/usr/share/applnk/Utilities/kbedic.desktop
-
 }