Drop old and broken version, bug #522180

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x60C0742D1F357D42)

5 files changed, 7 insertions, 211 deletions

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index 0a8bcbae7535..7355d7bab2db 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/tora
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.111 2014/12/29 02:28:25 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.112 2015/02/20 09:54:23 pinkbyte Exp $
+
+  20 Feb 2015; Sergey Popov <pinkbyte@gentoo.org> -tora-2.1.3-r3.ebuild,
+  -files/tora-2.1.3-desktop.patch, -files/tora-2.1.3-ext-loki.patch,
+  -files/tora-2.1.3-gcc-4.7.patch:
+  Drop old and broken version, bug #522180
 
   29 Dec 2014; Patrick Lauer <patrick@gentoo.org> tora-3.0.0_pre20140929.ebuild:
   Fix postgresql dependency
diff --git a/dev-db/tora/files/tora-2.1.3-desktop.patch b/dev-db/tora/files/tora-2.1.3-desktop.patch
deleted file mode 100644
index 1e4d2d35f043..000000000000
--- a/dev-db/tora/files/tora-2.1.3-desktop.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/484198
-
---- debian/tora.desktop.orig	2013-10-30 21:37:09.624133990 +0100
-+++ debian/tora.desktop	2013-10-30 21:37:51.847371678 +0100
-@@ -4,11 +4,11 @@
- Exec=tora
- Icon=tora
- Type=Application
--MimeType=application/x-tora
-+MimeType=application/x-tora;
- Comment=A graphical toolkit for database administration and development
- Comment[fr]=Une boite à outil graphique pour l'administration et le développement de base de données
- Comment[de]=Grafisches Toolkit zur Administration und Entwicklung von Datenbanken
- X-KDE-StartupNotify=true
- Terminal=false
--Categories=Database;Office;Development;KDE;Qt
-+Categories=Database;Office;Development;KDE;Qt;
- 
diff --git a/dev-db/tora/files/tora-2.1.3-ext-loki.patch b/dev-db/tora/files/tora-2.1.3-ext-loki.patch
deleted file mode 100644
index dec482a31bc1..000000000000
--- a/dev-db/tora/files/tora-2.1.3-ext-loki.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- CMakeLists.txt.orig	2012-09-25 21:47:27.591130679 +0200
-+++ CMakeLists.txt	2012-09-25 21:51:02.953508806 +0200
-@@ -4,6 +4,7 @@
- # options available for user's input
- OPTION(WANT_DEBUG "Set the debug build and possible additional outputs" OFF)
- OPTION(WANT_INTERNAL_QSCINTILLA "Use internal/bundled QScintilla2 source" OFF)
-+OPTION(WANT_INTERNAL_LOKI "Use internal/bundled Loki source" OFF)
- OPTION(ENABLE_ORACLE "Enable/Disable Oracle support at all. Including detection" ON)
- OPTION(ENABLE_PGSQL "Enable/Disable PostgreSQL support. Including detection" ON)
- OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON)
-@@ -50,6 +51,7 @@
- INCLUDE(CheckCXXCompilerFlag)
- INCLUDE(CheckTypeSize)
- INCLUDE(TestBigEndian)
-+INCLUDE(FindPkgConfig)
- 
- #Set the custom CMake module directory where our include/lib finders are
- SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
-@@ -197,6 +199,10 @@
-     MESSAGE(FATAL_ERROR "No Qt4 found")
- ENDIF(QT_FOUND)
- 
-+IF (WANT_INTERNAL_LOKI)
-+ELSE (WANT_INTERNAL_LOKI)
-+  pkg_check_modules(LOKI REQUIRED  ferrisloki)
-+ENDIF (WANT_INTERNAL_LOKI)
- 
- IF (WANT_INTERNAL_QSCINTILLA)
-     MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.")
---- src/CMakeLists.txt.orig	2012-09-25 22:45:20.702694011 +0200
-+++ src/CMakeLists.txt	2012-09-25 22:47:39.742124547 +0200
-@@ -3,7 +3,10 @@
- 
- #Subdirectories
- # ADD_SUBDIRECTORY(i18n)
--ADD_SUBDIRECTORY(loki)
-+# Default: loki as 3rd party lib!
-+IF (WANT_INTERNAL_LOKI)
-+  ADD_SUBDIRECTORY(loki)
-+ENDIF(WANT_INTERNAL_LOKI)
- IF (WIN32)
-     ADD_SUBDIRECTORY(windows)
- ENDIF (WIN32)
-@@ -468,7 +471,9 @@
- QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES})
- 
- 
--LINK_DIRECTORIES(./loki)
-+IF (WANT_INTERNAL_LOKI)
-+  LINK_DIRECTORIES(./loki)
-+ENDIF(WANT_INTERNAL_LOKI)
- IF (WIN32)
-     LINK_DIRECTORIES(./windows)
- ENDIF (WIN32)
-@@ -477,7 +482,10 @@
- ENDIF (WANT_INTERNAL_QSCINTILLA)
- 
- 
--SET(TORA_LOKI_LIB "tora_loki_lib")
-+IF (WANT_INTERNAL_LOKI)
-+  SET(LOKI_LIBRARIES "tora_loki_lib")
-+  SET(LOKI_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/loki/include)
-+ENDIF(WANT_INTERNAL_LOKI)
- IF (WANT_INTERNAL_QSCINTILLA)
-     SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib)
- ENDIF (WANT_INTERNAL_QSCINTILLA)
-@@ -493,7 +501,7 @@
-   ${CMAKE_CURRENT_SOURCE_DIR}
-   ${CMAKE_BINARY_DIR}
-   ${QT_INCLUDES}
--  ${CMAKE_CURRENT_SOURCE_DIR}/loki/include
-+  ${LOKI_INCLUDE_DIRS}
-   ${CMAKE_CURRENT_SOURCE_DIR}/otl
- )
- 
-@@ -590,7 +598,7 @@
- ENDIF (USE_TROTL)
- 
- # static
--TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LOKI_LIB})
-+TARGET_LINK_LIBRARIES(${EXE_NAME} ${LOKI_LIBRARIES})
- IF (WANT_INTERNAL_QSCINTILLA)
-     TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_QSCINTILLA_LIB} ${QT_LIBRARIES})
- ENDIF (WANT_INTERNAL_QSCINTILLA)
diff --git a/dev-db/tora/files/tora-2.1.3-gcc-4.7.patch b/dev-db/tora/files/tora-2.1.3-gcc-4.7.patch
deleted file mode 100644
index efcdbf42418c..000000000000
--- a/dev-db/tora/files/tora-2.1.3-gcc-4.7.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://tora.svn.sourceforge.net/viewvc/tora?view=revision&revision=4264
-
---- trunk/tora/src/toextract.cpp	2012/04/17 16:08:26	4263
-+++ trunk/tora/src/toextract.cpp	2012/04/20 01:49:18	4264
-@@ -58,6 +58,9 @@
- #include <winsock2.h>
- #endif
- 
-+#ifndef Q_OS_WIN32
-+#include <unistd.h>
-+#endif
- 
- std::map<QString, toExtract::extractor *> *toExtract::Extractors;
- 
---- trunk/tora/src/toreport.cpp	2012/04/17 16:08:26	4263
-+++ trunk/tora/src/toreport.cpp	2012/04/20 01:49:18	4264
-@@ -52,6 +52,9 @@
- #ifdef Q_OS_WIN32
- #include <winsock2.h>
- #endif
-+#ifndef Q_OS_WIN32
-+#include <unistd.h>
-+#endif
- 
- 
- static bool SameContext(const QString &str, const QString &str2)
diff --git a/dev-db/tora/tora-2.1.3-r3.ebuild b/dev-db/tora/tora-2.1.3-r3.ebuild
deleted file mode 100644
index 56419bc431a4..000000000000
--- a/dev-db/tora/tora-2.1.3-r3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.3-r3.ebuild,v 1.3 2014/12/28 15:20:50 titanofold Exp $
-
-EAPI=3
-
-inherit cmake-utils eutils
-
-DESCRIPTION="TOra - Toolkit For Oracle"
-HOMEPAGE="http://tora.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-IUSE="debug mysql oracle oci8-instant-client postgres"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="
-	dev-libs/ferrisloki
-	x11-libs/qscintilla
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4[mysql?,postgres?]
-	dev-qt/qtxmlpatterns:4
-	oci8-instant-client? (
-		dev-db/oracle-instantclient-basic
-		dev-db/oracle-instantclient-sqlplus
-	)
-	postgres? ( dev-db/postgresql[server] )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ( use oracle || use oci8-instant-client ) && [ -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_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc-4.7.patch #430044
-	epatch "${FILESDIR}"/${P}-ext-loki.patch #383109
-	epatch "${FILESDIR}"/${P}-desktop.patch #484198
-	sed -i \
-		-e "/COPYING/ d" \
-		CMakeLists.txt || die "Removal of COPYING file failed"
-}
-
-src_configure() {
-	local mycmakeargs=()
-	if use oracle || use oci8-instant-client ; then
-		mycmakeargs=(-DENABLE_ORACLE=ON)
-	else
-		mycmakeargs=(-DENABLE_ORACLE=OFF)
-	fi
-	mycmakeargs+=(
-		-DWANT_RPM=OFF
-		-DWANT_BUNDLE=OFF
-		-DWANT_BUNDLE_STANDALONE=OFF
-		-DWANT_INTERNAL_QSCINTILLA=OFF
-		-DWANT_INTERNAL_LOKI=OFF
-		$(cmake-utils_use_enable postgres PGSQL)
-		$(cmake-utils_use_want debug)
-		# path variables
-		-DTORA_DOC_DIR=share/doc/${PF}
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon src/icons/${PN}.xpm || die
-	domenu debian/${PN}.desktop || die
-}