haubi 14/10/03 16:10:40 Modified: ChangeLog tora-9999.ebuild Log: 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)
Revision Changes Path 1.105 dev-db/tora/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/ChangeLog?rev=1.105&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/ChangeLog?rev=1.105&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/ChangeLog?r1=1.104&r2=1.105 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- ChangeLog 18 Sep 2014 06:59:59 -0000 1.104 +++ ChangeLog 3 Oct 2014 16:10:40 -0000 1.105 @@ -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 <[email protected]> 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 <[email protected]> -tora-2.1.3-r1.ebuild: drop old, bug#523014 1.4 dev-db/tora/tora-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/tora-9999.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/tora-9999.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/tora-9999.ebuild?r1=1.3&r2=1.4 Index: tora-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/tora/tora-9999.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tora-9999.ebuild 8 Mar 2013 16:40:24 -0000 1.3 +++ tora-9999.ebuild 3 Oct 2014 16:10:40 -0000 1.4 @@ -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 @@ 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 @@ 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 @@ 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 @@ -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_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 }
