Adding patch for middle-mouse pasting from clipboard

5 files changed, 150 insertions, 3 deletions

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index a726666707f6..c1581e45ef8f 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-db/tora
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.12 2003/08/19 17:58:36 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.13 2003/08/26 14:31:09 rizzo Exp $
+
+*tora-1.3.11-r2 (26 Aug 2003)
+
+  26 Aug 2003; Don Seiler <rizzo@gentoo.org>; tora-1.3.11-r2.ebuild,
+  files/tora-clipboard.patch:
+  Adding patch for middle-mouse pasting from clipboard.
 
 *tora-1.3.11-r1 (19 Aug 2003)
 
diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index 2bce195a3ae3..a822ac2cd232 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,10 +1,10 @@
 MD5 8419022a25ffe64dc4d8f9a3df4a72bf tora-1.3.11.ebuild 1247
-MD5 19c871be029465672697898729067e37 tora-1.3.11-r2.ebuild 1291
+MD5 3b01f5d3126748b1284651228749f840 tora-1.3.11-r2.ebuild 1386
 MD5 f03fff2b63ddd77a03f5e3b3c756af27 tora-1.3.8.ebuild 1574
 MD5 774b6c7f3e913fafbd06035f2c5cbc27 tora-1.3.10.ebuild 1245
 MD5 3f33109e1f248ded2c13ac9f5d378ae8 tora-1.3.11-r1.ebuild 1345
 MD5 6df9df1a4a6aaf82cd39239ee161738c tora-1.3.9.2.ebuild 1249
-MD5 2be7b07e34d2455c551b695a9bcda02e ChangeLog 2296
+MD5 90ddd296a8ac61b3ff053c9af9625500 ChangeLog 2296
 MD5 bda8803c4adc9cf0b308b71157891f05 metadata.xml 536
 MD5 0cb18bcf00a1bd7ccb4010bba81619ed files/tora-index-segfault.patch 619
 MD5 94ba94945d843ea598f9b63230f31e8d files/digest-tora-1.3.9.2 71
diff --git a/dev-db/tora/files/digest-tora-1.3.11-r2 b/dev-db/tora/files/digest-tora-1.3.11-r2
new file mode 100644
index 000000000000..d176267843c8
--- /dev/null
+++ b/dev-db/tora/files/digest-tora-1.3.11-r2
@@ -0,0 +1 @@
+MD5 e056c5c84db1da8bccd7688a0aef9317 tora-alpha-1.3.11.tar.gz 2405314
diff --git a/dev-db/tora/files/tora-clipboard.patch b/dev-db/tora/files/tora-clipboard.patch
new file mode 100644
index 000000000000..b7f3dfa4f9aa
--- /dev/null
+++ b/dev-db/tora/files/tora-clipboard.patch
@@ -0,0 +1,86 @@
+Index: qtlegacy/qtmultilineedit.cpp
+===================================================================
+RCS file: /cvsroot/tora/tora/qtlegacy/qtmultilineedit.cpp,v
+retrieving revision 1.6
+diff -u -r1.6 qtmultilineedit.cpp
+--- qtlegacy/qtmultilineedit.cpp	24 Jul 2003 02:26:48 -0000	1.6
++++ qtlegacy/qtmultilineedit.cpp	26 Aug 2003 08:34:32 -0000
+@@ -1348,7 +1348,7 @@
+ 	case Key_Y:
+ 	    redo();
+ 	    break;
+-#if defined (_WS_WIN_)
++#if defined (Q_WS_WIN)
+ 	case Key_Insert:
+ 	    copy();
+ #endif
+@@ -1379,7 +1379,7 @@
+ 	    end( e->state() & ShiftButton );
+ 	    break;
+ 	case Key_Delete:
+-#if defined (_WS_WIN_)
++#if defined (Q_WS_WIN)
+ 	    if ( e->state() & ShiftButton ) {
+ 		cut();
+ 		break;
+@@ -1401,7 +1401,7 @@
+ 	case Key_Tab:
+ 	    insert( e->text() );
+ 	    break;
+-#if defined (_WS_WIN_)
++#if defined (Q_WS_WIN)
+ 	case Key_Insert:
+ 	    if ( e->state() & ShiftButton )
+ 		paste();
+@@ -2376,13 +2376,13 @@
+ 	turnMark( FALSE );
+ 
+ #ifndef QT_NO_CLIPBOARD
+-#if defined(_WS_X11_)
++#if defined(Q_WS_X11)
+     else if ( echoMode() == Normal )
+ 	copy();
+ #endif
+ 
+     if ( e->button() == MidButton && !readOnly ) {
+-#if defined(_WS_X11_)
++#if defined(Q_WS_X11)
+ 	paste();		// Will repaint the cursor line.
+ #else
+ #ifndef QT_NO_COMPAT
+@@ -2845,7 +2845,7 @@
+     turnMark( markDragX != markAnchorX || markDragY != markAnchorY );
+ 
+ #ifndef QT_NO_CLIPBOARD
+-#if defined(_WS_X11_)
++#if defined(Q_WS_X11)
+     if ( echoMode() == Normal )
+ 	copy();
+ #endif
+@@ -2876,7 +2876,7 @@
+ {
+     QString t = markedText();
+     if ( !t.isEmpty() && echoMode() == Normal ) {
+-#if defined(_WS_X11_)
++#if defined(Q_WS_X11)
+ 	disconnect( QApplication::clipboard(), SIGNAL(dataChanged()), this, 0);
+ #endif
+ #if defined(_OS_WIN32_)
+@@ -2924,7 +2924,7 @@
+ 
+ void QtMultiLineEdit::clipboardChanged()
+ {
+-#if defined(_WS_X11_)
++#if defined(Q_WS_X11)
+     disconnect( QApplication::clipboard(), SIGNAL(dataChanged()),
+ 		this, SLOT(clipboardChanged()) );
+     turnMark( FALSE );
+@@ -4195,7 +4195,7 @@
+ 	    switch ( ke->key() ) {
+ 	    case Key_A:
+ 	    case Key_E:
+-#if defined (_WS_WIN_)
++#if defined (Q_WS_WIN)
+ 	    case Key_Insert:
+ #endif
+ 	    case Key_X:
diff --git a/dev-db/tora/tora-1.3.11-r2.ebuild b/dev-db/tora/tora-1.3.11-r2.ebuild
new file mode 100644
index 000000000000..9c35087c1e90
--- /dev/null
+++ b/dev-db/tora/tora-1.3.11-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.11-r2.ebuild,v 1.1 2003/08/26 14:31:09 rizzo Exp $
+
+DESCRIPTION="TOra - Toolkit For Oracle"
+HOMEPAGE="http://www.globecom.se/tora/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-alpha-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND=">=x11-libs/qt-3.0.0
+	dev-lang/perl
+	kde? ( >=kde-base/kdebase-3.1 )"
+
+pkg_setup() {
+	if [ "`use oci8`" -a ! $ORACLE_HOME ] ; then
+		ewarn "ORACLE_HOME variable is not set."
+		ewarn ""
+        ewarn "You must install Oracle >= 8i client for Linux in"
+		ewarn "order to compile TOra with Oracle support."
+		ewarn ""
+		ewarn "Otherwise specify -oci8 in your USE variable."
+		ewarn ""
+		ewarn "You can download the Oracle software from"
+		ewarn "http://otn.oracle.com/software/content.html"
+		die
+	fi
+}
+
+src_unpack() {
+	unpack ${PN}-alpha-${PV}.tar.gz
+	cd ${P}
+	epatch ${FILESDIR}/tora-index-segfault.patch
+	epatch ${FILESDIR}/tora-clipboard.patch
+}
+
+src_compile() {
+	local myconf
+
+	use kde \
+		&& myconf="$myconf --with-kde" \
+		|| myconf="$myconf --without-kde"	
+	use oci8 || myconf="$myconf --without-oracle"	
+
+	./configure --prefix=/usr --with-mono $myconf || die "conf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodir ${D}/usr/bin
+	einstall ROOT=${D} 
+}