tora-9999: drop ext-loki patch, updated along bug#523262, thanks to Sergey S. Starikoff

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A630CCB8)

3 files changed, 17 insertions, 100 deletions

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index 5a29ed67148b..a4469383914a 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,10 @@
 # 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.104 2014/09/18 06:59:59 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.105 2014/10/03 16:10:40 haubi Exp $
+
+  03 Oct 2014; Michael Haubenwallner <haubi@gentoo.org> tora-9999.ebuild,
+  -files/tora-9999-ext-loki.patch:
+  drop ext-loki patch, updated along bug#523262, thanks to Sergey S. Starikoff
 
   18 Sep 2014; Michael Haubenwallner <haubi@gentoo.org> -tora-2.1.3-r1.ebuild:
   drop old, bug#523014
diff --git a/dev-db/tora/files/tora-9999-ext-loki.patch b/dev-db/tora/files/tora-9999-ext-loki.patch
deleted file mode 100644
index a6ee2faa1bc7..000000000000
--- a/dev-db/tora/files/tora-9999-ext-loki.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Naur tora-2.1.4~/CMakeLists.txt tora-2.1.4/CMakeLists.txt
---- tora-2.1.4~/CMakeLists.txt	2013-02-04 16:36:35.000000000 +0100
-+++ tora-2.1.4/CMakeLists.txt	2013-02-04 17:07:00.084287072 +0100
-@@ -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)
-@@ -54,6 +55,7 @@
- INCLUDE(CheckTypeSize)
- INCLUDE(TestBigEndian)
- INCLUDE(FindSubversion)
-+INCLUDE(FindPkgConfig)
- 
- 
- #Set the custom CMake module directory where our include/lib finders are
-@@ -222,6 +224,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.")
-diff -Naur tora-2.1.4~/src/CMakeLists.txt tora-2.1.4/src/CMakeLists.txt
---- tora-2.1.4~/src/CMakeLists.txt	2013-02-04 16:36:21.000000000 +0100
-+++ tora-2.1.4/src/CMakeLists.txt	2013-02-04 17:06:50.373408475 +0100
-@@ -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)
-@@ -497,7 +500,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)
-@@ -506,7 +511,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)
-@@ -522,7 +530,7 @@
-   ${CMAKE_CURRENT_SOURCE_DIR}
-   ${CMAKE_BINARY_DIR}
-   ${QT_INCLUDES}
--  ${CMAKE_CURRENT_SOURCE_DIR}/loki/include
-+  ${LOKI_INCLUDE_DIRS}
-   ${CMAKE_CURRENT_SOURCE_DIR}/otl
- )
- 
-@@ -648,7 +656,7 @@
- ENDIF(USE_EXPERIMENTAL)  
- 
- # 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/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild
index 26b1fb13020b..48765ed45c8e 100644
--- a/dev-db/tora/tora-9999.ebuild
+++ b/dev-db/tora/tora-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-9999.ebuild,v 1.3 2013/03/08 16:40:24 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-9999.ebuild,v 1.4 2014/10/03 16:10:40 haubi Exp $
 
-EAPI=2
+EAPI=5
 
 inherit cmake-utils eutils
 
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="TOra - Toolkit For Oracle"
-HOMEPAGE="http://tora.sourceforge.net"
+HOMEPAGE="http://torasql.com/"
 IUSE="debug mysql oracle oci8-instant-client postgres"
 
 SLOT="0"
@@ -23,16 +23,14 @@ LICENSE="GPL-2"
 KEYWORDS=""
 
 DEPEND="
+	virtual/pkgconfig
 	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 )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	postgres? ( dev-db/postgresql-base )
 "
 RDEPEND="${DEPEND}"
 
@@ -46,13 +44,12 @@ pkg_setup() {
 		eerror "Otherwise specify -oracle in your USE variable."
 		eerror
 		eerror "You can download the Oracle software from"
-		eerror "http://www.oracle.com/technetwork/indexes/downloads/"
+		eerror "http://otn.oracle.com/software/content.html"
 		die
 	fi
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ext-loki.patch #383109
 	sed -i \
 		-e "/COPYING/ d" \
 		CMakeLists.txt || die "Removal of COPYING file failed"
@@ -73,6 +70,8 @@ src_configure() {
 		-DWANT_BUNDLE_STANDALONE=OFF
 		-DWANT_INTERNAL_QSCINTILLA=OFF
 		-DWANT_INTERNAL_LOKI=OFF
+		-DLOKI_LIBRARY="$(pkg-config --variable=libdir ferrisloki)/libferrisloki.so"
+		-DLOKI_INCLUDE_DIR="$(pkg-config --variable=includedir ferrisloki)/FerrisLoki"
 		$(cmake-utils_use_enable postgres PGSQL)
 		$(cmake-utils_use_want debug)
 		# path variables
@@ -83,6 +82,6 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	doicon src/icons/${PN}.xpm || die
-	domenu debian/${PN}.desktop || die
+	doicon src/icons/${PN}.xpm
+	domenu src/${PN}.desktop
 }