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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA630CCB8

4 files changed, 114 insertions, 16 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/Manifest b/dev-db/tora/Manifest
index f2372be067b4..538c8d6a114d 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX tora-2.1.2-qt47.patch 446 SHA256 fabd80f233de1ac9c5dcbc80ac10e70289bf4a58c7984e490c19f91897593add SHA512 4a9d945cefa2a9675fc107924dfe1e3957612aad699f74dbfe7ab13bb98d0134cfba9ff7914adbcc49d1a62e4aa1bc5938ae55c3d74521411de533bab97753dd WHIRLPOOL 7569486312180609af48596704e36d35fd937dc8d4ab972b0a41b88a855de07449d358471df725114a3ee88e89d36443ad8c7bfbd2579c2e147833d8b57a2e8e
+AUX tora-2.1.3-desktop.patch 674 SHA256 d4b5fbdb534b8e4bd53d5cae0067fec3ef413b0686541b416ded3c9f1991114e SHA512 5de4a586ed0b5989ee3c1dfd306cc0c472bb04fe8ab67c0f19739ed93d39c94a3ff6fa02b167c31c847d9317191db79d07166e959ba76dd8d89ea38f547d8322 WHIRLPOOL 6d3aa992acc400a64425fc72e3216b01ca1ed6351def611b5af4cc111a852fb32a78e206075f79c0a1a090dd3ba725d1305565b7d32424282570d00ac89d6b42
 AUX tora-2.1.3-ext-loki.patch 2700 SHA256 b0ecdda09f05e196b7473d8156ded9c79effa25d55270abb1ff383915ed06848 SHA512 97a75b2770104e5ee0880cf0a49d47bae10cc2d880bc3a6b70a9d42461de1d76223fa5c634a71ea60ae2f3640035c39010e193b62110bf5d02d933b7bbf51e9c WHIRLPOOL 00f846f59b6db15fdb0747b77d6d60651121fe24d17c48a63f636cea24503b17473a5224fbdb8959e558d45399fa726fc59dc8c1ffcb07ef513907dfab639871
 AUX tora-2.1.3-gcc-4.7.patch 661 SHA256 290648e84948253669593f3b5fd2c4d243b6a56718185935c1582e231db8631b SHA512 152c3843772f18fd601752aea08a7a1f2924c56590375661dfcb44c7af47c6f20ca08f914cb3aa4e55d80046f26e6c0110bfe9c6721f834c178e3c48cb4065e9 WHIRLPOOL 54dd3bf7dc6e0ca3352bc719284661bbdb0460a8644da299f43aac6776dc2591c595ca70230ac215d01cd853af4ab69369b41d879a1dfab42ec156ec4bba79c9
 AUX tora-9999-ext-loki.patch 2816 SHA256 b495a4ee801614fccf41200fc46fece4cc18240397ad2efd3e4e134a304f1813 SHA512 55fbfa579f7c5599bfdc1aec9039bb7b9fe56590bfc8d993348e8042b307a672511792ac47cf45c3b2dfe0dd7335624375514400dcaece319416c27a274dcd70 WHIRLPOOL 33ae6c13dd561153c81fa7adcaddd332c46bd576e5e7f056f36e0b5e89f901cd50ca6d95682db8106654b34749fc09b721fd4fd4909a0a47819fbb2f5cf41ff1
@@ -10,23 +11,14 @@ DIST tora-2.1.3.tar.gz 12284451 SHA256 ecabb2f181d1fefe8c1c401f14e1fea80b49fc6bc
 EBUILD tora-2.1.1.ebuild 1811 SHA256 d9adf36e3bfdc1ccda51d84cdfe53419d643a7b696cb0fff8e91de4ee7c29422 SHA512 cd0cc6d5a6f000d746857fabcee10cfb38154168213cf8769595a4881f4700ab1df2eb70f8c348331aa018d67b4d6c71850876a0ca7762fd5a79f2d80e3bcbcb WHIRLPOOL 166b464f4d4cf53706477bba330587fb2e5e10f24f3579d28ccdbdedadad1cf654cae97d3d98e6462af1809e7b47472571bf69f50aa7caed83868e74a7eb8f38
 EBUILD tora-2.1.3-r1.ebuild 1934 SHA256 2b49f409dda6d11478344d68fa0e678283cae9927971c8f6b10e388d206874db SHA512 ffb98464ddca2d70242504b6fe98b98b0f21c0c3aff1498593875f49894fede635ef761da011a4add483421df6da9dc0db2b3cc889206e04f955dea48721655d WHIRLPOOL 3cc2d3d307bdf23cb6e38364847c8af9570a21cce26a06fafb00b92f3a78f1eacfaa2c52d8c2a2eced403236984020aab93c7d0bbd3b0e070500889c264d98ef
 EBUILD tora-2.1.3-r2.ebuild 2025 SHA256 103152b358c811d6b2582d21e8938b4a2c67d278ca2125f65fc3bbfc0270e242 SHA512 34d32d5feaa053dcb54ad0f9561dd270e778fad9d2ec7c0002e0e0953b883c0326ec67cf431ccd3eaa5165a64bb038cb76565231aa56b4d46c6a9e2d53d4ca43 WHIRLPOOL 826731c7052a6105825f84884ff182df48bc73923efef588d7514958312a2b1acdd9e9499fc144b6c716f72fea00c99eb356c9fa297c86a62302a340b6bae744
+EBUILD tora-2.1.3-r3.ebuild 2078 SHA256 456d87ae4379d3eda843a0f4981ac54beab997d3917f68053a1b1c9824304d0c SHA512 1d0d43c094be623a1cb66f70574ddc7be056230ec3b1b00ab2cfe602b6b96852807cf53cb21f42e44485b9728efc207595708aec5cd122848a0d0085e186df3e WHIRLPOOL 975bfb5516c9a29f74590738e22025694a26375ef47cd25f8346a2d0cc1d1fabd79038911676f32b389bdf7ff4d0d434e0a654c3e6424c5550aedfd678e3c61f
 EBUILD tora-9999.ebuild 2217 SHA256 d347eef217cfc4754a159d278f4bbf1d1bdcd21a03f96e833507104f5dc1b4b5 SHA512 ac432bddeeaef4cdc8f7fbad81b951480cb674f5a444acbb75b2d366ecb3599ac9d6e67514396b315108eb16be95d44096cddd226800e9ce8c55807a7fd5e5ca WHIRLPOOL 7498b4049de969aa3931653ec1efdf33e65657ba6efcb8472d670c460f08c7513baa7cc5c180a53c1d2ff374567393783f3d7800f0d98efa69c1670f1ec750b3
-MISC ChangeLog 14990 SHA256 7911553994c1a5a2e07987efeafb860219db02fd0cf477a1409dbf03d12e3f08 SHA512 9b483e533136f82456dfa71a3822425873968e1e5d9706237159833a54b8315f08dee8644a7c4fa3385c436b6c874122977e93a4619ac5e43cc1a7b678ce26a6 WHIRLPOOL 831b7b0457446beddaec5a36cf9443a98ac5c57f61f590ffc51bbcb1c50e867e3775e6d6fd6e50fd438c1e4b75b625b570bef6b2a613eec1fa0e16689315eb84
+MISC ChangeLog 15208 SHA256 2db131cae21cdf703a071b282434d33e99d76436966147d417344eb407863335 SHA512 b9344479591f6e1add3d626691eab2821009bfd91455dbfb5ff26fd71b05f04c4bf3c26ca7f1ee122ecedffc9f5fc6aa9253dc5b6f36269535b77aded79de7e7 WHIRLPOOL ce70392f8a649025bd4fd5a834d96cf028646c9acb6623f60cf4c0939d446ef9d2e2041183af8aae00f67a3599d6bc04f87ad4ce92bbc420de9c11f55be20d96
 MISC metadata.xml 488 SHA256 928af37742c0b69bdfa30d41ed060502fce397e7e80f8278aa7ce9597306297c SHA512 e92e0d2b2d79ba69f8c6a094b6b2b034a575ad91a2fba146ab271aee99b1a7550efe1e7f74f4e590febc9d9e0259ba59a6fd71af8a25f3a7862f9bb59009bc4e WHIRLPOOL 2e95444901b6ce260e5aef197f44b6988ca55fd8e2bc21ccc3020b711c1f60fd1926ad4e63bc522de8bfd2eda1d4c2801f37edd75f8ccbd167e765b665445427
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSQx0BAAoJELp701BxlEWfI0wP/jUk+vL8Vh7BedRGqBEe1ej7
-2y/tFwK6e60odPcyJ3ipsOXxkP1YkMTLK0FxpkPJC6s6VK6Xk7vCjIxLVIvf41yP
-c3WlB4ipCTk1t2mccZmhyl3is/3nmz61WftUbfbeuJaH9xn/8bcrXlF6TMD8KOcX
-UeIKC9ImqnwMo8xBGJwKVMeJ4TJoYPjruB7bZ2438P9N3/4jqNkprCrRfBnKue1q
-hfNRCxQd7oaO5u6sz4fDtYhYp97gQ7eCHMwVaduxScq44PVD8hTIsv3HtfW2su0F
-YC+d1E7URjIqh6X+Q7LR1aAhLhWXmR8lXAhQqvyHB9jKK1zq8kpyc61hsBddRChv
-jHCINMcOWqgDo3QWxD2oXX5eEgprSlZrpoVTHOwu1UcRY9QTVSdbpM7bUDYO1Hr8
-ic4cqZIDlvMcrdYabjpx/KabHMXHXcKEoH3yGeG+af0sTHC4ipXXa/9+1BQnyFMj
-4NlJAGxIoXWJte6OawcbJ4qB73pbVhNV3t42J3lKr0ou9cqdLVsVbmx4xkura2VK
-ra4/bdnPU2b8zw8LUml1uRoQrBllPOaAf9AJvL0841DXcMjq3IMzuA+kEmek5X1V
-8Fi0OyoXCk/AZmNGKS1wagm1GHbiDBW6kxE42gUlOHatJ4RptjYazN3QvimzpKfH
-b3504SWAg8Z1BjDTktA1
-=jLEy
+iEYEAREIAAYFAlJxeKUACgkQLc0TWKYwzLg7xQCfUmP2y1pF+DSHnHCH4me0dqu5
+3rYAnjLFnmpHU/zeuavtKTufWyMqO5Dc
+=tlTz
 -----END PGP SIGNATURE-----
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
+}