Cleanup, Revbump, Fixes #158213 and #155753

Package-Manager: portage-2.1.2_rc4-r1

7 files changed, 125 insertions, 9 deletions

diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 4bb2a77e3a8f..db769d948cf2 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -35,10 +35,10 @@ EBUILD oracle-instantclient-basic-10.1.0.4.ebuild 2674 RMD160 9e51f895ed7db5d037
 MD5 717af28fbe94dbe8dfc5dc5a85b1c258 oracle-instantclient-basic-10.1.0.4.ebuild 2674
 RMD160 9e51f895ed7db5d037ec114ca351b20558fe6458 oracle-instantclient-basic-10.1.0.4.ebuild 2674
 SHA256 e9f8c1b0f57228d38699fd6f700de2223c7a3b9abeb95efec5c7a7142eedaba4 oracle-instantclient-basic-10.1.0.4.ebuild 2674
-EBUILD oracle-instantclient-basic-10.1.0.5.ebuild 2677 RMD160 353879011d2b78c82722d8c99e3dd68ad857376e SHA1 5df30c6d83be9eb8ea2a3b65cd8cca87a4e01056 SHA256 1130c7cd97ce6d2e9d39268b23a2081818c67bee7892c7f105315cc898cc5414
-MD5 b1912514995dc42c39379866c83330b1 oracle-instantclient-basic-10.1.0.5.ebuild 2677
-RMD160 353879011d2b78c82722d8c99e3dd68ad857376e oracle-instantclient-basic-10.1.0.5.ebuild 2677
-SHA256 1130c7cd97ce6d2e9d39268b23a2081818c67bee7892c7f105315cc898cc5414 oracle-instantclient-basic-10.1.0.5.ebuild 2677
+EBUILD oracle-instantclient-basic-10.1.0.5.ebuild 2676 RMD160 5313de9d9e76d12117393ebe1f86d16253f26a24 SHA1 720edcae78f55f34cbf210ac667f65b49548bd3e SHA256 84ce8453829b6de86f34c49a8fc73476575f56da19a2da18a37d1a30b88720a5
+MD5 8b63f5550b7e93069ae770fe052be35c oracle-instantclient-basic-10.1.0.5.ebuild 2676
+RMD160 5313de9d9e76d12117393ebe1f86d16253f26a24 oracle-instantclient-basic-10.1.0.5.ebuild 2676
+SHA256 84ce8453829b6de86f34c49a8fc73476575f56da19a2da18a37d1a30b88720a5 oracle-instantclient-basic-10.1.0.5.ebuild 2676
 EBUILD oracle-instantclient-basic-10.2.0.1-r1.ebuild 3050 RMD160 2ea0fbf2f52b680e49c6d91d35da1dfb60b93bd3 SHA1 e0222facf05ccb6b09ed6184d733605250eb40f8 SHA256 524619e558133362f9d6ef9d5f9ad1fdfde76809c4e44c414826eca1d2e26357
 MD5 212123ffb0377954fdc3891b0a9a784d oracle-instantclient-basic-10.2.0.1-r1.ebuild 3050
 RMD160 2ea0fbf2f52b680e49c6d91d35da1dfb60b93bd3 oracle-instantclient-basic-10.2.0.1-r1.ebuild 3050
@@ -55,10 +55,10 @@ EBUILD oracle-instantclient-basic-10.2.0.3.ebuild 2940 RMD160 bdf95182739be848c4
 MD5 3001ead6cad6c62a4078071d1a766dec oracle-instantclient-basic-10.2.0.3.ebuild 2940
 RMD160 bdf95182739be848c4a188090ffff69748a56bc0 oracle-instantclient-basic-10.2.0.3.ebuild 2940
 SHA256 a416ea15bd88526c6a85fddea95d97db2592f8280dfd45311d7b98299a8ef558 oracle-instantclient-basic-10.2.0.3.ebuild 2940
-MISC ChangeLog 4081 RMD160 3a99d189981f7734da614cf90a93d7294163665f SHA1 12fce12ba1db622f11e986ccd1eb4466ae63f71a SHA256 215a62901320658d485ecf8497c393ae84a74d40cbee4d133a8921d501d1c4be
-MD5 f7b1880d4355fbfd59727ebc9200bd4a ChangeLog 4081
-RMD160 3a99d189981f7734da614cf90a93d7294163665f ChangeLog 4081
-SHA256 215a62901320658d485ecf8497c393ae84a74d40cbee4d133a8921d501d1c4be ChangeLog 4081
+MISC ChangeLog 4209 RMD160 2dfbadf9d5338b53ebbe3e45726954a894f6b6b7 SHA1 bc734f78915f92c3bbeeca4f0fe05e88c706fcbf SHA256 ee70b10a358355a1b6ea8f3741024dd5493eb9774b6043779b0ce82391b55c40
+MD5 48dab4fedd7170958e3a4ad9a676b490 ChangeLog 4209
+RMD160 2dfbadf9d5338b53ebbe3e45726954a894f6b6b7 ChangeLog 4209
+SHA256 ee70b10a358355a1b6ea8f3741024dd5493eb9774b6043779b0ce82391b55c40 ChangeLog 4209
 MISC metadata.xml 388 RMD160 f12fead3733f8a2760b2f190bcadd9a810e4bbc1 SHA1 f1cf715b4a7a2d39696097b2510967d640948075 SHA256 fa323e9829505e837ae433af3b0ce5e7b97e1aef0ec614baa6c6ba4602def893
 MD5 9f5d6b0af6c2271c1e2bbf0518bcc925 metadata.xml 388
 RMD160 f12fead3733f8a2760b2f190bcadd9a810e4bbc1 metadata.xml 388
diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index 2cad0bd4cfec..5a0ff2f42a50 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/tora
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.53 2006/11/05 19:27:33 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.54 2006/12/26 18:45:09 dertobi123 Exp $
+
+*tora-1.3.21-r1 (26 Dec 2006)
+
+  26 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/tora-1.3.16-configure-no_oracle.diff,
+  -files/tora-1.3.16-sh-no_oracle.diff, +files/tora.desktop,
+  +files/tora.png, -tora-1.3.16-r1.ebuild, +tora-1.3.21-r1.ebuild:
+  Cleanup.
+  Added tora icon/desktop file, bug #155753 by Gianluca Parmiggiani.
+  Added xinerama support, bug #158213 by Taavi Ilves.
+  Added oracle-instant-client support.
 
   05 Nov 2006; Daniel Gryniewicz <dang@gentoo.org> tora-1.3.18.ebuild:
   Marked stable on amd64 for bug #151809
diff --git a/dev-db/tora/files/digest-tora-1.3.21 b/dev-db/tora/files/digest-tora-1.3.21
index 445bcac51339..711ae0af6ee2 100644
--- a/dev-db/tora/files/digest-tora-1.3.21
+++ b/dev-db/tora/files/digest-tora-1.3.21
@@ -1 +1,3 @@
 MD5 10e3c9944ffaca50de046e2c3e02eee4 tora-1.3.21.tar.gz 3139444
+RMD160 4c4709e1a311d288396d76a45cb9ddd115935755 tora-1.3.21.tar.gz 3139444
+SHA256 135405accdd96a0cb52ca3797401173aec8bc1138934d52d9ceaa3984f7c7a2e tora-1.3.21.tar.gz 3139444
diff --git a/dev-db/tora/files/digest-tora-1.3.21-r1 b/dev-db/tora/files/digest-tora-1.3.21-r1
new file mode 100644
index 000000000000..711ae0af6ee2
--- /dev/null
+++ b/dev-db/tora/files/digest-tora-1.3.21-r1
@@ -0,0 +1,3 @@
+MD5 10e3c9944ffaca50de046e2c3e02eee4 tora-1.3.21.tar.gz 3139444
+RMD160 4c4709e1a311d288396d76a45cb9ddd115935755 tora-1.3.21.tar.gz 3139444
+SHA256 135405accdd96a0cb52ca3797401173aec8bc1138934d52d9ceaa3984f7c7a2e tora-1.3.21.tar.gz 3139444
diff --git a/dev-db/tora/files/tora.desktop b/dev-db/tora/files/tora.desktop
new file mode 100644
index 000000000000..bd63ca409104
--- /dev/null
+++ b/dev-db/tora/files/tora.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=TOra
+GenericName=Toolkit For Oracle
+Comment=Toolkit For Oracle (and more)
+Exec=tora
+TryExec=tora
+Icon=tora.png
+StartupNotify=true
+Terminal=false
+Type=Application
+MimeType=text/x-sql
+Categories=Application;Development;
diff --git a/dev-db/tora/files/tora.png b/dev-db/tora/files/tora.png
new file mode 100644
index 000000000000..3e246ce58998
--- /dev/null
+++ b/dev-db/tora/files/tora.png
diff --git a/dev-db/tora/tora-1.3.21-r1.ebuild b/dev-db/tora/tora-1.3.21-r1.ebuild
new file mode 100644
index 000000000000..fa25a124ab18
--- /dev/null
+++ b/dev-db/tora/tora-1.3.21-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2006 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.1 2006/12/26 18:45:09 dertobi123 Exp $
+
+inherit debug eutils kde-functions
+
+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"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+RDEPEND="${DEPEND}
+	xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )"
+
+DEPEND="=x11-libs/qt-3*
+	dev-lang/perl
+	dev-python/qscintilla
+	kde? ( >=kde-base/kdelibs-3.1
+		   kde-base/arts )
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )"
+
+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} $(use_with oci8-instant-client instant-client)"
+	myconf="${myconf} $(use_with xinerama)"
+
+	myconf="$myconf --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 ROOT=${D}
+	make install DESTDIR=${D}
+	dodoc LICENSE.txt BUGS INSTALL NEWS README TODO
+
+	insinto /usr/share/applications
+	doins ${FILESDIR}/${PN}.desktop
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/${PN}.png
+}