| 1 |
haubi 14/10/03 16:10:40 |
| 2 |
|
| 3 |
Modified: ChangeLog tora-9999.ebuild |
| 4 |
Log: |
| 5 |
tora-9999: drop ext-loki patch, updated along bug#523262, thanks to Sergey S. Starikoff |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A630CCB8) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.105 dev-db/tora/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/ChangeLog?rev=1.105&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/ChangeLog?rev=1.105&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/ChangeLog?r1=1.104&r2=1.105 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v |
| 19 |
retrieving revision 1.104 |
| 20 |
retrieving revision 1.105 |
| 21 |
diff -u -r1.104 -r1.105 |
| 22 |
--- ChangeLog 18 Sep 2014 06:59:59 -0000 1.104 |
| 23 |
+++ ChangeLog 3 Oct 2014 16:10:40 -0000 1.105 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for dev-db/tora |
| 26 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.104 2014/09/18 06:59:59 haubi Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.105 2014/10/03 16:10:40 haubi Exp $ |
| 29 |
+ |
| 30 |
+ 03 Oct 2014; Michael Haubenwallner <haubi@g.o> tora-9999.ebuild, |
| 31 |
+ -files/tora-9999-ext-loki.patch: |
| 32 |
+ drop ext-loki patch, updated along bug#523262, thanks to Sergey S. Starikoff |
| 33 |
|
| 34 |
18 Sep 2014; Michael Haubenwallner <haubi@g.o> -tora-2.1.3-r1.ebuild: |
| 35 |
drop old, bug#523014 |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.4 dev-db/tora/tora-9999.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/tora-9999.ebuild?rev=1.4&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/tora-9999.ebuild?rev=1.4&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/tora-9999.ebuild?r1=1.3&r2=1.4 |
| 44 |
|
| 45 |
Index: tora-9999.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/tora/tora-9999.ebuild,v |
| 48 |
retrieving revision 1.3 |
| 49 |
retrieving revision 1.4 |
| 50 |
diff -u -r1.3 -r1.4 |
| 51 |
--- tora-9999.ebuild 8 Mar 2013 16:40:24 -0000 1.3 |
| 52 |
+++ tora-9999.ebuild 3 Oct 2014 16:10:40 -0000 1.4 |
| 53 |
@@ -1,8 +1,8 @@ |
| 54 |
-# Copyright 1999-2013 Gentoo Foundation |
| 55 |
+# Copyright 1999-2014 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-9999.ebuild,v 1.3 2013/03/08 16:40:24 haubi Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-9999.ebuild,v 1.4 2014/10/03 16:10:40 haubi Exp $ |
| 59 |
|
| 60 |
-EAPI=2 |
| 61 |
+EAPI=5 |
| 62 |
|
| 63 |
inherit cmake-utils eutils |
| 64 |
|
| 65 |
@@ -15,7 +15,7 @@ |
| 66 |
fi |
| 67 |
|
| 68 |
DESCRIPTION="TOra - Toolkit For Oracle" |
| 69 |
-HOMEPAGE="http://tora.sourceforge.net" |
| 70 |
+HOMEPAGE="http://torasql.com/" |
| 71 |
IUSE="debug mysql oracle oci8-instant-client postgres" |
| 72 |
|
| 73 |
SLOT="0" |
| 74 |
@@ -23,16 +23,14 @@ |
| 75 |
KEYWORDS="" |
| 76 |
|
| 77 |
DEPEND=" |
| 78 |
+ virtual/pkgconfig |
| 79 |
dev-libs/ferrisloki |
| 80 |
x11-libs/qscintilla |
| 81 |
dev-qt/qtgui:4 |
| 82 |
dev-qt/qtsql:4[mysql?,postgres?] |
| 83 |
dev-qt/qtxmlpatterns:4 |
| 84 |
- oci8-instant-client? ( |
| 85 |
- dev-db/oracle-instantclient-basic |
| 86 |
- dev-db/oracle-instantclient-sqlplus |
| 87 |
- ) |
| 88 |
- postgres? ( dev-db/postgresql-server ) |
| 89 |
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic ) |
| 90 |
+ postgres? ( dev-db/postgresql-base ) |
| 91 |
" |
| 92 |
RDEPEND="${DEPEND}" |
| 93 |
|
| 94 |
@@ -46,13 +44,12 @@ |
| 95 |
eerror "Otherwise specify -oracle in your USE variable." |
| 96 |
eerror |
| 97 |
eerror "You can download the Oracle software from" |
| 98 |
- eerror "http://www.oracle.com/technetwork/indexes/downloads/" |
| 99 |
+ eerror "http://otn.oracle.com/software/content.html" |
| 100 |
die |
| 101 |
fi |
| 102 |
} |
| 103 |
|
| 104 |
src_prepare() { |
| 105 |
- epatch "${FILESDIR}"/${P}-ext-loki.patch #383109 |
| 106 |
sed -i \ |
| 107 |
-e "/COPYING/ d" \ |
| 108 |
CMakeLists.txt || die "Removal of COPYING file failed" |
| 109 |
@@ -73,6 +70,8 @@ |
| 110 |
-DWANT_BUNDLE_STANDALONE=OFF |
| 111 |
-DWANT_INTERNAL_QSCINTILLA=OFF |
| 112 |
-DWANT_INTERNAL_LOKI=OFF |
| 113 |
+ -DLOKI_LIBRARY="$(pkg-config --variable=libdir ferrisloki)/libferrisloki.so" |
| 114 |
+ -DLOKI_INCLUDE_DIR="$(pkg-config --variable=includedir ferrisloki)/FerrisLoki" |
| 115 |
$(cmake-utils_use_enable postgres PGSQL) |
| 116 |
$(cmake-utils_use_want debug) |
| 117 |
# path variables |
| 118 |
@@ -83,6 +82,6 @@ |
| 119 |
|
| 120 |
src_install() { |
| 121 |
cmake-utils_src_install |
| 122 |
- doicon src/icons/${PN}.xpm || die |
| 123 |
- domenu debian/${PN}.desktop || die |
| 124 |
+ doicon src/icons/${PN}.xpm |
| 125 |
+ domenu src/${PN}.desktop |
| 126 |
} |
Archives