gentoo resync : 18.08.2019

8 files changed, 11 insertions, 98 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 65ebcd3f219c..42bf15c94981 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/astrometry/Manifest b/sci-astronomy/astrometry/Manifest
index 0e85bc74bef0..49ea95393f02 100644
--- a/sci-astronomy/astrometry/Manifest
+++ b/sci-astronomy/astrometry/Manifest
@@ -5,7 +5,7 @@ AUX astrometry-0.72-dynlink.patch 3070 BLAKE2B 11c307d6cd5dff61579d4df7f1a739e9d
 DIST astrometry.net-0.67.tar.gz 10941863 BLAKE2B 16c88e9040d2cecec831fd4775f8b5a3b8e10223e2f17b185f92fe222ab1f4cbea8ec5fae9af661cc069987e7cddcfee9e1bdd88a77ffce8db8fb66afad124ba SHA512 f087e5a73a9881b1d4b1e4c205d45dc8b8663c304d8d1c1369a8427884df49fc8331fafeb5dc63648c2670b41a2626745568f6f11943bac56972db2d2bb11ddb
 DIST astrometry.net-0.70.tar.gz 11195158 BLAKE2B f0de1cd592873194199810e095d81559754f73bf433cbf803c63c1d4b81db15722c61e3d5ee3798f8f3e5d9b4f67e87ab2e38edaac8639665ec5a9348337fb0e SHA512 27e1dd27d69427bdff46613723423048959e447662126d25c8b2fbab571d09b834e4085e5a4a9a9f6e8122ff0868a1762a335086de8f674f49fdbc7374299409
 DIST astrometry.net-0.72.tar.gz 11339766 BLAKE2B 91dfe1e49c21a7d0a6b1a39c32d3f50ceafd2d1aa9b75c151d71faef4511164292546013a103d277f127e0391310f40521e6ec9bf83660734cb60c8ed415b3fd SHA512 6fa63ea1075b267ebbe0a5aea4c66679b552350b206f098fb64f69f0e13fb9f8cf9c12e3fbc18942a444165cfd68251201dee9e18d6ebb01a2f16899675c70ff
-EBUILD astrometry-0.67-r2.ebuild 2907 BLAKE2B 6abfab42865dd4b50a520b378e28e481d374e179b4d273cead282a3b632d858040ed8273dd479a606ec49f3fc4659248177b1dee796e6570b548a62f1b0ef70f SHA512 90dde36fa8da59ce24c032db2e23a0d0494a274596a554eb248c110f9e5dce247b36c0e0fb0c8677ce292c61232e12a495629279e5e5e60078bbaf3da102b0eb
-EBUILD astrometry-0.70.ebuild 2925 BLAKE2B 3f3481df64aa0ede54c47174fd848b51268dd50fe00c0a1a00991aaeefd44fed33f0363bb21bd23193b10481fe994541e66bcb51bc4bbdc57eaa176328449dfa SHA512 df93a84984178be565f07ee8b9d077259e2c40603492a00999e064e53f88ab6cd619f970f30825d49c4dfd8aa82778f6de5e3a6cfd3d599ee4e7d9a0e0e81390
-EBUILD astrometry-0.72.ebuild 2872 BLAKE2B 6bcadc6bce78ed48450a3d5f7718acd5e60c6350bd83c861b39446b4d7e53c582ddd60e5624dc1fb7099e79a0e48887c28ce56b950a0bc2f64020a31e39bd732 SHA512 5f37c8925caee01f9b01b6262383b26253a07103f10dc9546112a0d0fa2a650a294e9b073a77273bf56051c9f72e57b2999b9c3369ff74963f7e036518e35e93
+EBUILD astrometry-0.67-r2.ebuild 2902 BLAKE2B 5c474dd9f454ea1d1c9f5e829287df72e1b4e70f2f7bdc292a39f73984bb50e136d6330254e62de74724536a3ee122f5251938828e3c2a1c4de63afb0bad7627 SHA512 4a3e93b13ce0bf2d2fd0781d117c80d125b05d7cfe62ec8e7a5a5cef379a65e5950a1437fe1de7aade5e153d560416e2a3d96aa44a0dbd0cf9e70d55d24fbab7
+EBUILD astrometry-0.70.ebuild 2920 BLAKE2B 79de16af77557bdc4fc2616d93a61171d373cf1777eb188691d041f4dc8dee1b472fa5795a62a8857f9587fab1eee68f3306d8f1b0771093b5e4546e21c8e006 SHA512 fbaf7d16b82a0886eab8d93182226f4282eeb4dc0c0eeea59a92417c265c63b09df54d9b313ba21db35c86f71af7d5367dfaa3071d7efce44f5e21d1e2c91f4e
+EBUILD astrometry-0.72.ebuild 2867 BLAKE2B 204a15edf7833f28e7315e15b1ec95441cc4aed0057dcd5cfefb628e6bba5b13d2baf50671cb5732a52668219fe2e0f445218ffa0841138abd0c8614d483e809 SHA512 8a9b103128e64cbca9a0a59de55c979463f9005f503b5cb21dec0cc571f90817488abda23d6c28e583bf94e3afb01ab0eca086db5638e2ca2cbdcb120cc9991f
 MISC metadata.xml 691 BLAKE2B f1870bd79eebbcbaa332319bdeffe22d62819eba971770258e41f4abb2bcd3e3946372da9dead4a58748bcc84b372f1a1b48d5eb5fe876fb9c90edc61ff202d5 SHA512 af5a3566d247a3f46bb641602822563a2f58d73e13c83dc3e1d4de32b28a7534979848931993c4b7d9c89c2e3f96c88ba488c3288bd4f9c42b3bc550c12f33f6
diff --git a/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild b/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
index 79cf93d35da2..75a92d3581f5 100644
--- a/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
+++ b/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -87,7 +87,7 @@ ap_make() {
 		MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \
 		DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \
 		EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \
-		PY_BASE_INSTALL_DIR="${ED%/}$(python_get_sitedir)/astrometry" \
+		PY_BASE_INSTALL_DIR="${D}/$(python_get_sitedir)/astrometry" \
 		PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e 's|/usr/||')/astrometry" \
 		FINAL_DIR="${EPREFIX%/}/usr" \
 		DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \
diff --git a/sci-astronomy/astrometry/astrometry-0.70.ebuild b/sci-astronomy/astrometry/astrometry-0.70.ebuild
index 99a28b7ec1d6..d17b0d7aaf93 100644
--- a/sci-astronomy/astrometry/astrometry-0.70.ebuild
+++ b/sci-astronomy/astrometry/astrometry-0.70.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -87,7 +87,7 @@ ap_make() {
 		MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \
 		DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \
 		EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \
-		PY_BASE_INSTALL_DIR="${ED%/}$(python_get_sitedir)/astrometry" \
+		PY_BASE_INSTALL_DIR="${D}/$(python_get_sitedir)/astrometry" \
 		PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e 's|/usr/||')/astrometry" \
 		FINAL_DIR="${EPREFIX%/}/usr" \
 		DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \
diff --git a/sci-astronomy/astrometry/astrometry-0.72.ebuild b/sci-astronomy/astrometry/astrometry-0.72.ebuild
index 0a59e2174f17..b0fe8ea5b2ae 100644
--- a/sci-astronomy/astrometry/astrometry-0.72.ebuild
+++ b/sci-astronomy/astrometry/astrometry-0.72.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -87,7 +87,7 @@ ap_make() {
 		MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \
 		DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \
 		EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \
-		PY_BASE_INSTALL_DIR="${ED%/}$(python_get_sitedir)/astrometry" \
+		PY_BASE_INSTALL_DIR="${D}/$(python_get_sitedir)/astrometry" \
 		PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e 's|/usr/||')/astrometry" \
 		FINAL_DIR="${EPREFIX%/}/usr" \
 		DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index b193df8d1b76..88d1ca8fea3c 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,5 +1,3 @@
-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.2.2.ebuild 2195 BLAKE2B adde3a59e6159cd1034c64ab700f71d124c7ac19c8d8efd11261eaa6909c468f75353c1a4b0147c80158108fd9a46819aabd99b8cca13c62c34babffe9c07805 SHA512 24b9198d06e3171ac6652b3210a44640ab93391377e88cf52d5c29a3df7f16dc19f52becdff125f57e6d366dec6cd535b8da01a7c4cfa8961efb87cfb64b4614
-EBUILD kstars-3.2.3.ebuild 2197 BLAKE2B 7cb3ea0f13a4141ad3f6ba717bab0d41351c7f621fc694116f743e1b0c76287116c0e814a35c6efd0814da124c0777c5e2af34c7a940d6a4e85e03878c8832a7 SHA512 5b9cc2d2ea9836b23113e3bbf6f2ed5623176a1c4f72bebbf960fa1ad89f30637c46c1922ad8dbaf335d6f1900d29e932b09cb88990ee5eae46c39a0d8254283
+EBUILD kstars-3.2.3.ebuild 2195 BLAKE2B adde3a59e6159cd1034c64ab700f71d124c7ac19c8d8efd11261eaa6909c468f75353c1a4b0147c80158108fd9a46819aabd99b8cca13c62c34babffe9c07805 SHA512 24b9198d06e3171ac6652b3210a44640ab93391377e88cf52d5c29a3df7f16dc19f52becdff125f57e6d366dec6cd535b8da01a7c4cfa8961efb87cfb64b4614
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
diff --git a/sci-astronomy/kstars/kstars-3.2.2.ebuild b/sci-astronomy/kstars/kstars-3.2.2.ebuild
deleted file mode 100644
index 37fbdb6ba508..000000000000
--- a/sci-astronomy/kstars/kstars-3.2.2.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://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.3.ebuild b/sci-astronomy/kstars/kstars-3.2.3.ebuild
index dbf91c26649b..37fbdb6ba508 100644
--- a/sci-astronomy/kstars/kstars-3.2.3.ebuild
+++ b/sci-astronomy/kstars/kstars-3.2.3.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"