Drop old and broken version, bug #522180

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

6 files changed, 22 insertions, 217 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/Manifest b/dev-db/tora/Manifest
index 9ce328d4f4cc..db1144eac2d9 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,10 +1,19 @@
-AUX tora-2.1.3-desktop.patch 674 SHA256 d4b5fbdb534b8e4bd53d5cae0067fec3ef413b0686541b416ded3c9f1991114e SHA512 5de4a586ed0b5989ee3c1dfd306cc0c472bb04fe8ab67c0f19739ed93d39c94a3ff6fa02b167c31c847d9317191db79d07166e959ba76dd8d89ea38f547d8322 WHIRLPOOL 6d3aa992acc400a64425fc72e3216b01ca1ed6351def611b5af4cc111a852fb32a78e206075f79c0a1a090dd3ba725d1305565b7d32424282570d00ac89d6b42
-AUX tora-2.1.3-ext-loki.patch 2700 SHA256 b0ecdda09f05e196b7473d8156ded9c79effa25d55270abb1ff383915ed06848 SHA512 97a75b2770104e5ee0880cf0a49d47bae10cc2d880bc3a6b70a9d42461de1d76223fa5c634a71ea60ae2f3640035c39010e193b62110bf5d02d933b7bbf51e9c WHIRLPOOL 00f846f59b6db15fdb0747b77d6d60651121fe24d17c48a63f636cea24503b17473a5224fbdb8959e558d45399fa726fc59dc8c1ffcb07ef513907dfab639871
-AUX tora-2.1.3-gcc-4.7.patch 661 SHA256 290648e84948253669593f3b5fd2c4d243b6a56718185935c1582e231db8631b SHA512 152c3843772f18fd601752aea08a7a1f2924c56590375661dfcb44c7af47c6f20ca08f914cb3aa4e55d80046f26e6c0110bfe9c6721f834c178e3c48cb4065e9 WHIRLPOOL 54dd3bf7dc6e0ca3352bc719284661bbdb0460a8644da299f43aac6776dc2591c595ca70230ac215d01cd853af4ab69369b41d879a1dfab42ec156ec4bba79c9
-DIST tora-2.1.3.tar.gz 12284451 SHA256 ecabb2f181d1fefe8c1c401f14e1fea80b49fc6bc7963ef9f202821a626e619b SHA512 817de0eed05dcc89baf5dbf51d88577cf21b809435d76eef76bfc5ad9e5b5c8228c5cf0ac41d126144e3b41feb73fba04e62af7564fde2a11e9c81c62be59329 WHIRLPOOL aa81539e5218acd284c0bd44787220f3926734bd8c91fa7b3ddb86de6a6a50c7a8036f4bf6b5a89f246c52ff9d45533da108db9a7b1a5f5a162f20c87d5953d4
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST tora-3.0.0_pre20140929.tar.xz 9038680 SHA256 67fb6273c930b4ba4cbc185fd3e2a68b8c7029098b14f729ffbdfa09ed91af2b SHA512 42bc76d8bbed8a5cfee447ea6dec9966a31ef740d3ab58078ecdfc12f725cc94568fbb96d044668ae5fd83def5ab35823df6dee77b630e7903edfd1521b87b73 WHIRLPOOL 7fcf7fbe06d1fa4d31a88674f011c634ec9ef12003a074c8185a981650fff8aef85725007f51a3e463d95f332fde724392fd748d4fdbc464663a2da3b8ec8693
-EBUILD tora-2.1.3-r3.ebuild 2084 SHA256 10647830cf7bd28c1f3933fe6bb37be658b6ab559178f965d142cf4d5b451ef3 SHA512 1fc24727a422f857a9cca109376a81cff0bc3e58bc53950ae61018697386710df7f715faa6b6069efe1d8f0740c842a2f8ec421efc87892343a670c5092aea0f WHIRLPOOL dbc072cd7019c06f4bd595c77f6f71c56daa79bd96486218aacfbeae8d4e420450c3bfaba4a1dfc416487493c58edf42bc4b1578ca5fdd81c929b84187350d15
 EBUILD tora-3.0.0_pre20140929.ebuild 1978 SHA256 4d5fb6f2c5eadf9f2fc2c13501ee21fd7d6c594001d0bc7af5d3b4b9d4850dd2 SHA512 a93b8889e1bf28a4ad2eca3f17ddbb33beecdcaf18ac74d57e6e446eac312e5aebd90b15ee606119e0def1ce2ef4dc89d7fa31168517ec2ed5d0966f59eb9c67 WHIRLPOOL e1444c864e6673ae654ed06547050db0e308bb66eae90efc7ef241c3c20b48a46689d2d964f93b16c0c64f4769d06ee1180b490acb639fec71fff4db98bf26f8
 EBUILD tora-9999.ebuild 2269 SHA256 2807c3c58d271e4dfb96947a84704710378951fb81add4cbd51b7419fca8d7d3 SHA512 d891a80d037396511403af3ca04fa1e7cd5cf08e66a67842d8706ea662b2213d50291c155e4a23c40f8089842f4a98bc28913f16cfc641163e7d9ce444ab8bbe WHIRLPOOL 9598625298e108f26814a040c27b2cb3f2306c446cca646c04dc05e54963dac45665f2dad77a548abddbec19d336e3e0cf5368f265b6f94923cfc3802e268c00
-MISC ChangeLog 16489 SHA256 a37adce31d196c08d4e04b46418572f55322d26c957317385d8edc07c1e3df24 SHA512 267a3d798eb06dea776fe2a8578d6ce6655301f4ca8ae9c51d47a9c9c92a2b9e0dcf5ea60dbd6880ad5bca34cb0716419a78cf561de3fd959ca4536087849689 WHIRLPOOL 190845a3c90f707f27b90f591bc904d64df67ba0537dcbbdfcdf4f8c6c486ce62292f9b68798bdb50749a02389c951a3b7001bbdacb17c167964e380db52d5be
+MISC ChangeLog 16711 SHA256 50af5cb6840f75ae3fa0755703bc82874a0e70a94211e3c51e2e49ac68e64981 SHA512 0ded1a65479d0d12e68e74de4b524d9eb6d59ad424c046305dc0e5a1d6a9be1d4bd8ba68834a5d42d9faea1b06b59c8b1da8c7affebf9a1825e67202c4f60234 WHIRLPOOL 9adee62199a696595894e04bd953657df3d99fef74a824eb436216ebb3683316ef1fbecca24f6b1a71bec0306c79f9c1a2a8e6b121e651bdcc9ca20f125c06e2
 MISC metadata.xml 646 SHA256 98e2edfdf95660f5b4418a33b77d0c62a1dad0f637153aa7cfed7b4706df1a54 SHA512 2ff7adad6598f7f6710a27decacaaaae77091cf85d2a743f958ffb9bc3e267367104fad3b60674d22fb7e6ebdbc10dad01d7aee781e2fc340af46afe117fa434 WHIRLPOOL bd07ea1a4bcfe96421c3381ebdb3d1e2d4d1149e2d13f7c9fde7f3127ae3ff35b53526a219edc2d424d89138fb857f2f55901b5f96ff15d7a6e11cef6916fbbd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJU5wRNAAoJECo/aRed9267Bx0H/iFhSGE7z4WxZmiECd4J+nPs
+IS61L0wx/5NLYV45hwg1i567a/nPVaw7xoRPm5wv5lLAw5CROQT2WEy5jn76dw6v
+14eWE6oQv0uIUBV5e9S9bompPgn0/QnycuyoVJPhMfDrs20tzNPuCgo9MMRHDP2i
+IVc1649y8Ha9GMOV6bIbYu6GCIdt2o0OdcMi+drgdBoCwjaO7cTo1vWSue+ClDnw
+hjwBDF9NUj4rf1Shn4TjI6Y99kCjDmK2hvvZVKk0aPuHHhYGTkCtT2sSvHy8Vtrb
+OxkAH+Emdg862qL6sIzSqBbLj+w0jSOg5tQ+MNHk4DCl1XKktmhB7tr04CGdPAw=
+=wHQ+
+-----END PGP SIGNATURE-----
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
-}