Version bump, plus fix qscintilla dep as per #213898

(Portage version: 2.1.4.4)

5 files changed, 46 insertions, 110 deletions

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index 65bce06f6f51..1bbc1ac9c0a2 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/tora
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.63 2007/11/20 05:37:25 hawking Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.64 2008/03/21 10:04:27 dertobi123 Exp $
+
+*tora-1.3.22 (21 Mar 2008)
+
+  21 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org> files/tora.desktop,
+  -tora-1.3.18.ebuild, -tora-1.3.21.ebuild, tora-1.3.21-r1.ebuild,
+  +tora-1.3.22.ebuild:
+  Version bump, plus fix qscintilla dep as per #213898
 
   20 Nov 2007; Ali Polatel <hawking@gentoo.org> tora-1.3.21.ebuild,
   tora-1.3.21-r1.ebuild:
diff --git a/dev-db/tora/files/tora.desktop b/dev-db/tora/files/tora.desktop
index bd63ca409104..3ac1d7f4eb17 100644
--- a/dev-db/tora/files/tora.desktop
+++ b/dev-db/tora/files/tora.desktop
@@ -10,5 +10,5 @@ Icon=tora.png
 StartupNotify=true
 Terminal=false
 Type=Application
-MimeType=text/x-sql
+MimeType=text/x-sql;
 Categories=Application;Development;
diff --git a/dev-db/tora/tora-1.3.18.ebuild b/dev-db/tora/tora-1.3.18.ebuild
deleted file mode 100644
index 4513027038c7..000000000000
--- a/dev-db/tora/tora-1.3.18.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.18.ebuild,v 1.10 2007/07/13 06:38:59 mr_bones_ Exp $
-
-inherit eutils kde-functions
-
-IUSE="kde oracle debug"
-DESCRIPTION="TOra - Toolkit For Oracle"
-HOMEPAGE="http://tora.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~sparc x86"
-
-DEPEND="=x11-libs/qt-3*
-	dev-lang/perl
-	kde? ( >=kde-base/kdelibs-3.1
-		   kde-base/arts )"
-
-pkg_setup() {
-	if use oracle && [ -z "$ORACLE_HOME" ] ; then
-		eerror "ORACLE_HOME variable is not set."
-		eerror
-		eerror "You must install Oracle >= 8i client for Linux in"
-		eerror "order to compile TOra with Oracle support."
-		eerror
-		eerror "Otherwise specify -oracle in your USE variable."
-		eerror
-		eerror "You can download the Oracle software from"
-		eerror "http://otn.oracle.com/software/content.html"
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gcc41.patch
-}
-
-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
-	mkdir -p $T/fakehome/.qt
-	export HOME="$T/fakehome"
-	addwrite "${QTDIR}/etc/settings"
-
-	local myconf
-	#myconf="--prefix=/usr"
-	#myconf="$myconf --with-mono"
-
-	use kde \
-		&& myconf="$myconf --with-kde" \
-		|| myconf="$myconf --without-kde"
-	use oracle || myconf="$myconf --without-oracle"
-
-	myconf="$myconf --with-qt-dir=/usr/qt/3"
-
-	#./configure $myconf || die "configure failed"
-	econf $myconf || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	#make install ROOT=${D}
-	make install DESTDIR=${D}
-	dodoc LICENSE.txt BUGS INSTALL NEWS README TODO
-}
diff --git a/dev-db/tora/tora-1.3.21-r1.ebuild b/dev-db/tora/tora-1.3.21-r1.ebuild
index c7d711c1bd1b..64e88e234ec7 100644
--- a/dev-db/tora/tora-1.3.21-r1.ebuild
+++ b/dev-db/tora/tora-1.3.21-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.10 2007/11/20 05:37:25 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.21-r1.ebuild,v 1.11 2008/03/21 10:04:27 dertobi123 Exp $
 
 inherit eutils kde-functions
 
@@ -18,7 +18,7 @@ RDEPEND="${DEPEND}
 
 DEPEND="=x11-libs/qt-3*
 	dev-lang/perl
-	x11-libs/qscintilla
+	<x11-libs/qscintilla-2.1
 	kde? ( >=kde-base/kdelibs-3.1
 		   kde-base/arts )
 	xinerama? ( x11-proto/xineramaproto )
@@ -41,8 +41,8 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gcc41.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/gcc41.patch
 }
 
 src_compile() {
@@ -51,8 +51,8 @@ src_compile() {
 
 	# Need to fake out Qt or we'll get sandbox problems
 	REALHOME="$HOME"
-	mkdir -p $T/fakehome/.kde
-	mkdir -p $T/fakehome/.qt
+	mkdir -p "$T"/fakehome/.kde
+	mkdir -p "$T"/fakehome/.qt
 	export HOME="$T/fakehome"
 	addwrite "${QTDIR}/etc/settings"
 
@@ -73,12 +73,11 @@ src_compile() {
 }
 
 src_install() {
-	#make install ROOT=${D}
-	make install DESTDIR=${D}
-	dodoc LICENSE.txt BUGS INSTALL NEWS README TODO
+	make install DESTDIR="${D}"
+	dodoc BUGS INSTALL NEWS README TODO
 
 	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
+	doins "${FILESDIR}"/${PN}.desktop
 	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/${PN}.png
+	doins "${FILESDIR}"/${PN}.png
 }
diff --git a/dev-db/tora/tora-1.3.21.ebuild b/dev-db/tora/tora-1.3.22.ebuild
index 5aa2b4703582..a0011fb30c58 100644
--- a/dev-db/tora/tora-1.3.21.ebuild
+++ b/dev-db/tora/tora-1.3.22.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.ebuild,v 1.6 2007/11/20 05:37:25 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.22.ebuild,v 1.1 2008/03/21 10:04:27 dertobi123 Exp $
 
 inherit eutils kde-functions
 
-IUSE="kde oracle debug"
+IUSE="kde oracle debug oci8-instant-client xinerama"
 DESCRIPTION="TOra - Toolkit For Oracle"
 HOMEPAGE="http://tora.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -13,11 +13,16 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 
+RDEPEND="${DEPEND}
+	xinerama? ( x11-libs/libXinerama )"
+
 DEPEND="=x11-libs/qt-3*
 	dev-lang/perl
-	x11-libs/qscintilla
+	<x11-libs/qscintilla-2.1
 	kde? ( >=kde-base/kdelibs-3.1
-		   kde-base/arts )"
+		   kde-base/arts )
+	xinerama? ( x11-proto/xineramaproto )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )"
 
 pkg_setup() {
 	if use oracle && [ -z "$ORACLE_HOME" ] ; then
@@ -34,31 +39,25 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gcc41.patch
-}
-
 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
-	mkdir -p $T/fakehome/.qt
+	mkdir -p "$T"/fakehome/.kde
+	mkdir -p "$T"/fakehome/.qt
 	export HOME="$T/fakehome"
 	addwrite "${QTDIR}/etc/settings"
 
 	local myconf
-	#myconf="--prefix=/usr"
-	#myconf="$myconf --with-mono"
+	myconf="${myconf} $(use_with kde)"
+	myconf="${myconf} $(use_with oracle)"
+	myconf="${myconf} $(use_with xinerama)"
 
-	use kde \
-		&& myconf="$myconf --with-kde" \
-		|| myconf="$myconf --without-kde"
-	use oracle || myconf="$myconf --without-oracle"
+	if use oci8-instant-client; then
+		myconf="$myconf --with-instant-client"
+	fi
 
 	myconf="$myconf --with-qt-dir=/usr/qt/3"
 
@@ -68,7 +67,11 @@ src_compile() {
 }
 
 src_install() {
-	#make install ROOT=${D}
-	make install DESTDIR=${D}
-	dodoc LICENSE.txt BUGS INSTALL NEWS README TODO
+	make install DESTDIR="${D}"
+	dodoc BUGS INSTALL NEWS README TODO
+
+	insinto /usr/share/applications
+	doins "${FILESDIR}"/${PN}.desktop
+	insinto /usr/share/pixmaps
+	doins "${FILESDIR}"/${PN}.png
 }