[gentoo-commits] proj/kde:master commit in: kde-base/okular/, eclass/

[gentoo-commits] proj/kde:master commit in: kde-base/okular/, eclass/

[Jonathan Callen]

commit:     48f0f88ea04e6fd67b2bf06a8d0f86a3aec2c939
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 00:41:14 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Tue May 31 00:41:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=48f0f88e

[kde-base/okular] okular is now using git; branches named ${SLOT}, not KDE/${SLOT}

(Portage version: 2.2.0_alpha35/git/Linux x86_64, signed Manifest commit with key 229E5838)

---
 eclass/kde4-base.eclass                |    2 +-
 kde-base/okular/okular-4.6.9999.ebuild |   12 ++++++++++--
 kde-base/okular/okular-9999.ebuild     |    8 +++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 0f458da..2383beb 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -581,7 +581,7 @@ _calculate_live_repo() {
 				*)
 					# set EGIT_BRANCH and EGIT_COMMIT to ${SLOT}
 					case ${_kmname} in
-						kdeplasma-addons | kdepim | kdepim-runtime | kdepimlibs)
+						kdeplasma-addons | kdepim | kdepim-runtime | kdepimlibs | okular)
 							EGIT_BRANCH="${SLOT}"
 							;;
 						marble)

diff --git a/kde-base/okular/okular-4.6.9999.ebuild b/kde-base/okular/okular-4.6.9999.ebuild
index 0f4f99d..7caa83e 100644
--- a/kde-base/okular/okular-4.6.9999.ebuild
+++ b/kde-base/okular/okular-4.6.9999.ebuild
@@ -5,8 +5,14 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
+KDE_SCM="git"
+if [[ ${PV} == *9999 ]]; then
+kde_eclass="kde4-base"
+else
 KMNAME="kdegraphics"
-inherit kde4-meta
+kde_eclass="kde4-meta"
+fi
+inherit ${kde_eclass}
 
 DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
 KEYWORDS=""
@@ -26,7 +32,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+if [[ ${PV} != *9999 ]]; then
 KMEXTRACTONLY="libs/mobipocket"
+fi
 
 src_configure() {
 	mycmakeargs=(
@@ -41,5 +49,5 @@ src_configure() {
 		$(cmake-utils_use_with tiff)
 	)
 
-	kde4-meta_src_configure
+	${kde4_eclass}_src_configure
 }

diff --git a/kde-base/okular/okular-9999.ebuild b/kde-base/okular/okular-9999.ebuild
index 0f4f99d..dbf9007 100644
--- a/kde-base/okular/okular-9999.ebuild
+++ b/kde-base/okular/okular-9999.ebuild
@@ -5,8 +5,8 @@
 EAPI=4
 
 KDE_HANDBOOK="optional"
-KMNAME="kdegraphics"
-inherit kde4-meta
+KDE_SCM="git"
+inherit kde4-base
 
 DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
 KEYWORDS=""
@@ -26,8 +26,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-KMEXTRACTONLY="libs/mobipocket"
-
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with chm)
@@ -41,5 +39,5 @@ src_configure() {
 		$(cmake-utils_use_with tiff)
 	)
 
-	kde4-meta_src_configure
+	kde4-base_src_configure
 }