From 1ebc9f7807db09eb53d7f304c4d4126700c6b297 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 3 Dec 2020 14:12:24 +0100
Subject: */*: 9999: Sanitise eclass/ebuild vars, drop set-trinityver and
 need-trinity

Uniform ebuild variable blocks according to skel.ebuild and by devmanual example
Sort some DEPENDs, fix some DESCRIPTIONs

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 trinity-base/korganizer/korganizer-9999.ebuild | 51 +++++++++++++-------------
 1 file changed, 26 insertions(+), 25 deletions(-)

(limited to 'trinity-base/korganizer')

diff --git a/trinity-base/korganizer/korganizer-9999.ebuild b/trinity-base/korganizer/korganizer-9999.ebuild
index b3fc0185..d5df3177 100644
--- a/trinity-base/korganizer/korganizer-9999.ebuild
+++ b/trinity-base/korganizer/korganizer-9999.ebuild
@@ -3,45 +3,46 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-TRINITY_MODULE_NAME="tdepim"
 
+TSM_EXTRACT_ALSO="certmanager/lib/
+	libemailfunctions/
+	libkcal/
+	libkholidays/
+	libkpimidentities/
+	libtdepim/
+	libkmime/
+	kdgantt/
+	kmail/"
+TRINITY_MODULE_NAME="tdepim"
 inherit trinity-meta-2
 
 DESCRIPTION="A Personal Organizer for Trinity"
 
-IUSE+=" exchange"
+IUSE="exchange"
 
-COMMON_DEPEND="
+DEPEND="
+	~trinity-base/certmanager-${PV}
+	~trinity-base/kaddressbook-${PV}
 	~trinity-base/kgantt-${PV}
-	~trinity-base/libtdepim-${PV}
-	~trinity-base/libtdenetwork-${PV}
-	~trinity-base/libkcal-${PV}
 	~trinity-base/ktnef-${PV}
-	~trinity-base/libkmime-${PV}
+	~trinity-base/libkcal-${PV}
 	~trinity-base/libkholidays-${PV}
-	~trinity-base/certmanager-${PV}
+	~trinity-base/libkmime-${PV}
 	~trinity-base/libkpimidentities-${PV}
-	~trinity-base/kaddressbook-${PV}
-	exchange? ( ~trinity-base/libkpimexchange-${PV} )"
+	~trinity-base/libtdenetwork-${PV}
+	~trinity-base/libtdepim-${PV}
+	exchange? ( ~trinity-base/libkpimexchange-${PV} )
+"
 #	~trinity-base/tdepim-tderesources-${PV}:${SLOT}
+RDEPEND="${DEPEND}"
 
-DEPEND+=" ${COMMON_DEPEND}"
-RDEPEND+=" ${COMMON_DEPEND}"
-
-TSM_EXTRACT_ALSO="certmanager/lib/
-	libemailfunctions/
-	libkcal/
-	libkholidays/
-	libkpimidentities/
-	libtdepim/
-	libkmime/
-	kdgantt/
-	kmail/"
-
-TSM_EXTRACT_ALSO+=" libkpimexchange/core/" # required for USE=exchange
+pkg_setup() {
+	trinity-meta-2_pkg_setup
+	use exchange && TSM_EXTRACT_ALSO+=" libkpimexchange/core/"
+}
 
 src_configure () {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_EXCHANGE="$(usex exchange)"
 	)
 	trinity-meta-2_src_configure
-- 
cgit v1.2.1