gentoo resync : 30.12.2017

3 files changed, 3 insertions, 89 deletions

diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index 8aef9820b2b9..293df1e20cf1 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,7 +1,5 @@
 AUX tora-3.2-missing-header.patch 547 BLAKE2B 6f3ce8bb09de2bc3793fe6c76c166d0b8d0c1da389d9c0132b83ca2af70623b5f72b6fa0e05d098d03a1e2547af9d2585c4e53c3b4a281c87f67782abe2c3211 SHA512 f3f11c336a2c139a46495f75009762b8bba0d20a1bed3c2f710ed6e94a421e0d3b17241e16919349430a761bc7ddde460af06cdd357741166328fe2b5e4216ec
-DIST tora-3.0.0_pre20140929.tar.xz 9038680 BLAKE2B 93dc168c78ddf6f016a70e974dfade020bbbbed7fb628c6c7a3600e7cb95122067bf84be8bf99afebc58a735daa47694df757aaa86cdce717a31f504bce302d1 SHA512 42bc76d8bbed8a5cfee447ea6dec9966a31ef740d3ab58078ecdfc12f725cc94568fbb96d044668ae5fd83def5ab35823df6dee77b630e7903edfd1521b87b73
 DIST tora-3.2.tar.gz 12762547 BLAKE2B 9e52013cc4122a8c6278392fd2251bad941fa48dbbc6e3c72a98bb2bad173d0262877afc44eca689c3110f69883c246441844f7884e309e000f1068b23c6b918 SHA512 005f9bc42a7c7ee9676ad60cdcb7b8fb9862a8ff0be9ffeb7911d96da7f233553b68e4089d23161871b479702ae8a8dc8bc63bd8d9aa75677bdd6c166ce86f7a
-EBUILD tora-3.0.0_pre20140929-r2.ebuild 1981 BLAKE2B 41f53fb16e047feb5ee0d209741dac310f73e72d454d1db6fe80aecb3c566eb3594dbd818b955c981f0181c670cd9159f4984da59538777af4a6a6e40126261e SHA512 53c7c86a061c37734c0228d569bcb01a87169d6ba2642f4e2b13c182a7e4f639d4000ac67b1df8e64f36ab294831ed5abf85fde1d08171e2d721fe2d5504cfaf
-EBUILD tora-3.2.ebuild 2656 BLAKE2B 855892253d3828cabd21c4dce5b15c190e38bb5c3195fe026034f95bc0053e55c8e0a7f6fc5fc32c68e8a193b936b4bd1f8ba026b565c37dc9ba1855e27aa705 SHA512 c6a5e21530863998fe79c604e4c20566e426008a52266a74d6acf47fd3849b28343fb29754e21c2d54a9c3c973a9e0329b64146e28ece31d9df62fba4a8eff0b
+EBUILD tora-3.2.ebuild 2644 BLAKE2B 33da4e5e08b67ff64533892cfb276aa3779004b5fbbbd9ddb03d0977d88ce9f967599d88f023bff4adf266bff510b1ad433e36a9843065d28ca6daf0a7a107d3 SHA512 2ee3322d1331580402566ddc33cc286d96397a34521217c60a0cdee5ff85805883eebabb4b17e689adc3f093662505a36082f649f304c7146c579d551339b11d
 EBUILD tora-9999.ebuild 2603 BLAKE2B 284cba2eeb31b9348250ff0a47b187514a78449f01d6acb6ec7aae608ec8f1e408efc6c2cc8a1363c6963ae35707a88f1ba1186bd04d3854273063c15b90e3d7 SHA512 c8d8e4ea0e72c850ceab531d580f6cb9dc056d9de5e2b02f52bb9bc157cd1e7be6c660040d45c6df57a4b747da4af6e51f2143c6d71dd8a58c7811309d23e2cc
 MISC metadata.xml 843 BLAKE2B 483349f54edd1d61c459d689e4f4a65a427bfdc49a05244b8b9ef26f0d49460f3f04a995bca0e9e2becfb335cda699992bf62c4a1d26b264d5469741c01f9bf5 SHA512 fb6b7e2966d2cb74576f2558d44e64a5cf8aa79f78c5eeff58fcf433369b4efd32edb103ad4174bdd7d878466e4db720d81e4b1ff637d7c1193d37d944708247
diff --git a/dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild b/dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild
deleted file mode 100644
index fdd5149bda7f..000000000000
--- a/dev-db/tora/tora-3.0.0_pre20140929-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils eutils
-
-if [[ ${PV} == 9999 ]]; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/tora/code/trunk/tora"
-	inherit subversion
-	SRC_URI=""
-else
-	SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.xz"
-fi
-
-DESCRIPTION="TOra - Toolkit For Oracle"
-HOMEPAGE="http://torasql.com/"
-IUSE="debug mysql postgres"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/ferrisloki
-	x11-libs/qscintilla:=[qt4(-)]
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4[mysql?,postgres?]
-	dev-qt/qtxmlpatterns:4
-	=dev-db/oracle-instantclient-basic-11*
-	postgres? ( dev-db/postgresql:* )
-"
-DEPEND="
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-pkg_setup() {
-	if [ -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 "You can download the Oracle software from"
-		eerror "http://otn.oracle.com/software/content.html"
-		die
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "/COPYING/ d" \
-		CMakeLists.txt || die "Removal of COPYING file failed"
-	# bug 547520
-	grep -rlZ '$$ORIGIN' . | xargs -0 sed -i 's|:$$ORIGIN[^:"]*||' || \
-		die 'Removal of $$ORIGIN failed'
-}
-
-src_configure() {
-	local mycmakeargs=()
-	mycmakeargs=(-DENABLE_ORACLE=ON)
-	mycmakeargs+=(
-		-DWANT_RPM=OFF
-		-DWANT_BUNDLE=OFF
-		-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
-		-DTORA_DOC_DIR=share/doc/${PF}
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	#
-	doicon src/icons/${PN}.xpm || die
-	domenu src/${PN}.desktop || die
-}
diff --git a/dev-db/tora/tora-3.2.ebuild b/dev-db/tora/tora-3.2.ebuild
index bf2e09e74948..36ff60e39c22 100644
--- a/dev-db/tora/tora-3.2.ebuild
+++ b/dev-db/tora/tora-3.2.ebuild
@@ -15,7 +15,7 @@ fi
 
 DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs"
 HOMEPAGE="https://github.com/tora-tool/tora/wiki"
-IUSE="doc mysql oracle pch postgres"
+IUSE="doc mysql oracle postgres"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -81,7 +81,7 @@ src_configure() {
 		-DLOKI_INCLUDE_DIR="$(pkg-config --variable=includedir ferrisloki)/FerrisLoki"
 		$(cmake-utils_use_find_package doc Doxygen)
 		-DENABLE_ORACLE=$(usex oracle)
-		-DUSE_PCH=$(usex pch)
+		-DUSE_PCH=OFF
 		-DENABLE_PGSQL=$(usex postgres)
 	)
 	cmake-utils_src_configure