Remove usage of kde-functions.eclass; clean up ebuilds a bit

Package-Manager: portage--svn/cvs/Linux i686

5 files changed, 50 insertions, 53 deletions

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index 6d8bc97c47ab..346b8dd91cd2 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/tora
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.80 2010/01/07 18:21:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.81 2010/01/11 18:43:17 abcd Exp $
+
+  11 Jan 2010; Jonathan Callen <abcd@gentoo.org> tora-1.3.21-r1.ebuild,
+  tora-2.1.0.ebuild, tora-2.1.1.ebuild:
+  Remove usage of kde-functions.eclass; clean up ebuilds a bit
 
   07 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> tora-2.1.1.ebuild:
   amd64 stable wrt #298855
diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index 37b6519cb15b..c65d93c3b7ab 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gcc41.patch 438 RMD160 5ba95db43198d2ca79aa66fcf8b1f1719ca30fd5 SHA1 bcdaee7a567bc42c42625943792f3c817db188d9 SHA256 bceeefe86bd8ecf5d2194de6c5aff66f7103ef295ae2e247eedde57e91bfb21d
 AUX tora.desktop 267 RMD160 489ca7e384df925ed00842b405a8a8449f247d13 SHA1 497070e2b7e6f282ea82f5d625088678f706c68b SHA256 601dd498ffd8c26dbc02abb6cfba714d62863462000d6db867a7925446f4ad2f
 AUX tora.png 1227 RMD160 92904c3d0026829ceabf5acd86bce3c340fb8494 SHA1 bf8b89970377bace9f432b9dd56b16ef82f332fe SHA256 d218247bc2eb885a3783ab8b6f4f3f456df4b812d21b093f9b007da405f8068a
 DIST tora-1.3.21.tar.gz 3139444 RMD160 4c4709e1a311d288396d76a45cb9ddd115935755 SHA1 6215fb4846501b02a27c7725aa62d672ce66caaa SHA256 135405accdd96a0cb52ca3797401173aec8bc1138934d52d9ceaa3984f7c7a2e
 DIST tora-2.1.0.tar.gz 4718857 RMD160 a5e5f8119fb46f3639eb1afcf1f397e2a8b2cdb5 SHA1 d8e40ee0dc0eb740737352d669c46ebdf924a9f4 SHA256 f3fc1c07d309f79b267ed562fc1a7786717ec3e17d43120f0a33d246f0486a1f
 DIST tora-2.1.1.tar.gz 5356473 RMD160 1f81d512480fdfba2d66e2cd8665da8ab70d2de3 SHA1 61a2471fd9bac2578e6fa556f98d90976ea3ef9d SHA256 5063f2adda7c14ecdbc190b1459b3ea236fb37054640635f54bc2d46a5041663
-EBUILD tora-1.3.21-r1.ebuild 2046 RMD160 a94ea93f5df7767ba3b766ef497eb5c4fdf5a916 SHA1 6e871bc76e7e403b3bd6069abf9e9ce564d6f9e8 SHA256 61a20d95d1f176c980119f61637d4054cb2af3172047a6cd20be3d688734441b
-EBUILD tora-2.1.0.ebuild 2205 RMD160 ed69703fb3dad9c25a42a8a08308825b6d807b2e SHA1 b495f4ca1a1664a333dde084e02aabda51c54992 SHA256 7aae0891113bb2c706059b7bc6a38570dd9baedf6551f87b88af39e1238d4c76
-EBUILD tora-2.1.1.ebuild 1789 RMD160 71d42db1da35a423d20a18392d7f7c8dc57dad84 SHA1 54a152f5faf5a0516b259d74d341da16ac8b0799 SHA256 96b106e8c313dff4e26602ef2b90bcc58b8feb2b166fb430b656fb82c9b9835e
-MISC ChangeLog 12117 RMD160 ce4cd2f5604585a227ec4fa4b838229cb61e414d SHA1 5ba5eca970cea35168b9becdfdb1c0657ba0080c SHA256 7a2eb97948d07f50077e454984eaf5cbe11f1737d9688491b401c6f36423c84b
+EBUILD tora-1.3.21-r1.ebuild 1864 RMD160 70eed68540667ef51fa9e3322df23acbe18e5c1f SHA1 e79ba51403c120645b0977487bd034d3441201de SHA256 2b292c7652c4b0adba6e6e29198ee0ef92e372735b49aa11f2479f06aa6fd14c
+EBUILD tora-2.1.0.ebuild 1982 RMD160 e42d1e487f56085e2d76c53b83e3d1efe18fcb83 SHA1 e2b9c314adb05be5dd00327cc45d95db16f3af3e SHA256 ac84280d13365db978fe8fe3c8dbb9ed8b4e2e76d821e113940a8299b9c75bdd
+EBUILD tora-2.1.1.ebuild 1784 RMD160 9d2eae1fea50ab1a10cb9fbdbc050badf990c2fc SHA1 c4ff6a493173ceec904c625beeddafabd6fac7cd SHA256 0b8e5ea295bd5a74af0032f4262a864827185c3b82777c0bebcae9123d39d74c
+MISC ChangeLog 12288 RMD160 11b77a147ee4c04ba260b3f1645adb38447daa8a SHA1 d216597cee9c58d0a26d70bfcd0987cf1c859df1 SHA256 e459a4a3530d2611febcf478dac40a2b76d0666f3cbb60441113cc5492332717
 MISC metadata.xml 545 RMD160 c8a0b509c95d54228308ab8016ca36f36cde8b78 SHA1 992a140bc0b64afcbd46a3feaff6a4adf85fea3b SHA256 99c153750d77644b1e959d2dba6d413fd23fdc4f4d55ea04e5d283f43aae6f95
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktLcU4ACgkQOypDUo0oQOpeWwCgkz5FOHwZx3G9yJkKvk4renG4
+pkcAoNBwAzUi4tS+NMw8xd/4goeqN1cX
+=AVWa
+-----END PGP SIGNATURE-----
diff --git a/dev-db/tora/tora-1.3.21-r1.ebuild b/dev-db/tora/tora-1.3.21-r1.ebuild
index 149986e0a769..237f90560d46 100644
--- a/dev-db/tora/tora-1.3.21-r1.ebuild
+++ b/dev-db/tora/tora-1.3.21-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.21-r1.ebuild,v 1.12 2009/11/11 16:47:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.21-r1.ebuild,v 1.13 2010/01/11 18:43:17 abcd Exp $
 
-inherit eutils kde-functions
+inherit eutils
 
 IUSE="oracle debug oci8-instant-client xinerama"
 DESCRIPTION="TOra - Toolkit For Oracle"
@@ -44,9 +44,6 @@ src_unpack() {
 }
 
 src_compile() {
-	set-qtdir 3
-	set-kdedir 3
-
 	# Need to fake out Qt or we'll get sandbox problems
 	REALHOME="$HOME"
 	mkdir -p "$T"/fakehome/.kde
@@ -54,28 +51,22 @@ src_compile() {
 	export HOME="$T/fakehome"
 	addwrite "${QTDIR}/etc/settings"
 
-	local myconf
-	myconf="${myconf} --without-kde"
-	myconf="${myconf} $(use_with oracle)"
-	myconf="${myconf} $(use_with xinerama)"
-
-	if use oci8-instant-client; then
-		myconf="$myconf --with-instant-client"
-	fi
-
-	myconf="$myconf --with-qt-dir=/usr/qt/3"
+	econf \
+		--without-kde \
+		$(use_with oracle) \
+		$(use_with xinerama) \
+		$(use oci8-instant-client && echo --with-instant-client) \
+		--with-qt-dir=/usr/qt/3
 
-	#./configure $myconf || die "configure failed"
-	econf $myconf || die "configure failed"
 	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR="${D}"
+	emake -j1 install DESTDIR="${D}" || die "install failed"
 	dodoc BUGS INSTALL NEWS README TODO
 
 	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
+	doins "${FILESDIR}"/${PN}.desktop || die
 	insinto /usr/share/pixmaps
-	doins "${FILESDIR}"/${PN}.png
+	doins "${FILESDIR}"/${PN}.png || die
 }
diff --git a/dev-db/tora/tora-2.1.0.ebuild b/dev-db/tora/tora-2.1.0.ebuild
index 262da131625c..d67b208ed7cd 100644
--- a/dev-db/tora/tora-2.1.0.ebuild
+++ b/dev-db/tora/tora-2.1.0.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.0.ebuild,v 1.5 2010/01/02 23:12:38 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.0.ebuild,v 1.6 2010/01/11 18:43:17 abcd Exp $
 
 EAPI=2
 
-inherit eutils kde-functions
+inherit eutils multilib
 
-IUSE="debug mysql oracle oci8-instant-client postgres"
 DESCRIPTION="TOra - Toolkit For Oracle"
 HOMEPAGE="http://tora.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -14,12 +13,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ~ppc ~sparc x86"
+IUSE="debug mysql oracle oci8-instant-client postgres"
 
 RDEPEND="${DEPEND}"
 DEPEND="dev-lang/perl
-	x11-libs/qt-sql
-	mysql? ( x11-libs/qt-sql[mysql] )
-	postgres? ( x11-libs/qt-sql[postgres] )
+	x11-libs/qt-sql[mysql?,postgres?]
 	x11-libs/qscintilla
 	oci8-instant-client? (
 		dev-db/oracle-instantclient-basic
@@ -42,13 +40,6 @@ pkg_setup() {
 }
 
 src_configure() {
-	# Need to fake out Qt or we'll get sandbox problems
-	REALHOME="$HOME"
-	mkdir -p "$T"/fakehome/.kde
-	mkdir -p "$T"/fakehome/.qt
-	export HOME="$T/fakehome"
-	addwrite "${QTDIR}/etc/settings"
-
 	local myconf
 
 	if use oracle; then
@@ -64,9 +55,11 @@ src_configure() {
 			--with-oracle-includes=${ORACLE_HOME}/include "
 	fi
 
-	myconf="$myconf --with-qt-includes=/usr/include/qt4/ --with-qt-libraries=/usr/lib/qt4/ --with-qt-dir=/usr/lib/qt4"
-
-	econf $myconf || die "configure failed"
+	econf \
+		--with-qt-includes=/usr/include/qt4 \
+		--with-qt-libraries=/usr/$(get_libdir)/qt4 \
+		--with-qt-dir=/usr/$(get_libdir)/qt4 \
+		$myconf
 }
 
 src_compile() {
@@ -74,11 +67,11 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR="${D}"
+	emake -j1 install DESTDIR="${D}" || die "install failed"
 	dodoc BUGS INSTALL NEWS README TODO
 
 	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
+	doins "${FILESDIR}"/${PN}.desktop || die
 	insinto /usr/share/pixmaps
-	doins "${FILESDIR}"/${PN}.png
+	doins "${FILESDIR}"/${PN}.png || die
 }
diff --git a/dev-db/tora/tora-2.1.1.ebuild b/dev-db/tora/tora-2.1.1.ebuild
index 811da15919e7..f218c14928fd 100644
--- a/dev-db/tora/tora-2.1.1.ebuild
+++ b/dev-db/tora/tora-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.1.ebuild,v 1.4 2010/01/07 18:21:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.1.ebuild,v 1.5 2010/01/11 18:43:17 abcd Exp $
 
 EAPI=2
 
@@ -50,22 +50,21 @@ src_prepare() {
 }
 
 src_configure() {
+	local mycmakeargs=()
 	if use oracle || use oci8-instant-client ; then
-		mycmakeargs+=" -DENABLE_ORACLE=ON"
+		mycmakeargs=(-DENABLE_ORACLE=ON)
 	else
-		mycmakeargs+=" -DENABLE_ORACLE=OFF"
+		mycmakeargs=(-DENABLE_ORACLE=OFF)
 	fi
-	mycmakeargs+="
+	mycmakeargs+=(
 		-DWANT_RPM=OFF
 		-DWANT_BUNDLE=OFF
 		-DWANT_BUNDLE_STANDALONE=OFF
 		-DWANT_INTERNAL_QSCINTILLA=OFF
 		$(cmake-utils_use_enable postgres PGSQL)
 		$(cmake-utils_use_want debug)
-	"
-	# path variables
-	mycmakeargs+="
+		# path variables
 		-DTORA_DOC_DIR=share/doc/${PF}
-	"
+	)
 	cmake-utils_src_configure
 }