| 1 |
haubi 13/10/30 21:22:41 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: tora-2.1.3-r3.ebuild |
| 5 |
Log: |
| 6 |
+tora-2.1.3-r3: Fix tora.desktop file to pass validation, bug#484198. |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A630CCB8) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.102 dev-db/tora/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/ChangeLog?rev=1.102&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/ChangeLog?rev=1.102&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/ChangeLog?r1=1.101&r2=1.102 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v |
| 20 |
retrieving revision 1.101 |
| 21 |
retrieving revision 1.102 |
| 22 |
diff -u -r1.101 -r1.102 |
| 23 |
--- ChangeLog 25 Sep 2013 17:30:59 -0000 1.101 |
| 24 |
+++ ChangeLog 30 Oct 2013 21:22:41 -0000 1.102 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for dev-db/tora |
| 27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.101 2013/09/25 17:30:59 ago Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.102 2013/10/30 21:22:41 haubi Exp $ |
| 30 |
+ |
| 31 |
+*tora-2.1.3-r3 (30 Oct 2013) |
| 32 |
+ |
| 33 |
+ 30 Oct 2013; Michael Haubenwallner <haubi@g.o> +tora-2.1.3-r3.ebuild, |
| 34 |
+ +files/tora-2.1.3-desktop.patch: |
| 35 |
+ Fix tora.desktop file to pass validation, bug#484198. |
| 36 |
+ Bump EAPI 3. |
| 37 |
|
| 38 |
25 Sep 2013; Agostino Sarubbo <ago@g.o> tora-2.1.3-r2.ebuild: |
| 39 |
Stable for ppc, wrt bug #477176 |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 dev-db/tora/tora-2.1.3-r3.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/tora-2.1.3-r3.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/tora/tora-2.1.3-r3.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: tora-2.1.3-r3.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2013 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.3-r3.ebuild,v 1.1 2013/10/30 21:22:41 haubi Exp $ |
| 53 |
|
| 54 |
EAPI=3 |
| 55 |
|
| 56 |
inherit cmake-utils eutils |
| 57 |
|
| 58 |
DESCRIPTION="TOra - Toolkit For Oracle" |
| 59 |
HOMEPAGE="http://tora.sourceforge.net" |
| 60 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 61 |
IUSE="debug mysql oracle oci8-instant-client postgres" |
| 62 |
|
| 63 |
SLOT="0" |
| 64 |
LICENSE="GPL-2" |
| 65 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 66 |
|
| 67 |
DEPEND=" |
| 68 |
dev-libs/ferrisloki |
| 69 |
x11-libs/qscintilla |
| 70 |
dev-qt/qtgui:4 |
| 71 |
dev-qt/qtsql:4[mysql?,postgres?] |
| 72 |
dev-qt/qtxmlpatterns:4 |
| 73 |
oci8-instant-client? ( |
| 74 |
dev-db/oracle-instantclient-basic |
| 75 |
dev-db/oracle-instantclient-sqlplus |
| 76 |
) |
| 77 |
postgres? ( dev-db/postgresql-server ) |
| 78 |
" |
| 79 |
RDEPEND="${DEPEND}" |
| 80 |
|
| 81 |
pkg_setup() { |
| 82 |
if ( use oracle || use oci8-instant-client ) && [ -z "$ORACLE_HOME" ] ; then |
| 83 |
eerror "ORACLE_HOME variable is not set." |
| 84 |
eerror |
| 85 |
eerror "You must install Oracle >= 8i client for Linux in" |
| 86 |
eerror "order to compile TOra with Oracle support." |
| 87 |
eerror |
| 88 |
eerror "Otherwise specify -oracle in your USE variable." |
| 89 |
eerror |
| 90 |
eerror "You can download the Oracle software from" |
| 91 |
eerror "http://otn.oracle.com/software/content.html" |
| 92 |
die |
| 93 |
fi |
| 94 |
} |
| 95 |
|
| 96 |
src_prepare() { |
| 97 |
epatch "${FILESDIR}"/${P}-gcc-4.7.patch #430044 |
| 98 |
epatch "${FILESDIR}"/${P}-ext-loki.patch #383109 |
| 99 |
epatch "${FILESDIR}"/${P}-desktop.patch #484198 |
| 100 |
sed -i \ |
| 101 |
-e "/COPYING/ d" \ |
| 102 |
CMakeLists.txt || die "Removal of COPYING file failed" |
| 103 |
} |
| 104 |
|
| 105 |
src_configure() { |
| 106 |
local mycmakeargs=() |
| 107 |
if use oracle || use oci8-instant-client ; then |
| 108 |
mycmakeargs=(-DENABLE_ORACLE=ON) |
| 109 |
else |
| 110 |
mycmakeargs=(-DENABLE_ORACLE=OFF) |
| 111 |
fi |
| 112 |
mycmakeargs+=( |
| 113 |
-DWANT_RPM=OFF |
| 114 |
-DWANT_BUNDLE=OFF |
| 115 |
-DWANT_BUNDLE_STANDALONE=OFF |
| 116 |
-DWANT_INTERNAL_QSCINTILLA=OFF |
| 117 |
-DWANT_INTERNAL_LOKI=OFF |
| 118 |
$(cmake-utils_use_enable postgres PGSQL) |
| 119 |
$(cmake-utils_use_want debug) |
| 120 |
# path variables |
| 121 |
-DTORA_DOC_DIR=share/doc/${PF} |
| 122 |
) |
| 123 |
cmake-utils_src_configure |
| 124 |
} |
| 125 |
|
| 126 |
src_install() { |
| 127 |
cmake-utils_src_install |
| 128 |
doicon src/icons/${PN}.xpm || die |
| 129 |
domenu debian/${PN}.desktop || die |
| 130 |
} |
Archives