[gentoo-commits] proj/kde:master commit in: app-office/kmymoney/

[Andreas Sturmlechner]

commit:     726fdffc32849eeffcd539dc63c8dd93d9c1f2cc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 09:44:36 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 10:10:39 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=726fdffc

app-office/kmymoney: Drop IUSE=quotes, use optfeature

Add explanatory pkg_postinst message.

Bug: https://bugs.gentoo.org/758839
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/kmymoney/kmymoney-5.1.9999.ebuild | 31 +++++++++++++++++++---------
 app-office/kmymoney/kmymoney-9999.ebuild     | 31 +++++++++++++++++++---------
 app-office/kmymoney/metadata.xml             |  1 -
 3 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/app-office/kmymoney/kmymoney-5.1.9999.ebuild b/app-office/kmymoney/kmymoney-5.1.9999.ebuild
index 7ce1ad03e1..79899dc65a 100644
--- a/app-office/kmymoney/kmymoney-5.1.9999.ebuild
+++ b/app-office/kmymoney/kmymoney-5.1.9999.ebuild
@@ -10,10 +10,10 @@ KFMIN=5.74.0
 QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 VIRTUALDBUS_TEST="true"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org"
+HOMEPAGE="https://kmymoney.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
@@ -22,11 +22,11 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="activities addressbook calendar hbci holidays quotes"
+IUSE="activities addressbook calendar hbci holidays"
 [[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
 
 BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
+RDEPEND="
 	>=app-crypt/gpgme-1.7.1-r1[cxx]
 	>=app-office/libalkimia-7.0.0:=
 	dev-db/sqlcipher
@@ -45,14 +45,14 @@ COMMON_DEPEND="
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kitemmodels-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
@@ -76,12 +76,9 @@ COMMON_DEPEND="
 	)
 	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	dev-libs/boost
 "
-RDEPEND="${COMMON_DEPEND}
-	quotes? ( dev-perl/Finance-Quote )
-"
 
 pkg_setup() {
 	ecm_pkg_setup
@@ -120,3 +117,17 @@ src_test() {
 
 	ecm_src_test
 }
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "More options for online stock quote retrieval" dev-perl/Finance-Quote
+	fi
+	if has_version "app-office/kmymoney[quotes]"; then
+		elog "Please note: IUSE=quotes flag is gone in ${PN}-5.1.1. ${PN} still"
+		elog "does online stock quote retrieval without it, but dev-perl/Finance-Quote"
+		elog "may provide additional sources. To keep the functionality, run:"
+		elog "  emerge --noreplace dev-perl/Finance-Quote"
+	fi
+	ecm_pkg_postinst
+}

diff --git a/app-office/kmymoney/kmymoney-9999.ebuild b/app-office/kmymoney/kmymoney-9999.ebuild
index f687c77dba..8b8bc9b0c9 100644
--- a/app-office/kmymoney/kmymoney-9999.ebuild
+++ b/app-office/kmymoney/kmymoney-9999.ebuild
@@ -9,10 +9,10 @@ KFMIN=5.74.0
 QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 VIRTUALDBUS_TEST="true"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org"
+HOMEPAGE="https://kmymoney.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
@@ -21,11 +21,11 @@ fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="activities addressbook calendar hbci holidays quotes"
+IUSE="activities addressbook calendar hbci holidays"
 [[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
 
 BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
+RDEPEND="
 	>=app-crypt/gpgme-1.7.1-r1[cxx]
 	>=app-office/libalkimia-7.0.0:=
 	dev-db/sqlcipher
@@ -44,14 +44,14 @@ COMMON_DEPEND="
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kitemmodels-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/kjobwidgets-${KFMIN}:5
@@ -75,12 +75,9 @@ COMMON_DEPEND="
 	)
 	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	dev-libs/boost
 "
-RDEPEND="${COMMON_DEPEND}
-	quotes? ( dev-perl/Finance-Quote )
-"
 
 pkg_setup() {
 	ecm_pkg_setup
@@ -119,3 +116,17 @@ src_test() {
 
 	ecm_src_test
 }
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "More options for online stock quote retrieval" dev-perl/Finance-Quote
+	fi
+	if has_version "app-office/kmymoney[quotes]"; then
+		elog "Please note: IUSE=quotes flag is gone in ${PN}-5.1.1. ${PN} still"
+		elog "does online stock quote retrieval without it, but dev-perl/Finance-Quote"
+		elog "may provide additional sources. To keep the functionality, run:"
+		elog "  emerge --noreplace dev-perl/Finance-Quote"
+	fi
+	ecm_pkg_postinst
+}

diff --git a/app-office/kmymoney/metadata.xml b/app-office/kmymoney/metadata.xml
index 90b1c0487a..168245e093 100644
--- a/app-office/kmymoney/metadata.xml
+++ b/app-office/kmymoney/metadata.xml
@@ -11,6 +11,5 @@
 		<flag name="experimental">Build unfinished features. DANGEROUS to set - this *will* chew up data</flag>
 		<flag name="hbci">Enable HBCI support using <pkg>net-libs/aqbanking</pkg></flag>
 		<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag>
-		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
 	</use>
 </pkgmetadata>