Live ebuilds: More overlay cleanup.

- Remove superflous files folders.
- Fix wrong or bad variables.
- Remove superfluous dependencies.
- Mainstream hwlib flag for all ebuilds.
- Fix wrong WITH_XCURSOR flag (typo?).
- Fix wrong WITH_XTEST flag (typo?).

Signed-off-by: Chris <xchrisx@uber.space>
pull/45/head
Chris 4 years ago committed by TDE Gitea
parent 5aaf567621
commit c1a4b02009

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -10,4 +10,4 @@ inherit trinity-meta-2
DESCRIPTION="Trinity digital camera manager"
DEPEND="media-libs/libgphoto2"
RDEPEND="$DEPEND"
RDEPEND="${DEPEND}"

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -30,7 +30,7 @@ TSM_EXTRACT_ALSO="kcheckpass/"
src_configure() {
mycmakeargs=(
-DWITH_XCURSORS=ON
-DWITH_XCURSOR=ON
-DWITH_XRENDER=ON
-DWITH_PAM="$(usex pam)"
-DWITH_XSCREENSAVER="$(usex xscreensaver)"

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -11,6 +11,6 @@ DESCRIPTION="Trinity DVI viewer"
DEPEND="media-libs/freetype
=trinity-base/kviewshell-${PV}"
RDEPEND="$DEPEND"
RDEPEND="${DEPEND}"
TSM_EXTRACT_ALSO="kviewshell"

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -16,7 +16,7 @@ RDEPEND+=" x11-libs/libXtst"
src_configure() {
mycmakeargs=(
-D_WITH_XTEST=ON
-DWITH_XTEST=ON
)
trinity-meta-2_src_configure

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -24,7 +24,7 @@ src_configure() {
mycmakeargs=(
-DWITH_XFIXES="$(usex xcomposite)"
-DWITH_XRENDER="$(usex xcomposite)"
-DWITH_XCOMPOSITE="$(usex xcomposite)"
-DWITH_XCOMPOSITE="$(usex xcomposite)"
)
trinity-meta-2_src_configure

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -10,7 +10,7 @@ inherit trinity-meta-2
DESCRIPTION="kicker applet for Trinity and X clipboard management"
DEPEND="x11-libs/libXfixes"
RDEPEND="${RDEPEND}"
RDEPEND="${DEPEND}"
src_configure() {
mycmakeargs=(

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -23,7 +23,7 @@ COMMON_DEPEND="
=trinity-base/libkpimidentities-${PV}
=trinity-base/kaddressbook-${PV}
exchange? ( =trinity-base/libkpimexchange-${PV} )"
# >=trinity-base/tdepim-tderesources-${PV}:${SLOT}
# =trinity-base/tdepim-tderesources-${PV}:${SLOT}
DEPEND+=" ${COMMON_DEPEND}"
RDEPEND+=" ${COMMON_DEPEND}"

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -11,9 +11,8 @@ DESCRIPTION="Trinity splashscreen framework (of Trinity itself, not of individua
IUSE="xinerama"
DEPEND="x11-libs/libXcursor
xinerama? ( x11-base/xorg-proto )"
RDEPEND="$DEPEND"
DEPEND="xinerama? ( x11-base/xorg-proto )"
RDEPEND="${DEPEND}"
src_configure() {
mycmakeargs=(

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -12,7 +12,7 @@ DESCRIPTION="tdeartwork meta package - merge this to pull in all tdeartwork-deri
HOMEPAGE="http://www.trinitydesktop.org/"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="$TRINITY_VER"
SLOT="${TRINITY_VER}"
RDEPEND="
=trinity-base/tdeartwork-emoticons-${PV}

@ -9,4 +9,4 @@ inherit trinity-meta-2
DESCRIPTION="Window styles for Trinity"
DEPEND="=trinity-base/twin-${PV}"
RDEPEND="$DEPEND"
RDEPEND="${DEPEND}"

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -38,7 +38,7 @@ src_compile() {
# List all the multilib libdirs
local _libdir _libdirs
for _libdir in $(get_all_libdirs); do
_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
_libdirs="${_libdirs}:${TDEDIR}/${_libdir}"
done
_libdirs=${_libdirs#:}
}

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -10,7 +10,7 @@ inherit trinity-meta-2
TSM_EXTRACT="tdeioslave"
DESCRIPTION="Generic Trinity TDEIOslaves"
IUSE="samba ldap sasl openexr +tdehw"
IUSE="samba ldap sasl openexr +hwlib"
DEPEND="x11-libs/libXcursor
net-libs/rpcsvc-proto
@ -30,7 +30,7 @@ src_configure() {
-DWITH_LDAP="$(usex ldap)"
-DWITH_SASL="$(usex sasl)"
-DWITH_OPENEXR="$(usex openexr)"
-DWITH_TDEHWLIB="$(usex tdehw)"
-DWITH_TDEHWLIB="$(usex hwlib)"
)
trinity-meta-2_src_configure

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -12,7 +12,7 @@ DESCRIPTION="tdenetwork metapackage - merge this to pull in all tdenetwork-deriv
HOMEPAGE="http://www.trinitydesktop.org/"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="$TRINITY_VER"
SLOT="{$TRINITY_VER}"
RDEPEND="
=trinity-base/dcoprss-${PV}

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files/

@ -12,7 +12,7 @@ DESCRIPTION="tdetoys metapackage - merge this to pull in all tdetoys-derived pac
HOMEPAGE="http://www.trinitydesktop.org/"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="$TRINITY_VER"
SLOT="${TRINITY_VER}"
RDEPEND="
>=trinity-base/amor-${PV}

@ -12,7 +12,7 @@ DESCRIPTION="tdeutils metapackage - merge this to pull in all tdeutils-derived p
HOMEPAGE="http://www.trinitydesktop.org/"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="$TRINITY_VER"
SLOT="${TRINITY_VER}"
RDEPEND="
=trinity-base/ark-${PV}

@ -16,7 +16,6 @@ DEPEND="pam? ( trinity-base/tdebase-pam )
xcomposite? ( x11-libs/libXcomposite )
xrandr? ( x11-libs/libXrandr )
=trinity-base/tdelibs-${PV}[xrandr?]
sys-apps/dbus
x11-libs/libXtst
=trinity-base/kcontrol-${PV}
=dev-libs/dbus-tqt-${PV}"

@ -1 +0,0 @@
../../../eclass/trinity-shared-files

@ -1 +0,0 @@
../../../eclass/trinity-shared-files
Loading…
Cancel
Save