Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdesdk-misc/
Date: Tue, 05 Mar 2013 09:41:30
Message-Id: 1362476436.00fa7056beaf58c8f02347daa532a08d2b88aa94.kensington@gentoo
1 commit: 00fa7056beaf58c8f02347daa532a08d2b88aa94
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 5 09:40:36 2013 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 5 09:40:36 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=00fa7056
7
8 [kde-base/kdesdk-misc] Fix file collisions.
9
10 Package-Manager: portage-2.1.11.55
11
12 ---
13 kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild | 8 +++++++-
14 .../kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild | 11 +++++++++--
15 2 files changed, 16 insertions(+), 3 deletions(-)
16
17 diff --git a/kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild
18 index 675772d..cfc6aef 100644
19 --- a/kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild
20 +++ b/kde-base/kdesdk-misc/kdesdk-misc-4.10.1.ebuild
21 @@ -6,13 +6,19 @@ EAPI=5
22
23 if [[ ${PV} == *9999 ]]; then
24 KMNAME="kde-dev-util"
25 - KMNOMODULE="true"
26 else
27 KMNAME="kdesdk"
28 KMMODULE="kde-dev-utils"
29 fi
30 +KMNOMODULE="true"
31 inherit kde4-meta
32
33 DESCRIPTION="KDE miscellaneous SDK tools"
34 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
35 IUSE="debug"
36 +
37 +KMEXTRA="
38 + ${KMMODULE}/kmtrace/
39 + ${KMMODULE}/kpartloader/
40 + ${KMMODULE}/kprofilemethod/
41 +"
42
43 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
44 index 873d7c5..6fce21f 100644
45 --- a/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild
46 +++ b/kde-base/kdesdk-misc/kdesdk-misc-4.10.49.9999.ebuild
47 @@ -5,9 +5,10 @@
48 EAPI=5
49
50 if [[ ${PV} == *9999 ]]; then
51 - KMNAME="kde-dev-util"
52 -else
53 KMNAME="kde-dev-utils"
54 +else
55 + KMNAME="kdesdk"
56 + KMMODULE="kde-dev-utils"
57 fi
58 KMNOMODULE="true"
59 inherit kde4-meta
60 @@ -15,3 +16,9 @@ inherit kde4-meta
61 DESCRIPTION="KDE miscellaneous SDK tools"
62 KEYWORDS=""
63 IUSE="debug"
64 +
65 +KMEXTRA="
66 + ${KMMODULE}/kmtrace/
67 + ${KMMODULE}/kpartloader/
68 + ${KMMODULE}/kprofilemethod/
69 +"