Version bump, include fix to build w/ gcc-4.3 (#227497)

Package-Manager: portage-2.1.5.5

4 files changed, 108 insertions, 2 deletions

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index 1bbc1ac9c0a2..e0a9644df0cd 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/tora
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.65 2008/06/16 18:21:35 dertobi123 Exp $
+
+*tora-1.3.23 (16 Jun 2008)
+
+  16 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/tora-gcc43.patch, +tora-1.3.23.ebuild:
+  Version bump, include fix to build w/ gcc-4.3 (#227497)
 
 *tora-1.3.22 (21 Mar 2008)
 
diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index 4ad272ae46f8..29a5402cbef6 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,9 +1,12 @@
 AUX gcc41.patch 438 RMD160 5ba95db43198d2ca79aa66fcf8b1f1719ca30fd5 SHA1 bcdaee7a567bc42c42625943792f3c817db188d9 SHA256 bceeefe86bd8ecf5d2194de6c5aff66f7103ef295ae2e247eedde57e91bfb21d
+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
 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
+EBUILD tora-1.3.23.ebuild 2168 RMD160 e642c6ff42c9bf9ded8b0c489a4b1a8b61b730fb SHA1 ff820b1a0d9e685322a3e8fa2c737c4798e9012f SHA256 3946d86f717f3aa0b1379841805f3e88a8a5002f80b2282d1b72e9e0aaf44620
+MISC ChangeLog 10144 RMD160 489bedea0ffdb0accab092bcc2d684b2f13b0f00 SHA1 c1868f9272a99311e93aa47745d502ed7cee0d12 SHA256 db861a0a50839ff35d057815e48b6c73631d24724d2f0933cfe057e7b3fdd972
 MISC metadata.xml 545 RMD160 c8a0b509c95d54228308ab8016ca36f36cde8b78 SHA1 992a140bc0b64afcbd46a3feaff6a4adf85fea3b SHA256 99c153750d77644b1e959d2dba6d413fd23fdc4f4d55ea04e5d283f43aae6f95
diff --git a/dev-db/tora/files/tora-gcc43.patch b/dev-db/tora/files/tora-gcc43.patch
new file mode 100644
index 000000000000..b39b94dcdbfb
--- /dev/null
+++ b/dev-db/tora/files/tora-gcc43.patch
@@ -0,0 +1,11 @@
+--- ext/loki/loki-0.1.6/src/SmallObj.cpp.orig	2008-06-16 20:10:07.676442069 +0200
++++ ext/loki/loki-0.1.6/src/SmallObj.cpp	2008-06-16 20:10:21.139446807 +0200
+@@ -22,6 +22,8 @@
+ #include <vector>
+ #include <bitset>
+ 
++#include <limits.h>
++
+ //#define DO_EXTRA_LOKI_TESTS
+ //#define USE_NEW_TO_ALLOCATE
+ 
diff --git a/dev-db/tora/tora-1.3.23.ebuild b/dev-db/tora/tora-1.3.23.ebuild
new file mode 100644
index 000000000000..1df39b9d5362
--- /dev/null
+++ b/dev-db/tora/tora-1.3.23.ebuild
@@ -0,0 +1,86 @@
+# 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
+}