Version bump, #284360

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 11 insertions, 179 deletions

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index b9a7e11cb252..2418de824994 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/tora
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.70 2009/06/26 18:41:53 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.71 2009/09/17 16:10:12 dertobi123 Exp $
+
+*tora-2.1.0 (17 Sep 2009)
+
+  17 Sep 2009; Tobias Scherbaum <dertobi123@gentoo.org> -tora-1.3.22.ebuild,
+  -tora-1.3.23.ebuild, -tora-2.0.0.ebuild, +tora-2.1.0.ebuild:
+  Version bump, #284360
 
   26 Jun 2009; Tobias Scherbaum <dertobi123@gentoo.org> tora-2.0.0.ebuild:
   Really apply the patch for gcc-4.4.
diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index 757af0f9dbe1..1f9c5da73fa4 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -3,13 +3,9 @@ AUX tora-2.0.0-gcc44.patch 1077 RMD160 76407025786717cc51227f5fbb0fe89924d0637c
 AUX tora-gcc43.patch 304 RMD160 86bd8f66d392671667409674c0788aad1d67e52f SHA1 74367200e2739e0d4336a69d0fcdbc0424141536 SHA256 a551a1ba43fe48027bc4cc8d721c8645c40a530f0dbf6686cd0dc91e5e04c0b9
 AUX tora.desktop 267 RMD160 489ca7e384df925ed00842b405a8a8449f247d13 SHA1 497070e2b7e6f282ea82f5d625088678f706c68b SHA256 601dd498ffd8c26dbc02abb6cfba714d62863462000d6db867a7925446f4ad2f
 AUX tora.png 1227 RMD160 92904c3d0026829ceabf5acd86bce3c340fb8494 SHA1 bf8b89970377bace9f432b9dd56b16ef82f332fe SHA256 d218247bc2eb885a3783ab8b6f4f3f456df4b812d21b093f9b007da405f8068a
-DIST tora-1-3-end-of-life.tar.gz 3419462 RMD160 948cc0837a653ef9eb82975ea883d8e722f1492f SHA1 48f7ec9bfe4d1ec686ac5b7eee04f05bd587eaf1 SHA256 99ab5fa84b188e9d101de36a56320072f9f2aa6866adc899e829c0b2144ac5e8
 DIST tora-1.3.21.tar.gz 3139444 RMD160 4c4709e1a311d288396d76a45cb9ddd115935755 SHA1 6215fb4846501b02a27c7725aa62d672ce66caaa SHA256 135405accdd96a0cb52ca3797401173aec8bc1138934d52d9ceaa3984f7c7a2e
-DIST tora-1.3.22.tar.gz 3496227 RMD160 a1fa0aa9ef3cdd64dbb4987dfdd17c0ee5356a9c SHA1 0dae61eb7e7cfbe39861b7c2b44fd9b2002a8095 SHA256 7a1cbcc24db8cf57612bc7ffb8dba7505a27ea0c7ac655820ceeed6f79562c88
-DIST tora-2.0.0.tar.gz 6726940 RMD160 47d1f788a9a3406d2d553b423a229f38284d616b SHA1 e190439e120d902dfafefb3fc904824b1645fb70 SHA256 9f1133b58e616205fc39591c71e38dd39c93699d536891eeb8a1177f32663eae
+DIST tora-2.1.0.tar.gz 4718857 RMD160 a5e5f8119fb46f3639eb1afcf1f397e2a8b2cdb5 SHA1 d8e40ee0dc0eb740737352d669c46ebdf924a9f4 SHA256 f3fc1c07d309f79b267ed562fc1a7786717ec3e17d43120f0a33d246f0486a1f
 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
-EBUILD tora-1.3.23.ebuild 2168 RMD160 e642c6ff42c9bf9ded8b0c489a4b1a8b61b730fb SHA1 ff820b1a0d9e685322a3e8fa2c737c4798e9012f SHA256 3946d86f717f3aa0b1379841805f3e88a8a5002f80b2282d1b72e9e0aaf44620
-EBUILD tora-2.0.0.ebuild 2373 RMD160 afb3e265d5f218b2e691dd50f82a11bfa9608066 SHA1 3f708eddc377fdef7ad15a0c660169f792a3d494 SHA256 c7c8885a88f9df2ba1ca13455b0807047aa1a0cb07b4d7128fbf0379442f97b9
-MISC ChangeLog 10845 RMD160 1804d3285774f2d5095dfeeb35d7d2a1e408fa92 SHA1 c9cb741271d80d5f8d96562878d6210fe62b9853 SHA256 23930d9304e29607086416b7c052325acc6c854ba5005b7b05cd7cd12cc2084c
+EBUILD tora-2.1.0.ebuild 2224 RMD160 45aca3928832026b21413555b8dab6d7aae5a563 SHA1 62cc4fc775901866f1025df702979f312cfa82b0 SHA256 3d0fd9600af404dd00bc7b8df509cd28b90762eba0dd3afb85ea92dcc9bcdc70
+MISC ChangeLog 11037 RMD160 f12d0e0b9adbd025c46ba8a281fa5c3378fc7dbc SHA1 01f5e2da13788bc446a1a4e882a5e8aab7bea929 SHA256 f94981c95f23af1c3e770bbc5e6a9c445587b901b65aa6d9fbe20479279b7069
 MISC metadata.xml 545 RMD160 c8a0b509c95d54228308ab8016ca36f36cde8b78 SHA1 992a140bc0b64afcbd46a3feaff6a4adf85fea3b SHA256 99c153750d77644b1e959d2dba6d413fd23fdc4f4d55ea04e5d283f43aae6f95
diff --git a/dev-db/tora/tora-1.3.22.ebuild b/dev-db/tora/tora-1.3.22.ebuild
deleted file mode 100644
index a0011fb30c58..000000000000
--- a/dev-db/tora/tora-1.3.22.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.22.ebuild,v 1.1 2008/03/21 10:04:27 dertobi123 Exp $
-
-inherit 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 )"
-
-DEPEND="=x11-libs/qt-3*
-	dev-lang/perl
-	<x11-libs/qscintilla-2.1
-	kde? ( >=kde-base/kdelibs-3.1
-		   kde-base/arts )
-	xinerama? ( x11-proto/xineramaproto )
-	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_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="${myconf} $(use_with 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"
-
-	#./configure $myconf || die "configure failed"
-	econf $myconf || die "configure failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	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
-}
diff --git a/dev-db/tora/tora-1.3.23.ebuild b/dev-db/tora/tora-1.3.23.ebuild
deleted file mode 100644
index 1df39b9d5362..000000000000
--- a/dev-db/tora/tora-1.3.23.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.23.ebuild,v 1.1 2008/06/16 18:21:35 dertobi123 Exp $
-
-inherit 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}/${PN}-1-3-end-of-life.tar.gz"
-
-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-2.1
-	kde? ( >=kde-base/kdelibs-3.1
-		   kde-base/arts )
-	xinerama? ( x11-proto/xineramaproto )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )"
-
-S="${WORKDIR}/${PN}-1-3-end-of-life"
-
-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}/${PN}-gcc43.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="${myconf} $(use_with 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"
-
-	#./configure $myconf || die "configure failed"
-	econf $myconf || die "configure failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	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
-}
diff --git a/dev-db/tora/tora-2.0.0.ebuild b/dev-db/tora/tora-2.1.0.ebuild
index 0cbbb1dc368f..c0078ef10a83 100644
--- a/dev-db/tora/tora-2.0.0.ebuild
+++ b/dev-db/tora/tora-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.0.0.ebuild,v 1.5 2009/06/26 18:41:53 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.0.ebuild,v 1.1 2009/09/17 16:10:12 dertobi123 Exp $
 
 EAPI=2
 
@@ -41,10 +41,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc44.patch"
-}
-
 src_configure() {
 	# Need to fake out Qt or we'll get sandbox problems
 	REALHOME="$HOME"
@@ -53,9 +49,6 @@ src_configure() {
 	export HOME="$T/fakehome"
 	addwrite "${QTDIR}/etc/settings"
 
-	# Remove files generated with qt-4.4 moc
-	rm src/{moc_*.cpp,ui_*ui.h} || die "rm failed"
-
 	local myconf
 
 	if use oracle; then