diff options
author | Michael Haubenwallner <haubi@gentoo.org> | 2012-09-26 06:50:53 +0000 |
---|---|---|
committer | Michael Haubenwallner <haubi@gentoo.org> | 2012-09-26 06:50:53 +0000 |
commit | a8d325aadf52c0e00f0866c89af350e5dfea5067 (patch) | |
tree | 8edd381d38571ca709bf1cd9ac4f88fcfe4ab85e /dev-db | |
parent | Specify LICENSE more precisely. Bump ebuild to EAPI 4. (diff) | |
download | historical-a8d325aadf52c0e00f0866c89af350e5dfea5067.tar.gz historical-a8d325aadf52c0e00f0866c89af350e5dfea5067.tar.bz2 historical-a8d325aadf52c0e00f0866c89af350e5dfea5067.zip |
Use dev-libs/ferrisloki instead of bundled one, bug#383109.
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/tora/ChangeLog | 8 | ||||
-rw-r--r-- | dev-db/tora/Manifest | 10 | ||||
-rw-r--r-- | dev-db/tora/files/tora-2.1.3-ext-loki.patch | 84 | ||||
-rw-r--r-- | dev-db/tora/tora-2.1.3-r2.ebuild | 80 |
4 files changed, 177 insertions, 5 deletions
diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog index af327785fc96..b2b49b4d0054 100644 --- a/dev-db/tora/ChangeLog +++ b/dev-db/tora/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/tora # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.94 2012/09/24 19:49:08 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.95 2012/09/26 06:50:53 haubi Exp $ + +*tora-2.1.3-r2 (25 Sep 2012) + + 25 Sep 2012; Michael Haubenwallner <haubi@gentoo.org> +tora-2.1.3-r2.ebuild, + +files/tora-2.1.3-ext-loki.patch: + Use dev-libs/ferrisloki instead of bundled one, bug#383109. 24 Sep 2012; Michael Haubenwallner <haubi@gentoo.org> tora-2.1.3-r1.ebuild, +files/tora-2.1.3-gcc-4.7.patch: diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest index f098f794f103..be84dd4e2e52 100644 --- a/dev-db/tora/Manifest +++ b/dev-db/tora/Manifest @@ -2,17 +2,19 @@ Hash: SHA1 AUX tora-2.1.2-qt47.patch 446 RMD160 9453e46dbe60e7ab441ef802b241c3ac3da76026 SHA1 312db8f8c89659d6c0cd4d71b5816530a6515bbf SHA256 fabd80f233de1ac9c5dcbc80ac10e70289bf4a58c7984e490c19f91897593add +AUX tora-2.1.3-ext-loki.patch 2700 RMD160 fb4b8be632b0bf6c04ce75ad807ff2e703b45c67 SHA1 84ef94b5a2b60d1359b566f071552ca5745ff539 SHA256 b0ecdda09f05e196b7473d8156ded9c79effa25d55270abb1ff383915ed06848 AUX tora-2.1.3-gcc-4.7.patch 661 RMD160 a4cea19ceb26fb77d504cb9cbaf8ebbc88ee4dcb SHA1 8203483b423db2f8efab937d7c73cb9417236af1 SHA256 290648e84948253669593f3b5fd2c4d243b6a56718185935c1582e231db8631b DIST tora-2.1.1.tar.gz 5356473 RMD160 1f81d512480fdfba2d66e2cd8665da8ab70d2de3 SHA1 61a2471fd9bac2578e6fa556f98d90976ea3ef9d SHA256 5063f2adda7c14ecdbc190b1459b3ea236fb37054640635f54bc2d46a5041663 DIST tora-2.1.3.tar.gz 12284451 RMD160 084d90c94184939e24ac94109ff7940a33bed1d7 SHA1 d33ea3bafb09c5382ef4e0cb0e8ca4ed848a9155 SHA256 ecabb2f181d1fefe8c1c401f14e1fea80b49fc6bc7963ef9f202821a626e619b EBUILD tora-2.1.1.ebuild 1832 RMD160 c7a775a7708683452edf146950eafde8db14a89d SHA1 7daaf3ef0280d34c4ba06ff443e9d8e671fb2eb0 SHA256 93d20b1990a126bd5900268477f0165311fd80b8fd3a3f9cd1b95914947b55a6 EBUILD tora-2.1.3-r1.ebuild 1954 RMD160 72b6a77551579c0863f11f81e0dea935db16504b SHA1 62d94eeb1b1e45380fee0f883676decd46599a20 SHA256 1a6c22f29c35e5a7c8a2cbc931ddb9fbf62f84a08419307127c9ddff0376ec47 -MISC ChangeLog 13949 RMD160 91c800b3a26d1a787410cf41a66430b675232400 SHA1 5710e8e67aaa7fed4ae0fe3ed8454407e28d37be SHA256 967fc1ce7a490710996d96d5e296d1ad3935da9342ab233bbe19730058e52ea1 +EBUILD tora-2.1.3-r2.ebuild 2038 RMD160 c796b868945fc48c4e1f05ad367b30b34b635f55 SHA1 9370d2bae9a349abd91d1b5fac9b8b9b4ee588e2 SHA256 11a490e8fba5725896c4109f3cdd6ada38e31232145adaad11a131ad89c39043 +MISC ChangeLog 14157 RMD160 e6c8e1d0a771c5e28c32e536b909ab636d225c69 SHA1 605492201950d1abb3ada287b809cc3ee2951e27 SHA256 7599467da1e82e2b677528351325f6300d5b1b86f34a2604665b1baf5ae98656 MISC metadata.xml 488 RMD160 5d3c243d2111e5dddd7dd0b3986fa09be9d9bcb2 SHA1 26c23ee899733d67d467613f1edfc097e64ea3f7 SHA256 928af37742c0b69bdfa30d41ed060502fce397e7e80f8278aa7ce9597306297c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAlBguTwACgkQLc0TWKYwzLij9gCfbmX9cFWl2+p1cqUVDilkYRuv -FMIAmgNitAZ6jusaHpA5ZkBYizOjjGsw -=oWO5 +iEYEARECAAYFAlBipdUACgkQLc0TWKYwzLh99QCeKfPPx7ce38vipeJxbK2zPPRA +TfgAn3Duibn6ivmQ4FjVdinLNgQ6hfvQ +=HXZH -----END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..dec482a31bc1 --- /dev/null +++ b/dev-db/tora/files/tora-2.1.3-ext-loki.patch @@ -0,0 +1,84 @@ +--- 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/tora-2.1.3-r2.ebuild b/dev-db/tora/tora-2.1.3-r2.ebuild new file mode 100644 index 000000000000..82f141f8ba60 --- /dev/null +++ b/dev-db/tora/tora-2.1.3-r2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/09/26 06:50:53 haubi Exp $ + +EAPI=2 + +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 + x11-libs/qt-gui:4 + x11-libs/qt-sql:4[mysql?,postgres?] + x11-libs/qt-xmlpatterns: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 + 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 +} |