| 1 |
commit: 7998fabe57edb02d77f9c9a5e3aba908366d3fae |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 5 10:20:04 2013 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 5 10:20:04 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7998fabe |
| 7 |
|
| 8 |
[kde-base/kdesdk-misc] Restore old poxml behaviour for 4.10. |
| 9 |
|
| 10 |
Package-Manager: portage-2.1.11.55 |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild | 24 +++++++++++++++++-- |
| 14 |
.../kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild | 22 ++++++++++++++++- |
| 15 |
kde-base/kdesdk-misc/metadata.xml | 3 ++ |
| 16 |
3 files changed, 44 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild |
| 19 |
index cfc6aef..1b5e95d 100644 |
| 20 |
--- a/kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild |
| 21 |
+++ b/kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild |
| 22 |
@@ -5,8 +5,9 @@ |
| 23 |
EAPI=5 |
| 24 |
|
| 25 |
if [[ ${PV} == *9999 ]]; then |
| 26 |
- KMNAME="kde-dev-util" |
| 27 |
+ KMNAME="kde-dev-utils" |
| 28 |
else |
| 29 |
+ KMEXTRA="poxml/" |
| 30 |
KMNAME="kdesdk" |
| 31 |
KMMODULE="kde-dev-utils" |
| 32 |
fi |
| 33 |
@@ -15,10 +16,27 @@ inherit kde4-meta |
| 34 |
|
| 35 |
DESCRIPTION="KDE miscellaneous SDK tools" |
| 36 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
| 37 |
-IUSE="debug" |
| 38 |
+IUSE="debug extras" |
| 39 |
|
| 40 |
-KMEXTRA=" |
| 41 |
+KMEXTRA+=" |
| 42 |
${KMMODULE}/kmtrace/ |
| 43 |
${KMMODULE}/kpartloader/ |
| 44 |
${KMMODULE}/kprofilemethod/ |
| 45 |
" |
| 46 |
+ |
| 47 |
+DEPEND=" |
| 48 |
+ extras? ( >=dev-java/antlr-2.7.7:0[cxx,java,script] ) |
| 49 |
+" |
| 50 |
+RDEPEND="${DEPEND}" |
| 51 |
+ |
| 52 |
+# java deps on anltr cant be properly explained to cmake deps |
| 53 |
+# needs to be run in one thread |
| 54 |
+MAKEOPTS+=" -j1" |
| 55 |
+ |
| 56 |
+src_configure() { |
| 57 |
+ mycmakeargs=( |
| 58 |
+ $(cmake-utils_use_with extras Antlr2) |
| 59 |
+ ) |
| 60 |
+ |
| 61 |
+ kde4-meta_src_configure |
| 62 |
+} |
| 63 |
|
| 64 |
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild |
| 65 |
index 6fce21f..376fc4c 100644 |
| 66 |
--- a/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild |
| 67 |
+++ b/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild |
| 68 |
@@ -7,6 +7,7 @@ EAPI=5 |
| 69 |
if [[ ${PV} == *9999 ]]; then |
| 70 |
KMNAME="kde-dev-utils" |
| 71 |
else |
| 72 |
+ KMEXTRA="poxml/" |
| 73 |
KMNAME="kdesdk" |
| 74 |
KMMODULE="kde-dev-utils" |
| 75 |
fi |
| 76 |
@@ -15,10 +16,27 @@ inherit kde4-meta |
| 77 |
|
| 78 |
DESCRIPTION="KDE miscellaneous SDK tools" |
| 79 |
KEYWORDS="" |
| 80 |
-IUSE="debug" |
| 81 |
+IUSE="debug extras" |
| 82 |
|
| 83 |
-KMEXTRA=" |
| 84 |
+KMEXTRA+=" |
| 85 |
${KMMODULE}/kmtrace/ |
| 86 |
${KMMODULE}/kpartloader/ |
| 87 |
${KMMODULE}/kprofilemethod/ |
| 88 |
" |
| 89 |
+ |
| 90 |
+DEPEND=" |
| 91 |
+ extras? ( >=dev-java/antlr-2.7.7:0[cxx,java,script] ) |
| 92 |
+" |
| 93 |
+RDEPEND="${DEPEND}" |
| 94 |
+ |
| 95 |
+# java deps on anltr cant be properly explained to cmake deps |
| 96 |
+# needs to be run in one thread |
| 97 |
+MAKEOPTS+=" -j1" |
| 98 |
+ |
| 99 |
+src_configure() { |
| 100 |
+ mycmakeargs=( |
| 101 |
+ $(cmake-utils_use_with extras Antlr2) |
| 102 |
+ ) |
| 103 |
+ |
| 104 |
+ kde4-meta_src_configure |
| 105 |
+} |
| 106 |
|
| 107 |
diff --git a/kde-base/kdesdk-misc/metadata.xml b/kde-base/kdesdk-misc/metadata.xml |
| 108 |
index a23f444..5941d59 100644 |
| 109 |
--- a/kde-base/kdesdk-misc/metadata.xml |
| 110 |
+++ b/kde-base/kdesdk-misc/metadata.xml |
| 111 |
@@ -2,4 +2,7 @@ |
| 112 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 113 |
<pkgmetadata> |
| 114 |
<herd>kde</herd> |
| 115 |
+ <use> |
| 116 |
+ <flag name="extras">Build po2xml and swappo tools</flag> |
| 117 |
+ </use> |
| 118 |
</pkgmetadata> |
Archives