From 6994f319ff8862981119231d02bf784aae2d2908 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 25 Jul 2023 17:11:27 +0200 Subject: sci-astronomy/kstars: sci-libs/gsl is unconditionally required The patch said as much, too. Closes: https://bugs.gentoo.org/911202 Signed-off-by: Andreas Sturmlechner --- sci-astronomy/kstars/kstars-3.6.5-r1.ebuild | 113 ++++++++++++++++++++++++++++ sci-astronomy/kstars/kstars-3.6.5.ebuild | 113 ---------------------------- 2 files changed, 113 insertions(+), 113 deletions(-) create mode 100644 sci-astronomy/kstars/kstars-3.6.5-r1.ebuild delete mode 100644 sci-astronomy/kstars/kstars-3.6.5.ebuild (limited to 'sci-astronomy') diff --git a/sci-astronomy/kstars/kstars-3.6.5-r1.ebuild b/sci-astronomy/kstars/kstars-3.6.5-r1.ebuild new file mode 100644 index 000000000000..483df20a980a --- /dev/null +++ b/sci-astronomy/kstars/kstars-3.6.5-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm kde.org optfeature + +DESCRIPTION="Desktop Planetarium" +HOMEPAGE="https://apps.kde.org/kstars/ https://edu.kde.org/kstars/" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+ GPL-3+" +SLOT="5" +IUSE="fits indi +password raw wcs" + +REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND=" + >=dev-qt/qtdatavis3d-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwebsockets-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kplotting-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + sci-libs/gsl:= + sys-libs/zlib + fits? ( sci-libs/cfitsio:= ) + indi? ( + >=sci-libs/indilib-2.0.2 + sci-libs/libnova:= + >=sci-libs/stellarsolver-2.2 + ) + password? ( dev-libs/qtkeychain:=[qt5(+)] ) + raw? ( media-libs/libraw:= ) + wcs? ( sci-astronomy/wcslib:= ) +" +# TODO: Add back when re-enabled by upstream +# opengl? ( +# >=dev-qt/qtopengl-${QTMIN}:5 +# virtual/opengl +# ) +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:3 + >=dev-qt/qtconcurrent-${QTMIN}:5 +" +RDEPEND="${COMMON_DEPEND} + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtpositioning-${QTMIN}:5 + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 +" + +PATCHES=( + # https://invent.kde.org/education/kstars/-/issues/251 + "${FILESDIR}/${P}-buildfix.patch" + "${FILESDIR}/${P}-gsl.patch" # bug 911199 +) + +src_configure() { + local mycmakeargs=( + -DBUILD_PYKSTARS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_LibXISF=ON # not packaged + -DBUILD_DOC=$(usex handbook) + $(cmake_use_find_package fits CFitsio) + $(cmake_use_find_package indi INDI) + $(cmake_use_find_package indi Nova) + $(cmake_use_find_package password Qt5Keychain) + $(cmake_use_find_package raw LibRaw) + $(cmake_use_find_package wcs WCSLIB) + ) + + ecm_src_configure +} + +src_test() { + # bug 842768, test declared unstable by upstream + local myctestargs=( + -E "(TestKSPaths)" + ) + + ecm_src_test +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "Display 'current' pictures of planets" x11-misc/xplanet + fi + ecm_pkg_postinst +} diff --git a/sci-astronomy/kstars/kstars-3.6.5.ebuild b/sci-astronomy/kstars/kstars-3.6.5.ebuild deleted file mode 100644 index 79f688b6c33e..000000000000 --- a/sci-astronomy/kstars/kstars-3.6.5.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm kde.org optfeature - -DESCRIPTION="Desktop Planetarium" -HOMEPAGE="https://apps.kde.org/kstars/ https://edu.kde.org/kstars/" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+ GPL-3+" -SLOT="5" -IUSE="fits indi +password raw wcs" - -REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND=" - >=dev-qt/qtdatavis3d-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwebsockets-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kplotting-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - sys-libs/zlib - fits? ( sci-libs/cfitsio:= ) - indi? ( - sci-libs/gsl:= - >=sci-libs/indilib-2.0.2 - sci-libs/libnova:= - >=sci-libs/stellarsolver-2.2 - ) - password? ( dev-libs/qtkeychain:=[qt5(+)] ) - raw? ( media-libs/libraw:= ) - wcs? ( sci-astronomy/wcslib:= ) -" -# TODO: Add back when re-enabled by upstream -# opengl? ( -# >=dev-qt/qtopengl-${QTMIN}:5 -# virtual/opengl -# ) -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - >=dev-qt/qtconcurrent-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtpositioning-${QTMIN}:5 - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 -" - -PATCHES=( - # https://invent.kde.org/education/kstars/-/issues/251 - "${FILESDIR}/${P}-buildfix.patch" - "${FILESDIR}/${P}-gsl.patch" # bug 911199 -) - -src_configure() { - local mycmakeargs=( - -DBUILD_PYKSTARS=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_LibXISF=ON # not packaged - -DBUILD_DOC=$(usex handbook) - $(cmake_use_find_package fits CFitsio) - $(cmake_use_find_package indi INDI) - $(cmake_use_find_package indi Nova) - $(cmake_use_find_package password Qt5Keychain) - $(cmake_use_find_package raw LibRaw) - $(cmake_use_find_package wcs WCSLIB) - ) - - ecm_src_configure -} - -src_test() { - # bug 842768, test declared unstable by upstream - local myctestargs=( - -E "(TestKSPaths)" - ) - - ecm_src_test -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "Display 'current' pictures of planets" x11-misc/xplanet - fi - ecm_pkg_postinst -} -- cgit v1.2.3-65-gdbad