| 1 |
commit: 48f0f88ea04e6fd67b2bf06a8d0f86a3aec2c939 |
| 2 |
Author: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 31 00:41:14 2011 +0000 |
| 4 |
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 31 00:41:22 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=48f0f88e |
| 7 |
|
| 8 |
[kde-base/okular] okular is now using git; branches named ${SLOT}, not KDE/${SLOT} |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha35/git/Linux x86_64, signed Manifest commit with key 229E5838) |
| 11 |
|
| 12 |
--- |
| 13 |
eclass/kde4-base.eclass | 2 +- |
| 14 |
kde-base/okular/okular-4.6.9999.ebuild | 12 ++++++++++-- |
| 15 |
kde-base/okular/okular-9999.ebuild | 8 +++----- |
| 16 |
3 files changed, 14 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass |
| 19 |
index 0f458da..2383beb 100644 |
| 20 |
--- a/eclass/kde4-base.eclass |
| 21 |
+++ b/eclass/kde4-base.eclass |
| 22 |
@@ -581,7 +581,7 @@ _calculate_live_repo() { |
| 23 |
*) |
| 24 |
# set EGIT_BRANCH and EGIT_COMMIT to ${SLOT} |
| 25 |
case ${_kmname} in |
| 26 |
- kdeplasma-addons | kdepim | kdepim-runtime | kdepimlibs) |
| 27 |
+ kdeplasma-addons | kdepim | kdepim-runtime | kdepimlibs | okular) |
| 28 |
EGIT_BRANCH="${SLOT}" |
| 29 |
;; |
| 30 |
marble) |
| 31 |
|
| 32 |
diff --git a/kde-base/okular/okular-4.6.9999.ebuild b/kde-base/okular/okular-4.6.9999.ebuild |
| 33 |
index 0f4f99d..7caa83e 100644 |
| 34 |
--- a/kde-base/okular/okular-4.6.9999.ebuild |
| 35 |
+++ b/kde-base/okular/okular-4.6.9999.ebuild |
| 36 |
@@ -5,8 +5,14 @@ |
| 37 |
EAPI=4 |
| 38 |
|
| 39 |
KDE_HANDBOOK="optional" |
| 40 |
+KDE_SCM="git" |
| 41 |
+if [[ ${PV} == *9999 ]]; then |
| 42 |
+kde_eclass="kde4-base" |
| 43 |
+else |
| 44 |
KMNAME="kdegraphics" |
| 45 |
-inherit kde4-meta |
| 46 |
+kde_eclass="kde4-meta" |
| 47 |
+fi |
| 48 |
+inherit ${kde_eclass} |
| 49 |
|
| 50 |
DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4." |
| 51 |
KEYWORDS="" |
| 52 |
@@ -26,7 +32,9 @@ DEPEND=" |
| 53 |
" |
| 54 |
RDEPEND="${DEPEND}" |
| 55 |
|
| 56 |
+if [[ ${PV} != *9999 ]]; then |
| 57 |
KMEXTRACTONLY="libs/mobipocket" |
| 58 |
+fi |
| 59 |
|
| 60 |
src_configure() { |
| 61 |
mycmakeargs=( |
| 62 |
@@ -41,5 +49,5 @@ src_configure() { |
| 63 |
$(cmake-utils_use_with tiff) |
| 64 |
) |
| 65 |
|
| 66 |
- kde4-meta_src_configure |
| 67 |
+ ${kde4_eclass}_src_configure |
| 68 |
} |
| 69 |
|
| 70 |
diff --git a/kde-base/okular/okular-9999.ebuild b/kde-base/okular/okular-9999.ebuild |
| 71 |
index 0f4f99d..dbf9007 100644 |
| 72 |
--- a/kde-base/okular/okular-9999.ebuild |
| 73 |
+++ b/kde-base/okular/okular-9999.ebuild |
| 74 |
@@ -5,8 +5,8 @@ |
| 75 |
EAPI=4 |
| 76 |
|
| 77 |
KDE_HANDBOOK="optional" |
| 78 |
-KMNAME="kdegraphics" |
| 79 |
-inherit kde4-meta |
| 80 |
+KDE_SCM="git" |
| 81 |
+inherit kde4-base |
| 82 |
|
| 83 |
DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4." |
| 84 |
KEYWORDS="" |
| 85 |
@@ -26,8 +26,6 @@ DEPEND=" |
| 86 |
" |
| 87 |
RDEPEND="${DEPEND}" |
| 88 |
|
| 89 |
-KMEXTRACTONLY="libs/mobipocket" |
| 90 |
- |
| 91 |
src_configure() { |
| 92 |
mycmakeargs=( |
| 93 |
$(cmake-utils_use_with chm) |
| 94 |
@@ -41,5 +39,5 @@ src_configure() { |
| 95 |
$(cmake-utils_use_with tiff) |
| 96 |
) |
| 97 |
|
| 98 |
- kde4-meta_src_configure |
| 99 |
+ kde4-base_src_configure |
| 100 |
} |
Archives