gentoo resync : 21.05.2019

3 files changed, 2 insertions, 93 deletions

diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index c319b0f88c30..4488958170dd 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,6 +1,4 @@
 AUX kexi-3.1.0-qt-5.11.patch 724 BLAKE2B 8571c381220f163685017a5f6ed74cae80042e23836227e510160ffc1190e2172deb7c8280c3fadbec9b85d6f7469747e185e89414a5e2e508a4c6888442b17c SHA512 11817808ff2b0c86b52511c1f03941470beeebb61f63a6f1b5b29546de17371f9f3d771a49b2664e8c9fe07b5ffee65995d22ff19cc1aadf50af484cb2d43e17
-DIST kexi-3.1.0.tar.xz 3028492 BLAKE2B 8af7105ba570af225e7e2cbea2ab15d0c6e4997414c321654691af1329930754bea8a52c3ce5abb246c6a47e17473c462b9212eab8ef30fc23e4691f2ab8c9b2 SHA512 538b8b2c021bababb59a05cd477aa4414df76f84a9ae88244afe6f3dc29751257bfee2586279ee8ee7800d939702c3a81f71562039a6f97132f2cba4e9018118
 DIST kexi-3.2.0.tar.xz 3624956 BLAKE2B 8d0b3712f07d13f606c4c0d714b3d4ea0fe9f56e4d4a3aeeb144ffda56cd5ef89e4f08d5660550364103c86acd60923ddc74fcea135a23fffbae87853a7c00f4 SHA512 5cb9e0747c8e7ea19020b62345571ba10f65278dcc718bb0772827721bf8812d0ffee3c35d53b57285884c66e0406520835c7b00789fbe5459717722dff13e93
-EBUILD kexi-3.1.0.ebuild 2422 BLAKE2B 483be8e6c86c840938282593edcf59e34519c929f3261333d43e7ed7861107308def7ea32ea52ad7e42b7cf5ba7ca53e2feb6bb8524e93d4e8808565c5bfcd6f SHA512 4eaf9190d1e45dbbd2efc4a85e5bc5a6729bd2f96ba53f50cee981696b2c4c13021437f67ab12b1e1cbb81167f237325daef40be838391e67910ce29b5de8874
-EBUILD kexi-3.2.0.ebuild 2232 BLAKE2B 2aceea352f19be23cfdf2fe392f8e93f11b1dd2844072f8ddae16337ba19ec5bce194bef16e046cfefb78022ae4d5ff6536f3171d82e940d094523fab36e1731 SHA512 1e8122fcbd213e695e1c8303956a195b73fd80eebad09693b706f9fb4028e0ab68794ab8247072529fc8f56539927978fc346313d9f47344458aefcf868f6d26
+EBUILD kexi-3.2.0.ebuild 2230 BLAKE2B 343bf9c07df11bf1c55744a47f3930bdaaa580beac08161ff2b66aa0b225121dfd66b399a28f2d4a9364bce0558a5c1bc17b84a1c144cec531605c7870e45777 SHA512 4f6ba3e0838916d96abd774ef9dd43e57a3a29434880edc868e7beee71549f5db5bca1370f10827e2a1dd897286ef0c152ec7693021fe272cc1cdca10fc1d12b
 MISC metadata.xml 600 BLAKE2B 383b28f24ff8522330ed843789c30ac771b4ecb03f45f7f60503463ead5e6a6fd4480eea83be7904d3e0cfecaca73c6fc9d8d29214fbfb2082aa97c45ba607ff SHA512 fc7615150e90fb963d4ae2775b5d0dda7667c0fd975cdcd8e5d52a87d01935471c37c9256e894c68fe88268d61d7a3cde42f36171f9160dae20ce8140eaab22f
diff --git a/app-office/kexi/kexi-3.1.0.ebuild b/app-office/kexi/kexi-3.1.0.ebuild
deleted file mode 100644
index 16241347eb89..000000000000
--- a/app-office/kexi/kexi-3.1.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# KDE_HANDBOOK="true"
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.8.0"
-inherit kde5
-
-DESCRIPTION="Visual database applications creator"
-HOMEPAGE="https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-
-KEYWORDS="amd64 x86"
-IUSE="debug experimental marble mdb mysql postgres sqlite webkit"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep breeze-icons-rcc)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?]
-	>=dev-libs/kproperty-3.1.0:5=
-	>=dev-libs/kreport-3.1.0:5=[scripting]
-	marble? ( $(add_kdeapps_dep marble) )
-	mdb? (
-		dev-libs/glib:2
-		virtual/libiconv
-	)
-	mysql? ( virtual/libmysqlclient )
-	postgres? (
-		dev-db/postgresql:*
-		dev-libs/libpqxx
-	)
-	webkit? ( $(add_qt_dep qtwebkit) )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_kexi]
-	!app-office/calligra-l10n:4[calligra_features_kexi(+)]
-"
-
-PATCHES=( "${FILESDIR}"/${P}-qt-5.11.patch )
-
-src_prepare() {
-	if ! use webkit; then
-		punt_bogus_dep Qt5 WebKit
-		punt_bogus_dep Qt5 WebKitWidgets
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
-		-DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
-		-DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
-		$(cmake-utils_use_find_package marble KexiMarble)
-		$(cmake-utils_use_find_package mdb GLIB2)
-		$(cmake-utils_use_find_package mysql MySQL)
-		$(cmake-utils_use_find_package postgres PostgreSQL)
-	)
-	use experimental && mycmakeargs+=( -DKEXI_SCRIPTING_DEBUG=$(usex debug) )
-
-	kde5_src_configure
-}
diff --git a/app-office/kexi/kexi-3.2.0.ebuild b/app-office/kexi/kexi-3.2.0.ebuild
index 5dc44cc73a4b..c2ea1c5ddcad 100644
--- a/app-office/kexi/kexi-3.2.0.ebuild
+++ b/app-office/kexi/kexi-3.2.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Visual database applications creator"
 HOMEPAGE="https://kde.org/applications/office/kexi/ http://www.kexi-project.org/"
 [[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug experimental marble mdb mysql postgres sqlite webkit"
 
 BDEPEND="sys-devel/gettext"