Version bump, plus fix qscintilla dep as per #213898

Package-Manager: portage-2.1.4.4

6 files changed, 51 insertions, 116 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/Manifest b/dev-db/tora/Manifest
index 85636be1ace2..4ad272ae46f8 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,10 +1,9 @@
 AUX gcc41.patch 438 RMD160 5ba95db43198d2ca79aa66fcf8b1f1719ca30fd5 SHA1 bcdaee7a567bc42c42625943792f3c817db188d9 SHA256 bceeefe86bd8ecf5d2194de6c5aff66f7103ef295ae2e247eedde57e91bfb21d
-AUX tora.desktop 266 RMD160 9774cc37dca14f2452ad53318769294232afbf2a SHA1 48079b73de79d593016c442873a90c7ad3dd51ac SHA256 45f5abcf78cebe435ad45a0871121063cfa20b068946fec22f08330e68731e56
+AUX tora.desktop 267 RMD160 489ca7e384df925ed00842b405a8a8449f247d13 SHA1 497070e2b7e6f282ea82f5d625088678f706c68b SHA256 601dd498ffd8c26dbc02abb6cfba714d62863462000d6db867a7925446f4ad2f
 AUX tora.png 1227 RMD160 92904c3d0026829ceabf5acd86bce3c340fb8494 SHA1 bf8b89970377bace9f432b9dd56b16ef82f332fe SHA256 d218247bc2eb885a3783ab8b6f4f3f456df4b812d21b093f9b007da405f8068a
-DIST tora-1.3.18.tar.gz 3099863 RMD160 1bf23a7c25b164bb3b17d992f621db803c9e503b SHA1 115c74185c8c386d5c2c8e6ab9d88f1686fe9bb6 SHA256 67a486f6092750a8572ed7ebe2d86a561d34be6256892cbfa188bd2e6eecfc0a
 DIST tora-1.3.21.tar.gz 3139444 RMD160 4c4709e1a311d288396d76a45cb9ddd115935755 SHA1 6215fb4846501b02a27c7725aa62d672ce66caaa SHA256 135405accdd96a0cb52ca3797401173aec8bc1138934d52d9ceaa3984f7c7a2e
-EBUILD tora-1.3.18.ebuild 1779 RMD160 35ea40e31b2df59e33b4a9793388cc66cb56f8cc SHA1 976cb6b764c56ed0b4fe25eb53629dd0310fb035 SHA256 41db350e7c042fa134f0e372a15b71f4666957286fe80c2d1d978f839c270b43
-EBUILD tora-1.3.21-r1.ebuild 2120 RMD160 4cd26b723738b605deb8106a9eb9359257504817 SHA1 6431723da6b5d4790d9050aaeb137f4581ed9690 SHA256 b93e259d111bd8134e43810e7797606d4c03641b65ae0bd76ee14c75b9f39f62
-EBUILD tora-1.3.21.ebuild 1804 RMD160 240b081060876c7f388193cad12abd97b6a979a3 SHA1 678c442b7bcc8a01eae2644d9e541c20bcd383fa SHA256 e9e1151a738f0e8a76025ed9554abfe7aa740be0eec00ba13e668700444a6bc7
-MISC ChangeLog 9700 RMD160 b684043b1b5c2d1a0d2eb6364859826ac734881a SHA1 c307bbc5316a307c462fcaa3d0581cd96be597de SHA256 475e834591ad3ccb657e635ffcea08865e4249474048f990d5150dfea60ee8fb
+DIST tora-1.3.22.tar.gz 3496227 RMD160 a1fa0aa9ef3cdd64dbb4987dfdd17c0ee5356a9c SHA1 0dae61eb7e7cfbe39861b7c2b44fd9b2002a8095 SHA256 7a1cbcc24db8cf57612bc7ffb8dba7505a27ea0c7ac655820ceeed6f79562c88
+EBUILD tora-1.3.21-r1.ebuild 2105 RMD160 6f4a1ba58f922cf7034349e69b0ede29940061f6 SHA1 4714b30f2d56d8fd342e59af1e102851f04c991e SHA256 239d22eb608a72aca86ef5766fe1d35c971db01f5326fe46cfe68e80677fadc6
+EBUILD tora-1.3.22.ebuild 2030 RMD160 94d0a41eb779eece6016a56a4bb38827da5af44f SHA1 44eacb3ee2a16b903a9d69e387f2df66adfe0e2e SHA256 b85dceed8a81764c4b19f4b87aa1cd48f19f35146e44989ced217c2b43dad9b9
+MISC ChangeLog 9953 RMD160 03f4b36e9a7b601e4e4c12e9c1da0ebb66156eaf SHA1 f2f19a586599342fd37f4b3e3e9ad330dcaad6b8 SHA256 8f746b7561a5be8d4169d189d442af31b1234209f35408bf6a9b2c3e5da76add
 MISC metadata.xml 545 RMD160 c8a0b509c95d54228308ab8016ca36f36cde8b78 SHA1 992a140bc0b64afcbd46a3feaff6a4adf85fea3b SHA256 99c153750d77644b1e959d2dba6d413fd23fdc4f4d55ea04e5d283f43aae6f95
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
 }