summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Seiler <rizzo@gentoo.org>2005-03-08 17:34:57 +0000
committerDon Seiler <rizzo@gentoo.org>2005-03-08 17:34:57 +0000
commit5198564a71ee39fae9b60f0aa1c4c2b1fdc3081d (patch)
tree2f1123951060f9fd645cd2d5bff6f421d200b974 /dev-db/tora
parentRemoved old ebuilds. Updated the remaining ebuilds to work with KBUILD_OUTPUT. (diff)
downloadgentoo-2-5198564a71ee39fae9b60f0aa1c4c2b1fdc3081d.tar.gz
gentoo-2-5198564a71ee39fae9b60f0aa1c4c2b1fdc3081d.tar.bz2
gentoo-2-5198564a71ee39fae9b60f0aa1c4c2b1fdc3081d.zip
Stable on x86 and removing obsoletes
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-db/tora')
-rw-r--r--dev-db/tora/ChangeLog14
-rw-r--r--dev-db/tora/files/digest-tora-1.3.14.1-r11
-rw-r--r--dev-db/tora/files/digest-tora-1.3.14.1-r21
-rw-r--r--dev-db/tora/files/digest-tora-1.3.151
-rw-r--r--dev-db/tora/files/digest-tora-1.3.15-r11
-rw-r--r--dev-db/tora/files/tora-1.3.14.1-connection-memleak.diff19
-rw-r--r--dev-db/tora/files/tora-1.3.14.1-invalidobjects.diff148
-rw-r--r--dev-db/tora/files/tora-1.3.14.1-noblockquery.diff11
-rw-r--r--dev-db/tora/files/tora-1.3.14.1-oracleextract.diff72
-rw-r--r--dev-db/tora/files/tora-1.3.14.1-race.patch24
-rw-r--r--dev-db/tora/files/tora-1.3.14.1-resultcontent-dtor.diff21
-rw-r--r--dev-db/tora/files/tora-1.3.14.1-tooltip-memleaks.diff79
-rw-r--r--dev-db/tora/files/tora-1.3.14.1-triggers.diff11
-rw-r--r--dev-db/tora/files/tora-1.3.15-configure.diff28
-rw-r--r--dev-db/tora/tora-1.3.14.1-r1.ebuild75
-rw-r--r--dev-db/tora/tora-1.3.14.1-r2.ebuild90
-rw-r--r--dev-db/tora/tora-1.3.15-r1.ebuild68
-rw-r--r--dev-db/tora/tora-1.3.15.ebuild62
-rw-r--r--dev-db/tora/tora-1.3.16.ebuild4
19 files changed, 15 insertions, 715 deletions
diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index 1dbe2d142818..ce89b17bd3e6 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,18 @@
# ChangeLog for dev-db/tora
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.38 2005/03/04 16:09:45 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.39 2005/03/08 17:34:57 rizzo Exp $
+
+ 08 Mar 2005; Don Seiler <rizzo@gentoo.org>
+ -files/tora-1.3.14.1-connection-memleak.diff,
+ -files/tora-1.3.14.1-invalidobjects.diff,
+ -files/tora-1.3.14.1-noblockquery.diff,
+ -files/tora-1.3.14.1-oracleextract.diff, -files/tora-1.3.14.1-race.patch,
+ -files/tora-1.3.14.1-resultcontent-dtor.diff,
+ -files/tora-1.3.14.1-tooltip-memleaks.diff,
+ -files/tora-1.3.14.1-triggers.diff, -files/tora-1.3.15-configure.diff,
+ -tora-1.3.14.1-r1.ebuild, -tora-1.3.14.1-r2.ebuild,
+ -tora-1.3.15-r1.ebuild, -tora-1.3.15.ebuild, tora-1.3.16.ebuild:
+ Stable on x86 and removing obsoletes
*tora-1.3.16 (04 Mar 2005)
diff --git a/dev-db/tora/files/digest-tora-1.3.14.1-r1 b/dev-db/tora/files/digest-tora-1.3.14.1-r1
deleted file mode 100644
index 096b8ef34c0b..000000000000
--- a/dev-db/tora/files/digest-tora-1.3.14.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5560b5104438e1b71bd89386d0fcdc00 tora-alpha-1.3.14.1.tar.gz 2632386
diff --git a/dev-db/tora/files/digest-tora-1.3.14.1-r2 b/dev-db/tora/files/digest-tora-1.3.14.1-r2
deleted file mode 100644
index 096b8ef34c0b..000000000000
--- a/dev-db/tora/files/digest-tora-1.3.14.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5560b5104438e1b71bd89386d0fcdc00 tora-alpha-1.3.14.1.tar.gz 2632386
diff --git a/dev-db/tora/files/digest-tora-1.3.15 b/dev-db/tora/files/digest-tora-1.3.15
deleted file mode 100644
index 80bf3923f74d..000000000000
--- a/dev-db/tora/files/digest-tora-1.3.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8fffa5c3b4a0af82e605f568c34332c tora-1.3.15.tar.gz 2562513
diff --git a/dev-db/tora/files/digest-tora-1.3.15-r1 b/dev-db/tora/files/digest-tora-1.3.15-r1
deleted file mode 100644
index 80bf3923f74d..000000000000
--- a/dev-db/tora/files/digest-tora-1.3.15-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8fffa5c3b4a0af82e605f568c34332c tora-1.3.15.tar.gz 2562513
diff --git a/dev-db/tora/files/tora-1.3.14.1-connection-memleak.diff b/dev-db/tora/files/tora-1.3.14.1-connection-memleak.diff
deleted file mode 100644
index 22946e015b56..000000000000
--- a/dev-db/tora/files/tora-1.3.14.1-connection-memleak.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- tora-1.3.14.1-vanilla/toconnection.cpp 2004-07-02 07:27:57.000000000 +0200
-+++ tora-1.3.14.1/toconnection.cpp 2004-11-11 13:48:44.030865878 +0100
-@@ -1588,7 +1588,7 @@
- if (toTool::globalConfig(CONF_CACHE_DISK,DEFAULT_CACHE_DISK).isEmpty())
- return false;
-
-- toConnection::objectName *cur;
-+ toConnection::objectName *cur = 0;
- int objCounter = 0;
- int synCounter = 0;
-
-@@ -1636,6 +1636,7 @@
- synCounter++;
- }
- ObjectNames.insert(ObjectNames.end(),(*cur));
-+ delete cur; cur = 0;
- }
- return true;
- }
diff --git a/dev-db/tora/files/tora-1.3.14.1-invalidobjects.diff b/dev-db/tora/files/tora-1.3.14.1-invalidobjects.diff
deleted file mode 100644
index 3a835c64c202..000000000000
--- a/dev-db/tora/files/tora-1.3.14.1-invalidobjects.diff
+++ /dev/null
@@ -1,148 +0,0 @@
-*** toinvalid.cpp.old Thu Jul 22 19:38:19 2004
---- toinvalid.cpp Thu Jul 22 19:40:12 2004
-***************
-*** 45,54 ****
---- 45,55 ----
- #include "toresultlong.h"
- #include "toresultview.h"
- #include "tosql.h"
- #include "totool.h"
-
-+
- #ifdef TO_KDE
- # include <kmenubar.h>
- #endif
-
- #include <qlabel.h>
-***************
-*** 113,124 ****
- tr("Refresh list"),
- this,SLOT(refresh()),
- toolbar);
-
- new QToolButton(QPixmap((const char **)compile_xpm),
-! tr("Recompile selected"),
-! tr("Recompile selected"),
- this,SLOT(recompileSelected()),
- toolbar);
-
- toolbar->setStretchableWidget(new QLabel(toolbar,TO_KDE_TOOLBAR_WIDGET));
- new toChangeConnection(toolbar,TO_KDE_TOOLBAR_WIDGET);
---- 114,125 ----
- tr("Refresh list"),
- this,SLOT(refresh()),
- toolbar);
-
- new QToolButton(QPixmap((const char **)compile_xpm),
-! tr("Recompile all invalid"),
-! tr("Recompile all invalid"),
- this,SLOT(recompileSelected()),
- toolbar);
-
- toolbar->setStretchableWidget(new QLabel(toolbar,TO_KDE_TOOLBAR_WIDGET));
- new toChangeConnection(toolbar,TO_KDE_TOOLBAR_WIDGET);
-***************
-*** 126,139 ****
- QSplitter *splitter=new QSplitter(Horizontal,this);
-
- Objects=new toResultLong(false,false,toQuery::Background,splitter);
- Objects->setSQL(SQLListInvalid);
-
-! Objects->setSelectionMode(QListView::Extended);
- connect(Objects,SIGNAL(selectionChanged()),this,SLOT(changeSelection()));
-- connect(Objects,SIGNAL(currentChanged(QListViewItem *)),
-- this,SLOT(changeSelection()));
-
- Source=new toResultExtract(false,splitter);
- Source->setSQL(SQLListSource);
-
- connect(Source,SIGNAL(executed()),this,SLOT(refresh()));
---- 127,138 ----
- QSplitter *splitter=new QSplitter(Horizontal,this);
-
- Objects=new toResultLong(false,false,toQuery::Background,splitter);
- Objects->setSQL(SQLListInvalid);
-
-! Objects->setSelectionMode(QListView::Single);
- connect(Objects,SIGNAL(selectionChanged()),this,SLOT(changeSelection()));
-
- Source=new toResultExtract(false,splitter);
- Source->setSQL(SQLListSource);
-
- connect(Source,SIGNAL(executed()),this,SLOT(refresh()));
-***************
-*** 160,194 ****
- QProgressDialog progress(tr("Recompiling all invalid"),
- tr("Cancel"),Objects->childCount(),this,"progress",true);
- progress.setCaption("Recompiling");
- progress.show();
-
-- int i=0;
-
- for(QListViewItem *item=Objects->firstChild();item;item=item->nextSibling()) {
- toResultViewItem *ci=dynamic_cast<toResultViewItem *>(item);
-! if (ci&&ci->isSelected()) {
- toConnection &conn=connection();
- progress.setLabelText("Recompiling "+ci->allText(1)+"."+ci->allText(2));
-! progress.setProgress(i);
- qApp->processEvents();
- QString type=ci->allText(2);
- QString sql;
- if (type=="INDEX")
- sql="ALTER "+ci->allText(2)+" "+conn.quote(ci->allText(0))+"."+conn.quote(ci->allText(1))+" REBUILD";
- else if (type=="PACKAGE BODY")
-! sql="ALTER PACKAGE "+conn.quote(ci->allText(0))+"."+conn.quote(ci->allText(1))+" COMPILE BODY REUSE SETTINGS";
- else
-! sql="ALTER "+ci->allText(2)+" "+conn.quote(ci->allText(0))+"."+conn.quote(ci->allText(1))+" COMPILE REUSE SETTINGS";
- try {
- conn.execute(sql);
- } catch(...) {
- }
- }
-- i++;
- }
-! refresh();
- }
-
- void toInvalid::windowActivated(QWidget *widget)
- {
- if (widget==this) {
---- 159,196 ----
- QProgressDialog progress(tr("Recompiling all invalid"),
- tr("Cancel"),Objects->childCount(),this,"progress",true);
- progress.setCaption("Recompiling");
- progress.show();
-
-
- for(QListViewItem *item=Objects->firstChild();item;item=item->nextSibling()) {
- toResultViewItem *ci=dynamic_cast<toResultViewItem *>(item);
-! if (ci){
- toConnection &conn=connection();
- progress.setLabelText("Recompiling "+ci->allText(1)+"."+ci->allText(2));
-! progress.setProgress(progress.progress()+1);
- qApp->processEvents();
-+ if (progress.wasCancelled())
-+ break;
- QString type=ci->allText(2);
- QString sql;
- if (type=="INDEX")
- sql="ALTER "+ci->allText(2)+" "+conn.quote(ci->allText(0))+"."+conn.quote(ci->allText(1))+" REBUILD";
- else if (type=="PACKAGE BODY")
-! sql="ALTER PACKAGE "+conn.quote(ci->allText(0))+"."+conn.quote(ci->allText(1))+" COMPILE BODY";
- else
-! sql="ALTER "+ci->allText(2)+" "+conn.quote(ci->allText(0))+"."+conn.quote(ci->allText(1))+" COMPILE";
- try {
- conn.execute(sql);
- } catch(...) {
- }
- }
- }
-! if (progress.isVisible())
-! progress.close();
-! qApp->processEvents();
-! this->refresh();
- }
-
- void toInvalid::windowActivated(QWidget *widget)
- {
- if (widget==this) {
diff --git a/dev-db/tora/files/tora-1.3.14.1-noblockquery.diff b/dev-db/tora/files/tora-1.3.14.1-noblockquery.diff
deleted file mode 100644
index 4ca57692a219..000000000000
--- a/dev-db/tora/files/tora-1.3.14.1-noblockquery.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- tora-1.3.14.1/tonoblockquery.cpp 2004-07-02 07:27:57.000000000 +0200
-+++ tora-1.3.14.1-r2/tonoblockquery.cpp 2004-11-11 13:25:27.919801410 +0100
-@@ -141,7 +141,7 @@
- TO_DEBUGOUT("Locking EOQ\n");
- toLocker lock(Parent.Lock);
- TO_DEBUGOUT("Deleting query\n");
-- if (!Parent.Query->eof())
-+ if (!Parent.Error&&!Parent.Query->eof())
- try {
- Parent.Query->cancel();
- } catch(...) {
diff --git a/dev-db/tora/files/tora-1.3.14.1-oracleextract.diff b/dev-db/tora/files/tora-1.3.14.1-oracleextract.diff
deleted file mode 100644
index 3e1569d8b973..000000000000
--- a/dev-db/tora/files/tora-1.3.14.1-oracleextract.diff
+++ /dev/null
@@ -1,72 +0,0 @@
---- tora-1.3.14.1/tooracleextract.cpp 2004-07-02 07:27:57.000000000 +0200
-+++ tora-1.3.14.1-r2/tooracleextract.cpp 2004-11-11 13:30:17.070769225 +0100
-@@ -5073,12 +5073,8 @@
- " , table_name\n"
- " , base_object_type\n"
- " , referencing_names\n"
-- " , description\n"
-- " , DECODE(\n"
-- " when_clause\n"
-- " ,null,null\n"
-- " ,'WHEN (' || when_clause || ')' || CHR(10)\n"
-- " )\n"
-+ " , upper(description)\n"
-+ " , when_clause\n"
- " , trigger_body\n"
- " , DECODE(status,'ENABLED','ENABLE','DISABLE')\n"
- " FROM\n"
-@@ -5097,12 +5093,8 @@
- " , table_name\n"
- " , 'TABLE' AS base_object_type\n"
- " , referencing_names\n"
-- " , description\n"
-- " , DECODE(\n"
-- " when_clause\n"
-- " ,null,null\n"
-- " ,'WHEN (' || when_clause || ')' || CHR(10)\n"
-- " )\n"
-+ " , upper(description)\n"
-+ " , when_clause\n"
- " , trigger_body\n"
- " , DECODE(status,'ENABLED','ENABLE','DISABLE')\n"
- " FROM\n"
-@@ -5142,9 +5134,12 @@
- else if (triggerType.find("INSTEAD OF")>=0)
- trgType="INSTEAD OF";
-
-+
- QString trgPart = trgType+" "+event;
- QRegExp src("\\s"+trgPart+"\\s",false);
-+ description.replace(QRegExp("\nON"),QString("\n ON"));
- int pos=description.find(src);
-+ //QString columns=description;
- QString columns;
- if (pos>=0) {
- pos+=trgPart.length()+2;
-@@ -5180,8 +5175,11 @@
- }
- if (triggerType.find("EACH ROW")>=0)
- ret+="FOR EACH ROW\n";
-- if (!when.isEmpty())
-+ if (!when.isEmpty()) {
-+ ret+="WHEN (";
- ret+=when;
-+ ret+=")\n";
-+ }
- ret+=body;
- ret+="\n/\n\n";
- if (status!="ENABLE") {
-@@ -5983,11 +5981,12 @@
- QString src=trgType;
- src+=" ";
- src+=event;
-+ description.replace(QRegExp("\nON"),QString("\n ON"));
- int pos=description.find(src);
- QString columns;
- if (pos>=0) {
- pos+=src.length();
-- int endPos=description.find(" ON ",pos);
-+ int endPos=description.find(" ON ",pos,false);
- if (endPos>=0) {
- columns=description.right(description.length()-pos);
- columns.truncate(endPos-pos);
diff --git a/dev-db/tora/files/tora-1.3.14.1-race.patch b/dev-db/tora/files/tora-1.3.14.1-race.patch
deleted file mode 100644
index 509bb2aec70f..000000000000
--- a/dev-db/tora/files/tora-1.3.14.1-race.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- tora-1.3.14.1/tooracleconnection.cpp 2004-07-02 07:27:57.000000000 +0200
-+++ tora-1.3.14.1.ivan/tooracleconnection.cpp 2004-10-17 05:07:04.000000000 +0200
-@@ -362,7 +362,7 @@
- virtual void cancel(void);
- virtual bool eof(void)
- {
-- if (!Query)
-+ if (!Query || Cancel)
- return true;
- return Query->eof();
- }
-@@ -965,9 +965,10 @@
- oracleSub *conn=dynamic_cast<oracleSub *>(query()->connectionSub());
- if (!conn)
- throw QString::fromLatin1("Internal error, not oracle sub connection");
-- if (Running)
-+ if (Running) {
- conn->Connection->cancel();
-- else {
-+ Cancel=true;
-+ } else {
- Cancel=true;
- conn->Lock.up();
- }
diff --git a/dev-db/tora/files/tora-1.3.14.1-resultcontent-dtor.diff b/dev-db/tora/files/tora-1.3.14.1-resultcontent-dtor.diff
deleted file mode 100644
index a198a5e8489b..000000000000
--- a/dev-db/tora/files/tora-1.3.14.1-resultcontent-dtor.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr tora-1.3.14.1-vanilla/toresultcontent.cpp tora-1.3.14.1-neu/toresultcontent.cpp
---- tora-1.3.14.1-vanilla/toresultcontent.cpp 2004-07-02 07:27:57.000000000 +0200
-+++ tora-1.3.14.1-neu/toresultcontent.cpp 2004-11-11 14:01:19.572515375 +0100
-@@ -338,7 +338,7 @@
- {
- saveUnsaved();
- delete Query;
-- delete BinaryColumns;
-+ delete [] BinaryColumns;
- }
-
- void toResultContentEditor::wrongUsage(void)
-@@ -441,7 +441,7 @@
- if (numRows()==0) {
- Description=Query->describe();
-
-- delete BinaryColumns;
-+ delete [] BinaryColumns;
- BinaryColumns=new bool[Description.size()];
- for(unsigned int j=0;j<Description.size();j++)
- BinaryColumns[j]=false;
diff --git a/dev-db/tora/files/tora-1.3.14.1-tooltip-memleaks.diff b/dev-db/tora/files/tora-1.3.14.1-tooltip-memleaks.diff
deleted file mode 100644
index ac15f5311bc2..000000000000
--- a/dev-db/tora/files/tora-1.3.14.1-tooltip-memleaks.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -uNr tora-1.3.14.1-vanilla/topiechart.cpp tora-1.3.14.1/topiechart.cpp
---- tora-1.3.14.1-vanilla/topiechart.cpp 2004-07-02 07:27:57.000000000 +0200
-+++ tora-1.3.14.1/topiechart.cpp 2004-11-11 13:42:44.635126732 +0100
-@@ -96,7 +96,13 @@
- QFont font(toStringToFont(str));
- setFont(font);
- }
-- new toPieTip(this);
-+ AllTip = new toPieTip(this);
-+}
-+
-+toPieChart::~toPieChart()
-+{
-+ delete AllTip;
-+ AllTip = 0;
- }
-
- #define FONT_ALIGN AlignLeft|AlignTop|ExpandTabs
-diff -uNr tora-1.3.14.1-vanilla/topiechart.h tora-1.3.14.1/topiechart.h
---- tora-1.3.14.1-vanilla/topiechart.h 2004-07-02 07:27:57.000000000 +0200
-+++ tora-1.3.14.1/topiechart.h 2004-11-11 13:44:19.191324588 +0100
-@@ -40,6 +40,7 @@
-
- class QPopupMenu;
- class toLineChart;
-+class toPieTip;
-
- /** A widget that displays a piechart.
- */
-@@ -57,6 +58,7 @@
-
- QRect ChartRect;
- std::list<int> Angels;
-+ toPieTip* AllTip;
-
- protected:
- virtual void mouseDoubleClickEvent(QMouseEvent *e);
-@@ -69,6 +71,11 @@
- */
- toPieChart(QWidget *parent=NULL,const char *name=NULL,WFlags f=0);
-
-+ /**
-+ * dtor
-+ */
-+ virtual ~toPieChart();
-+
- /** Create a copy of a piechart.
- * @param pie Pie chart to copy.
- * @param parent Parent widget.
-diff -uNr tora-1.3.14.1-vanilla/toresultview.cpp tora-1.3.14.1/toresultview.cpp
---- tora-1.3.14.1-vanilla/toresultview.cpp 2004-07-02 07:27:57.000000000 +0200
-+++ tora-1.3.14.1/toresultview.cpp 2004-11-11 13:39:49.347320977 +0100
-@@ -500,6 +500,12 @@
- LastMove=QPoint(-1,-1);
- }
-
-+toListView::~toListView()
-+{
-+delete AllTip;
-+AllTip = 0;
-+}
-+
- void toListView::contentsMouseDoubleClickEvent (QMouseEvent *e)
- {
- QPoint p=e->pos();
-diff -uNr tora-1.3.14.1-vanilla/toresultview.h tora-1.3.14.1/toresultview.h
---- tora-1.3.14.1-vanilla/toresultview.h 2004-07-02 07:27:57.000000000 +0200
-+++ tora-1.3.14.1/toresultview.h 2004-11-11 13:38:52.748201045 +0100
-@@ -408,6 +408,10 @@
- */
- toListView(QWidget *parent,const char *name=NULL,WFlags f=0);
-
-+ /**
-+ * dtor
-+ */
-+ virtual ~toListView();
- /** Get SQL name of list.
- */
- virtual QString sqlName(void)
diff --git a/dev-db/tora/files/tora-1.3.14.1-triggers.diff b/dev-db/tora/files/tora-1.3.14.1-triggers.diff
deleted file mode 100644
index b30182cccf76..000000000000
--- a/dev-db/tora/files/tora-1.3.14.1-triggers.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- tobrowser.cpp.orig 2004-09-10 18:05:29.000000000 +0200
-+++ tobrowser.cpp 2004-09-10 17:58:45.000000000 +0200
-@@ -1456,6 +1456,8 @@
- curr->addTab(resultExtract,tr("Script"));
- SecondMap[TAB_TRIGGER_EXTRACT]=resultExtract;
-
-+ connect(curr,SIGNAL(currentChanged(QWidget *)),this,SLOT(changeSecondTab(QWidget *)));
-+
- splitter=new QSplitter(Horizontal,TopTab,TAB_ACCESS);
- TopTab->addTab(splitter,tr("Access"));
- #ifdef TOEXTENDED_MYSQL
diff --git a/dev-db/tora/files/tora-1.3.15-configure.diff b/dev-db/tora/files/tora-1.3.15-configure.diff
deleted file mode 100644
index a7060e2e4229..000000000000
--- a/dev-db/tora/files/tora-1.3.15-configure.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: configure.pl
-===================================================================
-RCS file: /cvsroot/tora/tora/configure.pl,v
-retrieving revision 1.177
-diff -u -p -r1.177 configure.pl
---- configure.pl 18 Feb 2005 22:07:47 -0000 1.177
-+++ configure.pl 21 Feb 2005 17:45:38 -0000
-@@ -1046,6 +1046,9 @@ __TEMP__
- $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/plsql/public");
- $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/public");
- $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/network/public");
-+ if ( $ENV{C_INCLUDE_PATH} ) {
-+ $Includes=&addInclude($Includes,$ENV{C_INCLUDE_PATH});
-+ }
- $Includes=&addInclude($Includes,$QtInclude);
-
- if (!$ForceTarget) {
-@@ -1376,10 +1379,6 @@ __EOT__
- print MAKEFILE "\t".join(".cpp \\\n\t",sort @allsource).
- ".cpp\n\ndefault: all\n";
-
-- if ($OracleFound) {
-- print MAKEFILE "include \$(ORACLE_HOME)/rdbms/lib/env_rdbms.mk\n";
-- }
--
- print MAKEFILE "\nTRANSLATIONS=\\\n";
- for my $t (@translations) {
- print MAKEFILE "\t$t.ts\\\n";
diff --git a/dev-db/tora/tora-1.3.14.1-r1.ebuild b/dev-db/tora/tora-1.3.14.1-r1.ebuild
deleted file mode 100644
index 615d158a3f62..000000000000
--- a/dev-db/tora/tora-1.3.14.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.14.1-r1.ebuild,v 1.3 2005/01/29 14:04:26 greg_g Exp $
-
-inherit debug eutils kde-functions
-
-IUSE="kde oracle debug"
-DESCRIPTION="TOra - Toolkit For Oracle"
-HOMEPAGE="http://www.globecom.se/tora/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-alpha-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-
-DEPEND=">=x11-libs/qt-3.0.0
- dev-lang/perl
- kde? ( >=kde-base/kdelibs-3.1 )"
-
-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}
- # http://sourceforge.net/tracker/index.php?func=detail&aid=1025950&group_id=16636&atid=316636
- epatch ${FILESDIR}/tora-1.3.14.1-triggers.diff
-
- # http://sourceforge.net/tracker/index.php?func=detail&aid=996061&group_id=16636&atid=316636
-
- epatch ${FILESDIR}/tora-1.3.14.1-invalidobjects.diff
- # http://sourceforge.net/tracker/index.php?func=detail&aid=1048530&group_id=16636&atid=316636
- epatch ${FILESDIR}/tora-1.3.14.1-race.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"
-
- ./configure $myconf || die "configure failed"
- emake || die "emake failed"
-}
-
-src_install() {
- make install ROOT=${D}
- dodoc LICENSE.txt BUGS INSTALL NEWS README TODO
-}
diff --git a/dev-db/tora/tora-1.3.14.1-r2.ebuild b/dev-db/tora/tora-1.3.14.1-r2.ebuild
deleted file mode 100644
index 4c2a2c0eabab..000000000000
--- a/dev-db/tora/tora-1.3.14.1-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.14.1-r2.ebuild,v 1.3 2005/01/29 14:04:26 greg_g Exp $
-
-inherit debug eutils kde-functions
-
-IUSE="kde oracle debug"
-DESCRIPTION="TOra - Toolkit For Oracle"
-HOMEPAGE="http://www.globecom.se/tora/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-alpha-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-
-DEPEND=">=x11-libs/qt-3.0.0
- dev-lang/perl
- kde? ( >=kde-base/kdelibs-3.1 )"
-
-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}
- # http://sourceforge.net/tracker/index.php?func=detail&aid=1025950&group_id=16636&atid=316636
- epatch ${FILESDIR}/tora-1.3.14.1-triggers.diff
-
- # http://sourceforge.net/tracker/index.php?func=detail&aid=996061&group_id=16636&atid=316636
-
- epatch ${FILESDIR}/tora-1.3.14.1-invalidobjects.diff
- # http://sourceforge.net/tracker/index.php?func=detail&aid=1048530&group_id=16636&atid=316636
- epatch ${FILESDIR}/tora-1.3.14.1-race.patch
-
- # http://sourceforge.net/tracker/index.php?func=detail&aid=1055777&group_id=16636&atid=316636
- epatch ${FILESDIR}/tora-1.3.14.1-noblockquery.diff
-
- # http://sourceforge.net/tracker/index.php?func=detail&aid=1055783&group_id=16636&atid=316636
- epatch ${FILESDIR}/tora-1.3.14.1-oracleextract.diff
-
- # http://sourceforge.net/tracker/index.php?func=detail&aid=1057806&group_id=16636&atid=316636
- epatch ${FILESDIR}/tora-1.3.14.1-resultcontent-dtor.diff
-
- # http://sourceforge.net/tracker/index.php?func=detail&aid=1058979&group_id=16636&atid=316636
- epatch ${FILESDIR}/tora-1.3.14.1-tooltip-memleaks.diff
-
- # http://sourceforge.net/tracker/index.php?func=detail&aid=1059686&group_id=16636&atid=316636
- epatch ${FILESDIR}/tora-1.3.14.1-connection-memleak.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
-}
diff --git a/dev-db/tora/tora-1.3.15-r1.ebuild b/dev-db/tora/tora-1.3.15-r1.ebuild
deleted file mode 100644
index 3f17ec3674a6..000000000000
--- a/dev-db/tora/tora-1.3.15-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.15-r1.ebuild,v 1.1 2005/02/21 18:58:21 rizzo Exp $
-
-inherit debug eutils kde-functions
-
-IUSE="kde oracle debug"
-DESCRIPTION="TOra - Toolkit For Oracle"
-HOMEPAGE="http://www.globecom.se/tora/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-
-DEPEND=">=x11-libs/qt-3.0.0
- dev-lang/perl
- kde? ( >=kde-base/kdelibs-3.1 )"
-
-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.15-configure.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
-}
diff --git a/dev-db/tora/tora-1.3.15.ebuild b/dev-db/tora/tora-1.3.15.ebuild
deleted file mode 100644
index 2d474178fbc1..000000000000
--- a/dev-db/tora/tora-1.3.15.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.15.ebuild,v 1.1 2005/02/17 21:17:21 rizzo Exp $
-
-inherit debug eutils kde-functions
-
-IUSE="kde oracle debug"
-DESCRIPTION="TOra - Toolkit For Oracle"
-HOMEPAGE="http://www.globecom.se/tora/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-
-DEPEND=">=x11-libs/qt-3.0.0
- dev-lang/perl
- kde? ( >=kde-base/kdelibs-3.1 )"
-
-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="--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
-}
diff --git a/dev-db/tora/tora-1.3.16.ebuild b/dev-db/tora/tora-1.3.16.ebuild
index 4e893876e3ec..f75bf57b9769 100644
--- a/dev-db/tora/tora-1.3.16.ebuild
+++ b/dev-db/tora/tora-1.3.16.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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.ebuild,v 1.1 2005/03/04 16:09:45 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.16.ebuild,v 1.2 2005/03/08 17:34:57 rizzo Exp $
inherit debug eutils kde-functions
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
DEPEND=">=x11-libs/qt-3.0.0
dev-lang/perl