From 3ffa67c73f0d6aee8c9cd5bd78b6ec3961bbb399 Mon Sep 17 00:00:00 2001 From: "E. Liddell" Date: Thu, 2 Jan 2020 14:31:56 -0500 Subject: Update of trinity-* eclasses, tqt, tqtinterface, dbus-1-tqt, tdelibs to EAPI7 and git-v3; wholesale slaughter of obsolete eclass code; ebuilds for 14.0.6; aRts flag nonfunctional Signed-off-by: E. Liddell --- trinity-base/tdelibs/tdelibs-14.0.6.ebuild | 141 +++++++++++++++++++++++++++++ trinity-base/tdelibs/tdelibs-9999.ebuild | 53 ++++++----- 2 files changed, 167 insertions(+), 27 deletions(-) create mode 100644 trinity-base/tdelibs/tdelibs-14.0.6.ebuild (limited to 'trinity-base/tdelibs') diff --git a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild b/trinity-base/tdelibs/tdelibs-14.0.6.ebuild new file mode 100644 index 00000000..9b93b211 --- /dev/null +++ b/trinity-base/tdelibs/tdelibs-14.0.6.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +EAPI="7" +TRINITY_MODULE_NAME="$PN" + +inherit trinity-base multilib + +set-trinityver + +need-arts optional + +DESCRIPTION="Trinity libraries needed by all TDE programs." +HOMEPAGE="http://www.trinitydesktop.org/" +LICENSE="GPL-2 LGPL-2" +SLOT="${TRINITY_VER}" +KEYWORDS="~amd64" +IUSE+=" alsa avahi cups consolekit fam jpeg2k lua lzma networkmanager openexr + spell sudo tiff utempter upower udisks old_udisks xcomposite +xrandr" + +MY_DEPEND="=dev-tqt/tqtinterface-${PV} + >=dev-libs/libxslt-1.1.16 + >=dev-libs/libxml2-2.6.6 + >=dev-libs/libpcre-6.6 + net-dns/libidn + app-text/ghostscript-gpl + >=dev-libs/openssl-0.9.7d:= + media-libs/fontconfig + media-libs/freetype:2 + media-libs/libart_lgpl + sys-apps/dbus + dev-libs/dbus-1-tqt + x11-libs/libXcursor + x11-libs/libXrender + alsa? ( media-libs/alsa-lib ) + avahi? ( net-dns/avahi ) + cups? ( >=net-print/cups-1.1.19 ) + fam? ( virtual/fam ) + jpeg2k? ( media-libs/jasper ) + lua? ( dev-lang/lua:* ) + openexr? ( >=media-libs/openexr-1.2.2-r2 ) + spell? ( >=app-dicts/aspell-en-6.0.0 >=app-text/aspell-0.60.5 ) + sudo? ( app-admin/sudo ) + tiff? ( media-libs/tiff:= ) + utempter? ( sys-libs/libutempter ) + networkmanager? ( net-misc/networkmanager ) + lzma? ( app-arch/xz-utils ) + xrandr? ( >=x11-libs/libXrandr-1.2 ) + xcomposite? ( x11-libs/libXcomposite )" +# NOTE: upstream lacks avahi support, so the use flag is currenly masked +# TODO: add elfres support via libr (not in portage now) +DEPEND+=" ${MY_DEPEND}" +RDEPEND+=" ${MY_DEPEND} + consolekit? ( sys-auth/consolekit ) + upower? ( sys-power/upower ) + udisks? ( sys-fs/udisks:2 ) + old_udisks? ( sys-fs/udisks:0 )" + +src_configure() { + mycmakeargs=( + -DMALLOC_FULL=ON + -DWITH_LIBIDN=ON + -DWITH_SSL=ON + -DWITH_LIBART=ON + -DWITH_PCRE=ON + -DWITH_XCURSOR=ON + -DWITH_HSPELL=OFF + -DKDE4_DEFAULT_HOME=.kde4 + -DWITH_ARTS=OFF + -DWITH_ALSA="$(usex alsa)" + -DWITH_AVAHI="$(usex avahi)" + -DWITH_CUPS="$(usex cups)" + -DWITH_INOTIFY="$(usex kernel_linux)" + -DWITH_JASPER="$(usex jpeg2k)" + -DWITH_LUA="$(usex lua)" + -DWITH_LZMA="$(usex lzma)" + -DWITH_OPENEXR="$(usex openexr)" + -DWITH_ASPELL="$(usex spell)" + -DWITH_GAMIN="$(usex fam)" + -DWITH_TIFF="$(usex tiff)" + -DWITH_UTEMPTER="$(usex utempter)" + -DWITH_UPOWER="$(usex upower)" + -DWITH_UDISKS="$(usex old_udisks)" + -DWITH_UDISKS2="$(usex udisks)" + -DWITH_CONSOLEKIT="$(usex consolekit)" + -DWITH_NETWORK_MANAGER_BACKEND="$(usex networkmanager)" + -DWITH_XCOMPOSITE="$(usex xcomposite)" + -DWITH_XRANDR="$(usex xrandr)" + -DWITH_SUDO_TDESU_BACKEND="$(usex sudo)" + ) + + trinity-base_src_configure +} + +src_install() { + trinity-base_src_install + + dodir /etc/env.d + # KDE implies that the install path is listed first in TDEDIRS and the user + # directory (implicitly added) to be the last entry. Doing otherwise breaks + # certain functionality. Do not break this (once again *sigh*), but read the code. + # KDE saves the installed path implicitly and so this is not needed, /usr + # is set in ${TDEDIR}/share/config/kdeglobals and so TDEDIRS is not needed. + + # List all the multilib libdirs + local libdirs pkgconfigdirs + for libdir in $(get_all_libdirs); do + libdirs="${TDEDIR}/${libdir}:${libdirs}" + done + + cat <"${D}/etc/env.d/45trinitypaths-${SLOT}" # number goes down with version upgrade +PATH=${TDEDIR}/bin +ROOTPATH=${TDEDIR}/sbin:${TDEDIR}/bin +LDPATH=${libdirs#:} +MANPATH=${TDEDIR}/share/man +CONFIG_PROTECT="${TDEDIR}/share/config ${TDEDIR}/env ${TDEDIR}/shutdown /usr/share/config" +XDG_DATA_DIRS="${TDEDIR}/share" +PKG_CONFIG_PATH="${TDEDIR}/$(get_libdir)/pkgconfig" +EOF + + # Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441. + dodir /etc/revdep-rebuild + +cat <"${D}/etc/revdep-rebuild/50-trinity-${SLOT}" +SEARCH_DIRS="${TDEDIR}/bin ${TDEDIR}/lib*" +EOF + + trinity-base_create_tmp_docfiles + trinity-base_install_docfiles +} + +pkg_postinst () { + if use sudo; then + einfo "Remember that the sudo use flag sets only the default superuser command." + einfo "It can be overriden on a user-level by adding:" + einfo " [super-user-command]" + einfo " super-user-command=su" + einfo "to the kdeglobal config file which is should be usually" + einfo "located in the ~/.trinity/share/config/ directory." + fi +} diff --git a/trinity-base/tdelibs/tdelibs-9999.ebuild b/trinity-base/tdelibs/tdelibs-9999.ebuild index 1883c907..baf32b50 100644 --- a/trinity-base/tdelibs/tdelibs-9999.ebuild +++ b/trinity-base/tdelibs/tdelibs-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="$PN" inherit trinity-base multilib @@ -18,7 +18,7 @@ KEYWORDS= IUSE+=" alsa avahi cups consolekit fam jpeg2k lua lzma networkmanager openexr spell sudo tiff utempter upower udisks old_udisks xcomposite +xrandr" -MY_DEPEND=">=dev-tqt/tqtinterface-${TRINITY_VER} +MY_DEPEND="=dev-tqt/tqtinterface-${PV} >=dev-libs/libxslt-1.1.16 >=dev-libs/libxml2-2.6.6 >=dev-libs/libpcre-6.6 @@ -66,26 +66,28 @@ src_configure() { -DWITH_XCURSOR=ON -DWITH_HSPELL=OFF -DKDE4_DEFAULT_HOME=.kde4 - $(cmake-utils_use_with alsa ALSA) - $(cmake-utils_use_with avahi AVAHI) - $(cmake-utils_use_with cups CUPS) - $(cmake-utils_use_with kernel_linux INOTIFY) - $(cmake-utils_use_with jpeg2k JASPER) - $(cmake-utils_use_with lua LUA) - $(cmake-utils_use_with lzma LZMA) - $(cmake-utils_use_with openexr OPENEXR) - $(cmake-utils_use_with spell ASPELL) - $(cmake-utils_use_with fam GAMIN) - $(cmake-utils_use_with tiff TIFF) - $(cmake-utils_use_with utempter UTEMPTER) - $(cmake-utils_use_with upower UPOWER) - $(cmake-utils_use_with old_udisks UDISKS) - $(cmake-utils_use_with udisks UDISKS2) - $(cmake-utils_use_with consolekit CONSOLEKIT) - $(cmake-utils_use_with networkmanager WITH_NETWORK_MANAGER_BACKEND) - $(cmake-utils_use_with xcomposite XCOMPOSITE) - $(cmake-utils_use_with xrandr XRANDR) - $(cmake-utils_use_with sudo SUDO_KDESU_BACKEND) + -DWITH_TDEHWLIB=OFF + -DWITH_ARTS=OFF + -DWITH_ALSA="$(usex alsa)" + -DWITH_AVAHI="$(usex avahi)" + -DWITH_CUPS="$(usex cups)" + -DWITH_INOTIFY="$(usex kernel_linux)" + -DWITH_JASPER="$(usex jpeg2k)" + -DWITH_LUA="$(usex lua)" + -DWITH_LZMA="$(usex lzma)" + -DWITH_OPENEXR="$(usex openexr)" + -DWITH_ASPELL="$(usex spell)" + -DWITH_GAMIN="$(usex fam)" + -DWITH_TIFF="$(usex tiff)" + -DWITH_UTEMPTER="$(usex utempter)" + -DWITH_UPOWER="$(usex upower)" + -DWITH_UDISKS="$(usex old_udisks)" + -DWITH_UDISKS2="$(usex udisks)" + -DWITH_CONSOLEKIT="$(usex consolekit)" + -DWITH_NETWORK_MANAGER_BACKEND="$(usex networkmanager)" + -DWITH_XCOMPOSITE="$(usex xcomposite)" + -DWITH_XRANDR="$(usex xrandr)" + -DWITH_SUDO_TDESU_BACKEND="$(usex sudo)" ) trinity-base_src_configure @@ -113,9 +115,6 @@ ROOTPATH=${TDEDIR}/sbin:${TDEDIR}/bin LDPATH=${libdirs#:} MANPATH=${TDEDIR}/share/man CONFIG_PROTECT="${TDEDIR}/share/config ${TDEDIR}/env ${TDEDIR}/shutdown /usr/share/config" -#TDE_IS_PRELINKED=1 -# Excessive flushing to disk as in releases before KDE 3.5.10. Usually you don't want that. -#TDE_EXTRA_FSYNC=1 XDG_DATA_DIRS="${TDEDIR}/share" PKG_CONFIG_PATH="${TDEDIR}/$(get_libdir)/pkgconfig" EOF @@ -133,11 +132,11 @@ EOF pkg_postinst () { if use sudo; then - einfo "Remember sudo use flag sets only the defauld value" + einfo "Remember that the sudo use flag sets only the default superuser command." einfo "It can be overriden on a user-level by adding:" einfo " [super-user-command]" einfo " super-user-command=su" - einfo "To the kdeglobal config file which is should be usually" + einfo "to the kdeglobal config file which is should be usually" einfo "located in the ~/.trinity/share/config/ directory." fi } -- cgit v1.2.3