From 42dffbf8d67de8a9b0ff4f312cfc4f0b85ad8083 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 9 Jan 2020 03:42:17 +0100 Subject: Live ebuilds: Port to EAPI7 and cleanup - Round 4. This time: amor, eyesapplet, fifteenapplet, kdict, kget, kmoon, knewsticker, kodo, kopete, kpf, kppp, krdc, krfb, ksirc, ktalkd, kteatime, ktux, kweather, kwifimanager, kworldclock, lisa, tdednssd, tdenetwork-doc, tdenetwork-filesharing, tdenetwork-meta, tdenetwork-tdefile-plugins, tdetoys-doc, and tdetoys-meta Signed-off-by: Chris --- .../tdenetwork-doc/tdenetwork-doc-9999.ebuild | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'trinity-base/tdenetwork-doc') diff --git a/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild b/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild index bb0e4a14..c49d3ef5 100644 --- a/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild +++ b/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild @@ -1,27 +1,26 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdenetwork" -inherit trinity-meta +inherit trinity-meta-2 + +DESCRIPTION="Documentaion for tdenetwork-derived packages" -DESCRIPTION="Documentaion for kdegraphics-derived packages" -KEYWORDS= -IUSE="" RDEPEND=" - >=trinity-base/khelpcenter-${PV}:${SLOT}" + =trinity-base/khelpcenter-${PV}" pkg_setup() { - # we should reduce MAKEOPTS -j parametr to no more than 4 + # Issue some warning if MAKEOPTS -j parameter is higher than 4 local makeopts_j makeopts_j="$(echo "$MAKEOPTS" | sed -n 's/\(^\|.*\s\)\(-j\s*[0-9]\+\)\(\s.*\|$\)/\2/p')" if [ -n "$makeopts_j" -a "$makeopts_j" > 4 ]; then - export MAKEOPTS="${MAKEOPTS//"${makeopts_j}"/-j4}" ewarn "This ebuild needs huge amoumt of memmory to compile in highly parallel" - ewarn "mode so it can chew it all. MAKEOPTS are reduced to \"$MAKEOPTS\"." + ewarn "mode so it can chew it all. Please change your MAKEOPTS if building fails." fi - trinity-meta_pkg_setup + trinity-meta-2_pkg_setup } -- cgit v1.2.1