From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QREZB-0007Xv-2t for garchives@archives.gentoo.org; Tue, 31 May 2011 02:20:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C2E11C0A7; Tue, 31 May 2011 02:20:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C4B9C1C0A7 for ; Tue, 31 May 2011 02:20:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27EF71B4011 for ; Tue, 31 May 2011 02:20:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8E70A80508 for ; Tue, 31 May 2011 02:20:02 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kwalletd/, kde-base/libplasmagenericshell/, kde-base/libtaskmanager/, ... X-VCS-Repository: proj/kde X-VCS-Files: kde-base/activitymanager/activitymanager-9999.ebuild kde-base/attica/attica-9999.ebuild kde-base/blinken/blinken-4.6.80.ebuild kde-base/blinken/blinken-9999.ebuild kde-base/cantor/cantor-9999.ebuild kde-base/dolphin/dolphin-9999.ebuild kde-base/drkonqi/drkonqi-9999.ebuild kde-base/freespacenotifier/freespacenotifier-9999.ebuild kde-base/gwenview/gwenview-9999.ebuild kde-base/kalgebra/kalgebra-4.6.80.ebuild kde-base/kalgebra/kalgebra-9999.ebuild kde-base/kalzium/kalzium-4.6.80.ebuild kde-base/kalzium/kalzium-9999.ebuild kde-base/kamera/kamera-4.6.80.ebuild kde-base/kamera/kamera-9999.ebuild kde-base/kanagram/kanagram-4.6.80.ebuild kde-base/kanagram/kanagram-9999.ebuild kde-base/kate/kate-9999.ebuild kde-base/kbruch/kbruch-9999.ebuild kde-base/kcheckpass/kcheckpass-9999.ebuild kde-base/kcminit/kcminit-9999.ebuild kde-base/kcmshell/kcmshell-9999.ebuild kde-base/kcolorchooser/kcolorchooser-9999.ebuild kde-base/kcontrol/kcontrol-9999.ebuild kde-base/kdebase-cursors/kd ebase-cursors-4.6.80.ebuild kde-base/kdebase-cursors/kdebase-cursors-4.6.9999.ebuild kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild kde-base/kdebase-data/kdebase-data-9999.ebuild kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild kde-base/kdebase-menu/kdebase-menu-9999.ebuild kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild kde-base/kdebugdialog/kdebugdialog-9999.ebuild kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.6.80.ebuild kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-9999.ebuild kde-base/kdepasswd/kdepasswd-9999.ebuild kde-base/kdesu/kdesu-9999.ebuild kde-base/kdialog/kdialog-9999.ebuild kde-base/kdm/kdm-9999.ebuild kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild kde-base/keditbookmarks/keditbookmarks-9999.ebuild kde-base/keditfiletype/keditfiletype-9999.ebuild kde-base/keph al/kephal-9999.ebuild kde-base/kfile/kfile-9999.ebuild kde-base/kfind/kfind-9999.ebuild kde-base/kfmclient/kfmclient-9999.ebuild kde-base/kgamma/kgamma-4.6.80.ebuild kde-base/kgamma/kgamma-9999.ebuild kde-base/kgeography/kgeography-9999.ebuild kde-base/kglobalaccel/kglobalaccel-9999.ebuild kde-base/khangman/khangman-4.6.80.ebuild kde-base/khangman/khangman-9999.ebuild kde-base/khelpcenter/khelpcenter-9999.ebuild kde-base/khotkeys/khotkeys-9999.ebuild kde-base/kiconfinder/kiconfinder-9999.ebuild kde-base/kig/kig-9999.ebuild kde-base/kinfocenter/kinfocenter-9999.ebuild kde-base/kioclient/kioclient-9999.ebuild kde-base/kiten/kiten-9999.ebuild kde-base/klettres/klettres-9999.ebuild kde-base/klipper/klipper-9999.ebuild kde-base/kmenuedit/kmenuedit-9999.ebuild kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild kde-base/kmplot/kmplot-9999.ebuild kde-base/knetattach/knetattach-9999.ebuild kde-base/knewstuff/knewstuff-9999.ebuild kde-base/knotify/knotify-9999.ebuild kde-base/kolour paint/kolourpaint-9999.ebuild kde-base/konq-plugins/konq-plugins-9999.ebuild kde-base/konqueror/konqueror-9999.ebuild kde-base/konsole/konsole-9999.ebuild kde-base/kpasswdserver/kpasswdserver-9999.ebuild kde-base/kquitapp/kquitapp-9999.ebuild kde-base/kreadconfig/kreadconfig-9999.ebuild kde-base/kruler/kruler-9999.ebuild kde-base/krunner/krunner-9999.ebuild kde-base/kscreensaver/kscreensaver-9999.ebuild kde-base/ksmserver/ksmserver-9999.ebuild kde-base/ksnapshot/ksnapshot-9999.ebuild kde-base/ksplash/ksplash-9999.ebuild kde-base/kstart/kstart-9999.ebuild kde-base/kstartupconfig/kstartupconfig-9999.ebuild kde-base/kstyles/kstyles-9999.ebuild kde-base/ksysguard/ksysguard-9999.ebuild kde-base/ksystraycmd/ksystraycmd-9999.ebuild kde-base/ktimezoned/ktimezoned-9999.ebuild kde-base/ktouch/ktouch-9999.ebuild kde-base/ktraderclient/ktraderclient-9999.ebuild kde-base/kturtle/kturtle-9999.ebuild kde-base/kuiserver/kuiserver-9999.ebuild kde-base/kurifilter-plugins/kurifilter-plugins-99 99.ebuild kde-base/kwalletd/kwalletd-9999.ebuild kde-base/kwin/kwin-9999.ebuild kde-base/kwordquiz/kwordquiz-4.6.80.ebuild kde-base/kwordquiz/kwordquiz-9999.ebuild kde-base/kwrite/kwrite-9999.ebuild kde-base/kwrited/kwrited-9999.ebuild kde-base/libkdcraw/libkdcraw-9999.ebuild kde-base/libkdeedu/libkdeedu-4.6.80.ebuild kde-base/libkdeedu/libkdeedu-9999.ebuild kde-base/libkexiv2/libkexiv2-9999.ebuild kde-base/libkipi/libkipi-9999.ebuild kde-base/libkonq/libkonq-9999.ebuild kde-base/libksane/libksane-9999.ebuild kde-base/libkworkspace/libkworkspace-9999.ebuild kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild kde-base/libplasmaclock/libplasmaclock-9999.ebuild kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild kde-base/libtaskmanager/libtaskmanager-9999.ebuild kde-base/marble/marble-9999.ebuild kde-base/nepomuk/nepomuk-9999.ebuild kde-base/nsplugins/nsplugins-9999.ebuild kde-base/parley/parley-9999.ebuild kde-base/phonon-kde/phonon-kde-9999.ebuild kde-base/plasma- apps/plasma-apps-9999.ebuild kde-base/plasma-runtime/plasma-runtime-9999.ebuild kde-base/plasma-workspace/plasma-workspace-9999.ebuild kde-base/powerdevil/powerdevil-9999.ebuild kde-base/pykde4/pykde4-4.6.80.ebuild kde-base/pykde4/pykde4-9999.ebuild kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-9999.ebuild kde-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild kde-base/rocs/rocs-9999.ebuild kde-base/solid-runtime/solid-runtime-9999.ebuild kde-base/solid/solid-9999.ebuild kde-base/step/step-9999.ebuild kde-base/svgpart/svgpart-9999.ebuild kde-base/systemsettings/systemsettings-9999.ebuild kde-base/thumbnailers/thumbnailers-4.6.80.ebuild kde-base/thumbnailers/thumbnailers-9999.ebuild X-VCS-Directories: kde-base/kwalletd/ kde-base/libplasmagenericshell/ kde-base/libtaskmanager/ kde-base/kdontchangethehostname/ kde-base/solid-runtime/ kde-base/thumbnailers/ kde-base/liboxygenstyle/ kde-base/kturtle/ kde-base/klettres/ kde-base/ktimezoned/ kde-base/konq-plugins/ kde-base/kwin/ kde-base/kruler/ kde-base/khangman/ kde-base/ksplash/ kde-base/libkonq/ kde-base/kanagram/ kde-base/ktraderclient/ kde-base/kuiserver/ kde-base/keditfiletype/ kde-base/nepomuk/ kde-base/kbruch/ kde-base/step/ kde-base/kdm/ kde-base/kamera/ kde-base/rocs/ kde-base/kiconfinder/ kde-base/freespacenotifier/ kde-base/kmplot/ kde-base/kolourpaint/ kde-base/gwenview/ kde-base/plasma-workspace/ kde-base/libkdcraw/ kde-base/ksystraycmd/ kde-base/krunner/ kde-base/kioclient/ kde-base/kgeography/ kde-base/kdialog/ kde-base/khotkeys/ kde-base/klipper/ kde-base/cantor/ kde-base/marble/ kde-base/plasma-apps/ kde-base/kdegraphics-strigi-analyzer/ kde-base/dolphin/ kde-base/plasma-runtime/ kde-base/kn otify/ kde-base/blinken/ kde-base/knewstuff/ kde-base/libplasmaclock/ kde-base/kquitapp/ kde-base/kcolorchooser/ kde-base/kstart/ kde-base/libkexiv2/ kde-base/kreadconfig/ kde-base/ksysguard/ kde-base/solid/ kde-base/libkipi/ kde-base/libksane/ kde-base/powerdevil/ kde-base/keditbookmarks/ kde-base/kstyles/ kde-base/kfile/ kde-base/kate/ kde-base/attica/ kde-base/kpasswdserver/ kde-base/activitymanager/ kde-base/kdepasswd/ kde-base/kcminit/ kde-base/kig/ kde-base/kdesu/ kde-base/kalzium/ kde-base/kdebase-kioslaves/ kde-base/kiten/ kde-base/kinfocenter/ kde-base/kdebugdialog/ kde-base/pykde4/ kde-base/svgpart/ kde-base/ksnapshot/ kde-base/qguiplatformplugin_kde/ kde-base/drkonqi/ kde-base/libkdeedu/ kde-base/kgamma/ kde-base/kdebase-desktoptheme/ kde-base/kdebase-menu/ kde-base/kalgebra/ kde-base/kstartupconfig/ kde-base/libkworkspace/ kde-base/kcheckpass/ kde-base/kscreensaver/ kde-base/kdebase-cursors/ kde-base/knetattach/ kde-base/khelpcenter/ kde-base/ksmserver/ kde-base/ kwordquiz/ kde-base/konqueror/ kde-base/systemsettings/ kde-base/kcontrol/ kde-base/kurifilter-plugins/ kde-base/parley/ kde-base/konsole/ kde-base/kdebase-menu-icons/ kde-base/kfind/ kde-base/nsplugins/ kde-base/kglobalaccel/ kde-base/kcmshell/ kde-base/phonon-kde/ kde-base/ktouch/ kde-base/kmimetypefinder/ kde-base/kdebase-data/ kde-base/kwrited/ kde-base/kwrite/ kde-base/kmenuedit/ kde-base/kephal/ kde-base/kdebase-startkde/ kde-base/renamedlg-plugins/ kde-base/kfmclient/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: bf9293c2ec0b9aafece15af4373ad42e0ceea414 Date: Tue, 31 May 2011 02:20:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 9a45edc11286ccc542a30a0f56c3b7c4 commit: bf9293c2ec0b9aafece15af4373ad42e0ceea414 Author: Jonathan Callen gentoo org> AuthorDate: Tue May 31 02:09:36 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Tue May 31 02:09:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dbf9293c2 [kde-base] General cleanup, remove some conditionals from :live (as we wa= nt the :live version for 4.7 now as well) (Portage version: 2.2.0_alpha35/git/Linux x86_64, signed Manifest commit = with key 229E5838) --- .../activitymanager/activitymanager-9999.ebuild | 6 ++++- kde-base/attica/attica-9999.ebuild | 2 +- kde-base/blinken/blinken-4.6.80.ebuild | 2 - kde-base/blinken/blinken-9999.ebuild | 12 +-------- kde-base/cantor/cantor-9999.ebuild | 12 ++------- kde-base/dolphin/dolphin-9999.ebuild | 2 +- kde-base/drkonqi/drkonqi-9999.ebuild | 2 +- .../freespacenotifier-9999.ebuild | 2 +- kde-base/gwenview/gwenview-9999.ebuild | 14 +++-------- kde-base/kalgebra/kalgebra-4.6.80.ebuild | 4 +-- kde-base/kalgebra/kalgebra-9999.ebuild | 21 +++-----------= -- kde-base/kalzium/kalzium-4.6.80.ebuild | 2 +- kde-base/kalzium/kalzium-9999.ebuild | 10 +------ kde-base/kamera/kamera-4.6.80.ebuild | 12 --------- kde-base/kamera/kamera-9999.ebuild | 22 +-------------= --- kde-base/kanagram/kanagram-4.6.80.ebuild | 4 --- kde-base/kanagram/kanagram-9999.ebuild | 12 +-------- kde-base/kate/kate-9999.ebuild | 3 +- kde-base/kbruch/kbruch-9999.ebuild | 8 +----- kde-base/kcheckpass/kcheckpass-9999.ebuild | 2 +- kde-base/kcminit/kcminit-9999.ebuild | 2 +- kde-base/kcmshell/kcmshell-9999.ebuild | 2 +- kde-base/kcolorchooser/kcolorchooser-9999.ebuild | 8 +----- kde-base/kcontrol/kcontrol-9999.ebuild | 2 +- .../kdebase-cursors/kdebase-cursors-4.6.80.ebuild | 3 +- .../kdebase-cursors-4.6.9999.ebuild | 3 +- .../kdebase-cursors/kdebase-cursors-9999.ebuild | 5 +-- kde-base/kdebase-data/kdebase-data-9999.ebuild | 2 +- .../kdebase-desktoptheme-9999.ebuild | 2 +- .../kdebase-kioslaves-9999.ebuild | 2 +- .../kdebase-menu-icons-9999.ebuild | 2 +- kde-base/kdebase-menu/kdebase-menu-9999.ebuild | 2 +- .../kdebase-startkde/kdebase-startkde-9999.ebuild | 2 +- kde-base/kdebugdialog/kdebugdialog-9999.ebuild | 2 +- .../kdegraphics-strigi-analyzer-4.6.80.ebuild | 6 ---- .../kdegraphics-strigi-analyzer-9999.ebuild | 15 +----------- kde-base/kdepasswd/kdepasswd-9999.ebuild | 2 +- kde-base/kdesu/kdesu-9999.ebuild | 2 +- kde-base/kdialog/kdialog-9999.ebuild | 2 +- kde-base/kdm/kdm-9999.ebuild | 2 +- .../kdontchangethehostname-9999.ebuild | 2 +- kde-base/keditbookmarks/keditbookmarks-9999.ebuild | 2 +- kde-base/keditfiletype/keditfiletype-9999.ebuild | 2 +- kde-base/kephal/kephal-9999.ebuild | 2 +- kde-base/kfile/kfile-9999.ebuild | 2 +- kde-base/kfind/kfind-9999.ebuild | 2 +- kde-base/kfmclient/kfmclient-9999.ebuild | 2 +- kde-base/kgamma/kgamma-4.6.80.ebuild | 8 ------ kde-base/kgamma/kgamma-9999.ebuild | 16 +------------ kde-base/kgeography/kgeography-9999.ebuild | 8 +----- kde-base/kglobalaccel/kglobalaccel-9999.ebuild | 2 +- kde-base/khangman/khangman-4.6.80.ebuild | 4 --- kde-base/khangman/khangman-9999.ebuild | 12 +-------- kde-base/khelpcenter/khelpcenter-9999.ebuild | 2 +- kde-base/khotkeys/khotkeys-9999.ebuild | 2 +- kde-base/kiconfinder/kiconfinder-9999.ebuild | 2 +- kde-base/kig/kig-9999.ebuild | 10 +------ kde-base/kinfocenter/kinfocenter-9999.ebuild | 2 +- kde-base/kioclient/kioclient-9999.ebuild | 2 +- kde-base/kiten/kiten-9999.ebuild | 8 +----- kde-base/klettres/klettres-9999.ebuild | 8 +----- kde-base/klipper/klipper-9999.ebuild | 2 +- kde-base/kmenuedit/kmenuedit-9999.ebuild | 2 +- .../kmimetypefinder/kmimetypefinder-9999.ebuild | 2 +- kde-base/kmplot/kmplot-9999.ebuild | 8 +----- kde-base/knetattach/knetattach-9999.ebuild | 2 +- kde-base/knewstuff/knewstuff-9999.ebuild | 2 +- kde-base/knotify/knotify-9999.ebuild | 2 +- kde-base/kolourpaint/kolourpaint-9999.ebuild | 8 +----- kde-base/konq-plugins/konq-plugins-9999.ebuild | 2 +- kde-base/konqueror/konqueror-9999.ebuild | 2 +- kde-base/konsole/konsole-9999.ebuild | 2 +- kde-base/kpasswdserver/kpasswdserver-9999.ebuild | 2 +- kde-base/kquitapp/kquitapp-9999.ebuild | 2 +- kde-base/kreadconfig/kreadconfig-9999.ebuild | 2 +- kde-base/kruler/kruler-9999.ebuild | 8 +----- kde-base/krunner/krunner-9999.ebuild | 2 +- kde-base/kscreensaver/kscreensaver-9999.ebuild | 2 +- kde-base/ksmserver/ksmserver-9999.ebuild | 2 +- kde-base/ksnapshot/ksnapshot-9999.ebuild | 10 +------ kde-base/ksplash/ksplash-9999.ebuild | 2 +- kde-base/kstart/kstart-9999.ebuild | 2 +- kde-base/kstartupconfig/kstartupconfig-9999.ebuild | 2 +- kde-base/kstyles/kstyles-9999.ebuild | 2 +- kde-base/ksysguard/ksysguard-9999.ebuild | 2 +- kde-base/ksystraycmd/ksystraycmd-9999.ebuild | 2 +- kde-base/ktimezoned/ktimezoned-9999.ebuild | 2 +- kde-base/ktouch/ktouch-9999.ebuild | 8 +----- kde-base/ktraderclient/ktraderclient-9999.ebuild | 2 +- kde-base/kturtle/kturtle-9999.ebuild | 8 +----- kde-base/kuiserver/kuiserver-9999.ebuild | 2 +- .../kurifilter-plugins-9999.ebuild | 2 +- kde-base/kwalletd/kwalletd-9999.ebuild | 2 +- kde-base/kwin/kwin-9999.ebuild | 2 +- kde-base/kwordquiz/kwordquiz-4.6.80.ebuild | 3 -- kde-base/kwordquiz/kwordquiz-9999.ebuild | 11 +-------- kde-base/kwrite/kwrite-9999.ebuild | 2 +- kde-base/kwrited/kwrited-9999.ebuild | 2 +- kde-base/libkdcraw/libkdcraw-9999.ebuild | 9 +------ kde-base/libkdeedu/libkdeedu-4.6.80.ebuild | 1 + kde-base/libkdeedu/libkdeedu-9999.ebuild | 10 +------ kde-base/libkexiv2/libkexiv2-9999.ebuild | 9 +------ kde-base/libkipi/libkipi-9999.ebuild | 9 +------ kde-base/libkonq/libkonq-9999.ebuild | 2 +- kde-base/libksane/libksane-9999.ebuild | 19 +-------------= - kde-base/libkworkspace/libkworkspace-9999.ebuild | 2 +- kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild | 2 +- kde-base/libplasmaclock/libplasmaclock-9999.ebuild | 2 +- .../libplasmagenericshell-9999.ebuild | 2 +- kde-base/libtaskmanager/libtaskmanager-9999.ebuild | 2 +- kde-base/marble/marble-9999.ebuild | 16 ++++-------- kde-base/nepomuk/nepomuk-9999.ebuild | 2 +- kde-base/nsplugins/nsplugins-9999.ebuild | 2 +- kde-base/parley/parley-9999.ebuild | 10 +------ kde-base/phonon-kde/phonon-kde-9999.ebuild | 2 +- kde-base/plasma-apps/plasma-apps-9999.ebuild | 2 +- kde-base/plasma-runtime/plasma-runtime-9999.ebuild | 2 +- .../plasma-workspace/plasma-workspace-9999.ebuild | 2 +- kde-base/powerdevil/powerdevil-9999.ebuild | 2 +- kde-base/pykde4/pykde4-4.6.80.ebuild | 2 +- kde-base/pykde4/pykde4-9999.ebuild | 25 +++++++-------= ----- .../qguiplatformplugin_kde-9999.ebuild | 2 +- .../renamedlg-plugins-9999.ebuild | 2 +- kde-base/rocs/rocs-9999.ebuild | 8 +----- kde-base/solid-runtime/solid-runtime-9999.ebuild | 2 +- kde-base/solid/solid-9999.ebuild | 2 +- kde-base/step/step-9999.ebuild | 11 +------- kde-base/svgpart/svgpart-9999.ebuild | 8 +----- kde-base/systemsettings/systemsettings-9999.ebuild | 2 +- kde-base/thumbnailers/thumbnailers-4.6.80.ebuild | 5 +-- kde-base/thumbnailers/thumbnailers-9999.ebuild | 16 +----------- 131 files changed, 159 insertions(+), 479 deletions(-) diff --git a/kde-base/activitymanager/activitymanager-9999.ebuild b/kde-b= ase/activitymanager/activitymanager-9999.ebuild index b037d73..193152f 100644 --- a/kde-base/activitymanager/activitymanager-9999.ebuild +++ b/kde-base/activitymanager/activitymanager-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"Activity manager" @@ -14,6 +14,10 @@ IUSE=3D"debug semantic-desktop" DEPEND=3D"$(add_kdebase_dep kdelibs 'semantic-desktop=3D')" RDEPEND=3D${DEPEND} =20 +KMEXTRACTONLY=3D" + nepomuk/ +" + src_configure() { mycmakeargs=3D( $(cmake-utils_use_with semantic-desktop Nepomuk) diff --git a/kde-base/attica/attica-9999.ebuild b/kde-base/attica/attica-= 9999.ebuild index 547064a..d3d5dec 100644 --- a/kde-base/attica/attica-9999.ebuild +++ b/kde-base/attica/attica-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"Open Collaboration Services provider management" diff --git a/kde-base/blinken/blinken-4.6.80.ebuild b/kde-base/blinken/bl= inken-4.6.80.ebuild index f279ed0..a25c7eb 100644 --- a/kde-base/blinken/blinken-4.6.80.ebuild +++ b/kde-base/blinken/blinken-4.6.80.ebuild @@ -18,5 +18,3 @@ DEPEND=3D" RDEPEND=3D"${DEPEND} $(add_kdebase_dep knotify) " - -KMEXTRACTONLY=3D"libkdeedu/kdeeduui" diff --git a/kde-base/blinken/blinken-9999.ebuild b/kde-base/blinken/blin= ken-9999.ebuild index 6123a92..b900402 100644 --- a/kde-base/blinken/blinken-9999.ebuild +++ b/kde-base/blinken/blinken-9999.ebuild @@ -5,14 +5,8 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -if [[ ${PV} =3D=3D *9999 ]]; then - KDE_SCM=3D"git" - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +KDE_SCM=3D"git" +inherit kde4-base =20 DESCRIPTION=3D"KDE version of the Simon Says game." KEYWORDS=3D"" @@ -24,5 +18,3 @@ DEPEND=3D" RDEPEND=3D"${DEPEND} $(add_kdebase_dep knotify) " - -KMEXTRACTONLY=3D"libkdeedu/kdeeduui" diff --git a/kde-base/cantor/cantor-9999.ebuild b/kde-base/cantor/cantor-= 9999.ebuild index 7bc58be..18798e4 100644 --- a/kde-base/cantor/cantor-9999.ebuild +++ b/kde-base/cantor/cantor-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE4 interface for doing mathematics and scientific compu= ting" KEYWORDS=3D"" @@ -32,11 +26,11 @@ src_configure() { $(cmake-utils_use_with ps LibSpectre) $(cmake-utils_use_with R) " - ${kde_eclass}_src_configure + kde4-base_src_configure } =20 pkg_postinst() { - ${kde_eclass}_pkg_postinst + kde4-base_pkg_postinst =20 if ! use R; then echo diff --git a/kde-base/dolphin/dolphin-9999.ebuild b/kde-base/dolphin/dolp= hin-9999.ebuild index bcfaeac..98c57b8 100644 --- a/kde-base/dolphin/dolphin-9999.ebuild +++ b/kde-base/dolphin/dolphin-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-apps" +KMNAME=3D"kde-baseapps" inherit kde4-meta =20 DESCRIPTION=3D"A KDE filemanager focusing on usability" diff --git a/kde-base/drkonqi/drkonqi-9999.ebuild b/kde-base/drkonqi/drko= nqi-9999.ebuild index 9c4b22d..5fdae6d 100644 --- a/kde-base/drkonqi/drkonqi-9999.ebuild +++ b/kde-base/drkonqi/drkonqi-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE crash handler, gives the user feedback if a program c= rashed" diff --git a/kde-base/freespacenotifier/freespacenotifier-9999.ebuild b/k= de-base/freespacenotifier/freespacenotifier-9999.ebuild index 1d9b0fe..82bc609 100644 --- a/kde-base/freespacenotifier/freespacenotifier-9999.ebuild +++ b/kde-base/freespacenotifier/freespacenotifier-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta =20 DESCRIPTION=3D"A module that monitors free disk space on the home dir" diff --git a/kde-base/gwenview/gwenview-9999.ebuild b/kde-base/gwenview/g= wenview-9999.ebuild index b56ab6b..7b8d11a 100644 --- a/kde-base/gwenview/gwenview-9999.ebuild +++ b/kde-base/gwenview/gwenview-9999.ebuild @@ -5,14 +5,8 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -if [[ ${PV} =3D=3D *9999 ]]; then - KDE_SCM=3D"git" - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdegraphics" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +KDE_SCM=3D"git" +inherit kde4-base =20 DESCRIPTION=3D"KDE image viewer" KEYWORDS=3D"" @@ -44,11 +38,11 @@ src_configure() { mycmakeargs+=3D(-DGWENVIEW_SEMANTICINFO_BACKEND=3DNone) fi =20 - ${kde_eclass}_src_configure + kde4-base_src_configure } =20 pkg_postinst() { - ${kde_eclass}_pkg_postinst + kde4-base_pkg_postinst =20 echo elog "For SVG support, emerge -va kde-base/svgpart" diff --git a/kde-base/kalgebra/kalgebra-4.6.80.ebuild b/kde-base/kalgebra= /kalgebra-4.6.80.ebuild index a4bd41e..5756018 100644 --- a/kde-base/kalgebra/kalgebra-4.6.80.ebuild +++ b/kde-base/kalgebra/kalgebra-4.6.80.ebuild @@ -41,10 +41,8 @@ src_configure() { =20 src_test() { # disable broken test - local dir - dir=3D"${S}" sed -i -e '/mathmlpresentationtest/ s/^/#DO_NOT_RUN_TEST /' \ - "${dir}"/analitza/tests/CMakeLists.txt || \ + "${S}"/analitza/tests/CMakeLists.txt || \ die "sed to disable mathmlpresentationtest failed." =20 kde4-base_src_test diff --git a/kde-base/kalgebra/kalgebra-9999.ebuild b/kde-base/kalgebra/k= algebra-9999.ebuild index 820d760..d86b2e9 100644 --- a/kde-base/kalgebra/kalgebra-9999.ebuild +++ b/kde-base/kalgebra/kalgebra-9999.ebuild @@ -7,14 +7,7 @@ EAPI=3D4 KDE_HANDBOOK=3D"optional" OPENGL_REQUIRED=3D"optional" KDE_SCM=3D"git" - -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"MathML-based graph calculator for KDE." KEYWORDS=3D"" @@ -43,20 +36,14 @@ src_configure() { $(cmake-utils_use_with opengl OpenGL) ) =20 - ${kde_eclass}_src_configure + kde4-base_src_configure } =20 src_test() { # disable broken test - local dir - if [[ ${PV} =3D=3D *9999 ]]; then - dir=3D"${S}" - else - dir=3D"${S}/${PN}" - fi sed -i -e '/mathmlpresentationtest/ s/^/#DO_NOT_RUN_TEST /' \ - "${dir}"/analitza/tests/CMakeLists.txt || \ + "${S}"/analitza/tests/CMakeLists.txt || \ die "sed to disable mathmlpresentationtest failed." =20 - ${kde_eclass}_src_test + kde4-base_src_test } diff --git a/kde-base/kalzium/kalzium-4.6.80.ebuild b/kde-base/kalzium/ka= lzium-4.6.80.ebuild index 1110da5..f19c96b 100644 --- a/kde-base/kalzium/kalzium-4.6.80.ebuild +++ b/kde-base/kalzium/kalzium-4.6.80.ebuild @@ -8,7 +8,7 @@ KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" CPPUNIT_REQUIRED=3D"optional" OPENGL_REQUIRED=3D"always" -inherit flag-o-matic kde4-base +inherit kde4-base flag-o-matic =20 DESCRIPTION=3D"KDE: periodic table of the elements." KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" diff --git a/kde-base/kalzium/kalzium-9999.ebuild b/kde-base/kalzium/kalz= ium-9999.ebuild index 8f3bdcc..7deedfa 100644 --- a/kde-base/kalzium/kalzium-9999.ebuild +++ b/kde-base/kalzium/kalzium-9999.ebuild @@ -6,15 +6,9 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi CPPUNIT_REQUIRED=3D"optional" OPENGL_REQUIRED=3D"always" -inherit ${kde_eclass} flag-o-matic +inherit kde4-base flag-o-matic =20 DESCRIPTION=3D"KDE: periodic table of the elements." KEYWORDS=3D"" @@ -46,5 +40,5 @@ src_configure(){ $(cmake-utils_use_with solver Libfacile) ) =20 - ${kde_eclass}_src_configure + kde4-base_src_configure } diff --git a/kde-base/kamera/kamera-4.6.80.ebuild b/kde-base/kamera/kamer= a-4.6.80.ebuild index f842604..7aa55e0 100644 --- a/kde-base/kamera/kamera-4.6.80.ebuild +++ b/kde-base/kamera/kamera-4.6.80.ebuild @@ -16,15 +16,3 @@ DEPEND=3D" media-libs/libgphoto2 " RDEPEND=3D"${DEPEND}" - -if [[ ${PV} !=3D *9999 ]]; then -src_unpack() { - if use handbook; then - KMEXTRA=3D" - doc/kcontrol/${PN} - " - fi - - kde4-base_src_unpack -} -fi diff --git a/kde-base/kamera/kamera-9999.ebuild b/kde-base/kamera/kamera-= 9999.ebuild index 7468fb6..87acf53 100644 --- a/kde-base/kamera/kamera-9999.ebuild +++ b/kde-base/kamera/kamera-9999.ebuild @@ -5,14 +5,8 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -if [[ ${PV} =3D=3D *9999 ]]; then - KDE_SCM=3D"git" - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdegraphics" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +KDE_SCM=3D"git" +inherit kde4-base =20 DESCRIPTION=3D"KDE digital camera manager" KEYWORDS=3D"" @@ -22,15 +16,3 @@ DEPEND=3D" media-libs/libgphoto2 " RDEPEND=3D"${DEPEND}" - -if [[ ${PV} !=3D *9999 ]]; then -src_unpack() { - if use handbook; then - KMEXTRA=3D" - doc/kcontrol/${PN} - " - fi - - kde4-meta_src_unpack -} -fi diff --git a/kde-base/kanagram/kanagram-4.6.80.ebuild b/kde-base/kanagram= /kanagram-4.6.80.ebuild index 174d089..23f9111 100644 --- a/kde-base/kanagram/kanagram-4.6.80.ebuild +++ b/kde-base/kanagram/kanagram-4.6.80.ebuild @@ -15,7 +15,3 @@ IUSE=3D"debug" DEPEND=3D" $(add_kdebase_dep libkdeedu) " -KMEXTRACTONLY=3D" - libkdeedu/kdeeduui/ - libkdeedu/keduvocdocument/ -" diff --git a/kde-base/kanagram/kanagram-9999.ebuild b/kde-base/kanagram/k= anagram-9999.ebuild index 7efe981..524783f 100644 --- a/kde-base/kanagram/kanagram-9999.ebuild +++ b/kde-base/kanagram/kanagram-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE: letter order game." KEYWORDS=3D"" @@ -21,7 +15,3 @@ IUSE=3D"debug" DEPEND=3D" $(add_kdebase_dep libkdeedu) " -KMEXTRACTONLY=3D" - libkdeedu/kdeeduui/ - libkdeedu/keduvocdocument/ -" diff --git a/kde-base/kate/kate-9999.ebuild b/kde-base/kate/kate-9999.ebu= ild index 5fb984b..2b64588 100644 --- a/kde-base/kate/kate-9999.ebuild +++ b/kde-base/kate/kate-9999.ebuild @@ -5,8 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdesdk" -[[ ${PV} =3D=3D *9999 ]] && KMNAME=3D"kate" +KMNAME=3D"kate" KDE_SCM=3D"git" inherit kde4-meta =20 diff --git a/kde-base/kbruch/kbruch-9999.ebuild b/kde-base/kbruch/kbruch-= 9999.ebuild index 801e506..49fc54a 100644 --- a/kde-base/kbruch/kbruch-9999.ebuild +++ b/kde-base/kbruch/kbruch-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE Educational: Learn calculating with fractions" KEYWORDS=3D"" diff --git a/kde-base/kcheckpass/kcheckpass-9999.ebuild b/kde-base/kcheck= pass/kcheckpass-9999.ebuild index cb2304c..a08f789 100644 --- a/kde-base/kcheckpass/kcheckpass-9999.ebuild +++ b/kde-base/kcheckpass/kcheckpass-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta =20 DESCRIPTION=3D"A simple password checker, used by any software in need o= f user authentication." diff --git a/kde-base/kcminit/kcminit-9999.ebuild b/kde-base/kcminit/kcmi= nit-9999.ebuild index 05d8cb9..85314ac 100644 --- a/kde-base/kcminit/kcminit-9999.ebuild +++ b/kde-base/kcminit/kcminit-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta =20 DESCRIPTION=3D"KCMInit - runs startups initialization for Control Module= s." diff --git a/kde-base/kcmshell/kcmshell-9999.ebuild b/kde-base/kcmshell/k= cmshell-9999.ebuild index 12b0c12..af9d857 100644 --- a/kde-base/kcmshell/kcmshell-9999.ebuild +++ b/kde-base/kcmshell/kcmshell-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KCMShell is a utility to host KDE control modules indepen= dently of SystemSettings." diff --git a/kde-base/kcolorchooser/kcolorchooser-9999.ebuild b/kde-base/= kcolorchooser/kcolorchooser-9999.ebuild index 6e7c37f..c92a74b 100644 --- a/kde-base/kcolorchooser/kcolorchooser-9999.ebuild +++ b/kde-base/kcolorchooser/kcolorchooser-9999.ebuild @@ -5,13 +5,7 @@ EAPI=3D4 =20 KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdegraphics" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE color selector/editor" KEYWORDS=3D"" diff --git a/kde-base/kcontrol/kcontrol-9999.ebuild b/kde-base/kcontrol/k= control-9999.ebuild index eed03c4..e8ae4a5 100644 --- a/kde-base/kcontrol/kcontrol-9999.ebuild +++ b/kde-base/kcontrol/kcontrol-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"The KDE Control Center" diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.6.80.ebuild b/kde= -base/kdebase-cursors/kdebase-cursors-4.6.80.ebuild index db5e42d..8199232 100644 --- a/kde-base/kdebase-cursors/kdebase-cursors-4.6.80.ebuild +++ b/kde-base/kdebase-cursors/kdebase-cursors-4.6.80.ebuild @@ -5,8 +5,7 @@ EAPI=3D4 =20 KMNAME=3D"kde-workspace" -KMEXTRA=3D"cursors" -KMNOMODULE=3D"true" +KMMODULE=3D"cursors" inherit kde4-meta =20 DESCRIPTION=3D"oxygen cursors from kdebase" diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.6.9999.ebuild b/k= de-base/kdebase-cursors/kdebase-cursors-4.6.9999.ebuild index 4e4372b..633edc5 100644 --- a/kde-base/kdebase-cursors/kdebase-cursors-4.6.9999.ebuild +++ b/kde-base/kdebase-cursors/kdebase-cursors-4.6.9999.ebuild @@ -5,8 +5,7 @@ EAPI=3D4 =20 KMNAME=3D"kdebase-workspace" -KMEXTRA=3D"cursors" -KMNOMODULE=3D"true" +KMMODULE=3D"cursors" inherit kde4-meta =20 DESCRIPTION=3D"oxygen cursors from kdebase" diff --git a/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild b/kde-b= ase/kdebase-cursors/kdebase-cursors-9999.ebuild index 4e4372b..9fe4df5 100644 --- a/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild +++ b/kde-base/kdebase-cursors/kdebase-cursors-9999.ebuild @@ -4,9 +4,8 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" -KMEXTRA=3D"cursors" -KMNOMODULE=3D"true" +KMNAME=3D"kde-workspace" +KMMODULE=3D"cursors" inherit kde4-meta =20 DESCRIPTION=3D"oxygen cursors from kdebase" diff --git a/kde-base/kdebase-data/kdebase-data-9999.ebuild b/kde-base/kd= ebase-data/kdebase-data-9999.ebuild index 2d6552d..0155f76 100644 --- a/kde-base/kdebase-data/kdebase-data-9999.ebuild +++ b/kde-base/kdebase-data/kdebase-data-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" KMNOMODULE=3D"true" inherit kde4-meta =20 diff --git a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebui= ld b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild index b26ace1..a2195d6 100644 --- a/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild +++ b/kde-base/kdebase-desktoptheme/kdebase-desktoptheme-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" KMMODULE=3D"desktoptheme" inherit kde4-meta =20 diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild b/k= de-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild index c5d9fdb..10870bc 100644 --- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild +++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" KMMODULE=3D"kioslave" inherit kde4-meta =20 diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild b= /kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild index 94479ad..8c35ec2 100644 --- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild +++ b/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" KMMODULE=3D"menu" inherit kde4-meta =20 diff --git a/kde-base/kdebase-menu/kdebase-menu-9999.ebuild b/kde-base/kd= ebase-menu/kdebase-menu-9999.ebuild index 446d5c4..03a9ccd 100644 --- a/kde-base/kdebase-menu/kdebase-menu-9999.ebuild +++ b/kde-base/kdebase-menu/kdebase-menu-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" KMMODULE=3D"kde-menu" inherit kde4-meta =20 diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde= -base/kdebase-startkde/kdebase-startkde-9999.ebuild index 01b772d..365d11d 100644 --- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild +++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" KMNOMODULE=3D"true" inherit kde4-meta multilib prefix =20 diff --git a/kde-base/kdebugdialog/kdebugdialog-9999.ebuild b/kde-base/kd= ebugdialog/kdebugdialog-9999.ebuild index 4d421cf..3e4fac3 100644 --- a/kde-base/kdebugdialog/kdebugdialog-9999.ebuild +++ b/kde-base/kdebugdialog/kdebugdialog-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE: A dialog box for setting preferences for debug outpu= t" diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-anal= yzer-4.6.80.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-str= igi-analyzer-4.6.80.ebuild index ab11afb..153c810 100644 --- a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.= 6.80.ebuild +++ b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-4.= 6.80.ebuild @@ -11,12 +11,6 @@ DESCRIPTION=3D"kdegraphics: strigi plugins" KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE=3D"debug" =20 -if [[ ${PV} !=3D *9999 ]]; then -KMEXTRACTONLY=3D" - libs/mobipocket/ -" -fi - DEPEND=3D" app-misc/strigi " diff --git a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-anal= yzer-9999.ebuild b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strig= i-analyzer-9999.ebuild index cb79891..8fea82e 100644 --- a/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-99= 99.ebuild +++ b/kde-base/kdegraphics-strigi-analyzer/kdegraphics-strigi-analyzer-99= 99.ebuild @@ -5,25 +5,12 @@ EAPI=3D4 =20 KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdegraphics" - KMMODULE=3D"strigi-analyzer" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"kdegraphics: strigi plugins" KEYWORDS=3D"" IUSE=3D"debug" =20 -if [[ ${PV} !=3D *9999 ]]; then -KMEXTRACTONLY=3D" - libs/mobipocket/ -" -fi - DEPEND=3D" app-misc/strigi " diff --git a/kde-base/kdepasswd/kdepasswd-9999.ebuild b/kde-base/kdepassw= d/kdepasswd-9999.ebuild index 58c4548..2c7bdff 100644 --- a/kde-base/kdepasswd/kdepasswd-9999.ebuild +++ b/kde-base/kdepasswd/kdepasswd-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-apps" +KMNAME=3D"kde-baseapps" inherit kde4-meta =20 DESCRIPTION=3D"KDE GUI for passwd" diff --git a/kde-base/kdesu/kdesu-9999.ebuild b/kde-base/kdesu/kdesu-9999= .ebuild index 043c5ea..a625203 100644 --- a/kde-base/kdesu/kdesu-9999.ebuild +++ b/kde-base/kdesu/kdesu-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 # FIXME: Is default command ( su/sudo ) still configurable, diff --git a/kde-base/kdialog/kdialog-9999.ebuild b/kde-base/kdialog/kdia= log-9999.ebuild index 5484ac0..d40c1ab 100644 --- a/kde-base/kdialog/kdialog-9999.ebuild +++ b/kde-base/kdialog/kdialog-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-apps" +KMNAME=3D"kde-baseapps" inherit kde4-meta =20 DESCRIPTION=3D"KDialog can be used to show nice dialog boxes from shell = scripts" diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild index 0a99097..bad9996 100644 --- a/kde-base/kdm/kdm-9999.ebuild +++ b/kde-base/kdm/kdm-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta flag-o-matic =20 DESCRIPTION=3D"KDE login manager, similar to xdm and gdm" diff --git a/kde-base/kdontchangethehostname/kdontchangethehostname-9999.= ebuild b/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebui= ld index 3f96b18..25e6486 100644 --- a/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild +++ b/kde-base/kdontchangethehostname/kdontchangethehostname-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"Tool to inform KDE about a change in hostname" diff --git a/kde-base/keditbookmarks/keditbookmarks-9999.ebuild b/kde-bas= e/keditbookmarks/keditbookmarks-9999.ebuild index da86b93..ad4d01f 100644 --- a/kde-base/keditbookmarks/keditbookmarks-9999.ebuild +++ b/kde-base/keditbookmarks/keditbookmarks-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-apps" +KMNAME=3D"kde-baseapps" inherit kde4-meta =20 DESCRIPTION=3D"KDE's bookmarks editor" diff --git a/kde-base/keditfiletype/keditfiletype-9999.ebuild b/kde-base/= keditfiletype/keditfiletype-9999.ebuild index d53a73c..c069a0d 100644 --- a/kde-base/keditfiletype/keditfiletype-9999.ebuild +++ b/kde-base/keditfiletype/keditfiletype-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE mime/file type assocciation editor" diff --git a/kde-base/kephal/kephal-9999.ebuild b/kde-base/kephal/kephal-= 9999.ebuild index e5717cb..7de514d 100644 --- a/kde-base/kephal/kephal-9999.ebuild +++ b/kde-base/kephal/kephal-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" KMMODULE=3D"libs/kephal" inherit kde4-meta =20 diff --git a/kde-base/kfile/kfile-9999.ebuild b/kde-base/kfile/kfile-9999= .ebuild index c9eb714..1265369 100644 --- a/kde-base/kfile/kfile-9999.ebuild +++ b/kde-base/kfile/kfile-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"A commandline frontend to KFileMetaInfo" diff --git a/kde-base/kfind/kfind-9999.ebuild b/kde-base/kfind/kfind-9999= .ebuild index c455ff1..b8a114f 100644 --- a/kde-base/kfind/kfind-9999.ebuild +++ b/kde-base/kfind/kfind-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-apps" +KMNAME=3D"kde-baseapps" inherit kde4-meta =20 DESCRIPTION=3D"KDE file finder utility" diff --git a/kde-base/kfmclient/kfmclient-9999.ebuild b/kde-base/kfmclien= t/kfmclient-9999.ebuild index 8b2ca44..30f6735 100644 --- a/kde-base/kfmclient/kfmclient-9999.ebuild +++ b/kde-base/kfmclient/kfmclient-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-apps" +KMNAME=3D"kde-baseapps" KMMODULE=3D"konqueror/client" inherit kde4-meta =20 diff --git a/kde-base/kgamma/kgamma-4.6.80.ebuild b/kde-base/kgamma/kgamm= a-4.6.80.ebuild index 781992e..8faa8f1 100644 --- a/kde-base/kgamma/kgamma-4.6.80.ebuild +++ b/kde-base/kgamma/kgamma-4.6.80.ebuild @@ -19,11 +19,3 @@ RDEPEND=3D" DEPEND=3D"${RDEPEND} x11-proto/xf86vidmodeproto " - -src_unpack() { - if use handbook; then - KMEXTRA_NOFATAL+=3D" doc/kcontrol/kgamma" - fi - - kde4-base_src_unpack -} diff --git a/kde-base/kgamma/kgamma-9999.ebuild b/kde-base/kgamma/kgamma-= 9999.ebuild index 78597d0..8a175a8 100644 --- a/kde-base/kgamma/kgamma-9999.ebuild +++ b/kde-base/kgamma/kgamma-9999.ebuild @@ -6,14 +6,8 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdegraphics" - kde_eclass=3D"kde4-meta" -fi =20 -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE screen gamma values kcontrol module" KEYWORDS=3D"" @@ -25,11 +19,3 @@ RDEPEND=3D" DEPEND=3D"${RDEPEND} x11-proto/xf86vidmodeproto " - -src_unpack() { - if use handbook; then - KMEXTRA_NOFATAL+=3D" doc/kcontrol/kgamma" - fi - - ${kde_eclass}_src_unpack -} diff --git a/kde-base/kgeography/kgeography-9999.ebuild b/kde-base/kgeogr= aphy/kgeography-9999.ebuild index af576dc..c70297c 100644 --- a/kde-base/kgeography/kgeography-9999.ebuild +++ b/kde-base/kgeography/kgeography-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE: a geography learning tool" KEYWORDS=3D"" diff --git a/kde-base/kglobalaccel/kglobalaccel-9999.ebuild b/kde-base/kg= lobalaccel/kglobalaccel-9999.ebuild index 532d36f..a9c76ed 100644 --- a/kde-base/kglobalaccel/kglobalaccel-9999.ebuild +++ b/kde-base/kglobalaccel/kglobalaccel-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE's Global Shortcut Daemon" diff --git a/kde-base/khangman/khangman-4.6.80.ebuild b/kde-base/khangman= /khangman-4.6.80.ebuild index 1fd666c..55a8c11 100644 --- a/kde-base/khangman/khangman-4.6.80.ebuild +++ b/kde-base/khangman/khangman-4.6.80.ebuild @@ -15,7 +15,3 @@ IUSE=3D"debug" DEPEND=3D" $(add_kdebase_dep libkdeedu) " - -KMEXTRACTONLY=3D" - libkdeedu/keduvocdocument -" diff --git a/kde-base/khangman/khangman-9999.ebuild b/kde-base/khangman/k= hangman-9999.ebuild index 6b24cfe..f56dbea 100644 --- a/kde-base/khangman/khangman-9999.ebuild +++ b/kde-base/khangman/khangman-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"Classical hangman game for KDE" KEYWORDS=3D"" @@ -21,7 +15,3 @@ IUSE=3D"debug" DEPEND=3D" $(add_kdebase_dep libkdeedu) " - -KMEXTRACTONLY=3D" - libkdeedu/keduvocdocument -" diff --git a/kde-base/khelpcenter/khelpcenter-9999.ebuild b/kde-base/khel= pcenter/khelpcenter-9999.ebuild index 74995c8..283731a 100644 --- a/kde-base/khelpcenter/khelpcenter-9999.ebuild +++ b/kde-base/khelpcenter/khelpcenter-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"always" -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"The KDE Help Center" diff --git a/kde-base/khotkeys/khotkeys-9999.ebuild b/kde-base/khotkeys/k= hotkeys-9999.ebuild index bada8d8..d030846 100644 --- a/kde-base/khotkeys/khotkeys-9999.ebuild +++ b/kde-base/khotkeys/khotkeys-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta =20 DESCRIPTION=3D"KDE: hotkey daemon" diff --git a/kde-base/kiconfinder/kiconfinder-9999.ebuild b/kde-base/kico= nfinder/kiconfinder-9999.ebuild index b4c8d80..4e53267 100644 --- a/kde-base/kiconfinder/kiconfinder-9999.ebuild +++ b/kde-base/kiconfinder/kiconfinder-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"Finds an icon based on its name" diff --git a/kde-base/kig/kig-9999.ebuild b/kde-base/kig/kig-9999.ebuild index e911ff3..1d17eae 100644 --- a/kde-base/kig/kig-9999.ebuild +++ b/kde-base/kig/kig-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE Interactive Geometry tool" KEYWORDS=3D"" @@ -28,5 +22,5 @@ src_configure() { $(cmake-utils_use_with kig-scripting BoostPython) ) =20 - ${kde_eclass}_src_configure + kde4-base_src_configure } diff --git a/kde-base/kinfocenter/kinfocenter-9999.ebuild b/kde-base/kinf= ocenter/kinfocenter-9999.ebuild index 331141e..39b1fb6 100644 --- a/kde-base/kinfocenter/kinfocenter-9999.ebuild +++ b/kde-base/kinfocenter/kinfocenter-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" OPENGL_REQUIRED=3D"optional" inherit kde4-meta =20 diff --git a/kde-base/kioclient/kioclient-9999.ebuild b/kde-base/kioclien= t/kioclient-9999.ebuild index 9793723..7cc4ac0 100644 --- a/kde-base/kioclient/kioclient-9999.ebuild +++ b/kde-base/kioclient/kioclient-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"Command-line tool for network-transparent operations" diff --git a/kde-base/kiten/kiten-9999.ebuild b/kde-base/kiten/kiten-9999= .ebuild index 399ba45..486560d 100644 --- a/kde-base/kiten/kiten-9999.ebuild +++ b/kde-base/kiten/kiten-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE Japanese dictionary and reference" KEYWORDS=3D"" diff --git a/kde-base/klettres/klettres-9999.ebuild b/kde-base/klettres/k= lettres-9999.ebuild index 88f3b04..32fcd6f 100644 --- a/kde-base/klettres/klettres-9999.ebuild +++ b/kde-base/klettres/klettres-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE: KLettres helps a very young child or an adult learni= ng " KEYWORDS=3D"" diff --git a/kde-base/klipper/klipper-9999.ebuild b/kde-base/klipper/klip= per-9999.ebuild index 94e1ec6..b145d6c 100644 --- a/kde-base/klipper/klipper-9999.ebuild +++ b/kde-base/klipper/klipper-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta =20 DESCRIPTION=3D"Applet for KDE and X clipboard management" diff --git a/kde-base/kmenuedit/kmenuedit-9999.ebuild b/kde-base/kmenuedi= t/kmenuedit-9999.ebuild index 847db3e..e4de0c9 100644 --- a/kde-base/kmenuedit/kmenuedit-9999.ebuild +++ b/kde-base/kmenuedit/kmenuedit-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta =20 DESCRIPTION=3D"KDE menu editor" diff --git a/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild b/kde-b= ase/kmimetypefinder/kmimetypefinder-9999.ebuild index bf40ef5..df145ac 100644 --- a/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild +++ b/kde-base/kmimetypefinder/kmimetypefinder-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE application to report the mimetype for a given file" diff --git a/kde-base/kmplot/kmplot-9999.ebuild b/kde-base/kmplot/kmplot-= 9999.ebuild index e561a5a..4c5809d 100644 --- a/kde-base/kmplot/kmplot-9999.ebuild +++ b/kde-base/kmplot/kmplot-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"Mathematical function plotter for KDE" KEYWORDS=3D"" diff --git a/kde-base/knetattach/knetattach-9999.ebuild b/kde-base/knetat= tach/knetattach-9999.ebuild index 37cb0aa..a630575 100644 --- a/kde-base/knetattach/knetattach-9999.ebuild +++ b/kde-base/knetattach/knetattach-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE network wizard" diff --git a/kde-base/knewstuff/knewstuff-9999.ebuild b/kde-base/knewstuf= f/knewstuff-9999.ebuild index ca94103..e7feea9 100644 --- a/kde-base/knewstuff/knewstuff-9999.ebuild +++ b/kde-base/knewstuff/knewstuff-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE4 software to download and upload 'new stuff'" diff --git a/kde-base/knotify/knotify-9999.ebuild b/kde-base/knotify/knot= ify-9999.ebuild index c83e289..f847aa1 100644 --- a/kde-base/knotify/knotify-9999.ebuild +++ b/kde-base/knotify/knotify-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"The KDE notification daemon." diff --git a/kde-base/kolourpaint/kolourpaint-9999.ebuild b/kde-base/kolo= urpaint/kolourpaint-9999.ebuild index bff1e5c..9deda83 100644 --- a/kde-base/kolourpaint/kolourpaint-9999.ebuild +++ b/kde-base/kolourpaint/kolourpaint-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdegraphics" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"Paint Program for KDE" KEYWORDS=3D"" diff --git a/kde-base/konq-plugins/konq-plugins-9999.ebuild b/kde-base/ko= nq-plugins/konq-plugins-9999.ebuild index c9472a7..29416b2 100644 --- a/kde-base/konq-plugins/konq-plugins-9999.ebuild +++ b/kde-base/konq-plugins/konq-plugins-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-apps" +KMNAME=3D"kde-baseapps" inherit kde4-meta =20 DESCRIPTION=3D"Various plugins for konqueror" diff --git a/kde-base/konqueror/konqueror-9999.ebuild b/kde-base/konquero= r/konqueror-9999.ebuild index b298004..5ccbf42 100644 --- a/kde-base/konqueror/konqueror-9999.ebuild +++ b/kde-base/konqueror/konqueror-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-apps" +KMNAME=3D"kde-baseapps" inherit flag-o-matic kde4-meta =20 DESCRIPTION=3D"KDE: Web browser, file manager, ..." diff --git a/kde-base/konsole/konsole-9999.ebuild b/kde-base/konsole/kons= ole-9999.ebuild index f32fd93..c23bdb7 100644 --- a/kde-base/konsole/konsole-9999.ebuild +++ b/kde-base/konsole/konsole-9999.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} =3D *9999 ]]; then KDE_DOC_DIRS=3D"doc/manual" kde_eclass=3D"kde4-base" else - KMNAME=3D"kdebase-apps" + KMNAME=3D"kde-baseapps" kde_eclass=3D"kde4-meta" fi inherit ${kde_eclass} diff --git a/kde-base/kpasswdserver/kpasswdserver-9999.ebuild b/kde-base/= kpasswdserver/kpasswdserver-9999.ebuild index 459bda7..63f3811 100644 --- a/kde-base/kpasswdserver/kpasswdserver-9999.ebuild +++ b/kde-base/kpasswdserver/kpasswdserver-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDED Password Module" diff --git a/kde-base/kquitapp/kquitapp-9999.ebuild b/kde-base/kquitapp/k= quitapp-9999.ebuild index f7f1b56..215439f 100644 --- a/kde-base/kquitapp/kquitapp-9999.ebuild +++ b/kde-base/kquitapp/kquitapp-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"A CLI application quitter" diff --git a/kde-base/kreadconfig/kreadconfig-9999.ebuild b/kde-base/krea= dconfig/kreadconfig-9999.ebuild index f1cad6a..b43b429 100644 --- a/kde-base/kreadconfig/kreadconfig-9999.ebuild +++ b/kde-base/kreadconfig/kreadconfig-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE: A command-line tool to read KConfig entries" diff --git a/kde-base/kruler/kruler-9999.ebuild b/kde-base/kruler/kruler-= 9999.ebuild index d13f9f4..d9b9b9b 100644 --- a/kde-base/kruler/kruler-9999.ebuild +++ b/kde-base/kruler/kruler-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdegraphics" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"A screen ruler for KDE" KEYWORDS=3D"" diff --git a/kde-base/krunner/krunner-9999.ebuild b/kde-base/krunner/krun= ner-9999.ebuild index 18e6013..e81fe6d 100644 --- a/kde-base/krunner/krunner-9999.ebuild +++ b/kde-base/krunner/krunner-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" OPENGL_REQUIRED=3D"optional" inherit kde4-meta =20 diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/ks= creensaver/kscreensaver-9999.ebuild index e4557cd..7fceaa0 100644 --- a/kde-base/kscreensaver/kscreensaver-9999.ebuild +++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" OPENGL_REQUIRED=3D"optional" inherit kde4-meta =20 diff --git a/kde-base/ksmserver/ksmserver-9999.ebuild b/kde-base/ksmserve= r/ksmserver-9999.ebuild index 43da2ee..39536e5 100644 --- a/kde-base/ksmserver/ksmserver-9999.ebuild +++ b/kde-base/ksmserver/ksmserver-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta =20 DESCRIPTION=3D"The reliable KDE session manager that talks the standard = X11R6" diff --git a/kde-base/ksnapshot/ksnapshot-9999.ebuild b/kde-base/ksnapsho= t/ksnapshot-9999.ebuild index 4fd19ec..b645034 100644 --- a/kde-base/ksnapshot/ksnapshot-9999.ebuild +++ b/kde-base/ksnapshot/ksnapshot-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdegraphics" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE Screenshot Utility" KEYWORDS=3D"" @@ -30,5 +24,5 @@ src_configure() { $(cmake-utils_use_with kipi) ) =20 - ${kde_eclass}_src_configure + kde4-base_src_configure } diff --git a/kde-base/ksplash/ksplash-9999.ebuild b/kde-base/ksplash/kspl= ash-9999.ebuild index ac5e3b0..8daeafc 100644 --- a/kde-base/ksplash/ksplash-9999.ebuild +++ b/kde-base/ksplash/ksplash-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta =20 DESCRIPTION=3D"KDE splashscreen framework (the splashscreen of KDE itsel= f, not of individual apps)" diff --git a/kde-base/kstart/kstart-9999.ebuild b/kde-base/kstart/kstart-= 9999.ebuild index c23450e..56f4a58 100644 --- a/kde-base/kstart/kstart-9999.ebuild +++ b/kde-base/kstart/kstart-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE: Utility to launch applications with special window p= roperties" diff --git a/kde-base/kstartupconfig/kstartupconfig-9999.ebuild b/kde-bas= e/kstartupconfig/kstartupconfig-9999.ebuild index 0ebc05e..af8d4bc 100644 --- a/kde-base/kstartupconfig/kstartupconfig-9999.ebuild +++ b/kde-base/kstartupconfig/kstartupconfig-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta =20 DESCRIPTION=3D"KDE: Utility to launch applications with special window p= roperties" diff --git a/kde-base/kstyles/kstyles-9999.ebuild b/kde-base/kstyles/ksty= les-9999.ebuild index b3c0977..c8b3d31 100644 --- a/kde-base/kstyles/kstyles-9999.ebuild +++ b/kde-base/kstyles/kstyles-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta =20 DESCRIPTION=3D"KDE: A set of different KDE styles." diff --git a/kde-base/ksysguard/ksysguard-9999.ebuild b/kde-base/ksysguar= d/ksysguard-9999.ebuild index b033891..c5041b2 100644 --- a/kde-base/ksysguard/ksysguard-9999.ebuild +++ b/kde-base/ksysguard/ksysguard-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" CPPUNIT_REQUIRED=3D"optional" VIRTUALX_REQUIRED=3Dtest inherit kde4-meta diff --git a/kde-base/ksystraycmd/ksystraycmd-9999.ebuild b/kde-base/ksys= traycmd/ksystraycmd-9999.ebuild index b4b0360..0cd83d7 100644 --- a/kde-base/ksystraycmd/ksystraycmd-9999.ebuild +++ b/kde-base/ksystraycmd/ksystraycmd-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta =20 DESCRIPTION=3D"Ksystraycmd embeds applications given as argument into th= e system tray." diff --git a/kde-base/ktimezoned/ktimezoned-9999.ebuild b/kde-base/ktimez= oned/ktimezoned-9999.ebuild index e39c575..eca67dd 100644 --- a/kde-base/ktimezoned/ktimezoned-9999.ebuild +++ b/kde-base/ktimezoned/ktimezoned-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE: Timezone daemon" diff --git a/kde-base/ktouch/ktouch-9999.ebuild b/kde-base/ktouch/ktouch-= 9999.ebuild index f2f6ea3..360680f 100644 --- a/kde-base/ktouch/ktouch-9999.ebuild +++ b/kde-base/ktouch/ktouch-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE: A program that helps you to learn and practice touch= typing" KEYWORDS=3D"" diff --git a/kde-base/ktraderclient/ktraderclient-9999.ebuild b/kde-base/= ktraderclient/ktraderclient-9999.ebuild index 00331bb..6805466 100644 --- a/kde-base/ktraderclient/ktraderclient-9999.ebuild +++ b/kde-base/ktraderclient/ktraderclient-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"A command-line tool for querying the KDE trader system" diff --git a/kde-base/kturtle/kturtle-9999.ebuild b/kde-base/kturtle/ktur= tle-9999.ebuild index ab426ac..cbffd76 100644 --- a/kde-base/kturtle/kturtle-9999.ebuild +++ b/kde-base/kturtle/kturtle-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE: Educational programming environment using the Logo p= rogramming language" KEYWORDS=3D"" diff --git a/kde-base/kuiserver/kuiserver-9999.ebuild b/kde-base/kuiserve= r/kuiserver-9999.ebuild index a190a1a..66df101 100644 --- a/kde-base/kuiserver/kuiserver-9999.ebuild +++ b/kde-base/kuiserver/kuiserver-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE: Progress Info UI server" diff --git a/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild b= /kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild index 0c5a0d6..3815066 100644 --- a/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild +++ b/kde-base/kurifilter-plugins/kurifilter-plugins-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE: Plugins to manage filtering URIs." diff --git a/kde-base/kwalletd/kwalletd-9999.ebuild b/kde-base/kwalletd/k= walletd-9999.ebuild index 1da1d7b..d6bd1cc 100644 --- a/kde-base/kwalletd/kwalletd-9999.ebuild +++ b/kde-base/kwalletd/kwalletd-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-runtime" +KMNAME=3D"kde-runtime" inherit kde4-meta =20 DESCRIPTION=3D"KDE Password Server" diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebu= ild index 333b1f2..4be74b0 100644 --- a/kde-base/kwin/kwin-9999.ebuild +++ b/kde-base/kwin/kwin-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" OPENGL_REQUIRED=3D"optional" inherit kde4-meta =20 diff --git a/kde-base/kwordquiz/kwordquiz-4.6.80.ebuild b/kde-base/kwordq= uiz/kwordquiz-4.6.80.ebuild index ae4278a..8866986 100644 --- a/kde-base/kwordquiz/kwordquiz-4.6.80.ebuild +++ b/kde-base/kwordquiz/kwordquiz-4.6.80.ebuild @@ -15,6 +15,3 @@ IUSE=3D"debug" DEPEND=3D" $(add_kdebase_dep libkdeedu) " -KMEXTRACTONLY=3D" - libkdeedu/keduvocdocument -" diff --git a/kde-base/kwordquiz/kwordquiz-9999.ebuild b/kde-base/kwordqui= z/kwordquiz-9999.ebuild index b04ccc3..64ce513 100644 --- a/kde-base/kwordquiz/kwordquiz-9999.ebuild +++ b/kde-base/kwordquiz/kwordquiz-9999.ebuild @@ -6,13 +6,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE: A powerful flashcard and vocabulary learning program= " KEYWORDS=3D"" @@ -21,6 +15,3 @@ IUSE=3D"debug" DEPEND=3D" $(add_kdebase_dep libkdeedu) " -KMEXTRACTONLY=3D" - libkdeedu/keduvocdocument -" diff --git a/kde-base/kwrite/kwrite-9999.ebuild b/kde-base/kwrite/kwrite-= 9999.ebuild index 700ef35..dff0fe4 100644 --- a/kde-base/kwrite/kwrite-9999.ebuild +++ b/kde-base/kwrite/kwrite-9999.ebuild @@ -5,7 +5,7 @@ EAPI=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdebase-apps" +KMNAME=3D"kde-baseapps" [[ ${PV} =3D *9999 ]] && KMNAME=3D"kate" KDE_SCM=3D"git" inherit kde4-meta diff --git a/kde-base/kwrited/kwrited-9999.ebuild b/kde-base/kwrited/kwri= ted-9999.ebuild index 234b961..0febf52 100644 --- a/kde-base/kwrited/kwrited-9999.ebuild +++ b/kde-base/kwrited/kwrited-9999.ebuild @@ -3,7 +3,7 @@ # $Header: $ =20 EAPI=3D4 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" inherit kde4-meta =20 DESCRIPTION=3D"KDE daemon listening for wall and write messages." diff --git a/kde-base/libkdcraw/libkdcraw-9999.ebuild b/kde-base/libkdcra= w/libkdcraw-9999.ebuild index 578cda4..f37d820 100644 --- a/kde-base/libkdcraw/libkdcraw-9999.ebuild +++ b/kde-base/libkdcraw/libkdcraw-9999.ebuild @@ -5,14 +5,7 @@ EAPI=3D4 =20 KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdegraphics" - KMMODULE=3D"libs/${PN}" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE digital camera raw image library wrapper" HOMEPAGE=3D"http://www.kipi-plugins.org" diff --git a/kde-base/libkdeedu/libkdeedu-4.6.80.ebuild b/kde-base/libkde= edu/libkdeedu-4.6.80.ebuild index 79ca210..474862c 100644 --- a/kde-base/libkdeedu/libkdeedu-4.6.80.ebuild +++ b/kde-base/libkdeedu/libkdeedu-4.6.80.ebuild @@ -4,6 +4,7 @@ =20 EAPI=3D4 =20 +KDE_SCM=3D"git" inherit kde4-base =20 DESCRIPTION=3D"Common library for KDE educational apps" diff --git a/kde-base/libkdeedu/libkdeedu-9999.ebuild b/kde-base/libkdeed= u/libkdeedu-9999.ebuild index b04e6ee..928dfd9 100644 --- a/kde-base/libkdeedu/libkdeedu-9999.ebuild +++ b/kde-base/libkdeedu/libkdeedu-9999.ebuild @@ -5,19 +5,13 @@ EAPI=3D4 =20 KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"Common library for KDE educational apps" KEYWORDS=3D"" IUSE=3D"debug" =20 -# 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally bro= ken,=20 +# 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally bro= ken, # see bug 258857 for details. RESTRICT=3Dtest =20 diff --git a/kde-base/libkexiv2/libkexiv2-9999.ebuild b/kde-base/libkexiv= 2/libkexiv2-9999.ebuild index a56f061..d9a3bd3 100644 --- a/kde-base/libkexiv2/libkexiv2-9999.ebuild +++ b/kde-base/libkexiv2/libkexiv2-9999.ebuild @@ -5,14 +5,7 @@ EAPI=3D4 =20 KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdegraphics" - KMMODULE=3D"libs/libkexiv2" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"KDE Image Plugin Interface: an exiv2 library wrapper" HOMEPAGE=3D"http://www.kipi-plugins.org" diff --git a/kde-base/libkipi/libkipi-9999.ebuild b/kde-base/libkipi/libk= ipi-9999.ebuild index 73ecadc..0a6682c 100644 --- a/kde-base/libkipi/libkipi-9999.ebuild +++ b/kde-base/libkipi/libkipi-9999.ebuild @@ -5,14 +5,7 @@ EAPI=3D4 =20 KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdegraphics" - KMMODULE=3D"libs/${PN}" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"A library for image plugins accross KDE applications." HOMEPAGE=3D"http://www.kipi-plugins.org" diff --git a/kde-base/libkonq/libkonq-9999.ebuild b/kde-base/libkonq/libk= onq-9999.ebuild index f5c5d33..7924e71 100644 --- a/kde-base/libkonq/libkonq-9999.ebuild +++ b/kde-base/libkonq/libkonq-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-apps" +KMNAME=3D"kde-baseapps" KMMODULE=3D"lib/konq" CPPUNIT_REQUIRED=3D"optional" inherit kde4-meta diff --git a/kde-base/libksane/libksane-9999.ebuild b/kde-base/libksane/l= ibksane-9999.ebuild index d74ab33..fce0790 100644 --- a/kde-base/libksane/libksane-9999.ebuild +++ b/kde-base/libksane/libksane-9999.ebuild @@ -5,14 +5,7 @@ EAPI=3D4 =20 KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdegraphics" - KMMODULE=3D"libs/${PN}" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} +inherit kde4-base =20 DESCRIPTION=3D"SANE Library interface for KDE" HOMEPAGE=3D"http://www.kipi-plugins.org" @@ -24,13 +17,3 @@ DEPEND=3D" media-gfx/sane-backends " RDEPEND=3D"${DEPEND}" - -# Not sure where this moved/who should install it in 4.7+ -if [[ ${PV} !=3D *9999 ]]; then -src_install() { - insinto "${KDEDIR}"/share/apps/cmake/modules - doins "${S}"/cmake/modules/FindKSane.cmake - - kde4-meta_src_install -} -fi diff --git a/kde-base/libkworkspace/libkworkspace-9999.ebuild b/kde-base/= libkworkspace/libkworkspace-9999.ebuild index 4ea8c29..0556dc5 100644 --- a/kde-base/libkworkspace/libkworkspace-9999.ebuild +++ b/kde-base/libkworkspace/libkworkspace-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" KMMODULE=3D"libs/kworkspace" inherit kde4-meta =20 diff --git a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild b/kde-bas= e/liboxygenstyle/liboxygenstyle-9999.ebuild index 570d89e..37bd8a7 100644 --- a/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild +++ b/kde-base/liboxygenstyle/liboxygenstyle-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" KMMODULE=3D"libs/oxygen" inherit kde4-meta =20 diff --git a/kde-base/libplasmaclock/libplasmaclock-9999.ebuild b/kde-bas= e/libplasmaclock/libplasmaclock-9999.ebuild index d08c689..f3256dc 100644 --- a/kde-base/libplasmaclock/libplasmaclock-9999.ebuild +++ b/kde-base/libplasmaclock/libplasmaclock-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" KMMODULE=3D"libs/plasmaclock" OPENGL_REQUIRED=3D"optional" inherit kde4-meta diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-9999.eb= uild b/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild index b648487..489e0a2 100644 --- a/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild +++ b/kde-base/libplasmagenericshell/libplasmagenericshell-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" KMMODULE=3D"libs/plasmagenericshell" inherit kde4-meta =20 diff --git a/kde-base/libtaskmanager/libtaskmanager-9999.ebuild b/kde-bas= e/libtaskmanager/libtaskmanager-9999.ebuild index f83aea5..53e2f29 100644 --- a/kde-base/libtaskmanager/libtaskmanager-9999.ebuild +++ b/kde-base/libtaskmanager/libtaskmanager-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -KMNAME=3D"kdebase-workspace" +KMNAME=3D"kde-workspace" KMMODULE=3D"libs/taskmanager" inherit kde4-meta =20 diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-= 9999.ebuild index 8d00cc0..cbabbe8 100644 --- a/kde-base/marble/marble-9999.ebuild +++ b/kde-base/marble/marble-9999.ebuild @@ -8,13 +8,7 @@ KDE_HANDBOOK=3D"optional" CPPUNIT_REQUIRED=3D"optional" PYTHON_DEPEND=3D"python? 2" KDE_SCM=3D"git" -if [[ ${PV} =3D=3D *9999 ]]; then - kde_eclass=3D"kde4-base" -else - KMNAME=3D"kdeedu" - kde_eclass=3D"kde4-meta" -fi -inherit ${kde_eclass} python +inherit kde4-base python =20 DESCRIPTION=3D"Generic geographical map widget" KEYWORDS=3D"" @@ -39,11 +33,11 @@ PATCHES=3D( "${FILESDIR}/${PN}-4.6.2-magic.patch" ) =20 pkg_setup() { python_set_active_version 2 - ${kde_eclass}_pkg_setup + kde4-base_pkg_setup } =20 src_prepare() { - ${kde_eclass}_src_prepare + kde4-base_src_prepare python_convert_shebangs -r $(python_get_version) . } =20 @@ -62,7 +56,7 @@ src_configure() { =20 find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed= -i 's/#include