[gentoo-commits] proj/kde:master commit in: kde-base/kdebase-wallpapers/

["Alexey Shvetsov" <alexxy@gentoo.org>]

commit:     863a6f3ab69292a2bec1d1b1a72b27c26dfcd188
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 13:11:18 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 13:11:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=863a6f3a

Fix kde-base/kdebase-wallpapers

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 .../kdebase-wallpapers-4.6.49.9999.ebuild          |   18 +++++++++++++-----
 .../kdebase-wallpapers-4.6.5.ebuild                |   18 +++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.49.9999.ebuild b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.49.9999.ebuild
index 89f6e94..ffc7fbd 100644
--- a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.49.9999.ebuild
+++ b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.49.9999.ebuild
@@ -4,10 +4,18 @@
 
 EAPI=4
 
-KMNAME="kde-wallpapers"
-KMMODULE="wallpapers"
-KDE_SCM="svn"
-inherit kde4-base
+if [[ $PV == *9999* ]]; then
+	KMNAME="kde-wallpapers"
+	KMMODULE="wallpapers"
+	KDE_SCM="svn"
+	kde_eclass=kde4-base
+else
+	KMNAME="kdebase-workspace"
+	KMMODULE="wallpapers"
+	kde_eclass=kde4-meta
+fi
+
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE wallpapers"
 KEYWORDS=""
@@ -16,5 +24,5 @@ IUSE=""
 src_configure() {
 	mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
 
-	kde4-base_src_configure
+	${kde_eclass}_src_configure
 }

diff --git a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.5.ebuild b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.5.ebuild
index 2c7af8a..8d7b55d 100644
--- a/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.5.ebuild
+++ b/kde-base/kdebase-wallpapers/kdebase-wallpapers-4.6.5.ebuild
@@ -4,10 +4,18 @@
 
 EAPI=4
 
-KMNAME="kde-wallpapers"
-KMMODULE="wallpapers"
-KDE_SCM="svn"
-inherit kde4-base
+if [[ $PV == *9999* ]]; then
+	KMNAME="kde-wallpapers"
+	KMMODULE="wallpapers"
+	KDE_SCM="svn"
+	kde_eclass=kde4-base
+else
+	KMNAME="kdebase-workspace"
+	KMMODULE="wallpapers"
+	kde_eclass=kde4-meta
+fi
+
+inherit ${kde_eclass}
 
 DESCRIPTION="KDE wallpapers"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
@@ -16,5 +24,5 @@ IUSE=""
 src_configure() {
 	mycmakeargs=( -DWALLPAPER_INSTALL_DIR="${EPREFIX}/usr/share/wallpapers" )
 
-	kde4-base_src_configure
+	${kde_eclass}_src_configure
 }