| 1 |
commit: 5c59649407f2a63dc6e4def8147b40c8b55e3f62 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 6 19:58:21 2013 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 6 19:58:21 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5c596494 |
| 7 |
|
| 8 |
[kde-base/kopete] Moved to git by upstream. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.0_alpha177 |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/kopete/kopete-4.10.49.9999.ebuild | 19 ++++++++++++------- |
| 14 |
kde-base/kopete/kopete-9999.ebuild | 12 +++++------- |
| 15 |
2 files changed, 17 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-base/kopete/kopete-4.10.49.9999.ebuild b/kde-base/kopete/kopete-4.10.49.9999.ebuild |
| 18 |
index 18c304d..0274266 100644 |
| 19 |
--- a/kde-base/kopete/kopete-4.10.49.9999.ebuild |
| 20 |
+++ b/kde-base/kopete/kopete-4.10.49.9999.ebuild |
| 21 |
@@ -4,10 +4,15 @@ |
| 22 |
|
| 23 |
EAPI=5 |
| 24 |
|
| 25 |
+if [[ $PV != *9999 ]]; then |
| 26 |
+ KMNAME="kdenetwork" |
| 27 |
+ KDE_ECLASS=meta |
| 28 |
+else |
| 29 |
+ KDE_ECLASS=base |
| 30 |
+fi |
| 31 |
+ |
| 32 |
KDE_HANDBOOK="optional" |
| 33 |
-KMNAME="kdenetwork" |
| 34 |
-KDE_SCM="svn" |
| 35 |
-inherit kde4-meta multilib |
| 36 |
+inherit kde4-${KDE_ECLASS} multilib |
| 37 |
|
| 38 |
DESCRIPTION="KDE multi-protocol IM client" |
| 39 |
KEYWORDS="" |
| 40 |
@@ -111,9 +116,9 @@ DEPEND="${COMMONDEPEND} |
| 41 |
|
| 42 |
src_prepare() { |
| 43 |
sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \ |
| 44 |
- -i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed" |
| 45 |
+ -i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed" |
| 46 |
|
| 47 |
- kde4-meta_src_prepare |
| 48 |
+ kde4-${KDE_ECLASS}_src_prepare |
| 49 |
} |
| 50 |
|
| 51 |
src_configure() { |
| 52 |
@@ -144,11 +149,11 @@ src_configure() { |
| 53 |
mycmakeargs+=($(cmake-utils_use_with ${x/+/})) |
| 54 |
done |
| 55 |
|
| 56 |
- kde4-meta_src_configure |
| 57 |
+ kde4-${KDE_ECLASS}_src_configure |
| 58 |
} |
| 59 |
|
| 60 |
pkg_postinst() { |
| 61 |
- kde4-meta_pkg_postinst |
| 62 |
+ kde4-${KDE_ECLASS}_pkg_postinst |
| 63 |
|
| 64 |
#if use telepathy; then |
| 65 |
# elog "To use kopete telepathy plugins, you need to start gabble first:" |
| 66 |
|
| 67 |
diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild |
| 68 |
index 18c304d..3024e3b 100644 |
| 69 |
--- a/kde-base/kopete/kopete-9999.ebuild |
| 70 |
+++ b/kde-base/kopete/kopete-9999.ebuild |
| 71 |
@@ -5,9 +5,7 @@ |
| 72 |
EAPI=5 |
| 73 |
|
| 74 |
KDE_HANDBOOK="optional" |
| 75 |
-KMNAME="kdenetwork" |
| 76 |
-KDE_SCM="svn" |
| 77 |
-inherit kde4-meta multilib |
| 78 |
+inherit kde4-base multilib |
| 79 |
|
| 80 |
DESCRIPTION="KDE multi-protocol IM client" |
| 81 |
KEYWORDS="" |
| 82 |
@@ -111,9 +109,9 @@ DEPEND="${COMMONDEPEND} |
| 83 |
|
| 84 |
src_prepare() { |
| 85 |
sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \ |
| 86 |
- -i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed" |
| 87 |
+ -i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed" |
| 88 |
|
| 89 |
- kde4-meta_src_prepare |
| 90 |
+ kde4-base_src_prepare |
| 91 |
} |
| 92 |
|
| 93 |
src_configure() { |
| 94 |
@@ -144,11 +142,11 @@ src_configure() { |
| 95 |
mycmakeargs+=($(cmake-utils_use_with ${x/+/})) |
| 96 |
done |
| 97 |
|
| 98 |
- kde4-meta_src_configure |
| 99 |
+ kde4-base_src_configure |
| 100 |
} |
| 101 |
|
| 102 |
pkg_postinst() { |
| 103 |
- kde4-meta_pkg_postinst |
| 104 |
+ kde4-base_pkg_postinst |
| 105 |
|
| 106 |
#if use telepathy; then |
| 107 |
# elog "To use kopete telepathy plugins, you need to start gabble first:" |
Archives