trinity-base/*: Unrestrict media-libs/libart_lgpl version dep

This was overriding existing ebuild from Gentoo ebuild repository.

What is the delta of the fork compared to upstream?
Why was it forked in the first place?
What made pinning down the version necessary like that?

Misc: local mycmakeargs

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
pull/180/head
Andreas Sturmlechner 4 years ago
parent a70912b669
commit af1b333e20

@ -3,13 +3,13 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI="7" EAPI="7"
TRINITY_MODULE_NAME="tdebase"
TRINITY_MODULE_NAME="tdebase"
inherit trinity-meta-2 inherit trinity-meta-2
DESCRIPTION="The Trinity Control Center" DESCRIPTION="The Trinity Control Center"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~x86"
IUSE="samba logitech-mouse ieee1394 +svg +hwlib +xrandr " IUSE="samba logitech-mouse ieee1394 +svg +hwlib +xrandr "
DEPEND="x11-libs/libX11 DEPEND="x11-libs/libX11
@ -29,12 +29,12 @@ RDEPEND="${DEPEND}
~trinity-base/tdesu-${PV} ~trinity-base/tdesu-${PV}
~trinity-base/khelpcenter-${PV} ~trinity-base/khelpcenter-${PV}
~trinity-base/khotkeys-${PV} ~trinity-base/khotkeys-${PV}
svg? ( ~media-libs/libart_lgpl-${PV} )" svg? ( media-libs/libart_lgpl )"
TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/" TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/"
src_configure() { src_configure() {
mycmakeargs=( local mycmakeargs=(
-DWITH_XCURSOR=ON -DWITH_XCURSOR=ON
-DWITH_XRENDER=ON -DWITH_XRENDER=ON
-DWITH_USBIDS=/usr/share/misc/usb.ids -DWITH_USBIDS=/usr/share/misc/usb.ids

@ -3,13 +3,13 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI="7" EAPI="7"
TRINITY_MODULE_NAME="tdebase"
TRINITY_MODULE_NAME="tdebase"
inherit trinity-meta-2 inherit trinity-meta-2
DESCRIPTION="The Trinity Control Center" DESCRIPTION="The Trinity Control Center"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~x86"
IUSE="samba logitech-mouse ieee1394 +svg +hwlib +xrandr " IUSE="samba logitech-mouse ieee1394 +svg +hwlib +xrandr "
DEPEND="x11-libs/libX11 DEPEND="x11-libs/libX11
@ -29,12 +29,12 @@ RDEPEND="${DEPEND}
~trinity-base/tdesu-${PV} ~trinity-base/tdesu-${PV}
~trinity-base/khelpcenter-${PV} ~trinity-base/khelpcenter-${PV}
~trinity-base/khotkeys-${PV} ~trinity-base/khotkeys-${PV}
svg? ( ~media-libs/libart_lgpl-${PV} )" svg? ( media-libs/libart_lgpl )"
TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/" TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/"
src_configure() { src_configure() {
mycmakeargs=( local mycmakeargs=(
-DWITH_XCURSOR=ON -DWITH_XCURSOR=ON
-DWITH_XRENDER=ON -DWITH_XRENDER=ON
-DWITH_USBIDS=/usr/share/misc/usb.ids -DWITH_USBIDS=/usr/share/misc/usb.ids

@ -3,8 +3,8 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI="7" EAPI="7"
TRINITY_MODULE_NAME="tdebase"
TRINITY_MODULE_NAME="tdebase"
inherit trinity-meta-2 inherit trinity-meta-2
DESCRIPTION="The Trinity Control Center" DESCRIPTION="The Trinity Control Center"
@ -28,12 +28,12 @@ RDEPEND="${DEPEND}
~trinity-base/tdesu-${PV} ~trinity-base/tdesu-${PV}
~trinity-base/khelpcenter-${PV} ~trinity-base/khelpcenter-${PV}
~trinity-base/khotkeys-${PV} ~trinity-base/khotkeys-${PV}
svg? ( ~media-libs/libart_lgpl-${PV} )" svg? ( media-libs/libart_lgpl )"
TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/" TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/"
src_configure() { src_configure() {
mycmakeargs=( local mycmakeargs=(
-DWITH_XCURSOR=ON -DWITH_XCURSOR=ON
-DWITH_XRENDER=ON -DWITH_XRENDER=ON
-DWITH_USBIDS=/usr/share/misc/usb.ids -DWITH_USBIDS=/usr/share/misc/usb.ids

@ -3,8 +3,8 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI="7" EAPI="7"
TRINITY_MODULE_NAME="tdelibs"
TRINITY_MODULE_NAME="tdelibs"
inherit trinity-base-2 multilib inherit trinity-base-2 multilib
set-trinityver set-trinityver
@ -13,12 +13,11 @@ need-arts optional
DESCRIPTION="Trinity libraries needed by all TDE programs." DESCRIPTION="Trinity libraries needed by all TDE programs."
HOMEPAGE="https://trinitydesktop.org/" HOMEPAGE="https://trinitydesktop.org/"
LICENSE="|| ( GPL-2 GPL-3 )"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="${TRINITY_VER}" SLOT="${TRINITY_VER}"
# NOTE: Building without tdehwlib segfaults, but you can try and report. # NOTE: Building without tdehwlib segfaults, but you can try and report.
IUSE+=" alsa avahi cups consolekit fam jpeg2k lua lzma +svg +idn +shm elogind IUSE+=" alsa avahi cups consolekit fam jpeg2k lua lzma +svg +idn +shm elogind
networkmanager openexr aspell sudo tiff utempter elficons +ssl kernel_linux networkmanager openexr aspell sudo tiff utempter elficons +ssl kernel_linux
upower xcomposite +hwlib libressl +xrandr +malloc systemd old_udisks udisks +pcre debug" upower xcomposite +hwlib libressl +xrandr +malloc systemd old_udisks udisks +pcre debug"
@ -43,7 +42,7 @@ MY_DEPEND="~dev-tqt/tqtinterface-${PV}
shm? ( x11-libs/libxshmfence ) shm? ( x11-libs/libxshmfence )
idn? ( net-dns/libidn ) idn? ( net-dns/libidn )
pcre? ( dev-libs/libpcre ) pcre? ( dev-libs/libpcre )
svg? ( ~media-libs/libart_lgpl-${PV} ) svg? ( media-libs/libart_lgpl )
alsa? ( media-libs/alsa-lib ) alsa? ( media-libs/alsa-lib )
avahi? ( net-dns/avahi ) avahi? ( net-dns/avahi )
cups? ( net-print/cups ) cups? ( net-print/cups )

@ -3,8 +3,8 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI="7" EAPI="7"
TRINITY_MODULE_NAME="tdelibs"
TRINITY_MODULE_NAME="tdelibs"
inherit trinity-base-2 multilib inherit trinity-base-2 multilib
set-trinityver set-trinityver
@ -13,12 +13,11 @@ need-arts optional
DESCRIPTION="Trinity libraries needed by all TDE programs." DESCRIPTION="Trinity libraries needed by all TDE programs."
HOMEPAGE="https://trinitydesktop.org/" HOMEPAGE="https://trinitydesktop.org/"
LICENSE="|| ( GPL-2 GPL-3 )"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="${TRINITY_VER}" SLOT="${TRINITY_VER}"
# NOTE: Building without tdehwlib segfaults, but you can try and report. # NOTE: Building without tdehwlib segfaults, but you can try and report.
IUSE+=" alsa avahi cups consolekit fam jpeg2k lua lzma +svg +idn +shm elogind IUSE+=" alsa avahi cups consolekit fam jpeg2k lua lzma +svg +idn +shm elogind
networkmanager openexr aspell sudo tiff utempter elficons +ssl kernel_linux networkmanager openexr aspell sudo tiff utempter elficons +ssl kernel_linux
upower xcomposite +hwlib libressl +xrandr +malloc systemd old_udisks udisks +pcre debug" upower xcomposite +hwlib libressl +xrandr +malloc systemd old_udisks udisks +pcre debug"
@ -43,7 +42,7 @@ MY_DEPEND="~dev-tqt/tqtinterface-${PV}
shm? ( x11-libs/libxshmfence ) shm? ( x11-libs/libxshmfence )
idn? ( net-dns/libidn ) idn? ( net-dns/libidn )
pcre? ( dev-libs/libpcre ) pcre? ( dev-libs/libpcre )
svg? ( ~media-libs/libart_lgpl-${PV} ) svg? ( media-libs/libart_lgpl )
alsa? ( media-libs/alsa-lib ) alsa? ( media-libs/alsa-lib )
avahi? ( net-dns/avahi ) avahi? ( net-dns/avahi )
cups? ( net-print/cups ) cups? ( net-print/cups )

@ -3,8 +3,8 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI="7" EAPI="7"
TRINITY_MODULE_NAME="tdelibs"
TRINITY_MODULE_NAME="tdelibs"
inherit trinity-base-2 inherit trinity-base-2
set-trinityver set-trinityver
@ -13,12 +13,11 @@ need-arts optional
DESCRIPTION="Trinity libraries needed by all TDE programs." DESCRIPTION="Trinity libraries needed by all TDE programs."
HOMEPAGE="https://trinitydesktop.org/" HOMEPAGE="https://trinitydesktop.org/"
LICENSE="|| ( GPL-2 GPL-3 )"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="${TRINITY_VER}" SLOT="${TRINITY_VER}"
# NOTE: Building without tdehwlib segfaults, but you can try and report. # 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 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 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" upower xcomposite +hwlib libressl +xrandr +malloc systemd old_udisks udisks +pcre debug spell"
@ -42,7 +41,7 @@ MY_DEPEND="~dev-tqt/tqtinterface-${PV}
shm? ( x11-libs/libxshmfence ) shm? ( x11-libs/libxshmfence )
idn? ( net-dns/libidn ) idn? ( net-dns/libidn )
pcre? ( dev-libs/libpcre ) pcre? ( dev-libs/libpcre )
svg? ( ~media-libs/libart_lgpl-${PV} ) svg? ( media-libs/libart_lgpl )
alsa? ( media-libs/alsa-lib ) alsa? ( media-libs/alsa-lib )
avahi? ( ~dev-tqt/avahi-tqt-${PV} ) avahi? ( ~dev-tqt/avahi-tqt-${PV} )
cups? ( net-print/cups ) cups? ( net-print/cups )

@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
DEPEND="pam? ( trinity-base/tdebase-pam ) DEPEND="pam? ( trinity-base/tdebase-pam )
xdmcp? ( x11-libs/libXdmcp ) xdmcp? ( x11-libs/libXdmcp )
xcomposite? ( x11-libs/libXcomposite ) xcomposite? ( x11-libs/libXcomposite )
svg? ( ~media-libs/libart_lgpl-${PV} ) svg? ( media-libs/libart_lgpl )
~trinity-base/tdelibs-${PV}[xrandr?] ~trinity-base/tdelibs-${PV}[xrandr?]
sys-apps/dbus sys-apps/dbus
x11-libs/libXtst x11-libs/libXtst
@ -33,7 +33,7 @@ pkg_setup() {
} }
src_configure() { src_configure() {
mycmakeargs=( local mycmakeargs=(
-DWITH_XTEST=ON -DWITH_XTEST=ON
-DWITH_LIBART="$(usex svg)" -DWITH_LIBART="$(usex svg)"
-DWITH_SHADOW=ON -DWITH_SHADOW=ON

@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
DEPEND="pam? ( trinity-base/tdebase-pam ) DEPEND="pam? ( trinity-base/tdebase-pam )
xdmcp? ( x11-libs/libXdmcp ) xdmcp? ( x11-libs/libXdmcp )
xcomposite? ( x11-libs/libXcomposite ) xcomposite? ( x11-libs/libXcomposite )
svg? ( ~media-libs/libart_lgpl-${PV} ) svg? ( media-libs/libart_lgpl )
~trinity-base/tdelibs-${PV}[xrandr?] ~trinity-base/tdelibs-${PV}[xrandr?]
sys-apps/dbus sys-apps/dbus
x11-libs/libXtst x11-libs/libXtst
@ -33,7 +33,7 @@ pkg_setup() {
} }
src_configure() { src_configure() {
mycmakeargs=( local mycmakeargs=(
-DWITH_XTEST=ON -DWITH_XTEST=ON
-DWITH_LIBART="$(usex svg)" -DWITH_LIBART="$(usex svg)"
-DWITH_SHADOW=ON -DWITH_SHADOW=ON

@ -3,8 +3,8 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI="7" EAPI="7"
TRINITY_MODULE_NAME="tdebase"
TRINITY_MODULE_NAME="tdebase"
inherit trinity-meta-2 inherit trinity-meta-2
DESCRIPTION="Trinity login manager, similar to XDM and GDM" DESCRIPTION="Trinity login manager, similar to XDM and GDM"
@ -14,7 +14,7 @@ IUSE="pam xdmcp xcomposite sak +xrandr +hwlib +svg"
DEPEND="pam? ( trinity-base/tdebase-pam ) DEPEND="pam? ( trinity-base/tdebase-pam )
xdmcp? ( x11-libs/libXdmcp ) xdmcp? ( x11-libs/libXdmcp )
xcomposite? ( x11-libs/libXcomposite ) xcomposite? ( x11-libs/libXcomposite )
svg? ( ~media-libs/libart_lgpl-${PV} ) svg? ( media-libs/libart_lgpl )
~trinity-base/tdelibs-${PV}[xrandr?] ~trinity-base/tdelibs-${PV}[xrandr?]
sys-apps/dbus sys-apps/dbus
x11-libs/libXtst x11-libs/libXtst
@ -31,7 +31,7 @@ pkg_setup() {
} }
src_configure() { src_configure() {
mycmakeargs=( local mycmakeargs=(
-DWITH_XTEST=ON -DWITH_XTEST=ON
-DWITH_SHADOW=ON -DWITH_SHADOW=ON
-DWITH_LIBART="$(usex svg)" -DWITH_LIBART="$(usex svg)"

Loading…
Cancel
Save