public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexey Shvetsov" <alexxy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdebase-wallpapers/
Date: Fri,  1 Jul 2011 19:12:44 +0000 (UTC)	[thread overview]
Message-ID: <4d8effc9d38a7f88d6c38a1d688016bb35d5ad6b.alexxy@gentoo> (raw)

commit:     4d8effc9d38a7f88d6c38a1d688016bb35d5ad6b
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 19:12:12 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 19:12:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4d8effc9

fix kdebase-wallpapers-4.6.5

---
 .../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
 }



             reply	other threads:[~2011-07-01 19:13 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-01 19:12 Alexey Shvetsov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-05-25 10:54 [gentoo-commits] proj/kde:master commit in: kde-base/kdebase-wallpapers/ Johannes Huber
2011-07-09 13:11 Alexey Shvetsov
2011-07-02 12:54 Alexey Shvetsov
2011-06-10 21:54 Andreas Hüttel
2011-06-09  0:52 Marc Schiffbauer
2011-06-05 21:49 Andreas Hüttel
2011-05-12 16:00 Marc Schiffbauer
2011-05-12 15:51 Marc Schiffbauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4d8effc9d38a7f88d6c38a1d688016bb35d5ad6b.alexxy@gentoo \
    --to=alexxy@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox