gentoo resync : 08.06.2019

4 files changed, 2 insertions, 89 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index ed399d75de05..c9077350c53d 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 940a4a05a05e..b193df8d1b76 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,7 +1,5 @@
-DIST kstars-3.1.1.tar.xz 70308140 BLAKE2B 97c32773bb600b6601f6b0f64cb951d9931760f3f83bd40e99888868a49643c26af666756fde7b8fb59c634cdfdd7391d4ea8674e99acbe0955bc07b194f4285 SHA512 f482a0bf82eda596a6da9ab8641059aaae8c1983b3c28e963b18665aec3d6418472997aa3d94f6cdff496a95f4151f4b5ca2171bed4c9ff3f7f95177a8fd67c0
 DIST kstars-3.2.2.tar.xz 70730772 BLAKE2B f92510e7e1a077d685e67a3e2ddadb1f5ca0c79a4775a07db9d05e25cd871c8faf04d2cf827c60e1c0173ac35b170d3460ec747b5e00b2a1d2cc3a60c6354524 SHA512 05bdb1ce739ae05a0557082fa3ad299a9ea233d747def20a0ec3ded566d66cd9fa15d6d2cc338429c63dfe61385bbfc961ead195208b429a39111ca9ea44a5e1
 DIST kstars-3.2.3.tar.xz 70750660 BLAKE2B ea44b1ab2ba5d34a472b513180c148093defeff9fc2b8fb823621149b836a6fb7d6f53e0e50765de7c423fcdcdfc8fac6ae4feb4c4670d475353e091fa14d20c SHA512 29c534c860cb1ab2c52e497061b16c7870e63253a7184f79ed8565d56abbc2909160d7f8c649764e4eb7462630e30e4428a88753e7987e97e530b174076cbd37
-EBUILD kstars-3.1.1.ebuild 2199 BLAKE2B 6a15c7174ad19e05253c89ad9f7744b80ecbeacd3aa4c5f3f25a938a0b9ab56a3ba7c377b78f60c6650b9c7ae9879d64e1583a97bd6ad77d39a4f398fe837626 SHA512 126b54bb36b0407fe49a0da961e7b93aec43f211d17c1120b27ad3d962392b21ddaa17345b6f357982e8493c3e35877a352d563592fe210556007793cddab926
-EBUILD kstars-3.2.2.ebuild 2196 BLAKE2B 237f77cbc0eaea95a37e78e63cef9924035585369509a30dc01f127046a2c527a896ed1d317b8d4084c600a119566c944699c6857dc89e426a37c96c53b2f967 SHA512 fe95a5ba0bc95a25c390f8513e248ac47881ed8fdc45436014bf47bef44f9361c21ced4e4dbec3d7e9276cded3dc10a35dc41b7fa1d8447598e142354f7e3eb8
+EBUILD kstars-3.2.2.ebuild 2195 BLAKE2B adde3a59e6159cd1034c64ab700f71d124c7ac19c8d8efd11261eaa6909c468f75353c1a4b0147c80158108fd9a46819aabd99b8cca13c62c34babffe9c07805 SHA512 24b9198d06e3171ac6652b3210a44640ab93391377e88cf52d5c29a3df7f16dc19f52becdff125f57e6d366dec6cd535b8da01a7c4cfa8961efb87cfb64b4614
 EBUILD kstars-3.2.3.ebuild 2197 BLAKE2B 7cb3ea0f13a4141ad3f6ba717bab0d41351c7f621fc694116f743e1b0c76287116c0e814a35c6efd0814da124c0777c5e2af34c7a940d6a4e85e03878c8832a7 SHA512 5b9cc2d2ea9836b23113e3bbf6f2ed5623176a1c4f72bebbf960fa1ad89f30637c46c1922ad8dbaf335d6f1900d29e932b09cb88990ee5eae46c39a0d8254283
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
diff --git a/sci-astronomy/kstars/kstars-3.1.1.ebuild b/sci-astronomy/kstars/kstars-3.1.1.ebuild
deleted file mode 100644
index 6fd64bafb989..000000000000
--- a/sci-astronomy/kstars/kstars-3.1.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python2_7 )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Desktop Planetarium"
-HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars/"
-IUSE="fits indi +password raw wcs"
-
-REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdatavis3d)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebsockets)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	fits? ( sci-libs/cfitsio )
-	indi? ( >=sci-libs/indilib-1.7.5 )
-	password? ( dev-libs/qtkeychain:= )
-	raw? ( media-libs/libraw:= )
-	wcs? ( sci-astronomy/wcslib )
-"
-# TODO: Add back when re-enabled by upstream
-# 	opengl? (
-# 		$(add_qt_dep qtopengl)
-# 		virtual/opengl
-# 	)
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	dev-cpp/eigen:3
-"
-RDEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DFETCH_TRANSLATIONS=OFF
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package indi INDI)
-		$(cmake-utils_use_find_package password Qt5Keychain)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package wcs WCSLIB)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst () {
-	kde5_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "x11-misc/xplanet" ; then
-		elog "${PN} has optional runtime support for x11-misc/xplanet"
-	fi
-	# same for AstrometryNet, which is not packaged.
-}
diff --git a/sci-astronomy/kstars/kstars-3.2.2.ebuild b/sci-astronomy/kstars/kstars-3.2.2.ebuild
index 609206b52681..37fbdb6ba508 100644
--- a/sci-astronomy/kstars/kstars-3.2.2.ebuild
+++ b/sci-astronomy/kstars/kstars-3.2.2.ebuild
@@ -9,7 +9,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Desktop Planetarium"