+tora-2.1.3-r3: Fix tora.desktop file to pass validation, bug#484198.

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

3 files changed, 107 insertions, 1 deletions

diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index e24ff203e55e..822893504d4c 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/tora
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.101 2013/09/25 17:30:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.102 2013/10/30 21:22:41 haubi Exp $
+
+*tora-2.1.3-r3 (30 Oct 2013)
+
+  30 Oct 2013; Michael Haubenwallner <haubi@gentoo.org> +tora-2.1.3-r3.ebuild,
+  +files/tora-2.1.3-desktop.patch:
+  Fix tora.desktop file to pass validation, bug#484198.
+  Bump EAPI 3.
 
   25 Sep 2013; Agostino Sarubbo <ago@gentoo.org> tora-2.1.3-r2.ebuild:
   Stable for ppc, wrt bug #477176
diff --git a/dev-db/tora/files/tora-2.1.3-desktop.patch b/dev-db/tora/files/tora-2.1.3-desktop.patch
new file mode 100644
index 000000000000..1e4d2d35f043
--- /dev/null
+++ b/dev-db/tora/files/tora-2.1.3-desktop.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/484198
+
+--- debian/tora.desktop.orig	2013-10-30 21:37:09.624133990 +0100
++++ debian/tora.desktop	2013-10-30 21:37:51.847371678 +0100
+@@ -4,11 +4,11 @@
+ Exec=tora
+ Icon=tora
+ Type=Application
+-MimeType=application/x-tora
++MimeType=application/x-tora;
+ Comment=A graphical toolkit for database administration and development
+ Comment[fr]=Une boite à outil graphique pour l'administration et le développement de base de données
+ Comment[de]=Grafisches Toolkit zur Administration und Entwicklung von Datenbanken
+ X-KDE-StartupNotify=true
+ Terminal=false
+-Categories=Database;Office;Development;KDE;Qt
++Categories=Database;Office;Development;KDE;Qt;
+ 
diff --git a/dev-db/tora/tora-2.1.3-r3.ebuild b/dev-db/tora/tora-2.1.3-r3.ebuild
new file mode 100644
index 000000000000..d47cee614d4c
--- /dev/null
+++ b/dev-db/tora/tora-2.1.3-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/10/30 21:22:41 haubi Exp $
+
+EAPI=3
+
+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
+	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 )
+"
+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
+	epatch "${FILESDIR}"/${P}-desktop.patch #484198
+	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
+}