From 7ed6b42adb46d6e23c9e523d49d4ed0b4bc04aaf Mon Sep 17 00:00:00 2001 From: "E. Liddell" Date: Sat, 21 Nov 2020 01:28:00 +0100 Subject: 14.0.8 ebuilds for tdebase, tdeartwork, tdeutils, and their dependencies (also 14.0.7 ebuild for kworldclock), and removal of obsolete 14.0.6 ebuilds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also removed all references to ispell (no longer in main portage tree, aspell provides same functionality) and streamlined spelling flags in general. Signed-off-by: E. Liddell Signed-off-by: Slávek Banko --- trinity-base/tdelibs/Manifest | 1 + trinity-base/tdelibs/tdelibs-14.0.6.ebuild | 216 ---------------------------- trinity-base/tdelibs/tdelibs-14.0.8.ebuild | 222 +++++++++++++++++++++++++++++ 3 files changed, 223 insertions(+), 216 deletions(-) delete mode 100644 trinity-base/tdelibs/tdelibs-14.0.6.ebuild create mode 100644 trinity-base/tdelibs/tdelibs-14.0.8.ebuild (limited to 'trinity-base/tdelibs') diff --git a/trinity-base/tdelibs/Manifest b/trinity-base/tdelibs/Manifest index 29ad8b3c..20aabcd9 100644 --- a/trinity-base/tdelibs/Manifest +++ b/trinity-base/tdelibs/Manifest @@ -1,2 +1,3 @@ DIST tdelibs-trinity-14.0.6.tar.xz 15288368 BLAKE2B a271bcf95a42d9324cd335668691319b6158e3b34e8ffddc2e77b9f0ba065f64297f6ba57b7e282fa6ae5d712007273983fa6a567e8db386235817f810c54798 SHA512 3b976e7ac57a0a1e6b9571d1ab1e97976f551cacb3dc1b980f564d935f04054bc622a67ea085891d681554c2450d2ba96e6fca5210fbd58830ac2e127fd51fb5 DIST tdelibs-trinity-14.0.7.tar.xz 15302920 BLAKE2B 38e794a91afab9fbbfd6eeb3d7a005b9a96d86f2304a92fffe3b627ffd08de8bff87303d554cfdaeffdc264fad37a22a62a48012d635fd1da0bea49b1fb8db1b SHA512 b1c3ba3c8ebeb1a6ece5823546e0769a2f239420649a589d7defb7e3bdf484024737c10a49c2bcfd150ccbcdd08bf546a8a9ee0487185ae8ee61e2338ce36c58 +DIST tdelibs-trinity-14.0.8.tar.xz 15286968 BLAKE2B f7d149f47027f4db3ce221c186f142d2f5b5e85f16d525e3d39944d2cb7f246b0c50f501c36803c8499738c591e0f06e2bbcc649dbc1578c9a855c5195ef393c SHA512 82c06d17aef37b5f562d1f56ea7e21b750216831da41a4975145ed0f517b1a49cf079918491d9943f6b997decaa2df26d4fdcffd3c40fd1ed7d8058b3697fab4 diff --git a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild b/trinity-base/tdelibs/tdelibs-14.0.6.ebuild deleted file mode 100644 index 92c8d157..00000000 --- a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Copyright 2020 The Trinity Desktop Project -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -TRINITY_MODULE_NAME="tdelibs" -inherit trinity-base-2 multilib - -set-trinityver - -need-arts optional - -DESCRIPTION="Trinity libraries needed by all TDE programs" -HOMEPAGE="https://trinitydesktop.org/" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" -KEYWORDS="~amd64 ~x86" - -# NOTE: Building without tdehwlib segfaults, but you can try and report. -IUSE+=" alsa aspell consolekit cups debug elogind fam +hwlib +idn jpeg2k -kernel_linux libressl lua lzma +malloc networkmanager old-udisks openexr +pcre -+shm +ssl sudo +svg systemd tiff udisks upower utempter xcomposite +xrandr -zeroconf" - -COMMON_DEPEND=" - app-text/ghostscript-gpl - ~dev-libs/dbus-1-tqt-${PV} - dev-libs/libxslt - dev-libs/libxml2 - ~dev-tqt/tqtinterface-${PV} - media-libs/fontconfig - media-libs/freetype - x11-libs/libxshmfence - x11-libs/libXcursor - x11-libs/libXrender - alsa? ( media-libs/alsa-lib ) - aspell? ( app-dicts/aspell-en app-text/aspell ) - cups? ( net-print/cups ) - debug? ( sys-libs/binutils-libs:= ) - fam? ( virtual/fam ) - hwlib? ( virtual/libudev:= ) - idn? ( net-dns/libidn ) - jpeg2k? ( media-libs/jasper ) - lua? ( dev-lang/lua:* ) - lzma? ( app-arch/xz-utils ) - openexr? ( media-libs/openexr ) - pcre? ( dev-libs/libpcre ) - shm? ( x11-libs/libxshmfence ) - ssl? ( - app-misc/ca-certificates - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) - ) - sudo? ( app-admin/sudo ) - svg? ( ~media-libs/libart_lgpl-14.0.7 ) - tiff? ( media-libs/tiff:= ) - utempter? ( sys-libs/libutempter ) - xcomposite? ( x11-libs/libXcomposite ) - xrandr? ( x11-libs/libXrandr ) - zeroconf? ( net-dns/avahi ) -" -DEPEND+=" ${COMMON_DEPEND}" -RDEPEND+=" ${COMMON_DEPEND} - hwlib? ( - acct-group/plugdev - !udisks? ( !old-udisks? ( sys-apps/pmount ) ) - consolekit? ( sys-auth/consolekit ) - elogind? ( sys-auth/elogind ) - networkmanager? ( net-misc/networkmanager ) - old-udisks? ( sys-fs/udisks:0 ) - systemd? ( sys-apps/systemd ) - udisks? ( sys-fs/udisks:2 ) - upower? ( sys-power/upower ) - )" - -#Revisit these USE flags and dependencies for 14.0.8 -#pkcs11 pcsc-lite udevil cryptsetup -# pcsc-lite? ( sys-apps/pcsc-lite ) -# pkcs11? ( dev-libs/pkcs11-helper ) -# cryptsetup? ( sys-fs/cryptsetup ) -# udevil? ( sys-apps/udevil ) - -src_configure() { - local enable_logind="OFF" - if use systemd || use elogind; then - enable_logind="ON" - fi - - mycmakeargs=( - -DTDE_MALLOC="$(usex malloc)" - -DTDE_MALLOC_FULL="$(usex malloc)" - -DTDE_MALLOC_DEBUG="$(usex debug)" - -DWITH_HSPELL=OFF - -DWITH_HAL=OFF - -DWITH_DEVKITPOWER=OFF - -DWITH_OLD_XDG_STD=OFF - -DWITH_KDE4_MENU_SUFFIX=OFF - -DWITH_LIBIDN="$(usex idn)" - -DWITH_MITSHM="$(usex shm)" - -DWITH_PCRE="$(usex pcre)" - -DWITH_LIBART="$(usex svg)" - -DWITH_SSL="$(usex ssl)" - -DWITH_LIBBFD="$(usex debug)" - -DWITH_ELFICON=OFF - -DWITH_TDEHWLIB="$(usex hwlib)" - -DWITH_TDEHWLIB_DAEMONS="$(usex hwlib)" - -DWITH_UDISKS="$(usex old-udisks)" - -DWITH_UDISKS2="$(usex udisks)" - -DWITH_ALSA="$(usex alsa)" - -DWITH_AVAHI="$(usex zeroconf)" - -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 aspell)" - -DWITH_GAMIN="$(usex fam)" - -DWITH_TIFF="$(usex tiff)" - -DWITH_UTEMPTER="$(usex utempter)" - -DUTEMPTER_HELPER="/usr/sbin/utempter" - -DWITH_UPOWER="$(usex upower)" - -DWITH_CONSOLEKIT="$(usex consolekit)" - -DWITH_LOGINDPOWER="${enable_logind}" - -DWITH_NETWORK_MANAGER_BACKEND="$(usex networkmanager)" - -DWITH_XCOMPOSITE="$(usex xcomposite)" - -DWITH_XRANDR="$(usex xrandr)" - -DWITH_SUDO_TDESU_BACKEND="$(usex sudo)" - -DWITH_TDEICONLOADER_DEBUG="$(usex debug)" - ) - - #These options are not available in this version of the package. - #Revisit for 14.0.8. - - # -DWITH_UDEVIL="$(usex udevil)" - # -DWITH_CRYPTSETUP="$(usex cryptsetup)" - # -DWITH_PCSC="$(usex pcsc-lite)" - # -DWITH_PKCS="$(usex pkcs11)" - - trinity-base-2_src_configure -} - -src_install() { - trinity-base-2_src_install - - if use ssl; then - # Make TDE to use our system certificates - rm -f "${D}"${TDEDIR}/share/apps/kssl/ca-bundle.crt || die - dosym /etc/ssl/certs/ca-certificates.crt ${TDEDIR}/share/apps/kssl/ca-bundle.crt - fi - - dodir /etc/env.d - # TDE expects that the install path is listed first in TDEDIRS and the user - # directory (implicitly added) is the last entry. Doing otherwise breaks - # certain functionality. Do not break this (once again *sigh*), but read the code. - # TDE 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-2_create_tmp_docfiles - trinity-base-2_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 kdeglobals config file, which is usually" - einfo "located in the ~/.trinity/share/config/ directory." - fi - if use malloc; then - einfo "You have build TDE with its own malloc implementation." - einfo "That might result in better memory use for you when using TDE." - einfo "But it could also result in a slightly different performance." - einfo "With Gentoo you are free to choose what works better for you." - einfo "If you remove the malloc USE flag, GLIBC's malloc will be used." - fi - if ! use hwlib; then - for flag in consolekit networkmanager upower systemd old-udisks udisks udevil; do - use $flag && \ - ewarn "USE=\"$flag\" is passed, but it doesn't change anything because" && \ - ewarn "$flag support in ${P} takes effect only if the TDE hwlib is enabled." - done - - fi - if use hwlib; then - einfo "Please add your user to the plugdev group to be able" - einfo "to use the features of the TDE hwlibdaemons like suspend." - fi -} diff --git a/trinity-base/tdelibs/tdelibs-14.0.8.ebuild b/trinity-base/tdelibs/tdelibs-14.0.8.ebuild new file mode 100644 index 00000000..cd3330b6 --- /dev/null +++ b/trinity-base/tdelibs/tdelibs-14.0.8.ebuild @@ -0,0 +1,222 @@ +# Copyright 1999-2020 Gentoo Authors +# Copyright 2020 The Trinity Desktop Project +# Distributed under the terms of the GNU General Public License v2 + +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/" + +LICENSE="|| ( GPL-2 GPL-3 )" +KEYWORDS="~amd64 ~x86" +SLOT="${TRINITY_VER}" + +# NOTE: Building without tdehwlib segfaults, but you can try and report. + +IUSE+=" alsa avahi cups consolekit fam jpeg2k lua lzma +svg +idn +shm elogind + networkmanager openexr sudo tiff utempter elficons +ssl kernel_linux + upower xcomposite +hwlib libressl +xrandr +malloc systemd old-udisks udisks +pcre debug spell" + +COMMON_DEPEND=" + app-text/ghostscript-gpl + ~dev-libs/dbus-1-tqt-${PV} + dev-libs/libxslt + dev-libs/libxml2 + ~dev-tqt/tqtinterface-${PV} + media-libs/fontconfig + media-libs/freetype + x11-libs/libXrender + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + debug? ( sys-libs/binutils-libs:= ) + fam? ( virtual/fam ) + hwlib? ( virtual/libudev:= ) + idn? ( net-dns/libidn ) + jpeg2k? ( media-libs/jasper ) + lua? ( dev-lang/lua:* ) + lzma? ( app-arch/xz-utils ) + openexr? ( media-libs/openexr ) + pcre? ( dev-libs/libpcre ) + shm? ( x11-libs/libxshmfence ) + spell? ( app-text/aspell ) + ssl? ( + app-misc/ca-certificates + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + sudo? ( app-admin/sudo ) + svg? ( ~media-libs/libart_lgpl-14.0.7 ) + tiff? ( media-libs/tiff:= ) + utempter? ( sys-libs/libutempter ) + xcomposite? ( x11-libs/libXcomposite ) + xrandr? ( x11-libs/libXrandr ) + zeroconf? ( ~dev-tqt/avahi-tqt-${PV} ) +" +DEPEND+=" ${COMMON_DEPEND}" +RDEPEND+=" ${COMMON_DEPEND} + hwlib? ( + acct-group/plugdev + !udisks? ( !old-udisks? ( sys-apps/pmount ) ) + consolekit? ( sys-auth/consolekit ) + elogind? ( sys-auth/elogind ) + networkmanager? ( net-misc/networkmanager ) + old-udisks? ( sys-fs/udisks:0 ) + systemd? ( sys-apps/systemd ) + udisks? ( sys-fs/udisks:2 ) + upower? ( sys-power/upower ) + )" + +#Revisit these USE flags and dependencies for 14.0.9 +#pkcs11 pcsc-lite udevil cryptsetup +# pcsc-lite? ( sys-apps/pcsc-lite ) +# pkcs11? ( dev-libs/pkcs11-helper ) +# cryptsetup? ( sys-fs/cryptsetup ) +# udevil? ( sys-apps/udevil ) + +src_configure() { + local enable_logind="OFF" + if use systemd || use elogind; then + enable_logind="ON" + fi + + mycmakeargs=( + -DTDE_MALLOC="$(usex malloc)" + -DTDE_MALLOC_FULL="$(usex malloc)" + -DTDE_MALLOC_DEBUG="$(usex debug)" + -DWITH_HSPELL=OFF + -DWITH_HAL=OFF + -DWITH_DEVKITPOWER=OFF + -DWITH_OLD_XDG_STD=OFF + -DWITH_KDE4_MENU_SUFFIX=OFF + -DWITH_LIBIDN="$(usex idn)" + -DWITH_MITSHM="$(usex shm)" + -DWITH_PCRE="$(usex pcre)" + -DWITH_LIBART="$(usex svg)" + -DWITH_SSL="$(usex ssl)" + -DWITH_LIBBFD="$(usex debug)" + -DWITH_ELFICON=OFF + -DWITH_TDEHWLIB="$(usex hwlib)" + -DWITH_TDEHWLIB_DAEMONS="$(usex hwlib)" + -DWITH_UDISKS="$(usex old-udisks)" + -DWITH_UDISKS2="$(usex udisks)" + -DWITH_ALSA="$(usex alsa)" + -DWITH_AVAHI="$(usex zeroconf)" + -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)" + -DUTEMPTER_HELPER="/usr/sbin/utempter" + -DWITH_UPOWER="$(usex upower)" + -DWITH_CONSOLEKIT="$(usex consolekit)" + -DWITH_LOGINDPOWER="${enable_logind}" + -DWITH_NETWORK_MANAGER_BACKEND="$(usex networkmanager)" + -DWITH_XCOMPOSITE="$(usex xcomposite)" + -DWITH_XRANDR="$(usex xrandr)" + -DWITH_SUDO_TDESU_BACKEND="$(usex sudo)" + -DWITH_TDEICONLOADER_DEBUG="$(usex debug)" + ) + + #These options are not available in this version of the package. + #Revisit for 14.0.9. + + # -DWITH_UDEVIL="$(usex udevil)" + # -DWITH_CRYPTSETUP="$(usex cryptsetup)" + # -DWITH_PCSC="$(usex pcsc-lite)" + # -DWITH_PKCS="$(usex pkcs11)" + + trinity-base-2_src_configure +} + +src_install() { + trinity-base-2_src_install + + if use ssl; then + # Make TDE to use our system certificates + rm -f "${D}"${TDEDIR}/share/apps/kssl/ca-bundle.crt || die + dosym /etc/ssl/certs/ca-certificates.crt ${TDEDIR}/share/apps/kssl/ca-bundle.crt + fi + + dodir /etc/env.d + # TDE expects that the install path is listed first in TDEDIRS and the user + # directory (implicitly added) is the last entry. Doing otherwise breaks + # certain functionality. Do not break this (once again *sigh*), but read the code. + # TDE 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-2_create_tmp_docfiles + trinity-base-2_install_docfiles +} + +pkg_postinst () { + if use sudo; then + echo + 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 kdeglobals config file, which is usually" + einfo "located in the ~/.trinity/share/config/ directory." + echo + fi + if use malloc; then + echo + einfo "You have build TDE with its own malloc implementation." + einfo "That might result in better memory use for you when using TDE." + einfo "But it could also result in a slightly different performance." + einfo "With Gentoo you are free to choose what works better for you." + einfo "If you remove the malloc USE flag, GLIBC's malloc will be used." + echo + fi + if ! use hwlib; then + for flag in consolekit networkmanager upower systemd elogind old-udisks udisks udevil pkcs11 pcsc-lite cryptsetup; do + use $flag && \ + echo + ewarn "USE=\"$flag\" is passed, but it doesn't change anything because" && \ + ewarn "$flag support in ${P} takes effect only if the TDE hwlib is enabled." + echo + done + + fi + if use hwlib; then + echo + einfo "Please add your user to the plugdev group to be able" + einfo "to use the features of the TDE hwlibdaemons like suspend." + echo + fi +} -- cgit v1.2.1