summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--eclass/kde4-base.eclass103
-rw-r--r--eclass/kde4-functions.eclass349
-rw-r--r--eclass/kde4-meta.eclass85
-rw-r--r--sets/kde-4.114
-rw-r--r--sets/kdeaccessibility-4.16
-rw-r--r--sets/kdeadmin-4.14
-rw-r--r--sets/kdeartwork-4.19
-rw-r--r--sets/kdebase-4.167
-rw-r--r--sets/kdedeps-4.12
-rw-r--r--sets/kdeedu-4.120
-rw-r--r--sets/kdegraphics-4.114
-rw-r--r--sets/kdemultimedia-4.17
-rw-r--r--sets/kdenetwork-4.18
-rw-r--r--sets/kdepim-4.128
-rw-r--r--sets/kdesdk-4.115
-rw-r--r--sets/kdetoys-4.14
-rw-r--r--sets/kdeutils-4.111
17 files changed, 218 insertions, 528 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index d7b6a6bb041..cc25923a9a3 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -108,7 +108,7 @@ RDEPEND="${RDEPEND} ${COMMONDEPEND}"
# Add the kdeprefix use flag
case "${EAPI}" in
2 | 2_pre3 | 2_pre2 | 2_pre1)
- [[ "${NEED_KDE}" != "any" ]] && IUSE="${IUSE} kdeprefix"
+ IUSE="${IUSE} kdeprefix"
;;
esac
@@ -182,13 +182,6 @@ fi
export KDE_WANTED
case ${NEED_KDE} in
- any)
- _kdedir=""
- _operator=">="
- _pv="-3.9" # we do not specify version only that it needs 4
- # kdedir is not set and it needs to be detected (maybe fallback for
- # latest version availible)
- ;;
latest)
if [[ "${KDEBASE}" == "kde-base" ]]; then
case ${PV} in
@@ -212,19 +205,9 @@ case ${NEED_KDE} in
esac
_operator=">="
else
-<<<<<<< HEAD:eclass/kde4-base.eclass
# this creates dependency on any version of kde4
_operator=">="
_pv="-3.9"
-=======
- case ${PV} in
- 4.2 | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6* ) _kdedir="4.2" ;;
- 4.1 | 4.0.9* | 4.0.8*) _kdedir="4.1" ;;
- 4.0*) _kdedir="4.0" ;;
- 3.9*) _kdedir="3.9" ;;
- *) die "NEED_KDE=latest not supported for PV=${PV}" ;;
- esac
->>>>>>> origin/4.2:eclass/kde4-base.eclass
fi
;;
@@ -272,15 +255,6 @@ case ${NEED_KDE} in
# NEED_KDE="${PV}"
scm|svn|live|9999*)
_kdedir="live"
-<<<<<<< HEAD:eclass/kde4-base.eclass
- _operator=">="
- _pv="-${NEED_KDE}:live"
- export NEED_KDE="live"
- ;;
- 4.2 | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*)
- _kdedir="4.2"
- _operator=">="
-=======
_operator=">="
_pv="-${NEED_KDE}:live"
export NEED_KDE="live"
@@ -288,7 +262,6 @@ case ${NEED_KDE} in
4.2 | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*)
_kdedir="4.2"
_operator=">="
->>>>>>> origin/4.2:eclass/kde4-base.eclass
_pv="-${NEED_KDE}:4.2"
;;
4.1 | 4.0.9* | 4.0.8*)
@@ -332,14 +305,9 @@ if [[ ${NEED_KDE} != none ]]; then
;;
*)
case ${PV} in
-<<<<<<< HEAD:eclass/kde4-base.eclass
4.1* | 4.0.9* | 4.0.8*) SLOT="4.1" ;;
4.2* | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*) SLOT="4.2" ;;
9999*) SLOT="live" ;;
-=======
- 4.2* | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*) SLOT="4.2" ;;
- 4.1* | 4.0.9* | 4.0.8*) SLOT="4.1" ;;
->>>>>>> origin/4.2:eclass/kde4-base.eclass
*) SLOT="kde-4" ;;
esac
;;
@@ -353,28 +321,17 @@ if [[ ${NEED_KDE} != none ]]; then
for KDE_SLOT in ${KDE_SLOTS[@]}; do
# block non kdeprefix ${PN} on other slots
# we do this only if we do not depend on any version of kde
-<<<<<<< HEAD:eclass/kde4-base.eclass
if [[ ${SLOT} != ${KDE_SLOT} ]]; then
DEPEND="${DEPEND}
!kdeprefix? ( !kde-base/${PN}:${KDE_SLOT}[-kdeprefix] )"
RDEPEND="${RDEPEND}
!kdeprefix? ( !kde-base/${PN}:${KDE_SLOT}[-kdeprefix] )"
-=======
- if [[ ${NEED_KDE} != "any" ]]; then
- if [[ ${SLOT} != ${KDE_SLOT} ]]; then
- DEPEND="${DEPEND}
- !kdeprefix? ( !kde-base/${PN}:${KDE_SLOT}[-kdeprefix] )"
- RDEPEND="${RDEPEND}
- !kdeprefix? ( !kde-base/${PN}:${KDE_SLOT}[-kdeprefix] )"
- fi
->>>>>>> origin/4.2:eclass/kde4-base.eclass
fi
done
;;
esac
# We only need to add the dependencies if ${PN} is not "kdelibs" or "kdepimlibs"
-<<<<<<< HEAD:eclass/kde4-base.eclass
if [[ ${PN} != "kdelibs" ]]; then
case "${EAPI}" in
2 | 2_pre3 | 2_pre2 | 2_pre1)
@@ -387,41 +344,15 @@ if [[ ${NEED_KDE} != none ]]; then
;;
esac
if [[ ${PN} != "kdepimlibs" ]]; then
-=======
- if [[ ${NEED_KDE} != "any" ]]; then
- if [[ ${PN} != "kdelibs" ]]; then
->>>>>>> origin/4.2:eclass/kde4-base.eclass
case "${EAPI}" in
2 | 2_pre3 | 2_pre2 | 2_pre1)
- DEPEND="${DEPEND} ${_operator}kde-base/kdelibs${_pv}[kdeprefix=]"
- RDEPEND="${RDEPEND} ${_operator}kde-base/kdelibs${_pv}[kdeprefix=]"
+ DEPEND="${DEPEND} ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=]"
+ RDEPEND="${RDEPEND} ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=]"
;;
*)
- DEPEND="${DEPEND} ${_operator}kde-base/kdelibs${_pv}"
- RDEPEND="${RDEPEND} ${_operator}kde-base/kdelibs${_pv}"
- ;;
- esac
- if [[ ${PN} != "kdepimlibs" ]]; then
- case "${EAPI}" in
- 2 | 2_pre3 | 2_pre2 | 2_pre1)
- DEPEND="${DEPEND} ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=]"
- RDEPEND="${RDEPEND} ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix=]"
- ;;
- *)
- DEPEND="${DEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
- RDEPEND="${RDEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
- esac
- fi
- fi
- else
- if [[ ${PN} != "kdelibs" ]]; then
- # need_kde == any
- DEPEND="${DEPEND} ${_operator}kde-base/kdelibs${_pv}"
- RDEPEND="${RDEPEND} ${_operator}kde-base/kdelibs${_pv}"
- if [[ ${PN} != "kdepimlibs" ]]; then
- DEPEND="${DEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
- RDEPEND="${RDEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
- fi
+ DEPEND="${DEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
+ RDEPEND="${RDEPEND} ${_operator}kde-base/kdepimlibs${_pv}"
+ esac
fi
fi
unset _operator _pv
@@ -474,13 +405,9 @@ case ${SLOT} in
ESVN_REPO_URI="${ESVN_MIRROR}/trunk/KDE/${PN}"
ESVN_PROJECT="KDE/${PN}"
fi
-<<<<<<< HEAD:eclass/kde4-base.eclass
# limit syncing to 1 hour.
ESVN_UP_FREQ=${ESVN_UP_FREQ:-1}
inherit subversion
-=======
- inherit subversion
->>>>>>> origin/4.2:eclass/kde4-base.eclass
;;
*)
if [[ -n ${KDEBASE} ]]; then
@@ -584,14 +511,9 @@ kde4-base_pkg_setup() {
# Set PREFIX
case "${EAPI}" in
2 | 2_pre3 | 2_pre2 | 2_pre1)
- if [[ ${NEED_KDE} != "any" ]]; then
- if use kdeprefix; then
- KDEDIR="/usr/kde/${_kdedir}"
- KDEDIRS="/usr:/usr/local:${KDEDIR}"
- else
- KDEDIR="/usr"
- KDEDIRS="/usr:/usr/local"
- fi
+ if use kdeprefix; then
+ KDEDIR="/usr/kde/${_kdedir}"
+ KDEDIRS="/usr:/usr/local:${KDEDIR}"
else
KDEDIR="/usr"
KDEDIRS="/usr:/usr/local"
@@ -646,17 +568,10 @@ kde4-base_pkg_setup() {
case ${SLOT} in
live)
if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
-<<<<<<< HEAD:eclass/kde4-base.eclass
elog
elog "WARNING! This is an experimental ebuild of the ${KMNAME:-${PN}} KDE4 SVN tree."
elog "Use at your own risk. Do _NOT_ file bugs at bugs.gentoo.org because"
elog "of this ebuild!"
-=======
- echo
- ewarn "WARNING! This is an experimental ebuild of the ${KMNAME:-${PN}} KDE4 SVN tree."
- ewarn "Use at your own risk. Do _NOT_ file bugs at bugs.gentoo.org because"
- ewarn "of this ebuild!"
->>>>>>> origin/4.2:eclass/kde4-base.eclass
fi
;;
*)
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 6d28ca05c43..4d021f3efad 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -39,355 +39,6 @@ KDE_SLOTS=( "kde-4" "4.1" "4.2" )
# @DESCRIPTION:
# The slots used by all KDE live versions.
KDE_LIVE_SLOTS=( "live" )
-<<<<<<< HEAD:eclass/kde4-functions.eclass
-=======
-
-# @ECLASS-VARIABLE: KDE_DERIVATION_MAP
-# @DESCRIPTION:
-# Map of the monolithic->split ebuild derivation.
-# Used to build dependencies describing the relationships between them:
-# Monolithic ebuilds block their split counterparts in the same slot, and vice versa.
-#
-# Also see get-parent-package(), get-child-packages(), is-parent-package()
-KDE_DERIVATION_MAP='
-app-office/koffice app-office/karbon
-app-office/koffice app-office/kchart
-app-office/koffice app-office/kexi
-app-office/koffice app-office/kformula
-app-office/koffice app-office/kivio
-app-office/koffice app-office/koffice-data
-app-office/koffice app-office/koffice-libs
-app-office/koffice app-office/koshell
-app-office/koffice app-office/kplato
-app-office/koffice app-office/kpresenter
-app-office/koffice app-office/krita
-app-office/koffice app-office/kspread
-app-office/koffice app-office/kugar
-app-office/koffice app-office/kword
-kde-base/kdeaccessibility kde-base/kdeaccessibility-colorschemes
-kde-base/kdeaccessibility kde-base/kdeaccessibility-iconthemes
-kde-base/kdeaccessibility kde-base/kmag
-kde-base/kdeaccessibility kde-base/kmousetool
-kde-base/kdeaccessibility kde-base/kmouth
-kde-base/kdeaccessibility kde-base/kttsd
-kde-base/kdeadmin kde-base/kcron
-kde-base/kdeadmin kde-base/kdat
-kde-base/kdeadmin kde-base/knetworkconf
-kde-base/kdeadmin kde-base/kpackage
-kde-base/kdeadmin kde-base/ksystemlog
-kde-base/kdeadmin kde-base/ksysv
-kde-base/kdeadmin kde-base/kuser
-kde-base/kdeadmin kde-base/lilo-config
-kde-base/kdeadmin kde-base/secpolicy
-kde-base/kdeartwork kde-base/kdeartwork-colorschemes
-kde-base/kdeartwork kde-base/kdeartwork-emoticons
-kde-base/kdeartwork kde-base/kdeartwork-icewm-themes
-kde-base/kdeartwork kde-base/kdeartwork-iconthemes
-kde-base/kdeartwork kde-base/kdeartwork-kscreensaver
-kde-base/kdeartwork kde-base/kdeartwork-kworldclock
-kde-base/kdeartwork kde-base/kdeartwork-sounds
-kde-base/kdeartwork kde-base/kdeartwork-styles
-kde-base/kdeartwork kde-base/kdeartwork-wallpapers
-kde-base/kdebase kde-base/dolphin
-kde-base/kdebase kde-base/drkonqi
-kde-base/kdebase kde-base/kappfinder
-kde-base/kdebase kde-base/kcheckpass
-kde-base/kdebase kde-base/kcminit
-kde-base/kdebase kde-base/kcmshell
-kde-base/kdebase kde-base/kcontrol
-kde-base/kdebase kde-base/kde-menu
-kde-base/kdebase kde-base/kde-menu-icons
-kde-base/kdebase kde-base/kde-wallpapers
-kde-base/kdebase kde-base/kdebase-cursors
-kde-base/kdebase kde-base/kdebase-data
-kde-base/kdebase kde-base/kdebase-kioslaves
-kde-base/kdebase kde-base/kdebase-startkde
-kde-base/kdebase kde-base/kdebugdialog
-kde-base/kdebase kde-base/kdepasswd
-kde-base/kdebase kde-base/kdesu
-kde-base/kdebase kde-base/kdialog
-kde-base/kdebase kde-base/kdm
-kde-base/kdebase kde-base/keditbookmarks
-kde-base/kdebase kde-base/kfile
-kde-base/kdebase kde-base/kfind
-kde-base/kdebase kde-base/khelpcenter
-kde-base/kdebase kde-base/khotkeys
-kde-base/kdebase kde-base/kiconfinder
-kde-base/kdebase kde-base/kinfocenter
-kde-base/kdebase kde-base/kioclient
-kde-base/kdebase kde-base/klipper
-kde-base/kdebase kde-base/kmenuedit
-kde-base/kdebase kde-base/kmimetypefinder
-kde-base/kdebase kde-base/knetattach
-kde-base/kdebase kde-base/knewstuff
-kde-base/kdebase kde-base/knotify
-kde-base/kdebase kde-base/konqueror
-kde-base/kdebase kde-base/konsole
-kde-base/kdebase kde-base/kpasswdserver
-kde-base/kdebase kde-base/kquitapp
-kde-base/kdebase kde-base/kreadconfig
-kde-base/kdebase kde-base/krunner
-kde-base/kdebase kde-base/kscreensaver
-kde-base/kdebase kde-base/ksmserver
-kde-base/kdebase kde-base/ksplash
-kde-base/kdebase kde-base/kstart
-kde-base/kdebase kde-base/kstartupconfig
-kde-base/kdebase kde-base/kstyles
-kde-base/kdebase kde-base/ksysguard
-kde-base/kdebase kde-base/ksystraycmd
-kde-base/kdebase kde-base/ktimezoned
-kde-base/kdebase kde-base/ktip
-kde-base/kdebase kde-base/ktraderclient
-kde-base/kdebase kde-base/kuiserver
-kde-base/kdebase kde-base/kurifilter-plugins
-kde-base/kdebase kde-base/kwin
-kde-base/kdebase kde-base/kwrite
-kde-base/kdebase kde-base/libkonq
-kde-base/kdebase kde-base/libkworkspace
-kde-base/kdebase kde-base/libplasma
-kde-base/kdebase kde-base/libplasmaclock
-kde-base/kdebase kde-base/libtaskmanager
-kde-base/kdebase kde-base/nepomuk
-kde-base/kdebase kde-base/nsplugins
-kde-base/kdebase kde-base/powerdevil
-kde-base/kdebase kde-base/phonon
-kde-base/kdebase kde-base/phonon-kde
-kde-base/kdebase kde-base/phonon-xine
-kde-base/kdebase kde-base/plasma
-kde-base/kdebase kde-base/plasma-apps
-kde-base/kdebase kde-base/plasma-workspace
-kde-base/kdebase kde-base/renamedlg-plugins
-kde-base/kdebase kde-base/solid
-kde-base/kdebase kde-base/solid-hardware
-kde-base/kdebase kde-base/soliduiserver
-kde-base/kdebase kde-base/systemsettings
-kde-base/kdebase kde-base/kwalletd
-kde-base/kdebindings kde-base/kalyptus
-kde-base/kdebindings kde-base/kdejava
-kde-base/kdebindings kde-base/kimono
-kde-base/kdebindings kde-base/kjsembed
-kde-base/kdebindings kde-base/korundum
-kde-base/kdebindings kde-base/krossjava
-kde-base/kdebindings kde-base/krosspython
-kde-base/kdebindings kde-base/krossruby
-kde-base/kdebindings kde-base/pykde4
-kde-base/kdebindings kde-base/qtjava
-kde-base/kdebindings kde-base/qtruby
-kde-base/kdebindings kde-base/qtsharp
-kde-base/kdebindings kde-base/qyoto
-kde-base/kdebindings kde-base/smoke
-kde-base/kdebindings kde-base/xparts
-kde-base/kdeedu kde-base/blinken
-kde-base/kdeedu kde-base/kalgebra
-kde-base/kdeedu kde-base/kalzium
-kde-base/kdeedu kde-base/kanagram
-kde-base/kdeedu kde-base/kbruch
-kde-base/kdeedu kde-base/kgeography
-kde-base/kdeedu kde-base/khangman
-kde-base/kdeedu kde-base/kig
-kde-base/kdeedu kde-base/kiten
-kde-base/kdeedu kde-base/klettres
-kde-base/kdeedu kde-base/kmplot
-kde-base/kdeedu kde-base/kpercentage
-kde-base/kdeedu kde-base/kstars
-kde-base/kdeedu kde-base/ktouch
-kde-base/kdeedu kde-base/kturtle
-kde-base/kdeedu kde-base/kwordquiz
-kde-base/kdeedu kde-base/libkdeedu
-kde-base/kdeedu kde-base/marble
-kde-base/kdeedu kde-base/parley
-kde-base/kdeedu kde-base/step
-kde-base/kdegames kde-base/bovo
-kde-base/kdegames kde-base/katomic
-kde-base/kdegames kde-base/kbattleship
-kde-base/kdegames kde-base/kblackbox
-kde-base/kdegames kde-base/kblocks
-kde-base/kdegames kde-base/kbounce
-kde-base/kdegames kde-base/kbreakout
-kde-base/kdegames kde-base/kdiamond
-kde-base/kdegames kde-base/kfourinline
-kde-base/kdegames kde-base/kgoldrunner
-kde-base/kdegames kde-base/kiriki
-kde-base/kdegames kde-base/kjumpingcube
-kde-base/kdegames kde-base/klines
-kde-base/kdegames kde-base/kmahjongg
-kde-base/kdegames kde-base/kmines
-kde-base/kdegames kde-base/knetwalk
-kde-base/kdegames kde-base/kolf
-kde-base/kdegames kde-base/kollision
-kde-base/kdegames kde-base/konquest
-kde-base/kdegames kde-base/kpat
-kde-base/kdegames kde-base/kreversi
-kde-base/kdegames kde-base/ksame
-kde-base/kdegames kde-base/kshisen
-kde-base/kdegames kde-base/ksirk
-kde-base/kdegames kde-base/kspaceduel
-kde-base/kdegames kde-base/ksquares
-kde-base/kdegames kde-base/ksudoku
-kde-base/kdegames kde-base/ktuberling
-kde-base/kdegames kde-base/kubrick
-kde-base/kdegames kde-base/libkdegames
-kde-base/kdegames kde-base/libkmahjongg
-kde-base/kdegames kde-base/lskat
-kde-base/kdegraphics kde-base/gwenview
-kde-base/kdegraphics kde-base/kamera
-kde-base/kdegraphics kde-base/kcolorchooser
-kde-base/kdegraphics kde-base/kdegraphics-strigi-analyzer
-kde-base/kdegraphics kde-base/kgamma
-kde-base/kdegraphics kde-base/kghostview
-kde-base/kdegraphics kde-base/kolourpaint
-kde-base/kdegraphics kde-base/kruler
-kde-base/kdegraphics kde-base/ksaneplugin
-kde-base/kdegraphics kde-base/ksnapshot
-kde-base/kdegraphics kde-base/libkdcraw
-kde-base/kdegraphics kde-base/libkexiv2
-kde-base/kdegraphics kde-base/libkipi
-kde-base/kdegraphics kde-base/libksane
-kde-base/kdegraphics kde-base/libkscan
-kde-base/kdegraphics kde-base/okular
-kde-base/kdegraphics kde-base/svgpart
-kde-base/kdemultimedia kde-base/dragonplayer
-kde-base/kdemultimedia kde-base/juk
-kde-base/kdemultimedia kde-base/kdemultimedia-kioslaves
-kde-base/kdemultimedia kde-base/kdemultimedia-strigi-analyzer
-kde-base/kdemultimedia kde-base/kmix
-kde-base/kdemultimedia kde-base/kscd
-kde-base/kdemultimedia kde-base/libkcddb
-kde-base/kdemultimedia kde-base/libkcompactdisc
-kde-base/kdenetwork kde-base/kdenetwork-filesharing
-kde-base/kdenetwork kde-base/kdnssd
-kde-base/kdenetwork kde-base/kget
-kde-base/kdenetwork kde-base/knewsticker
-kde-base/kdenetwork kde-base/kopete
-kde-base/kdenetwork kde-base/kppp
-kde-base/kdenetwork kde-base/krdc
-kde-base/kdenetwork kde-base/krfb
-kde-base/kdepim kde-base/akonadi
-kde-base/kdepim kde-base/akregator
-kde-base/kdepim kde-base/certmanager
-kde-base/kdepim kde-base/kabc2mutt
-kde-base/kdepim kde-base/kabcclient
-kde-base/kdepim kde-base/kaddressbook
-kde-base/kdepim kde-base/kalarm
-kde-base/kdepim kde-base/kdemaildir
-kde-base/kdepim kde-base/kdepim-icons
-kde-base/kdepim kde-base/kdepim-kioslaves
-kde-base/kdepim kde-base/kdepim-kresources
-kde-base/kdepim kde-base/kdepim-strigi-analyzer
-kde-base/kdepim kde-base/kdepim-wizards
-kde-base/kdepim kde-base/kfeed
-kde-base/kdepim kde-base/kitchensync
-kde-base/kdepim kde-base/kjots
-kde-base/kdepim kde-base/kleopatra
-kde-base/kdepim kde-base/kmail
-kde-base/kdepim kde-base/kmailcvt
-kde-base/kdepim kde-base/kmobiletools
-kde-base/kdepim kde-base/knode
-kde-base/kdepim kde-base/knotes
-kde-base/kdepim kde-base/kode
-kde-base/kdepim kde-base/konsolekalendar
-kde-base/kdepim kde-base/kontact
-kde-base/kdepim kde-base/kontact-specialdates
-kde-base/kdepim kde-base/kontactinterfaces
-kde-base/kdepim kde-base/korganizer
-kde-base/kdepim kde-base/korn
-kde-base/kdepim kde-base/kpilot
-kde-base/kdepim kde-base/ktimetracker
-kde-base/kdepim kde-base/ktnef
-kde-base/kdepim kde-base/libkdepim
-kde-base/kdepim kde-base/libkholidays
-kde-base/kdepim kde-base/libkleo
-kde-base/kdepim kde-base/libkpgp
-kde-base/kdepim kde-base/libksieve
-kde-base/kdepim kde-base/mailtransport
-kde-base/kdepim kde-base/mimelib
-kde-base/kdepim kde-base/networkstatus
-kde-base/kdesdk kde-base/cervisia
-kde-base/kdesdk kde-base/kapptemplate
-kde-base/kdesdk kde-base/kate
-kde-base/kdesdk kde-base/kbabel
-kde-base/kdesdk kde-base/kbugbuster
-kde-base/kdesdk kde-base/kcachegrind
-kde-base/kdesdk kde-base/kdeaccounts-plugin
-kde-base/kdesdk kde-base/kdesdk-kioslaves
-kde-base/kdesdk kde-base/kdesdk-misc
-kde-base/kdesdk kde-base/kdesdk-scripts
-kde-base/kdesdk kde-base/kdesdk-strigi-analyzer
-kde-base/kdesdk kde-base/kmtrace
-kde-base/kdesdk kde-base/kompare
-kde-base/kdesdk kde-base/kspy
-kde-base/kdesdk kde-base/kstartperf
-kde-base/kdesdk kde-base/kuiviewer
-kde-base/kdesdk kde-base/lokalize
-kde-base/kdesdk kde-base/poxml
-kde-base/kdesdk kde-base/strigi-analyzer
-kde-base/kdesdk kde-base/umbrello
-kde-base/kdetoys kde-base/amor
-kde-base/kdetoys kde-base/kteatime
-kde-base/kdetoys kde-base/ktux
-kde-base/kdetoys kde-base/kweather
-kde-base/kdetoys kde-base/kworldclock
-kde-base/kdeutils kde-base/ark
-kde-base/kdeutils kde-base/kcalc
-kde-base/kdeutils kde-base/kcharselect
-kde-base/kdeutils kde-base/kdessh
-kde-base/kdeutils kde-base/kdf
-kde-base/kdeutils kde-base/kfloppy
-kde-base/kdeutils kde-base/kgpg
-kde-base/kdeutils kde-base/kmilo
-kde-base/kdeutils kde-base/kregexpeditor
-kde-base/kdeutils kde-base/ktimer
-kde-base/kdeutils kde-base/kwallet
-kde-base/kdeutils kde-base/okteta
-kde-base/kdeutils kde-base/superkaramba
-kde-base/kdeutils kde-base/sweeper
-kde-base/kdewebdev kde-base/kfilereplace
-kde-base/kdewebdev kde-base/kimagemapeditor
-kde-base/kdewebdev kde-base/klinkstatus
-kde-base/kdewebdev kde-base/kommander
-kde-base/kdewebdev kde-base/kxsldbg
-kde-base/kdewebdev kde-base/quanta
-'
-
-# @FUNCTION: get-parent-package
-# @USAGE: <split ebuild>
-# @DESCRIPTION:
-# Echoes the name of the monolithic package that a given split ebuild was derived from.
-get-parent-package() {
- local parent child
- while read parent child; do
- if [[ "${child}" == "$1" ]]; then
- echo ${parent}
- return 0
- fi
- done <<< "$KDE_DERIVATION_MAP"
- die "Package $target not found in KDE_DERIVATION_MAP, please report bug"
-}
-
-# @FUNCTION: get-child-packages
-# @USAGE: <monolithic ebuild>
-# @DESCRIPTION:
-# Echoes the names of all (split) ebuilds derived from a given monolithic ebuild.
-get-child-packages() {
- local parent child
- while read parent child; do
- [[ "${parent}" == "$1" ]] && echo -n "${child} "
- done <<< "$KDE_DERIVATION_MAP"
-}
-
-# @FUNCTION: is-parent-package
-# @USAGE: <$CATEGORY/$PN>
-# @DESCRIPTION:
-# Returns zero exit-status if the given package is a parent (monolithic) ebuild.
-# Returns non-zero exit-status if it's not.
-is-parent-package() {
- local parent child
- while read parent child; do
- [[ "${parent}" == "$1" ]] && return 0
- done <<< "$KDE_DERIVATION_MAP"
- return 1
-}
->>>>>>> origin/4.2:eclass/kde4-functions.eclass
# @FUNCTION: buildsycoca
# @DESCRIPTION:
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index b977171318a..214d4eb2442 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -166,27 +166,12 @@ kde4-meta_src_unpack() {
case ${SLOT} in
live)
S="${WORKDIR}/${PN}"
-<<<<<<< HEAD:eclass/kde4-meta.eclass
mkdir -p "${S}"
ESVN_RESTRICT="export" subversion_src_unpack
subversion_wc_info
kde4-meta_src_extract
kde4-base_apply_patches
subversion_bootstrap
-=======
- # Ensure the target directory exists
- mkdir -p "${S}"
- # Update working copy
- ESVN_RESTRICT="export" subversion_src_unpack
- # this sets variables used by the src_extract and change_cmakelists
- subversion_wc_info
- # Fetch SVN sources and export (parts of) our SVN working copy to ${S}
- kde4-meta_src_extract
- # Make sure PATCHES as well as ESVN_PATCHES get applied
- kde4-base_apply_patches
- subversion_bootstrap
- # CMakeLists.txt magic
->>>>>>> origin/4.2:eclass/kde4-meta.eclass
kde4-meta_change_cmakelists
;;
*)
@@ -203,15 +188,9 @@ kde4-meta_src_unpack() {
kde4-meta_src_extract() {
case ${SLOT} in
live)
-<<<<<<< HEAD:eclass/kde4-meta.eclass
local rsync_options subdir kmnamedir targetdir
# Export working copy to ${S}
einfo "Exporting parts of working copy to ${S}"
-=======
- local rsync_options subdir kmnamedir targetdir
- # Export working copy to ${S}
- einfo "Exporting parts of working copy to ${S}"
->>>>>>> origin/4.2:eclass/kde4-meta.eclass
kde4-meta_create_extractlists
case ${KMNAME} in
@@ -283,7 +262,6 @@ kde4-meta_src_extract() {
[[ -n ${abort} ]] && die "There were missing files."
fi
-<<<<<<< HEAD:eclass/kde4-meta.eclass
kde4-base_src_unpack
if [[ "${KMNAME}" == "koffice" ]]; then
@@ -291,47 +269,17 @@ kde4-meta_src_extract() {
koffice-data|koffice-libs)
;;
*)
-=======
- kde4-base_src_unpack
-
- if [[ "${KMNAME}" == "koffice" ]]; then
- case ${PN} in
- koffice-data|koffice-libs)
- ;;
- *)
- ### We need to check for latest kdedir if kdedir does not point onto /usr
- # we check for some basic application and if we found it in /usr we use
- # /usr as master tree otherwise we pick latest version in /usr/kde/
- elog "we always prefer KDE installed without kdeprefix so if you get"
- elog "some issues with linking please switch to -kdeprefix KDE install."
- if [ -e /usr/bin/kwin ]; then
- KD="/usr"
- else
- KD=$(find /usr/kde/ -maxdepth 1 -mindepth 1 -type d |tail -n 1)
- #pickup latest version from /usr/kde
- fi
- # we have few lib states we can occur on koffice sources
->>>>>>> origin/4.2:eclass/kde4-meta.eclass
### basic array
LIB_ARRAY="kostore koodf kokross komain pigmentcms koresources flake koguiutils kopageapp kotext kowmf"
### dep array
R_QT_kostore="\"/usr/$(get_libdir)/qt4/libQtCore.so\"
\"/usr/$(get_libdir)/qt4/libQtXml.so\"
-<<<<<<< HEAD:eclass/kde4-meta.eclass
\"${KDEDIR}/$(get_libdir)/libkdecore.so\""
R_BAS_kostore="libkostore ${R_QT_kostore}"
R_BAS_koodf="libkoodf ${R_BAS_kostore}"
R_KROSS_kokross="
\"${KDEDIR}/$(get_libdir)/libkrossui.so\"
\"${KDEDIR}/$(get_libdir)/libkrosscore.so\""
-=======
- \"${KD}/$(get_libdir)/libkdecore.so\""
- R_BAS_kostore="libkostore ${R_QT_kostore}"
- R_BAS_koodf="libkoodf ${R_BAS_kostore}"
- R_KROSS_kokross="
- \"${KD}/$(get_libdir)/libkrossui.so\"
- \"${KD}/$(get_libdir)/libkrosscore.so\""
->>>>>>> origin/4.2:eclass/kde4-meta.eclass
R_BAS_kokross="libkokross ${R_BAS_koodf} ${R_KROSS_kokross}"
R_QT_komain="\"/usr/$(get_libdir)/qt4/libQtGui.so\""
R_BAS_komain="libkomain ${R_BAS_koodf} ${R_QT_komain}"
@@ -348,17 +296,12 @@ kde4-meta_src_extract() {
echo "Fixing library ${libname} with hardcoded path"
for libpath in $(eval "echo \$R_BAS_${libname}"); do
if [[ "${libpath}" != "\"/usr/"* ]]; then
-<<<<<<< HEAD:eclass/kde4-meta.eclass
local R="${R} \"${KDEDIR}/$(get_libdir)/${libpath}.so\""
-=======
- local R="${R} \"/usr/$(get_libdir)/${libpath}.so\""
->>>>>>> origin/4.2:eclass/kde4-meta.eclass
else
local R="${R} ${libpath}"
fi
done
find ${S} -name CMakeLists.txt -print| xargs -i \
-<<<<<<< HEAD:eclass/kde4-meta.eclass
sed -i \
-e "s: ${libname} : ${R} :g" \
-e "s: ${libname}): ${R}):g" \
@@ -370,19 +313,6 @@ kde4-meta_src_extract() {
;;
esac
fi
-=======
- sed -i \
- -e "s: ${libname} : ${R} :g" \
- -e "s: ${libname}): ${R}):g" \
- -e "s:(${libname} :(${R} :g" \
- -e "s:(${libname}):(${R}):g" \
- -e "s: ${libname}: ${R}:g" \
- {} || die "Fixing library names failed."
- done
- ;;
- esac
- fi
->>>>>>> origin/4.2:eclass/kde4-meta.eclass
esac
}
@@ -765,13 +695,8 @@ kde4-meta_src_install() {
# remove unvanted koffice stuff
if [[ "${KMNAME}" == "koffice" ]] ; then
if [[ "${PN}" != "koffice-data" ]]; then
-<<<<<<< HEAD:eclass/kde4-meta.eclass
rm "${D}"/${KDEDIR}/include/config-openexr.h
rm "${D}"/${KDEDIR}/share/apps/cmake/modules/FindKOfficeLibs.cmake
-=======
- rm "${D}"/usr/include/config-openexr.h
- rm "${D}"/usr/share/apps/cmake/modules/FindKOfficeLibs.cmake
->>>>>>> origin/4.2:eclass/kde4-meta.eclass
fi
fi
}
@@ -806,14 +731,4 @@ kde4-meta_pkg_postinst() {
kde4-meta_pkg_postrm() {
kde4-base_pkg_postrm
}
-<<<<<<< HEAD:eclass/kde4-meta.eclass
-=======
-kdebase_toplevel_cmakelist() {
- insert=$(sed -e '/macro_optional_find_package/!d' < "${ESVN_WC_PATH}"/CMakeLists.txt)
- at=$(sed -n '/^include[[:space:]]*(/=' < "${S}"/CMakeLists.txt | sed -n '$p')
- for line in ${insert}; do
- sed "${at}a${line}" -i "${S}"/CMakeLists.txt
- done
-}
->>>>>>> origin/4.2:eclass/kde4-meta.eclass
diff --git a/sets/kde-4.1 b/sets/kde-4.1
new file mode 100644
index 00000000000..7817c531d21
--- /dev/null
+++ b/sets/kde-4.1
@@ -0,0 +1,14 @@
+# We don't include kdesdk on the global set
+kde-base/kate:4.1
+
+@kdeadmin-4.1
+@kdeartwork-4.1
+@kdebase-4.1
+@kdeedu-4.1
+@kdegames-4.1
+@kdegraphics-4.1
+@kdemultimedia-4.1
+@kdenetwork-4.1
+@kdepim-4.1
+@kdetoys-4.1
+@kdeutils-4.1
diff --git a/sets/kdeaccessibility-4.1 b/sets/kdeaccessibility-4.1
new file mode 100644
index 00000000000..f80b5645908
--- /dev/null
+++ b/sets/kdeaccessibility-4.1
@@ -0,0 +1,6 @@
+kde-base/kdeaccessibility-colorschemes:4.1
+kde-base/kdeaccessibility-iconthemes:4.1
+kde-base/kmag:4.1
+kde-base/kmousetool:4.1
+kde-base/kmouth:4.1
+kde-base/kttsd:4.1
diff --git a/sets/kdeadmin-4.1 b/sets/kdeadmin-4.1
new file mode 100644
index 00000000000..57315af8b20
--- /dev/null
+++ b/sets/kdeadmin-4.1
@@ -0,0 +1,4 @@
+kde-base/kcron:4.1
+kde-base/knetworkconf:4.1
+kde-base/ksystemlog:4.1
+kde-base/kuser:4.1
diff --git a/sets/kdeartwork-4.1 b/sets/kdeartwork-4.1
new file mode 100644
index 00000000000..0f9be7d5e95
--- /dev/null
+++ b/sets/kdeartwork-4.1
@@ -0,0 +1,9 @@
+kde-base/kdeartwork-colorschemes:4.1
+kde-base/kdeartwork-emoticons:4.1
+kde-base/kdeartwork-iconthemes:4.1
+kde-base/kdeartwork-kscreensaver:4.1
+kde-base/kdeartwork-kworldclock:4.1
+kde-base/kdeartwork-sounds:4.1
+kde-base/kdeartwork-styles:4.1
+kde-base/kdeartwork-wallpapers:4.1
+kde-base/kdeartwork-icewm-themes:4.1
diff --git a/sets/kdebase-4.1 b/sets/kdebase-4.1
new file mode 100644
index 00000000000..6df107266e9
--- /dev/null
+++ b/sets/kdebase-4.1
@@ -0,0 +1,67 @@
+kde-base/dolphin:4.1
+kde-base/drkonqi:4.1
+kde-base/kappfinder:4.1
+kde-base/kcheckpass:4.1
+kde-base/kcminit:4.1
+kde-base/kcmshell:4.1
+kde-base/kcontrol:4.1
+kde-base/kde-menu:4.1
+kde-base/kde-menu-icons:4.1
+kde-base/kde-wallpapers:4.1
+kde-base/kdebase-cursors:4.1
+kde-base/kdebase-data:4.1
+kde-base/kdebase-kioslaves:4.1
+kde-base/kdebase-startkde:4.1
+kde-base/kdebugdialog:4.1
+kde-base/kdepasswd:4.1
+kde-base/kdesu:4.1
+kde-base/kdialog:4.1
+kde-base/kdm:4.1
+kde-base/keditbookmarks:4.1
+kde-base/kfile:4.1
+kde-base/kfind:4.1
+kde-base/khelpcenter:4.1
+kde-base/khotkeys:4.1
+kde-base/kiconfinder:4.1
+kde-base/kinfocenter:4.1
+kde-base/kioclient:4.1
+kde-base/klipper:4.1
+kde-base/kmenuedit:4.1
+kde-base/kmimetypefinder:4.1
+kde-base/knetattach:4.1
+kde-base/knewstuff:4.1
+kde-base/knotify:4.1
+kde-base/konqueror:4.1
+kde-base/konsole:4.1
+kde-base/kpasswdserver:4.1
+kde-base/kquitapp:4.1
+kde-base/kreadconfig:4.1
+kde-base/krunner:4.1
+kde-base/kscreensaver:4.1
+kde-base/ksmserver:4.1
+kde-base/ksplash:4.1
+kde-base/kstart:4.1
+kde-base/kstartupconfig:4.1
+kde-base/kstyles:4.1
+kde-base/ksysguard:4.1
+kde-base/ksystraycmd:4.1
+kde-base/ktimezoned:4.1
+kde-base/ktraderclient:4.1
+kde-base/kuiserver:4.1
+kde-base/kurifilter-plugins:4.1
+kde-base/kwin:4.1
+kde-base/kwrite:4.1
+kde-base/libkonq:4.1
+kde-base/libkworkspace:4.1
+kde-base/libplasma:4.1
+kde-base/libtaskmanager:4.1
+kde-base/nepomuk:4.1
+kde-base/nsplugins:4.1
+kde-base/phonon-xine:4.1
+kde-base/plasma-apps:4.1
+kde-base/plasma-workspace:4.1
+kde-base/renamedlg-plugins:4.1
+kde-base/solid:4.1
+kde-base/solid-hardware:4.1
+kde-base/soliduiserver:4.1
+kde-base/systemsettings:4.1
diff --git a/sets/kdedeps-4.1 b/sets/kdedeps-4.1
new file mode 100644
index 00000000000..dd1df7305d8
--- /dev/null
+++ b/sets/kdedeps-4.1
@@ -0,0 +1,2 @@
+kde-base/kdelibs:4.1
+kde-base/kdepimlibs:4.1
diff --git a/sets/kdeedu-4.1 b/sets/kdeedu-4.1
new file mode 100644
index 00000000000..e44084d707f
--- /dev/null
+++ b/sets/kdeedu-4.1
@@ -0,0 +1,20 @@
+kde-base/blinken:4.1
+kde-base/kalgebra:4.1
+kde-base/kalzium:4.1
+kde-base/kanagram:4.1
+kde-base/kbruch:4.1
+kde-base/kgeography:4.1
+kde-base/khangman:4.1
+kde-base/kig:4.1
+kde-base/kiten:4.1
+kde-base/klettres:4.1
+kde-base/kmplot:4.1
+kde-base/kpercentage:4.1
+kde-base/kstars:4.1
+kde-base/ktouch:4.1
+kde-base/kturtle:4.1
+kde-base/kwordquiz:4.1
+kde-base/libkdeedu:4.1
+kde-base/marble:4.1
+kde-base/parley:4.1
+kde-base/step:4.1
diff --git a/sets/kdegraphics-4.1 b/sets/kdegraphics-4.1
new file mode 100644
index 00000000000..b65c439fc32
--- /dev/null
+++ b/sets/kdegraphics-4.1
@@ -0,0 +1,14 @@
+kde-base/gwenview:4.1
+kde-base/kamera:4.1
+kde-base/kcolorchooser:4.1
+kde-base/kgamma:4.1
+kde-base/kolourpaint:4.1
+kde-base/kruler:4.1
+kde-base/ksnapshot:4.1
+kde-base/libkdcraw:4.1
+kde-base/libkexiv2:4.1
+kde-base/libkipi:4.1
+kde-base/libksane:4.1
+kde-base/okular:4.1
+kde-base/svgpart:4.1
+kde-base/kdegraphics-strigi-analyzer:4.1
diff --git a/sets/kdemultimedia-4.1 b/sets/kdemultimedia-4.1
new file mode 100644
index 00000000000..bf2256648c4
--- /dev/null
+++ b/sets/kdemultimedia-4.1
@@ -0,0 +1,7 @@
+kde-base/dragonplayer:4.1
+kde-base/juk:4.1
+kde-base/kdemultimedia-kioslaves:4.1
+kde-base/kmix:4.1
+kde-base/kscd:4.1
+kde-base/libkcddb:4.1
+kde-base/libkcompactdisc:4.1
diff --git a/sets/kdenetwork-4.1 b/sets/kdenetwork-4.1
new file mode 100644
index 00000000000..a7595bd284c
--- /dev/null
+++ b/sets/kdenetwork-4.1
@@ -0,0 +1,8 @@
+kde-base/kdenetwork-filesharing:4.1
+kde-base/kdnssd:4.1
+kde-base/kget:4.1
+kde-base/knewsticker:4.1
+kde-base/kopete:4.1
+kde-base/kppp:4.1
+kde-base/krdc:4.1
+kde-base/krfb:4.1
diff --git a/sets/kdepim-4.1 b/sets/kdepim-4.1
new file mode 100644
index 00000000000..68f040d6623
--- /dev/null
+++ b/sets/kdepim-4.1
@@ -0,0 +1,28 @@
+kde-base/akonadi:4.1
+kde-base/akregator:4.1
+kde-base/kaddressbook:4.1
+kde-base/kalarm:4.1
+kde-base/kdemaildir:4.1
+kde-base/kdepim-icons:4.1
+kde-base/kdepim-kresources:4.1
+kde-base/kdepim-strigi-analyzer:4.1
+kde-base/kdepim-wizards:4.1
+kde-base/kitchensync:4.1
+kde-base/kjots:4.1
+kde-base/kleopatra:4.1
+kde-base/kmail:4.