Minor cleanup of dependency syntax. Added missing dep trinity-base/kontact-14.0.8

Signed-off-by: E. Liddell <ejlddll@warpmail.net>
pull/193/head
E. Liddell 3 years ago committed by TDE Gitea
parent f0575f757d
commit 494d42a599

@ -32,6 +32,9 @@ SLOT="${TRINITY_VER}"
# Yauap isn't in Portage tree, but could be added later. # Yauap isn't in Portage tree, but could be added later.
# #
# - Rio Karma support needs libkarma which neeeds to be added to our overlay later. # - Rio Karma support needs libkarma which neeeds to be added to our overlay later.
# USE=riokarma
# DEPEND+=" riokarma? ( media-libs/libkarma )"
# -DWITH_RIOKARMA="$(usex riokarma)"
# #
# - No Support for DAAP because it's not tested if that works with Mongrel2. # - No Support for DAAP because it's not tested if that works with Mongrel2.
# #
@ -39,7 +42,7 @@ SLOT="${TRINITY_VER}"
# #
# - Otherwise the ebuild should offer all what can be done with CMake at the moment. # - Otherwise the ebuild should offer all what can be done with CMake at the moment.
IUSE+=" konqsidebar +xine ipod riokarma ifp njb mtp mp4 IUSE+=" konqsidebar +xine ipod ifp njb mtp mp4
inotify visualization amazon mysql postgres opengl akode" inotify visualization amazon mysql postgres opengl akode"
REQUIRED_USE="|| ( xine akode )" REQUIRED_USE="|| ( xine akode )"
@ -49,10 +52,9 @@ DEPEND+="
media-libs/taglib media-libs/taglib
dev-db/sqlite dev-db/sqlite
xine? ( <media-libs/xine-lib-1.2.10 ) xine? ( <media-libs/xine-lib-1.2.10 )
akode? ( =media-libs/akode-${PV} ) akode? ( ~media-libs/akode-${PV} )
mp4? ( media-libs/libmp4v2 ) mp4? ( media-libs/libmp4v2 )
ipod? ( media-libs/libgpod ) ipod? ( media-libs/libgpod )
riokarma? ( media-libs/libkarma )
ifp? ( media-libs/libifp ) ifp? ( media-libs/libifp )
njb? ( media-libs/libnjb ) njb? ( media-libs/libnjb )
opengl? ( virtual/opengl ) opengl? ( virtual/opengl )
@ -73,7 +75,6 @@ src_configure() {
-DWITH_XINE="$(usex xine)" -DWITH_XINE="$(usex xine)"
-DWITH_AKODE="$(usex akode)" -DWITH_AKODE="$(usex akode)"
-DWITH_IPOD="$(usex ipod)" -DWITH_IPOD="$(usex ipod)"
-DWITH_RIOKARMA="$(usex riokarma)"
-DWITH_IFP="$(usex ifp)" -DWITH_IFP="$(usex ifp)"
-DWITH_NJB="$(usex njb)" -DWITH_NJB="$(usex njb)"
-DWITH_MTP="$(usex mtp)" -DWITH_MTP="$(usex mtp)"

@ -25,8 +25,8 @@ SLOT="${TRINITY_VER}"
IUSE+=" crypt +svg kontact" IUSE+=" crypt +svg kontact"
DEPEND+=" crypt? ( app-crypt/gpgme ) DEPEND+=" crypt? ( app-crypt/gpgme )
svg? ( =media-libs/libart_lgpl-${PV} ) svg? ( ~media-libs/libart_lgpl-${PV} )
kontact? ( =trinity-base/kontact-${PV} )" kontact? ( ~trinity-base/kontact-${PV} )"
RDEPEND+=" ${DEPEND}" RDEPEND+=" ${DEPEND}"
src_configure() { src_configure() {

@ -27,7 +27,7 @@ DEPEND+=" media-libs/libsamplerate
alsa? ( media-libs/alsa-lib ) alsa? ( media-libs/alsa-lib )
dvd? ( media-libs/libdvdread ) dvd? ( media-libs/libdvdread )
encode? ( media-sound/lame ) encode? ( media-sound/lame )
ffmpeg? ( virtual/ffmpeg ) ffmpeg? ( media-video/ffmpeg )
flac? ( media-libs/flac[cxx] ) flac? ( media-libs/flac[cxx] )
mp3? ( media-libs/libmad ) mp3? ( media-libs/libmad )
sndfile? ( media-libs/libsndfile ) sndfile? ( media-libs/libsndfile )

@ -22,6 +22,8 @@ SLOT="${TRINITY_VER}"
# Native GNU Barcode support seems to be broken right now. # Native GNU Barcode support seems to be broken right now.
# The GNU Barcode binary is needed anyway. # The GNU Barcode binary is needed anyway.
# Might be related to the following tidbit from Gentoo user ML:
#"As of version 0.99, GNU Barcode no longer installs its library."
IUSE+=" javascript native_gnu_barcode" IUSE+=" javascript native_gnu_barcode"

@ -21,7 +21,7 @@ need-trinity
SLOT="${TRINITY_VER}" SLOT="${TRINITY_VER}"
RDEPEND+=" =trinity-base/kcontrol-${PV} RDEPEND+=" ~trinity-base/kcontrol-${PV}
app-backup/rdiff-backup" app-backup/rdiff-backup"
pkg_postinst () { pkg_postinst () {

@ -23,7 +23,7 @@ SLOT="${TRINITY_VER}"
IUSE+=" tqt tde gtk2" IUSE+=" tqt tde gtk2"
DEPEND+=" DEPEND+="
tqt? ( =dev-tqt/tqtinterface-${PV} ) tqt? ( ~dev-tqt/tqtinterface-${PV} )
gtk2? ( x11-libs/gtk+:2 ) gtk2? ( x11-libs/gtk+:2 )
" "
RDEPEND+=" ${DEPEND}" RDEPEND+=" ${DEPEND}"

@ -20,7 +20,7 @@ need-trinity
SLOT="${TRINITY_VER}" SLOT="${TRINITY_VER}"
DEPEND+=" =trinity-base/mimelib-${PV}" DEPEND+=" ~trinity-base/mimelib-${PV}"
RDEPEND+=" ${DEPEND}" RDEPEND+=" ${DEPEND}"
src_configure() { src_configure() {

@ -25,9 +25,9 @@ SLOT="${TRINITY_VER}"
IUSE+=" extras" IUSE+=" extras"
RDEPEND+=" RDEPEND+="
=trinity-base/tdesu-${PV} ~trinity-base/tdesu-${PV}
=trinity-base/kcontrol-${PV} ~trinity-base/kcontrol-${PV}
=trinity-base/kdialog-${PV}" ~trinity-base/kdialog-${PV}"
src_configure() { src_configure() {
mycmakeargs=( mycmakeargs=(

@ -28,7 +28,7 @@ IUSE+=" cisco smartcard +openvpn strongswan pptpd libreswan"
DEPEND+=" sys-apps/net-tools DEPEND+=" sys-apps/net-tools
dev-libs/libgcrypt" dev-libs/libgcrypt"
RDEPEND+=" ${DEPEND} RDEPEND+=" ${DEPEND}
cisco? ( net-misc/vpnc ) cisco? ( net-vpn/vpnc )
smartcard? ( dev-libs/openct ) smartcard? ( dev-libs/openct )
openvpn? ( net-vpn/openvpn ) openvpn? ( net-vpn/openvpn )
strongswan? ( net-vpn/strongswan ) strongswan? ( net-vpn/strongswan )

@ -26,7 +26,7 @@ SLOT="${TRINITY_VER}"
DEPEND+=" x11-libs/libXScrnSaver DEPEND+=" x11-libs/libXScrnSaver
x11-libs/libXext x11-libs/libXext
x11-libs/libXtst x11-libs/libXtst
=dev-libs/dbus-1-tqt-${PV}" ~dev-libs/dbus-1-tqt-${PV}"
RDEPEND+=" ${DEPEND}" RDEPEND+=" ${DEPEND}"
src_configure() { src_configure() {

@ -22,6 +22,8 @@ SLOT="${TRINITY_VER}"
IUSE+=" test" IUSE+=" test"
RESTRICT="!test? ( test )"
DEPEND+=" dev-vcs/subversion" DEPEND+=" dev-vcs/subversion"
RDEPEND+=" ${DEPEND}" RDEPEND+=" ${DEPEND}"

@ -20,7 +20,7 @@ need-trinity
SLOT="${TRINITY_VER}" SLOT="${TRINITY_VER}"
RDEPEND+=" =trinity-base/tdm-${PV}" RDEPEND+=" ~trinity-base/tdm-${PV}"
src_configure() { src_configure() {
mycmakeargs=( mycmakeargs=(

@ -21,5 +21,5 @@ need-trinity
SLOT="${TRINITY_VER}" SLOT="${TRINITY_VER}"
DEPEND+=" =trinity-base/konsole-${PV}" DEPEND+=" ~trinity-base/konsole-${PV}"
RDEPEND+=" ${DEPEND}" RDEPEND+=" ${DEPEND}"

@ -0,0 +1,2 @@
DIST tdepim-trinity-14.0.7.tar.xz 9367460 BLAKE2B cbb4a16cd18dcfbd09dffd829b086c02af36863e57b72af8496c28870b21cbfe2525809f0116e38ccbfd03ec0216617c240c46248f63fb35c993fe632c434048 SHA512 ebedf72b1454c22dfa60608ce83083e3e366758160b42dbaf881f754a0d95ea3cef9b5bbfe1849f3ef6ecfc2fb9635056cc8595d3f7e910e1c91394aceb2c76d
DIST tdepim-trinity-14.0.8.tar.xz 9357184 BLAKE2B d5e489faa5a2e7db41dc1f076280e8115fd5c7cfd136c65088418ef1e2f2e5ddb0eaf013818acabeb96d7b4ed72ae4b749b1872066c6f804fd4292aa7c0d1c5f SHA512 f9f4d49d5ec02f1e2f472d4dff5b1f326ffa657e3e33f83a3d396ae729c978afcf2ee6256098f4bf0f958a17838a50633a27cbb11e4d177f19b306b72bb5db62

@ -0,0 +1,21 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
TRINITY_MODULE_NAME="tdepim"
inherit trinity-meta-2
DESCRIPTION="Trinity personal information manager"
KEYWORDS="~amd64 ~x86"
COMMON_DEPEND="~trinity-base/libtdepim-${PV}
~trinity-base/libkpimidentities-${PV}
~trinity-base/libkholidays-${PV}
~trinity-base/knotes-${PV}"
DEPEND+=" $COMMON_DEPEND"
RDEPEND+=" $COMMON_DEPEND"
TSM_EXTRACT_ALSO="libtdepim/ libtdenetwork/"
Loading…
Cancel
Save