| 1 |
commit: cbebe78dbe9ebc18912bcab38feff3a685569f7d |
| 2 |
Author: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 30 08:21:15 2011 +0000 |
| 4 |
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 30 08:21:15 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cbebe78d |
| 7 |
|
| 8 |
More EAPI=4 stuff (ruby-ng.eclass now supported, plus other missed bits) |
| 9 |
|
| 10 |
--- |
| 11 |
games-board/kaya/kaya-9999.ebuild | 12 +++++------- |
| 12 |
kde-base/kde-meta/kde-meta-4.6.9999.ebuild | 7 +++++-- |
| 13 |
kde-base/kde-meta/kde-meta-9999.ebuild | 2 +- |
| 14 |
.../kdebindings-ruby-4.6.9999.ebuild | 3 ++- |
| 15 |
.../kdebindings-ruby/kdebindings-ruby-9999.ebuild | 3 ++- |
| 16 |
kde-base/libkexiv2/libkexiv2-9999.ebuild | 2 +- |
| 17 |
6 files changed, 16 insertions(+), 13 deletions(-) |
| 18 |
|
| 19 |
diff --git a/games-board/kaya/kaya-9999.ebuild b/games-board/kaya/kaya-9999.ebuild |
| 20 |
index caf0d07..3deff23 100644 |
| 21 |
--- a/games-board/kaya/kaya-9999.ebuild |
| 22 |
+++ b/games-board/kaya/kaya-9999.ebuild |
| 23 |
@@ -2,7 +2,7 @@ |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
-EAPI=3 |
| 28 |
+EAPI=4 |
| 29 |
USE_RUBY="ruby18" |
| 30 |
KDE_SCM="git" |
| 31 |
inherit kde4-base ruby-ng |
| 32 |
@@ -21,17 +21,15 @@ RDEPEND="" |
| 33 |
ruby_add_bdepend "$(add_kdebase_dep kdebindings-ruby)" |
| 34 |
ruby_add_rdepend "$(add_kdebase_dep kdebindings-ruby)" |
| 35 |
|
| 36 |
+EGIT_SOURCE_UNPACK="${WORKDIR}/all/${P}" |
| 37 |
+ |
| 38 |
pkg_setup() { |
| 39 |
ruby-ng_pkg_setup |
| 40 |
kde4-base_pkg_setup |
| 41 |
} |
| 42 |
|
| 43 |
-src_unpack() { |
| 44 |
- git-2_src_unpack |
| 45 |
- |
| 46 |
- cd "${WORKDIR}" |
| 47 |
- mkdir all |
| 48 |
- mv ${P} all/ || die "Could not move sources" |
| 49 |
+all_ruby_unpack() { |
| 50 |
+ kde4-base_src_unpack |
| 51 |
} |
| 52 |
|
| 53 |
all_ruby_prepare() { |
| 54 |
|
| 55 |
diff --git a/kde-base/kde-meta/kde-meta-4.6.9999.ebuild b/kde-base/kde-meta/kde-meta-4.6.9999.ebuild |
| 56 |
index 7d5dc08..7b18451 100644 |
| 57 |
--- a/kde-base/kde-meta/kde-meta-4.6.9999.ebuild |
| 58 |
+++ b/kde-base/kde-meta/kde-meta-4.6.9999.ebuild |
| 59 |
@@ -2,7 +2,7 @@ |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
# $Header: $ |
| 62 |
|
| 63 |
-EAPI=3 |
| 64 |
+EAPI=4 |
| 65 |
inherit kde4-meta-pkg |
| 66 |
|
| 67 |
DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages" |
| 68 |
@@ -29,5 +29,8 @@ RDEPEND=" |
| 69 |
$(add_kdebase_dep kdesdk-meta) |
| 70 |
$(add_kdebase_dep kdewebdev-meta) |
| 71 |
) |
| 72 |
- semantic-desktop? ( || ( >=kde-base/kdepim-meta-4.5.93 >=kde-base/kdepim-meta-4.4.9 ) ) |
| 73 |
+ semantic-desktop? ( || ( |
| 74 |
+ ( $(add_kdebase_dep kdepim-meta '' 4.5.93) ) |
| 75 |
+ ( $(add_kdebase_dep kdepim-meta '' 4.4.9) ) |
| 76 |
+ ) ) |
| 77 |
" |
| 78 |
|
| 79 |
diff --git a/kde-base/kde-meta/kde-meta-9999.ebuild b/kde-base/kde-meta/kde-meta-9999.ebuild |
| 80 |
index 433f02b..81893e5 100644 |
| 81 |
--- a/kde-base/kde-meta/kde-meta-9999.ebuild |
| 82 |
+++ b/kde-base/kde-meta/kde-meta-9999.ebuild |
| 83 |
@@ -2,7 +2,7 @@ |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
# $Header: $ |
| 86 |
|
| 87 |
-EAPI=3 |
| 88 |
+EAPI=4 |
| 89 |
inherit kde4-meta-pkg |
| 90 |
|
| 91 |
DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages" |
| 92 |
|
| 93 |
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild |
| 94 |
index 83cad08..d201b77 100644 |
| 95 |
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild |
| 96 |
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-4.6.9999.ebuild |
| 97 |
@@ -2,7 +2,7 @@ |
| 98 |
# Distributed under the terms of the GNU General Public License v2 |
| 99 |
# $Header: $ |
| 100 |
|
| 101 |
-EAPI=3 |
| 102 |
+EAPI=4 |
| 103 |
|
| 104 |
KMNAME="kdebindings" |
| 105 |
KMMODULE="ruby" |
| 106 |
@@ -41,6 +41,7 @@ pkg_setup() { |
| 107 |
} |
| 108 |
|
| 109 |
src_unpack() { |
| 110 |
+ local S="${WORKDIR}/${P}" |
| 111 |
kde4-meta_src_unpack |
| 112 |
|
| 113 |
cd "${WORKDIR}" |
| 114 |
|
| 115 |
diff --git a/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild b/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild |
| 116 |
index 83cad08..d201b77 100644 |
| 117 |
--- a/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild |
| 118 |
+++ b/kde-base/kdebindings-ruby/kdebindings-ruby-9999.ebuild |
| 119 |
@@ -2,7 +2,7 @@ |
| 120 |
# Distributed under the terms of the GNU General Public License v2 |
| 121 |
# $Header: $ |
| 122 |
|
| 123 |
-EAPI=3 |
| 124 |
+EAPI=4 |
| 125 |
|
| 126 |
KMNAME="kdebindings" |
| 127 |
KMMODULE="ruby" |
| 128 |
@@ -41,6 +41,7 @@ pkg_setup() { |
| 129 |
} |
| 130 |
|
| 131 |
src_unpack() { |
| 132 |
+ local S="${WORKDIR}/${P}" |
| 133 |
kde4-meta_src_unpack |
| 134 |
|
| 135 |
cd "${WORKDIR}" |
| 136 |
|
| 137 |
diff --git a/kde-base/libkexiv2/libkexiv2-9999.ebuild b/kde-base/libkexiv2/libkexiv2-9999.ebuild |
| 138 |
index a3f107b..b82ee7a 100644 |
| 139 |
--- a/kde-base/libkexiv2/libkexiv2-9999.ebuild |
| 140 |
+++ b/kde-base/libkexiv2/libkexiv2-9999.ebuild |
| 141 |
@@ -2,7 +2,7 @@ |
| 142 |
# Distributed under the terms of the GNU General Public License v2 |
| 143 |
# $Header: $ |
| 144 |
|
| 145 |
-EAPI=3 |
| 146 |
+EAPI=4 |
| 147 |
|
| 148 |
KDE_SCM="git" |
| 149 |
if [[ ${PV} == *9999 ]]; then |
Archives