Merge branch 'kde-git'

Conflicts:
	app-cdr/k3b/Manifest
	app-editors/kile/Manifest
	app-office/akonadi-server/Manifest
	app-office/karbon/Manifest
	app-office/karbon/karbon-2.3.0.ebuild
	app-office/karbon/karbon-9999.ebuild
	app-office/kexi/Manifest
	app-office/kexi/kexi-2.3.0.ebuild
	app-office/kexi/kexi-9999.ebuild
	app-office/koffice-data/Manifest
	app-office/koffice-data/koffice-data-2.3.0.ebuild
	app-office/koffice-data/koffice-data-9999.ebuild
	app-office/koffice-l10n/Manifest
	app-office/koffice-l10n/koffice-l10n-2.3.0.ebuild
	app-office/koffice-libs/Manifest
	app-office/koffice-libs/koffice-libs-2.3.0.ebuild
	app-office/koffice-libs/koffice-libs-9999.ebuild
	app-office/koffice-meta/Manifest
	app-office/koffice-meta/koffice-meta-2.3.0.ebuild
	app-office/koffice-meta/koffice-meta-9999.ebuild
	app-office/kplato/Manifest
	app-office/kplato/kplato-2.3.0.ebuild
	app-office/kplato/kplato-9999.ebuild
	app-office/kpresenter/Manifest
	app-office/kpresenter/kpresenter-2.3.0.ebuild
	app-office/kpresenter/kpresenter-9999.ebuild
	app-office/krita/Manifest
	app-office/krita/krita-2.3.0.ebuild
	app-office/krita/krita-9999.ebuild
	app-office/kspread/Manifest
	app-office/kspread/kspread-2.3.0.ebuild
	app-office/kspread/kspread-9999.ebuild
	app-office/kword/Manifest
	app-office/kword/kword-2.3.0.ebuild
	app-office/kword/kword-9999.ebuild
	app-office/scribus/Manifest
	app-office/scribus/scribus-9999.ebuild
	dev-libs/libindicate/Manifest
	dev-libs/libindicate/libindicate-0.4.4.ebuild
	dev-libs/soprano/Manifest
	eclass/kde4-functions.eclass
	kde-base/activitymanager/Manifest
	kde-base/akonadiconsole/Manifest
	kde-base/akregator/Manifest
	kde-base/amor/Manifest
	kde-base/ark/Manifest
	kde-base/attica/Manifest
	kde-base/blinken/Manifest
	kde-base/blogilo/Manifest
	kde-base/bomber/Manifest
	kde-base/bovo/Manifest
	kde-base/cantor/Manifest
	kde-base/cervisia/Manifest
	kde-base/dolphin-plugins/Manifest
	kde-base/dolphin-plugins/dolphin-plugins-4.5.5.ebuild
	kde-base/dolphin-plugins/dolphin-plugins-4.6.0.ebuild
	kde-base/dolphin/Manifest
	kde-base/dragonplayer/Manifest
	kde-base/drkonqi/Manifest
	kde-base/ffmpegthumbs/Manifest
	kde-base/filelight/Manifest
	kde-base/freespacenotifier/Manifest
	kde-base/granatier/Manifest
	kde-base/gwenview/Manifest
	kde-base/jovie/Manifest
	kde-base/juk/Manifest
	kde-base/kabcclient/Manifest
	kde-base/kaccessible/Manifest
	kde-base/kaddressbook/Manifest
	kde-base/kajongg/Manifest
	kde-base/kalarm/Manifest
	kde-base/kalgebra/Manifest
	kde-base/kalzium/Manifest
	kde-base/kamera/Manifest
	kde-base/kanagram/Manifest
	kde-base/kapman/Manifest
	kde-base/kapptemplate/Manifest
	kde-base/kate/Manifest
	kde-base/katomic/Manifest
	kde-base/kbattleship/Manifest
	kde-base/kblackbox/Manifest
	kde-base/kblocks/Manifest
	kde-base/kbounce/Manifest
	kde-base/kbreakout/Manifest
	kde-base/kbruch/Manifest
	kde-base/kbugbuster/Manifest
	kde-base/kbugbuster/kbugbuster-4.5.5.ebuild
	kde-base/kcachegrind/Manifest
	kde-base/kcalc/Manifest
	kde-base/kcharselect/Manifest
	kde-base/kcheckpass/Manifest
	kde-base/kcminit/Manifest
	kde-base/kcmshell/Manifest
	kde-base/kcolorchooser/Manifest
	kde-base/kcontrol/Manifest
	kde-base/kcron/Manifest
	kde-base/kde-env/Manifest
	kde-base/kde-l10n/Manifest
	kde-base/kde-meta/Manifest
	kde-base/kdeaccessibility-colorschemes/Manifest
	kde-base/kdeaccessibility-iconthemes/Manifest
	kde-base/kdeaccessibility-meta/Manifest
	kde-base/kdeaccounts-plugin/Manifest
	kde-base/kdeadmin-meta/Manifest
	kde-base/kdeartwork-colorschemes/Manifest
	kde-base/kdeartwork-desktopthemes/Manifest
	kde-base/kdeartwork-emoticons/Manifest
	kde-base/kdeartwork-iconthemes/Manifest
	kde-base/kdeartwork-kscreensaver/Manifest
	kde-base/kdeartwork-meta/Manifest
	kde-base/kdeartwork-sounds/Manifest
	kde-base/kdeartwork-styles/Manifest
	kde-base/kdeartwork-wallpapers/Manifest
	kde-base/kdeartwork-weatherwallpapers/Manifest
	kde-base/kdebase-cursors/Manifest
	kde-base/kdebase-data/Manifest
	kde-base/kdebase-desktoptheme/Manifest
	kde-base/kdebase-kioslaves/Manifest
	kde-base/kdebase-menu-icons/Manifest
	kde-base/kdebase-menu/Manifest
	kde-base/kdebase-meta/Manifest
	kde-base/kdebase-runtime-meta/Manifest
	kde-base/kdebase-startkde/Manifest
	kde-base/kdebase-wallpapers/Manifest
	kde-base/kdebindings-csharp/Manifest
	kde-base/kdebindings-meta/Manifest
	kde-base/kdebindings-perl/Manifest
	kde-base/kdebindings-ruby/Manifest
	kde-base/kdebindings-ruby/kdebindings-ruby-4.5.5.ebuild
	kde-base/kdebindings-ruby/kdebindings-ruby-4.6.0.ebuild
	kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild
	kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
	kde-base/kdebugdialog/Manifest
	kde-base/kdeedu-meta/Manifest
	kde-base/kdegames-meta/Manifest
	kde-base/kdegraphics-meta/Manifest
	kde-base/kdegraphics-strigi-analyzer/Manifest
	kde-base/kdelibs/Manifest
	kde-base/kdemultimedia-kioslaves/Manifest
	kde-base/kdemultimedia-meta/Manifest
	kde-base/kdenetwork-filesharing/Manifest
	kde-base/kdenetwork-meta/Manifest
	kde-base/kdepasswd/Manifest
	kde-base/kdepim-common-libs/Manifest
	kde-base/kdepim-icons/Manifest
	kde-base/kdepim-kresources/Manifest
	kde-base/kdepim-meta/Manifest
	kde-base/kdepim-runtime/Manifest
	kde-base/kdepim-strigi-analyzer/Manifest
	kde-base/kdepim-wizards/Manifest
	kde-base/kdepimlibs/Manifest
	kde-base/kdeplasma-addons/Manifest
	kde-base/kdesdk-kioslaves/Manifest
	kde-base/kdesdk-meta/Manifest
	kde-base/kdesdk-misc/Manifest
	kde-base/kdesdk-scripts/Manifest
	kde-base/kdesdk-strigi-analyzer/Manifest
	kde-base/kdesu/Manifest
	kde-base/kdetoys-meta/Manifest
	kde-base/kdeutils-meta/Manifest
	kde-base/kdewebdev-meta/Manifest
	kde-base/kdf/Manifest
	kde-base/kdialog/Manifest
	kde-base/kdiamond/Manifest
	kde-base/kdm/Manifest
	kde-base/kdnssd/Manifest
	kde-base/kdontchangethehostname/Manifest
	kde-base/keditbookmarks/Manifest
	kde-base/keditfiletype/Manifest
	kde-base/kephal/Manifest
	kde-base/kfile/Manifest
	kde-base/kfilereplace/Manifest
	kde-base/kfind/Manifest
	kde-base/kfloppy/Manifest
	kde-base/kfmclient/Manifest
	kde-base/kfourinline/Manifest
	kde-base/kgamma/Manifest
	kde-base/kgeography/Manifest
	kde-base/kget/Manifest
	kde-base/kglobalaccel/Manifest
	kde-base/kgoldrunner/Manifest
	kde-base/kgpg/Manifest
	kde-base/khangman/Manifest
	kde-base/khelpcenter/Manifest
	kde-base/khotkeys/Manifest
	kde-base/kiconfinder/Manifest
	kde-base/kig/Manifest
	kde-base/kigo/Manifest
	kde-base/killbots/Manifest
	kde-base/kimagemapeditor/Manifest
	kde-base/kinfocenter/Manifest
	kde-base/kioclient/Manifest
	kde-base/kiriki/Manifest
	kde-base/kiten/Manifest
	kde-base/kjots/Manifest
	kde-base/kjumpingcube/Manifest
	kde-base/kleopatra/Manifest
	kde-base/klettres/Manifest
	kde-base/klickety/Manifest
	kde-base/klines/Manifest
	kde-base/klinkstatus/Manifest
	kde-base/klipper/Manifest
	kde-base/kmag/Manifest
	kde-base/kmahjongg/Manifest
	kde-base/kmail/Manifest
	kde-base/kmail/kmail-4.4.9999.ebuild
	kde-base/kmail/kmail-4.6.9999.ebuild
	kde-base/kmail/kmail-9999.ebuild
	kde-base/kmenuedit/Manifest
	kde-base/kmimetypefinder/Manifest
	kde-base/kmines/Manifest
	kde-base/kmix/Manifest
	kde-base/kmousetool/Manifest
	kde-base/kmouth/Manifest
	kde-base/kmplot/Manifest
	kde-base/knetattach/Manifest
	kde-base/knetwalk/Manifest
	kde-base/knetworkconf/Manifest
	kde-base/knetworkconf/knetworkconf-4.5.5.ebuild
	kde-base/knewstuff/Manifest
	kde-base/knode/Manifest
	kde-base/knotes/Manifest
	kde-base/knotify/Manifest
	kde-base/kolf/Manifest
	kde-base/kollision/Manifest
	kde-base/kolourpaint/Manifest
	kde-base/kommander/Manifest
	kde-base/kompare/Manifest
	kde-base/konqueror/Manifest
	kde-base/konquest/Manifest
	kde-base/konsole/Manifest
	kde-base/konsolekalendar/Manifest
	kde-base/kontact/Manifest
	kde-base/kopete/Manifest
	kde-base/korganizer/Manifest
	kde-base/kpasswdserver/Manifest
	kde-base/kpat/Manifest
	kde-base/kppp/Manifest
	kde-base/kquitapp/Manifest
	kde-base/krdc/Manifest
	kde-base/kreadconfig/Manifest
	kde-base/kremotecontrol/Manifest
	kde-base/kreversi/Manifest
	kde-base/krfb/Manifest
	kde-base/krfb/krfb-4.5.5.ebuild
	kde-base/krossjava/Manifest
	kde-base/krosspython/Manifest
	kde-base/kruler/Manifest
	kde-base/krunner/Manifest
	kde-base/ksame/Manifest
	kde-base/ksame/ksame-4.5.5.ebuild
	kde-base/ksaneplugin/Manifest
	kde-base/kscd/Manifest
	kde-base/kscreensaver/Manifest
	kde-base/kshisen/Manifest
	kde-base/ksirk/Manifest
	kde-base/ksmserver/Manifest
	kde-base/ksnapshot/Manifest
	kde-base/ksnapshot/ksnapshot-4.5.5.ebuild
	kde-base/kspaceduel/Manifest
	kde-base/ksplash/Manifest
	kde-base/ksquares/Manifest
	kde-base/kstars/Manifest
	kde-base/kstart/Manifest
	kde-base/kstartperf/Manifest
	kde-base/kstartupconfig/Manifest
	kde-base/kstyles/Manifest
	kde-base/ksudoku/Manifest
	kde-base/ksysguard/Manifest
	kde-base/ksystemlog/Manifest
	kde-base/ksystraycmd/Manifest
	kde-base/kteatime/Manifest
	kde-base/ktimer/Manifest
	kde-base/ktimetracker/Manifest
	kde-base/ktimezoned/Manifest
	kde-base/ktouch/Manifest
	kde-base/ktraderclient/Manifest
	kde-base/ktron/Manifest
	kde-base/ktuberling/Manifest
	kde-base/kturtle/Manifest
	kde-base/ktux/Manifest
	kde-base/kubrick/Manifest
	kde-base/kuiserver/Manifest
	kde-base/kuiviewer/Manifest
	kde-base/kurifilter-plugins/Manifest
	kde-base/kuser/Manifest
	kde-base/kvtml-data/Manifest
	kde-base/kwallet/Manifest
	kde-base/kwalletd/Manifest
	kde-base/kwin/Manifest
	kde-base/kwordquiz/Manifest
	kde-base/kwrite/Manifest
	kde-base/kwrited/Manifest
	kde-base/libkcddb/Manifest
	kde-base/libkcompactdisc/Manifest
	kde-base/libkdcraw/Manifest
	kde-base/libkdeedu/Manifest
	kde-base/libkdegames/Manifest
	kde-base/libkdepim/Manifest
	kde-base/libkdepim/libkdepim-4.4.9999.ebuild
	kde-base/libkexiv2/Manifest
	kde-base/libkipi/Manifest
	kde-base/libkmahjongg/Manifest
	kde-base/libkonq/Manifest
	kde-base/libksane/Manifest
	kde-base/libkworkspace/Manifest
	kde-base/liboxygenstyle/Manifest
	kde-base/libplasmaclock/Manifest
	kde-base/libplasmagenericshell/Manifest
	kde-base/libtaskmanager/Manifest
	kde-base/lokalize/Manifest
	kde-base/lskat/Manifest
	kde-base/marble/Manifest
	kde-base/mplayerthumbs/Manifest
	kde-base/nepomuk/Manifest
	kde-base/nsplugins/Manifest
	kde-base/okteta/Manifest
	kde-base/okular/Manifest
	kde-base/oxygen-icons/Manifest
	kde-base/palapeli/Manifest
	kde-base/parley/Manifest
	kde-base/phonon-kde/Manifest
	kde-base/plasma-apps/Manifest
	kde-base/plasma-runtime/Manifest
	kde-base/plasma-workspace/Manifest
	kde-base/powerdevil/Manifest
	kde-base/printer-applet/Manifest
	kde-base/pykde4/Manifest
	kde-base/qguiplatformplugin_kde/Manifest
	kde-base/renamedlg-plugins/Manifest
	kde-base/rocs/Manifest
	kde-base/smoke/Manifest
	kde-base/solid-runtime/Manifest
	kde-base/solid/Manifest
	kde-base/step/Manifest
	kde-base/superkaramba/Manifest
	kde-base/svgpart/Manifest
	kde-base/sweeper/Manifest
	kde-base/system-config-printer-kde/Manifest
	kde-base/systemsettings/Manifest
	kde-base/thumbnailers/Manifest
	kde-base/umbrello/Manifest
	kde-misc/kdiff3/Manifest
	kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
	kde-misc/kdiff3/kdiff3-9999.ebuild
	kde-misc/nightmode/Manifest
	kde-misc/nightmode/nightmode-0.2.ebuild
	kde-misc/plasma-mail/Manifest
	kde-misc/plasma-mail/plasma-mail-0.3.1.ebuild
	media-sound/phonon-gstreamer/Manifest
	media-sound/phonon-gstreamer/phonon-gstreamer-9999.ebuild
	media-sound/phonon-vlc/Manifest
	media-sound/phonon-vlc/phonon-vlc-9999.ebuild
	media-sound/phonon-xine/Manifest
	media-sound/phonon-xine/phonon-xine-9999.ebuild
	media-sound/phonon/Manifest
	media-sound/phonon/phonon-9999.ebuild
	net-im/choqok/Manifest
	net-libs/libgcal/Manifest
	net-libs/libgcal/libgcal-0.9.6.ebuild
	net-libs/libktorrent/Manifest
	net-misc/ksshaskpass/Manifest
	net-misc/ksshaskpass/ksshaskpass-0.5.3.ebuild
	net-p2p/ktorrent/Manifest
	sys-auth/polkit-kde-agent/Manifest
	x11-themes/oxygen-gtk/Manifest

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

2 files changed, 12 insertions, 68 deletions

diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index bbc8b6bb77f..5f68958d809 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,2 +1,2 @@
-EBUILD kdiff3-9999.ebuild 1774 RMD160 3657ffe36a7069c47aeda2c0f31cf095c7c20b48 SHA1 ee135188476917510a4d3fcb070f4fba584ef7e3 SHA256 ac6dfa561e7e447c17c54758efa4414efa93e2d8904ad331f6662c6cb5dec92d
+EBUILD kdiff3-9999.ebuild 584 RMD160 9fad3cc63bdf4d247094c26e2880415f3c7e4627 SHA1 1d28e63a314b945565560ad6f6e5e07330dcba1f SHA256 6e8565a7c2a260075504b3990ffdec7e1922d22bbe3645f842eb524f2b991348
 MISC metadata.xml 272 RMD160 13741b05a0a212384a26dfa158a82c6a370fb522 SHA1 f25ebed93ced9da6bbb189cb5d64e98ed4205236 SHA256 d05363662a508f4e4ec9a8bf9089942548391002a2427b25985232d9c16cce01
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index b471c0c73d4..0fa882ccf1b 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -1,20 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI="3"
 
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.4.0"
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ar bg br cs cy da de el en_GB es et fr ga gl hi hu it ja ka lt nb
-	nds nl pl pt pt_BR ro ru rw sv ta tg tr uk zh_CN"
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KDE_HANDBOOK="optional"
-fi
-
-inherit kde4-base qt4-r2
+KMNAME="extragear/utils"
+inherit kde4-base
 
 DESCRIPTION="KDE-based frontend to diff3"
 HOMEPAGE="http://kdiff3.sourceforge.net/"
@@ -22,67 +13,20 @@ HOMEPAGE="http://kdiff3.sourceforge.net/"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="4"
-IUSE="debug kde konqueror"
+IUSE="debug konqueror"
 
 DEPEND="
-	>=x11-libs/qt-core-${QT_MINIMAL}
-	>=x11-libs/qt-gui-${QT_MINIMAL}
-	kde? (
-		$(add_kdebase_dep kdelibs)
-		konqueror? ( $(add_kdebase_dep libkonq) )
-	)
+	konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} )
 "
 RDEPEND="${DEPEND}
 	sys-apps/diffutils
+	konqueror? ( >=kde-base/konqueror-${KDE_MINIMAL} )
 "
 
-RESTRICT="!kde? ( test )"
-
-src_unpack(){
-	if [[ ${PV} == *9999* ]]; then
-		ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3"
-		subversion_src_unpack
-	elif use kde; then
-		kde4-base_src_unpack
-	else
-		qt4-r2_src_unpack
-	fi
-}
-
-src_prepare() {
-	if ! use kde; then
-		# adapt to Gentoo paths
-		sed -e s,documentation.path.*$,documentation.path\ =\ /usr/share/doc/${PF}, \
-			-e s,target.path.*$,target.path\ =\ /usr/bin, \
-			"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
-	else
-		kde4-base_src_prepare
-	fi
-
-	echo "Categories=Qt;KDE;Development;" >> "${S}"/src-QT4/kdiff3.desktop
-}
-
 src_configure() {
-	if use kde; then
-		mycmakeargs=( $(cmake-utils_use_with konqueror LibKonq) )
-		kde4-base_src_configure
-	else
-		eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro
-	fi
-}
-
-src_compile() {
-	if use kde; then
-		kde4-base_src_compile
-	else
-		qt4-r2_src_compile
-	fi
-}
+	mycmakeargs=(
+		$(cmake-utils_use_with konqueror LibKonq)
+	)
 
-src_install() {
-	if use kde; then
-		kde4-base_src_install
-	else
-		qt4-r2_src_install
-	fi
+	kde4-base_src_configure
 }