[gentoo-commits] proj/kde:master commit in: kde-base/kwallet/, kde-base/kdf/, kde-base/printer-applet/, kde-base/ktimer/, ...

[Alexey Shvetsov]

commit:     33fb888423c20ce94685071f47161ed2b28f9f6b
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  6 16:05:48 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Sep  6 16:05:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=33fb8884

[kde-base] KDEUTILS black magic

Run sed -e 's:kde4-base:${kde_eclass}:g' -e's:KDE_SCM="git":KDE_SCM="git"\nif [[ ${PV} == *9999 ]]; then\n\tkde_eclass="kde4-base"\nelse\n\tKMNAME="kdeutils"\n\tkde_eclass="kde4-meta"\nfi:g' on  all kdeutils related packages

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

---
 kde-base/ark/ark-4.7.49.9999.ebuild                |   12 +++++++++---
 kde-base/filelight/filelight-4.7.49.9999.ebuild    |    8 +++++++-
 kde-base/kcalc/kcalc-4.7.49.9999.ebuild            |   10 ++++++++--
 .../kcharselect/kcharselect-4.7.49.9999.ebuild     |    8 +++++++-
 kde-base/kdf/kdf-4.7.49.9999.ebuild                |   10 ++++++++--
 kde-base/kgpg/kgpg-4.7.49.9999.ebuild              |   10 ++++++++--
 .../kremotecontrol-4.7.49.9999.ebuild              |   10 ++++++++--
 kde-base/ktimer/ktimer-4.7.49.9999.ebuild          |    8 +++++++-
 kde-base/kwallet/kwallet-4.7.49.9999.ebuild        |    8 +++++++-
 .../printer-applet-4.7.49.9999.ebuild              |   14 ++++++++++----
 .../superkaramba/superkaramba-4.7.49.9999.ebuild   |   12 +++++++++---
 kde-base/sweeper/sweeper-4.7.49.9999.ebuild        |    8 +++++++-
 12 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/kde-base/ark/ark-4.7.49.9999.ebuild b/kde-base/ark/ark-4.7.49.9999.ebuild
index 469baa4..d9aadc0 100644
--- a/kde-base/ark/ark-4.7.49.9999.ebuild
+++ b/kde-base/ark/ark-4.7.49.9999.ebuild
@@ -6,7 +6,13 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-inherit kde4-base
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE Archiving tool"
 KEYWORDS=""
@@ -26,10 +32,10 @@ src_configure() {
 		$(cmake-utils_use_with bzip2 BZip2)
 		$(cmake-utils_use_with lzma LibLZMA)
 	)
-	kde4-base_src_configure
+	${kde_eclass}_src_configure
 }
 
 pkg_postinst() {
-	kde4-base_pkg_postinst
+	${kde_eclass}_pkg_postinst
 	elog "For creating rar archives, install app-arch/rar"
 }

diff --git a/kde-base/filelight/filelight-4.7.49.9999.ebuild b/kde-base/filelight/filelight-4.7.49.9999.ebuild
index 2bc36da..00a3b2a 100644
--- a/kde-base/filelight/filelight-4.7.49.9999.ebuild
+++ b/kde-base/filelight/filelight-4.7.49.9999.ebuild
@@ -6,7 +6,13 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-inherit kde4-base
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="Filelight creates an interactive map of concentric, segmented rings that help visualise disk usage."
 

diff --git a/kde-base/kcalc/kcalc-4.7.49.9999.ebuild b/kde-base/kcalc/kcalc-4.7.49.9999.ebuild
index 87e4a44..652253f 100644
--- a/kde-base/kcalc/kcalc-4.7.49.9999.ebuild
+++ b/kde-base/kcalc/kcalc-4.7.49.9999.ebuild
@@ -7,7 +7,13 @@ EAPI=4
 KDE_HANDBOOK="optional"
 CPPUNIT_REQUIRED="optional"
 KDE_SCM="git"
-inherit kde4-base
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE calculator"
 KEYWORDS=""
@@ -23,5 +29,5 @@ PATCHES=(
 )
 
 src_test() {
-	LANG=C kde4-base_src_test
+	LANG=C ${kde_eclass}_src_test
 }

diff --git a/kde-base/kcharselect/kcharselect-4.7.49.9999.ebuild b/kde-base/kcharselect/kcharselect-4.7.49.9999.ebuild
index f17d84f..7ac3396 100644
--- a/kde-base/kcharselect/kcharselect-4.7.49.9999.ebuild
+++ b/kde-base/kcharselect/kcharselect-4.7.49.9999.ebuild
@@ -6,7 +6,13 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-inherit kde4-base
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE character selection utility"
 KEYWORDS=""

diff --git a/kde-base/kdf/kdf-4.7.49.9999.ebuild b/kde-base/kdf/kdf-4.7.49.9999.ebuild
index 8ecff45..b7dd6da 100644
--- a/kde-base/kdf/kdf-4.7.49.9999.ebuild
+++ b/kde-base/kdf/kdf-4.7.49.9999.ebuild
@@ -6,12 +6,18 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-inherit kde4-base
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE free disk space utility"
 KEYWORDS=""
 IUSE="debug"
 
 src_unpack() {
-	kde4-base_src_unpack
+	${kde_eclass}_src_unpack
 }

diff --git a/kde-base/kgpg/kgpg-4.7.49.9999.ebuild b/kde-base/kgpg/kgpg-4.7.49.9999.ebuild
index 0e8eb8e..9038e3f 100644
--- a/kde-base/kgpg/kgpg-4.7.49.9999.ebuild
+++ b/kde-base/kgpg/kgpg-4.7.49.9999.ebuild
@@ -6,7 +6,13 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-inherit kde4-base
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE gpg keyring manager"
 KEYWORDS=""
@@ -20,7 +26,7 @@ RDEPEND="${DEPEND}
 "
 
 pkg_postinst() {
-	kde4-base_pkg_postinst
+	${kde_eclass}_pkg_postinst
 
 	if ! has_version app-crypt/dirmngr ; then
 		elog "For improved key search functionality, install app-crypt/dirmngr."

diff --git a/kde-base/kremotecontrol/kremotecontrol-4.7.49.9999.ebuild b/kde-base/kremotecontrol/kremotecontrol-4.7.49.9999.ebuild
index f62330d..0ca579b 100644
--- a/kde-base/kremotecontrol/kremotecontrol-4.7.49.9999.ebuild
+++ b/kde-base/kremotecontrol/kremotecontrol-4.7.49.9999.ebuild
@@ -6,7 +6,13 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-inherit kde4-base
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE frontend for remote controls"
 KEYWORDS=""
@@ -19,5 +25,5 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_unpack() {
-	kde4-base_src_unpack
+	${kde_eclass}_src_unpack
 }

diff --git a/kde-base/ktimer/ktimer-4.7.49.9999.ebuild b/kde-base/ktimer/ktimer-4.7.49.9999.ebuild
index e758bce..1627c59 100644
--- a/kde-base/ktimer/ktimer-4.7.49.9999.ebuild
+++ b/kde-base/ktimer/ktimer-4.7.49.9999.ebuild
@@ -6,7 +6,13 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-inherit kde4-base
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE Timer"
 KEYWORDS=""

diff --git a/kde-base/kwallet/kwallet-4.7.49.9999.ebuild b/kde-base/kwallet/kwallet-4.7.49.9999.ebuild
index 543b982..1fd957a 100644
--- a/kde-base/kwallet/kwallet-4.7.49.9999.ebuild
+++ b/kde-base/kwallet/kwallet-4.7.49.9999.ebuild
@@ -6,7 +6,13 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-inherit kde4-base
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE Wallet Management Tool"
 KEYWORDS=""

diff --git a/kde-base/printer-applet/printer-applet-4.7.49.9999.ebuild b/kde-base/printer-applet/printer-applet-4.7.49.9999.ebuild
index b580743..60b94b0 100644
--- a/kde-base/printer-applet/printer-applet-4.7.49.9999.ebuild
+++ b/kde-base/printer-applet/printer-applet-4.7.49.9999.ebuild
@@ -7,7 +7,13 @@ EAPI=3
 KDE_HANDBOOK="optional"
 PYTHON_DEPEND="2"
 KDE_SCM="git"
-inherit python kde4-base
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit python ${kde_eclass}
 
 DESCRIPTION="KDE printer system tray utility"
 KEYWORDS=""
@@ -20,12 +26,12 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
-	kde4-base_pkg_setup
+	${kde_eclass}_pkg_setup
 	python_set_active_version 2
 }
 
 src_prepare() {
-	kde4-base_src_prepare
+	${kde_eclass}_src_prepare
 
 	# Rename printer-applet -> printer-applet-kde
 	local newname="printer-applet-kde"
@@ -37,7 +43,7 @@ src_prepare() {
 }
 
 src_install() {
-	kde4-base_src_install
+	${kde_eclass}_src_install
 	python_convert_shebangs -q -r $(python_get_version) "${ED}"
 }
 

diff --git a/kde-base/superkaramba/superkaramba-4.7.49.9999.ebuild b/kde-base/superkaramba/superkaramba-4.7.49.9999.ebuild
index 4a49b63..18f464a 100644
--- a/kde-base/superkaramba/superkaramba-4.7.49.9999.ebuild
+++ b/kde-base/superkaramba/superkaramba-4.7.49.9999.ebuild
@@ -6,7 +6,13 @@ EAPI=3
 
 PYTHON_DEPEND="python? 2"
 KDE_SCM="git"
-inherit python kde4-base
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit python ${kde_eclass}
 
 DESCRIPTION="A tool to create interactive applets for the KDE desktop."
 KEYWORDS=""
@@ -23,7 +29,7 @@ RDEPEND="${DEPEND}
 PATCHES=( "${FILESDIR}/${PN}-as-needed.patch" )
 
 pkg_setup() {
-	kde4-base_pkg_setup
+	${kde_eclass}_pkg_setup
 	python_set_active_version 2
 }
 
@@ -32,5 +38,5 @@ src_configure() {
 		$(cmake-utils_use_with python PythonLibs)
 	)
 
-	kde4-base_src_configure
+	${kde_eclass}_src_configure
 }

diff --git a/kde-base/sweeper/sweeper-4.7.49.9999.ebuild b/kde-base/sweeper/sweeper-4.7.49.9999.ebuild
index 38c5480..abc4fab 100644
--- a/kde-base/sweeper/sweeper-4.7.49.9999.ebuild
+++ b/kde-base/sweeper/sweeper-4.7.49.9999.ebuild
@@ -6,7 +6,13 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
-inherit kde4-base
+if [[ ${PV} == *9999 ]]; then
+	kde_eclass="kde4-base"
+else
+	KMNAME="kdeutils"
+	kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE Privacy Settings Widget"
 KEYWORDS=""