[gentoo-commits] proj/kde:master commit in: games-board/kaya/, kde-base/kdebindings-ruby/, kde-base/kde-meta/, ...

[gentoo-commits] proj/kde:master commit in: games-board/kaya/, kde-base/kdebindings-ruby/, kde-base/kde-meta/, ...

[Jonathan Callen]

commit:     cbebe78dbe9ebc18912bcab38feff3a685569f7d
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 08:21:15 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 08:21:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cbebe78d

More EAPI=4 stuff (ruby-ng.eclass now supported, plus other missed bits)

---
 games-board/kaya/kaya-9999.ebuild                  |   12 +++++-------
 kde-base/kde-meta/kde-meta-4.6.9999.ebuild         |    7 +++++--
 kde-base/kde-meta/kde-meta-9999.ebuild             |    2 +-
 .../kdebindings-ruby-4.6.9999.ebuild               |    3 ++-
 .../kdebindings-ruby/kdebindings-ruby-9999.ebuild  |    3 ++-
 kde-base/libkexiv2/libkexiv2-9999.ebuild           |    2 +-
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/games-board/kaya/kaya-9999.ebuild b/games-board/kaya/kaya-9999.ebuild
index caf0d07..3deff23 100644
--- a/games-board/kaya/kaya-9999.ebuild
+++ b/games-board/kaya/kaya-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 USE_RUBY="ruby18"
 KDE_SCM="git"
 inherit kde4-base ruby-ng
@@ -21,17 +21,15 @@ RDEPEND=""
 ruby_add_bdepend "$(add_kdebase_dep kdebindings-ruby)"
 ruby_add_rdepend "$(add_kdebase_dep kdebindings-ruby)"
 
+EGIT_SOURCE_UNPACK="${WORKDIR}/all/${P}"
+
 pkg_setup() {
 	ruby-ng_pkg_setup
 	kde4-base_pkg_setup
 }
 
-src_unpack() {
-	git-2_src_unpack
-
-	cd "${WORKDIR}"
-	mkdir all
-	mv ${P} all/ || die "Could not move sources"
+all_ruby_unpack() {
+	kde4-base_src_unpack
 }
 
 all_ruby_prepare() {

diff --git a/kde-base/kde-meta/kde-meta-4.6.9999.ebuild b/kde-base/kde-meta/kde-meta-4.6.9999.ebuild
index 7d5dc08..7b18451 100644
--- a/kde-base/kde-meta/kde-meta-4.6.9999.ebuild
+++ b/kde-base/kde-meta/kde-meta-4.6.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
@@ -29,5 +29,8 @@ RDEPEND="
 		$(add_kdebase_dep kdesdk-meta)
 		$(add_kdebase_dep kdewebdev-meta)
 	)
-	semantic-desktop? ( || ( >=kde-base/kdepim-meta-4.5.93 >=kde-base/kdepim-meta-4.4.9 ) )
+	semantic-desktop? ( || (
+		( $(add_kdebase_dep kdepim-meta '' 4.5.93) )
+		( $(add_kdebase_dep kdepim-meta '' 4.4.9) )
+	) )
 "

diff --git a/kde-base/kde-meta/kde-meta-9999.ebuild b/kde-base/kde-meta/kde-meta-9999.ebuild
index 433f02b..81893e5 100644
--- a/kde-base/kde-meta/kde-meta-9999.ebuild
+++ b/kde-base/kde-meta/kde-meta-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 inherit kde4-meta-pkg
 
 DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"

diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild
index 83cad08..d201b77 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="kdebindings"
 KMMODULE="ruby"
@@ -41,6 +41,7 @@ pkg_setup() {
 }
 
 src_unpack() {
+	local S="${WORKDIR}/${P}"
 	kde4-meta_src_unpack
 
 	cd "${WORKDIR}"

diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
index 83cad08..d201b77 100644
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KMNAME="kdebindings"
 KMMODULE="ruby"
@@ -41,6 +41,7 @@ pkg_setup() {
 }
 
 src_unpack() {
+	local S="${WORKDIR}/${P}"
 	kde4-meta_src_unpack
 
 	cd "${WORKDIR}"

diff --git a/kde-base/libkexiv2/libkexiv2-9999.ebuild b/kde-base/libkexiv2/libkexiv2-9999.ebuild
index a3f107b..b82ee7a 100644
--- a/kde-base/libkexiv2/libkexiv2-9999.ebuild
+++ b/kde-base/libkexiv2/libkexiv2-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 KDE_SCM="git"
 if [[ ${PV} == *9999 ]]; then