trinity-base/tdelibs: Various fixes

- Add missing IUSE metadata
- Sort IUSE, DEPENDs
- Drop IUSE=elficons from 14.0.6 and 14.0.7 for missing dependency
- Rename IUSE=avahi->zeroconf (happened in Gentoo ebuild repo long ago)
- Rename IUSE=old_udisks->old-udisks (UnderscoreInUseFlag)
- Fix bogus dependency sys-libs/libr -> dev-libs/libr)
- Cleanup trailing whitespaces

Note: sys-fs/udisks:0 is still missing after this commit
Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --force
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
pull/180/head
Andreas Sturmlechner 4 years ago
parent 667e636015
commit 5b5653cd89

@ -1,2 +0,0 @@
trinity-base/tdelibs:pcsc-lite - Smartcard support via pcsc-lite
trinity-base/tdelibs:cryptsetup - Support for sys-fs/cryptsetup

@ -6,12 +6,20 @@
<name>Alexander Golubev</name>
</maintainer>
<use>
<flag name="sudo"> Use <pkg>app-admin/sudo</pkg> as a default program to
obtain root privileges.</flag>
<flag name="utempter">Records user logins. Useful on multi-user systems</flag>
<flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
<flag name="consolekit">Enable <pkg>sys-auth/consolekit</pkg> as tdehw backend</flag>
<flag name="old_udisks">Enable <pkg>sys-fs/udisks</pkg>:0 as tdehw backend</flag>
<flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
<flag name="elficons">Enable <pkg>dev-libs/libr</pkg> support</flag>
<flag name="ispell">Enable spellchecking using <pkg>app-text/ispell</pkg></flag>
<flag name="malloc">Enable TDE's own malloc implementation instead of GLIBC's.</flag>
<flag name="old-udisks">Enable <pkg>sys-fs/udisks</pkg>:0 as tdehw backend</flag>
<flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag>
<flag name="pkcs11">Enable PKCS11 entropy support</flag>
<flag name="shm">Enable support for shm</flag>
<flag name="sudo"> Use <pkg>app-admin/sudo</pkg> as a default program to obtain root privileges.</flag>
<flag name="udevil">Enable support for sys-apps/udevil</flag>
<flag name="udisks">Enable <pkg>sys-fs/udisks</pkg>:2 as tdehw backend</flag>
<flag name="upower">Enable <pkg>sys-power/upower</pkg> as tdehw backend</flag>
<flag name="utempter">Records user logins. Useful on multi-user systems</flag>
</use>
</pkgmetadata>

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
@ -11,72 +11,72 @@ set-trinityver
need-arts optional
DESCRIPTION="Trinity libraries needed by all TDE programs."
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 avahi cups consolekit fam jpeg2k lua lzma +svg +idn +shm elogind
networkmanager openexr aspell sudo tiff utempter elficons +ssl kernel_linux
upower xcomposite +hwlib libressl +xrandr +malloc systemd old_udisks udisks +pcre debug"
KEYWORDS="~amd64 ~x86"
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"
MY_DEPEND="~dev-tqt/tqtinterface-${PV}
COMMON_DEPEND="
app-text/ghostscript-gpl
~dev-libs/dbus-1-tqt-${PV}
dev-libs/libxslt
dev-libs/libxml2
app-text/ghostscript-gpl
~dev-tqt/tqtinterface-${PV}
media-libs/fontconfig
media-libs/freetype
~dev-libs/dbus-1-tqt-${PV}
x11-libs/libxshmfence
x11-libs/libXcursor
x11-libs/libXrender
ssl? (
app-misc/ca-certificates
!libressl? ( dev-libs/openssl:= )
libressl? ( dev-libs/libressl:= )
)
shm? ( x11-libs/libxshmfence )
idn? ( net-dns/libidn )
pcre? ( dev-libs/libpcre )
svg? ( media-libs/libart_lgpl )
alsa? ( media-libs/alsa-lib )
avahi? ( net-dns/avahi )
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 )
aspell? ( app-dicts/aspell-en app-text/aspell )
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 )
tiff? ( media-libs/tiff:= )
utempter? ( sys-libs/libutempter )
lzma? ( app-arch/xz-utils )
hwlib? ( virtual/libudev:= )
xrandr? ( x11-libs/libXrandr )
xcomposite? ( x11-libs/libXcomposite )
elficons? ( ~sys-libs/libr-${PV} )
debug? ( sys-libs/binutils-libs:= )"
DEPEND+=" ${MY_DEPEND}"
RDEPEND+=" ${MY_DEPEND}
xrandr? ( x11-libs/libXrandr )
zeroconf? ( net-dns/avahi )
"
DEPEND+=" ${COMMON_DEPEND}"
RDEPEND+=" ${COMMON_DEPEND}
hwlib? (
acct-group/plugdev
!udisks? ( !old_udisks? ( sys-apps/pmount ) )
networkmanager? ( net-misc/networkmanager )
!udisks? ( !old-udisks? ( sys-apps/pmount ) )
consolekit? ( sys-auth/consolekit )
upower? ( sys-power/upower )
systemd? ( sys-apps/systemd )
elogind? ( sys-auth/elogind )
old_udisks? ( sys-fs/udisks:0 )
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
#pkcs11 pcsc-lite udevil cryptsetup
# pcsc-lite? ( sys-apps/pcsc-lite )
# pkcs11? ( dev-libs/pkcs11-helper )
# cryptsetup? ( sys-fs/cryptsetup )
@ -103,13 +103,13 @@ src_configure() {
-DWITH_LIBART="$(usex svg)"
-DWITH_SSL="$(usex ssl)"
-DWITH_LIBBFD="$(usex debug)"
-DWITH_ELFICON="$(usex elficons)"
-DWITH_ELFICON=OFF
-DWITH_TDEHWLIB="$(usex hwlib)"
-DWITH_TDEHWLIB_DAEMONS="$(usex hwlib)"
-DWITH_UDISKS="$(usex old_udisks)"
-DWITH_UDISKS="$(usex old-udisks)"
-DWITH_UDISKS2="$(usex udisks)"
-DWITH_ALSA="$(usex alsa)"
-DWITH_AVAHI="$(usex avahi)"
-DWITH_AVAHI="$(usex zeroconf)"
-DWITH_CUPS="$(usex cups)"
-DWITH_INOTIFY="$(usex kernel_linux)"
-DWITH_JASPER="$(usex jpeg2k)"
@ -144,7 +144,7 @@ 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
@ -202,7 +202,7 @@ pkg_postinst () {
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
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."

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
@ -11,72 +11,72 @@ set-trinityver
need-arts optional
DESCRIPTION="Trinity libraries needed by all TDE programs."
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 avahi cups consolekit fam jpeg2k lua lzma +svg +idn +shm elogind
networkmanager openexr aspell sudo tiff utempter elficons +ssl kernel_linux
upower xcomposite +hwlib libressl +xrandr +malloc systemd old_udisks udisks +pcre debug"
KEYWORDS="~amd64 ~x86"
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"
MY_DEPEND="~dev-tqt/tqtinterface-${PV}
COMMON_DEPEND="
app-text/ghostscript-gpl
~dev-libs/dbus-1-tqt-${PV}
dev-libs/libxslt
dev-libs/libxml2
app-text/ghostscript-gpl
~dev-tqt/tqtinterface-${PV}
media-libs/fontconfig
media-libs/freetype
~dev-libs/dbus-1-tqt-${PV}
x11-libs/libxshmfence
x11-libs/libXcursor
x11-libs/libXrender
ssl? (
app-misc/ca-certificates
!libressl? ( dev-libs/openssl:= )
libressl? ( dev-libs/libressl:= )
)
shm? ( x11-libs/libxshmfence )
idn? ( net-dns/libidn )
pcre? ( dev-libs/libpcre )
svg? ( media-libs/libart_lgpl )
alsa? ( media-libs/alsa-lib )
avahi? ( net-dns/avahi )
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 )
aspell? ( app-dicts/aspell-en app-text/aspell )
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 )
tiff? ( media-libs/tiff:= )
utempter? ( sys-libs/libutempter )
lzma? ( app-arch/xz-utils )
hwlib? ( virtual/libudev:= )
xrandr? ( x11-libs/libXrandr )
xcomposite? ( x11-libs/libXcomposite )
elficons? ( ~sys-libs/libr-${PV} )
debug? ( sys-libs/binutils-libs:= )"
DEPEND+=" ${MY_DEPEND}"
RDEPEND+=" ${MY_DEPEND}
xrandr? ( x11-libs/libXrandr )
zeroconf? ( net-dns/avahi )
"
DEPEND+=" ${COMMON_DEPEND}"
RDEPEND+=" ${COMMON_DEPEND}
hwlib? (
acct-group/plugdev
!udisks? ( !old_udisks? ( sys-apps/pmount ) )
networkmanager? ( net-misc/networkmanager )
!udisks? ( !old-udisks? ( sys-apps/pmount ) )
consolekit? ( sys-auth/consolekit )
upower? ( sys-power/upower )
systemd? ( sys-apps/systemd )
elogind? ( sys-auth/elogind )
old_udisks? ( sys-fs/udisks:0 )
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
#pkcs11 pcsc-lite udevil cryptsetup
# pcsc-lite? ( sys-apps/pcsc-lite )
# pkcs11? ( dev-libs/pkcs11-helper )
# cryptsetup? ( sys-fs/cryptsetup )
@ -103,13 +103,13 @@ src_configure() {
-DWITH_LIBART="$(usex svg)"
-DWITH_SSL="$(usex ssl)"
-DWITH_LIBBFD="$(usex debug)"
-DWITH_ELFICON="$(usex elficons)"
-DWITH_ELFICON=OFF
-DWITH_TDEHWLIB="$(usex hwlib)"
-DWITH_TDEHWLIB_DAEMONS="$(usex hwlib)"
-DWITH_UDISKS="$(usex old_udisks)"
-DWITH_UDISKS="$(usex old-udisks)"
-DWITH_UDISKS2="$(usex udisks)"
-DWITH_ALSA="$(usex alsa)"
-DWITH_AVAHI="$(usex avahi)"
-DWITH_AVAHI="$(usex zeroconf)"
-DWITH_CUPS="$(usex cups)"
-DWITH_INOTIFY="$(usex kernel_linux)"
-DWITH_JASPER="$(usex jpeg2k)"
@ -144,7 +144,7 @@ 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
@ -202,7 +202,7 @@ pkg_postinst () {
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
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."

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
@ -11,74 +11,75 @@ set-trinityver
need-arts optional
DESCRIPTION="Trinity libraries needed by all TDE programs."
DESCRIPTION="Trinity libraries needed by all TDE programs"
HOMEPAGE="https://trinitydesktop.org/"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="${TRINITY_VER}"
# NOTE: Building without tdehwlib segfaults, but you can try and report.
IUSE+=" alsa avahi cups consolekit cryptsetup fam jpeg2k lua lzma udevil +svg +idn +shm elogind
networkmanager openexr pcsc-lite aspell ispell sudo tiff utempter elficons +ssl pkcs11 kernel_linux
upower xcomposite +hwlib libressl +xrandr +malloc systemd old_udisks udisks +pcre debug spell"
IUSE+=" alsa aspell consolekit 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 ) )"
REQUIRED_USE="spell? ( || ( aspell ispell ) )"
MY_DEPEND="~dev-tqt/tqtinterface-${PV}
COMMON_DEPEND="
app-text/ghostscript-gpl
~dev-libs/dbus-1-tqt-${PV}
dev-libs/libxslt
dev-libs/libxml2
app-text/ghostscript-gpl
~dev-tqt/tqtinterface-${PV}
media-libs/fontconfig
media-libs/freetype
~dev-libs/dbus-1-tqt-${PV}
x11-libs/libXrender
ssl? (
app-misc/ca-certificates
!libressl? ( dev-libs/openssl:= )
libressl? ( dev-libs/libressl:= )
)
shm? ( x11-libs/libxshmfence )
idn? ( net-dns/libidn )
pcre? ( dev-libs/libpcre )
svg? ( media-libs/libart_lgpl )
alsa? ( media-libs/alsa-lib )
avahi? ( ~dev-tqt/avahi-tqt-${PV} )
cups? ( net-print/cups )
debug? ( sys-libs/binutils-libs:= )
elficons? ( ~dev-libs/libr-${PV} )
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 )
sudo? ( app-admin/sudo )
pcre? ( dev-libs/libpcre )
shm? ( x11-libs/libxshmfence )
spell? (
aspell? ( app-text/aspell )
ispell? ( app-text/ispell )
)
ssl? (
app-misc/ca-certificates
!libressl? ( dev-libs/openssl:= )
libressl? ( dev-libs/libressl:= )
)
sudo? ( app-admin/sudo )
svg? ( media-libs/libart_lgpl )
tiff? ( media-libs/tiff:= )
utempter? ( sys-libs/libutempter )
lzma? ( app-arch/xz-utils )
hwlib? ( virtual/libudev:= )
xrandr? ( x11-libs/libXrandr )
xcomposite? ( x11-libs/libXcomposite )
elficons? ( ~sys-libs/libr-${PV} )
debug? ( sys-libs/binutils-libs:= )"
DEPEND+=" ${MY_DEPEND}"
RDEPEND+=" ${MY_DEPEND}
xrandr? ( x11-libs/libXrandr )
zeroconf? ( ~dev-tqt/avahi-tqt-${PV} )
"
DEPEND+=" ${COMMON_DEPEND}"
RDEPEND+=" ${COMMON_DEPEND}
hwlib? (
acct-group/plugdev
!udevil? ( !udisks? ( !old_udisks? ( sys-apps/pmount ) ) )
pcsc-lite? ( sys-apps/pcsc-lite )
pkcs11? ( dev-libs/pkcs11-helper )
!udevil? ( !udisks? ( !old-udisks? ( sys-apps/pmount ) ) )
consolekit? ( sys-auth/consolekit )
cryptsetup? ( sys-fs/cryptsetup )
elogind? ( sys-auth/elogind )
networkmanager? ( net-misc/networkmanager )
consolekit? ( sys-auth/consolekit )
upower? ( sys-power/upower )
old-udisks? ( sys-fs/udisks:0 )
pcsc-lite? ( sys-apps/pcsc-lite )
pkcs11? ( dev-libs/pkcs11-helper )
systemd? ( sys-apps/systemd )
elogind? ( sys-auth/elogind )
old_udisks? ( sys-fs/udisks:0 )
udisks? ( sys-fs/udisks:2 )
udevil? ( sys-apps/udevil )
udisks? ( sys-fs/udisks:2 )
upower? ( sys-power/upower )
)"
src_configure() {
@ -105,11 +106,11 @@ src_configure() {
-DWITH_ELFICON="$(usex elficons)"
-DWITH_TDEHWLIB="$(usex hwlib)"
-DWITH_TDEHWLIB_DAEMONS="$(usex hwlib)"
-DWITH_UDISKS="$(usex old_udisks)"
-DWITH_UDISKS="$(usex old-udisks)"
-DWITH_UDISKS2="$(usex udisks)"
-DWITH_UDEVIL="$(usex udevil)"
-DWITH_ALSA="$(usex alsa)"
-DWITH_AVAHI="$(usex avahi)"
-DWITH_AVAHI="$(usex zeroconf)"
-DWITH_CRYPTSETUP="$(usex cryptsetup)"
-DWITH_CUPS="$(usex cups)"
-DWITH_INOTIFY="$(usex kernel_linux)"
@ -201,7 +202,7 @@ pkg_postinst () {
echo
fi
if ! use hwlib; then
for flag in consolekit networkmanager upower systemd elogind old_udisks udisks udevil pkcs11 pcsc-lite cryptsetup; do
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" && \

Loading…
Cancel
Save