Cleanup, Revbump, Fixes #158213 and #155753

(Portage version: 2.1.2_rc4-r1)
 (Unsigned Manifest commit)

5 files changed, 23 insertions, 177 deletions

diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index c92235fc9dfe..e6d9d104b858 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,54 +1,43 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gcc41.patch 438 RMD160 5ba95db43198d2ca79aa66fcf8b1f1719ca30fd5 SHA1 bcdaee7a567bc42c42625943792f3c817db188d9 SHA256 bceeefe86bd8ecf5d2194de6c5aff66f7103ef295ae2e247eedde57e91bfb21d
 MD5 4440a082e3138964f4da6471d77f2cdd files/gcc41.patch 438
 RMD160 5ba95db43198d2ca79aa66fcf8b1f1719ca30fd5 files/gcc41.patch 438
 SHA256 bceeefe86bd8ecf5d2194de6c5aff66f7103ef295ae2e247eedde57e91bfb21d files/gcc41.patch 438
-AUX tora-1.3.16-configure-no_oracle.diff 2153 RMD160 e6bcec6b562cae410bf076e189e84a7673401778 SHA1 7e1316625abf436154e938eec41a7858aa80163c SHA256 be49506a68421db5aa537fb59408b2f5bfbd60d8dbbf2b35a00d76e012dc05d3
-MD5 515605f39cc89ed7f4e3efb14ae9bb59 files/tora-1.3.16-configure-no_oracle.diff 2153
-RMD160 e6bcec6b562cae410bf076e189e84a7673401778 files/tora-1.3.16-configure-no_oracle.diff 2153
-SHA256 be49506a68421db5aa537fb59408b2f5bfbd60d8dbbf2b35a00d76e012dc05d3 files/tora-1.3.16-configure-no_oracle.diff 2153
-AUX tora-1.3.16-sh-no_oracle.diff 611 RMD160 988cdb9590d6da75eb72cfb80818c5ff8e2074ce SHA1 214be58ffb93777af1bbee5938b064e5040980ef SHA256 d8672d0c92bc6ae21f1001dc0c93f26f46d2494bdcb62b895125768121dc178c
-MD5 0b13d1a7a8370a01657623ade86d1c0b files/tora-1.3.16-sh-no_oracle.diff 611
-RMD160 988cdb9590d6da75eb72cfb80818c5ff8e2074ce files/tora-1.3.16-sh-no_oracle.diff 611
-SHA256 d8672d0c92bc6ae21f1001dc0c93f26f46d2494bdcb62b895125768121dc178c files/tora-1.3.16-sh-no_oracle.diff 611
-DIST tora-1.3.16.tar.gz 2761539
+AUX tora.desktop 266 RMD160 9774cc37dca14f2452ad53318769294232afbf2a SHA1 48079b73de79d593016c442873a90c7ad3dd51ac SHA256 45f5abcf78cebe435ad45a0871121063cfa20b068946fec22f08330e68731e56
+MD5 fcbd84c14a186eba0ba3cbd74c51f3b7 files/tora.desktop 266
+RMD160 9774cc37dca14f2452ad53318769294232afbf2a files/tora.desktop 266
+SHA256 45f5abcf78cebe435ad45a0871121063cfa20b068946fec22f08330e68731e56 files/tora.desktop 266
+AUX tora.png 1227 RMD160 92904c3d0026829ceabf5acd86bce3c340fb8494 SHA1 bf8b89970377bace9f432b9dd56b16ef82f332fe SHA256 d218247bc2eb885a3783ab8b6f4f3f456df4b812d21b093f9b007da405f8068a
+MD5 35abd0e762358add8e4c5de932d31a59 files/tora.png 1227
+RMD160 92904c3d0026829ceabf5acd86bce3c340fb8494 files/tora.png 1227
+SHA256 d218247bc2eb885a3783ab8b6f4f3f456df4b812d21b093f9b007da405f8068a files/tora.png 1227
 DIST tora-1.3.18.tar.gz 3099863 RMD160 1bf23a7c25b164bb3b17d992f621db803c9e503b SHA1 115c74185c8c386d5c2c8e6ab9d88f1686fe9bb6 SHA256 67a486f6092750a8572ed7ebe2d86a561d34be6256892cbfa188bd2e6eecfc0a
-DIST tora-1.3.21.tar.gz 3139444
-EBUILD tora-1.3.16-r1.ebuild 1748 RMD160 64e01014e6841ad9220862d6df936f0e39d7a0f5 SHA1 5e3881630c86048428383fd9192d57e5e6f511b4 SHA256 cf533eb17c5897f2fe7586c4ea918cf25ffd07d0d6720626c5298a1d29d8f86b
-MD5 353ace874564984189b4bcbb3aac14fb tora-1.3.16-r1.ebuild 1748
-RMD160 64e01014e6841ad9220862d6df936f0e39d7a0f5 tora-1.3.16-r1.ebuild 1748
-SHA256 cf533eb17c5897f2fe7586c4ea918cf25ffd07d0d6720626c5298a1d29d8f86b tora-1.3.16-r1.ebuild 1748
+DIST tora-1.3.21.tar.gz 3139444 RMD160 4c4709e1a311d288396d76a45cb9ddd115935755 SHA1 6215fb4846501b02a27c7725aa62d672ce66caaa SHA256 135405accdd96a0cb52ca3797401173aec8bc1138934d52d9ceaa3984f7c7a2e
 EBUILD tora-1.3.18.ebuild 1801 RMD160 3a8a5c1b126a988d437e8e3cd0519be344797fe9 SHA1 f6a9f060e3c35ad24b7daef2956df543c72a0595 SHA256 7414321dd1c7b2bffb015d31bea0a1189bb756a59849c13548f6ee4322e07718
 MD5 90d0055dfe8e220c065c2e8d9ff13045 tora-1.3.18.ebuild 1801
 RMD160 3a8a5c1b126a988d437e8e3cd0519be344797fe9 tora-1.3.18.ebuild 1801
 SHA256 7414321dd1c7b2bffb015d31bea0a1189bb756a59849c13548f6ee4322e07718 tora-1.3.18.ebuild 1801
+EBUILD tora-1.3.21-r1.ebuild 2279 RMD160 4af6f13b033798f035fbef533eca64ba6f1365b0 SHA1 ae6e08e4818c4a8e24e1cc8130eb5f55a99e00f5 SHA256 494b0ae5af27ca5f9df3a7a912d627e99e9d207695f46c6ddeaf7bcd60e0980b
+MD5 6e7193b60f604e4cf92978832768746d tora-1.3.21-r1.ebuild 2279
+RMD160 4af6f13b033798f035fbef533eca64ba6f1365b0 tora-1.3.21-r1.ebuild 2279
+SHA256 494b0ae5af27ca5f9df3a7a912d627e99e9d207695f46c6ddeaf7bcd60e0980b tora-1.3.21-r1.ebuild 2279
 EBUILD tora-1.3.21.ebuild 1815 RMD160 1a88a595c7ff75ddf05b5033ef0e284d4bfe5b52 SHA1 d6b98eb58aa8d7f291991a468be77b5120e538c7 SHA256 f437e58aab23b049df154c68d1ad33ce8f72859b7cd8e07802dad61b786bb1fb
 MD5 3be2b3a233932ce5b9cfc0031aef8e9e tora-1.3.21.ebuild 1815
 RMD160 1a88a595c7ff75ddf05b5033ef0e284d4bfe5b52 tora-1.3.21.ebuild 1815
 SHA256 f437e58aab23b049df154c68d1ad33ce8f72859b7cd8e07802dad61b786bb1fb tora-1.3.21.ebuild 1815
-MISC ChangeLog 8174 RMD160 1a3dd524162223dea1a433dfee0f9e36bf2a7b61 SHA1 a4424a095eaab24ebed48e55ffcb74369dbc93d9 SHA256 2e49e90870cc39c970814e5d8530440fa9ae25e5c9d8c06429514d56a35a057f
-MD5 e21b47f14143df96db697a2e25c5dd27 ChangeLog 8174
-RMD160 1a3dd524162223dea1a433dfee0f9e36bf2a7b61 ChangeLog 8174
-SHA256 2e49e90870cc39c970814e5d8530440fa9ae25e5c9d8c06429514d56a35a057f ChangeLog 8174
+MISC ChangeLog 8616 RMD160 e6937cc80ace2caaf88328893f70f9fe890326bb SHA1 da747d574d2db887d9b2bc162a02d52e0319e3c2 SHA256 bc218f08c71c24703f454f809cbd0dc09425b0f620f7e7eddcb662b8ea1ff300
+MD5 85104c95838d11beb8d7c488b66da01c ChangeLog 8616
+RMD160 e6937cc80ace2caaf88328893f70f9fe890326bb ChangeLog 8616
+SHA256 bc218f08c71c24703f454f809cbd0dc09425b0f620f7e7eddcb662b8ea1ff300 ChangeLog 8616
 MISC metadata.xml 545 RMD160 c8a0b509c95d54228308ab8016ca36f36cde8b78 SHA1 992a140bc0b64afcbd46a3feaff6a4adf85fea3b SHA256 99c153750d77644b1e959d2dba6d413fd23fdc4f4d55ea04e5d283f43aae6f95
 MD5 26195c7b7ebc00c63f817e3266b8c4a0 metadata.xml 545
 RMD160 c8a0b509c95d54228308ab8016ca36f36cde8b78 metadata.xml 545
 SHA256 99c153750d77644b1e959d2dba6d413fd23fdc4f4d55ea04e5d283f43aae6f95 metadata.xml 545
-MD5 360385b94626738c4ea70afa2cc2ed56 files/digest-tora-1.3.16-r1 64
-RMD160 13f72c431a0099bf25a118262058681965949740 files/digest-tora-1.3.16-r1 64
-SHA256 53b6055cfbf7c8bb9b6f4f4d3eaa7de9520cf9a448977ea9ac4d869fda09caaf files/digest-tora-1.3.16-r1 64
 MD5 609e91208c04cf2f080185a3fbae397e files/digest-tora-1.3.18 238
 RMD160 68949e8705b0c5ef1493a58aa272bbfb398c0228 files/digest-tora-1.3.18 238
 SHA256 bd8b4b5f1a4d836ed4d8e1f01daab938b6c0026c1cf458e6e78ba1ab3105b0cd files/digest-tora-1.3.18 238
-MD5 cb38d2b46fa6836ac008ee673891505a files/digest-tora-1.3.21 64
-RMD160 b501c14ce7dc45096739d0b6a7bcecb1000ad973 files/digest-tora-1.3.21 64
-SHA256 0c68943866baa79d8fbf2525c862709e59f1c1f17d24807a1579f6187a3b2208 files/digest-tora-1.3.21 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFTjocomPajV0RnrERAnRyAJ0R0b6hECa0qVCUkl2S0yGIH+XmcgCfQfwk
-EZ1NnvP6hkhdcsl5MESep6o=
-=/6KE
------END PGP SIGNATURE-----
+MD5 bbc8f32a66fde069e527fdb1630c2118 files/digest-tora-1.3.21 238
+RMD160 0ab7bd2a8b69fc65186d0d3caad3f9c9e4654b47 files/digest-tora-1.3.21 238
+SHA256 b5c236c3a2db563a817ae77ce9962c65b08cf779a770cd773207997f0cf2b918 files/digest-tora-1.3.21 238
+MD5 bbc8f32a66fde069e527fdb1630c2118 files/digest-tora-1.3.21-r1 238
+RMD160 0ab7bd2a8b69fc65186d0d3caad3f9c9e4654b47 files/digest-tora-1.3.21-r1 238
+SHA256 b5c236c3a2db563a817ae77ce9962c65b08cf779a770cd773207997f0cf2b918 files/digest-tora-1.3.21-r1 238
diff --git a/dev-db/tora/files/digest-tora-1.3.16-r1 b/dev-db/tora/files/digest-tora-1.3.16-r1
deleted file mode 100644
index 42a472cb3bf5..000000000000
--- a/dev-db/tora/files/digest-tora-1.3.16-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e3276f208d64bf8269fecf0c5cb34b8 tora-1.3.16.tar.gz 2761539
diff --git a/dev-db/tora/files/tora-1.3.16-configure-no_oracle.diff b/dev-db/tora/files/tora-1.3.16-configure-no_oracle.diff
deleted file mode 100644
index ebc48205c0ce..000000000000
--- a/dev-db/tora/files/tora-1.3.16-configure-no_oracle.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-===================================================================
-RCS file: /cvsroot/tora/tora/configure.pl,v
-retrieving revision 1.181
-retrieving revision 1.182
-diff -u -r1.181 -r1.182
---- configure.pl	2005/02/24 18:40:37	1.181
-+++ configure.pl	2005/03/13 14:28:52	1.182
-@@ -1012,12 +1012,13 @@
- 	print "QSql ";
-     }
-     print "\n";
--
-+    if ($OracleFound) {
-     $LFlags.="\"-L".$ENV{ORACLE_HOME}."/lib32\" ";
-     $LFlags.="\"-L".$ENV{ORACLE_HOME}."/lib\" ";
-     $LFlags.="\"-L".$ENV{ORACLE_HOME}."\" ";
-+    }
-     $LFlags.="\"-L".$QtLib."\" ";
--    if ($OracleRelease =~ /^8.0/) {
-+    if ($OracleFound && $OracleRelease =~ /^8.0/) {
-         $LFlags.="\"$ENV{ORACLE_HOME}/lib/scorept.o\" ";
-         $LFlags.="\"-lcore4\" ";
-         $LFlags.="\"-lnlsrtl3\" ";
-@@ -1047,17 +1048,21 @@
-     print "$extra\n";
- 
-     if (!$NoRPath) {
--	$LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."/lib32\" ";
--	$LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."/lib\" ";
--	$LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."\" ";
-+	if ($OracleFound) {
-+	    $LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."/lib32\" ";
-+	    $LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."/lib\" ";
-+	    $LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."\" ";
-+	}
- 	$LFlags.="-Xlinker \"--rpath\=$QtLib\" ";
-     }
- 
--    $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/demo");
--    $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/plsql/public");
--    $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/public");
--    $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/network/public");
--    $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/sdk/include");
-+    if ($OracleFound) {
-+	$Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/demo");
-+	$Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/plsql/public");
-+	$Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/public");
-+	$Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/network/public");
-+	$Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/sdk/include");
-+    }
-     if ( $ENV{C_INCLUDE_PATH} ) {
-       $Includes=&addInclude($Includes,$ENV{C_INCLUDE_PATH});
-     }
diff --git a/dev-db/tora/files/tora-1.3.16-sh-no_oracle.diff b/dev-db/tora/files/tora-1.3.16-sh-no_oracle.diff
deleted file mode 100644
index 4f2d38886ce2..000000000000
--- a/dev-db/tora/files/tora-1.3.16-sh-no_oracle.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-===================================================================
-RCS file: /cvsroot/tora/tora/rpm/tora.sh,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -r1.1 -r1.2
---- rpm/tora.sh	2003/07/22 20:14:15	1.1
-+++ rpm/tora.sh	2005/03/29 19:15:47	1.2
-@@ -2,9 +2,9 @@
- 
- if [ "X$ORACLE_HOME" = "X" ]
- then
--    echo "Environment variable ORACLE_HOME not set, check your Oracle installation"
-+    echo "WARNING: Environment variable ORACLE_HOME not set, check your Oracle installation"
- else
-     LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME/lib
-     export LD_LIBRARY_PATH
--    tora.real
- fi
-+tora.real
diff --git a/dev-db/tora/tora-1.3.16-r1.ebuild b/dev-db/tora/tora-1.3.16-r1.ebuild
deleted file mode 100644
index 34355787b5f2..000000000000
--- a/dev-db/tora/tora-1.3.16-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.16-r1.ebuild,v 1.5 2006/01/19 19:15:28 dertobi123 Exp $
-
-inherit debug 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}/tora-1.3.16-configure-no_oracle.diff
-	epatch ${FILESDIR}/tora-1.3.16-sh-no_oracle.diff
-}
-
-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"
-
-	./configure $myconf || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install ROOT=${D}
-	dodoc LICENSE.txt BUGS INSTALL NEWS README TODO
-}