diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-16 11:56:11 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-29 23:11:55 +0100 |
| commit | 2a9e89c1c4e8e6855fc39ae8310c84eb78f9779e (patch) | |
| tree | c70fae623c91604552a13b863cf5a2d14e5d98d4 | |
| parent | 39016ce22c6aebcaae5cc877885e6d8b18ed2c67 (diff) | |
| download | tde-packaging-gentoo-2a9e89c1c4e8e6855fc39ae8310c84eb78f9779e.tar.gz tde-packaging-gentoo-2a9e89c1c4e8e6855fc39ae8310c84eb78f9779e.zip | |
trinity-base/tdelibs: Add IUSE="arts", drop set-trinityver/need-arts
If your eclass needs special provisioning for a single ebuild, just do it
in the ebuild instead.
- We no longer have to tip-toe around assigning IUSE, DEPEND and RDEPEND
- Drop superfluous COMMON_DEPEND
- local mycmakeargs
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | trinity-base/tdelibs/tdelibs-9999.ebuild | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/trinity-base/tdelibs/tdelibs-9999.ebuild b/trinity-base/tdelibs/tdelibs-9999.ebuild index 357baa13..1714915d 100644 --- a/trinity-base/tdelibs/tdelibs-9999.ebuild +++ b/trinity-base/tdelibs/tdelibs-9999.ebuild @@ -7,10 +7,6 @@ EAPI="7" TRINITY_MODULE_NAME="tdelibs" inherit trinity-base-2 -set-trinityver - -need-arts optional - DESCRIPTION="Trinity libraries needed by all TDE programs" HOMEPAGE="https://trinitydesktop.org/" @@ -22,14 +18,14 @@ if [[ ${PV} != *9999* ]] ; then fi # NOTE: Building without tdehwlib segfaults, but you can try and report. -IUSE+=" alsa aspell cryptsetup cups debug elficons elogind fam +hwlib +IUSE+=" alsa arts aspell cryptsetup cups debug elficons elogind fam +hwlib +idn ispell jpeg2k kernel_linux libressl lua lzma malloc networkmanager old-udisks openexr +pcre pcsc-lite pkcs11 +shm spell +ssl sudo +svg systemd tiff udevil udisks upower utempter xcomposite +xrandr zeroconf" REQUIRED_USE="spell? ( || ( aspell ispell ) )" -COMMON_DEPEND=" +DEPEND=" app-text/ghostscript-gpl ~dev-libs/dbus-1-tqt-${PV} dev-libs/libxslt @@ -39,6 +35,7 @@ COMMON_DEPEND=" media-libs/freetype x11-libs/libXrender alsa? ( media-libs/alsa-lib ) + arts? ( ~trinity-base/arts-${PV} ) cups? ( net-print/cups ) debug? ( sys-libs/binutils-libs:= ) elficons? ( ~dev-libs/libr-${PV} ) @@ -68,8 +65,7 @@ COMMON_DEPEND=" xrandr? ( x11-libs/libXrandr ) zeroconf? ( ~dev-tqt/avahi-tqt-${PV} ) " -DEPEND+=" ${COMMON_DEPEND}" -RDEPEND+=" ${COMMON_DEPEND} +RDEPEND="${DEPEND} hwlib? ( acct-group/plugdev !udevil? ( !udisks? ( !old-udisks? ( sys-apps/pmount ) ) ) @@ -83,7 +79,8 @@ RDEPEND+=" ${COMMON_DEPEND} udevil? ( sys-apps/udevil ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower ) - )" + ) +" src_configure() { local enable_logind="OFF" @@ -91,7 +88,7 @@ src_configure() { enable_logind="ON" fi - mycmakeargs=( + local mycmakeargs=( -DTDE_MALLOC="$(usex malloc)" -DTDE_MALLOC_FULL="$(usex malloc)" -DTDE_MALLOC_DEBUG="$(usex debug)" @@ -100,6 +97,7 @@ src_configure() { -DWITH_DEVKITPOWER=OFF -DWITH_OLD_XDG_STD=OFF -DWITH_KDE4_MENU_SUFFIX=OFF + -DWITH_ARTS="$(usex arts)" -DWITH_LIBIDN="$(usex idn)" -DWITH_MITSHM="$(usex shm)" -DWITH_PCRE="$(usex pcre)" |