[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)

4 files changed, 29 insertions, 23 deletions

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 0f458dad1c3..2383beb2ca9 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/Manifest b/kde-base/okular/Manifest
index e04646d09de..d0e32364bdc 100644
--- a/kde-base/okular/Manifest
+++ b/kde-base/okular/Manifest
@@ -3,23 +3,23 @@ Hash: SHA256
 
 DIST kdegraphics-4.6.80.tar.bz2 1187161 RMD160 113955a4805cc18324728d9cb1b875f6f12c3931 SHA1 69f191663db147cf481edd9f528fcae50c1dc2c3 SHA256 e4840dd8746b7fac14db7043ee90296f37d376de59c43cd59e48d5459b44ad8a
 EBUILD okular-4.6.80.ebuild 1122 RMD160 732811b92665bc501b561d67c93bf0e5ccb0c24a SHA1 44ef2ebeb934b67856c344110c7255c2fbad0c0b SHA256 499c9006a85c3c96ba9ea12143ca0670b3f6ea5503336905d72c178db46ccda3
-EBUILD okular-4.6.9999.ebuild 1085 RMD160 e6b91569d271b746d26b97ea626ecace9913208d SHA1 211264e7cca052bca3a8ce8dc2a50f44560ac22d SHA256 02f4fb6a76298428a16dc7cb70b33bc0aac18c1e3812cd0d97f35810aa0b369a
-EBUILD okular-9999.ebuild 1085 RMD160 e6b91569d271b746d26b97ea626ecace9913208d SHA1 211264e7cca052bca3a8ce8dc2a50f44560ac22d SHA256 02f4fb6a76298428a16dc7cb70b33bc0aac18c1e3812cd0d97f35810aa0b369a
+EBUILD okular-4.6.9999.ebuild 1225 RMD160 f9ccf3e0943a4c877ba13eae8164dc0c3b4f6385 SHA1 eebcd32d3e5182cb89f49ab13a4e16d0178351b5 SHA256 f3838312a9bdfd37b6979d5be6b79237369fa78c0823d092dbe1f1a9815bf5d5
+EBUILD okular-9999.ebuild 1045 RMD160 d56be9a998463c522e9763a4e9cbe90f37210d69 SHA1 a23114f6272ac4d774c44412bdcda66bcdef7c27 SHA256 be1b051a923dbac0ad2d6fbcf026ae7d30ee69ee1c3f9a5428ffc640320e4519
 MISC metadata.xml 342 RMD160 2857cb76c50c3e210a583d1801907d2f782ddfa2 SHA1 6a46017e8205a774ec2d91d009174cc5fb21e076 SHA256 dbbb7111504dadeb35c244cc4f84f7e641f46f1644d99a9c2159bd16d4b0e8a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN5DTWAAoJELHSF2kinlg4104QAJnC2O7I3ZmB49vFpUyxm9Ng
-B11t9fb3SUmxqIij+tPDY/00FYiPTs7u6duEVlYUTuRCfWsuPfkzvT3RtNn9+pNf
-al/ts9aZQMFnEthETU4jZCaJ2KOwUAPBaxOo3JLMMM5SBp/xXN7I/i2HcvbMtnub
-A0OdyJRxoBRrOqJuCbldKDaKNMjdzIaKx2R8EBOASNQSvkWZgZ94kAexAzstQvNl
-kNS9jb/cz6EsZTX6UY36wFXjQuT4oj+KS2bEMGPqIvBMKLdjH/gR+AT8yGUjGJX7
-qJEq6KHQlBAA/rGVnIlWAMGunR6kWDHYIUd6Cvx8UMRkogfV0cnKWnO0aYRfmLBH
-uGOaigX47HGk2zdD37lYsW+nyJxq3xRUoEIKhiEAbr7uVI9qFrxs5E4HpkQGlY8o
-HPZE0Uk829LzvsK/a+iBU0thyNOVhgt4L5cwkEnTTeT0IxmjPDev649hGkhSwtNH
-lWN3wiQoiOa4MJE5d9NA3WaI+Yl4gMTo+eYR7btNO+UsoM+6o5DdCzJ0boaV5KPY
-BRqRYoUvf3Y+MvURcVoHgZMxXqeO9mn22C0kgWjEamHi3cw86hxxVhqnWk84C7L0
-MDu5GfqScFtECmWlKT7diZddq3xGuu+g5TSxHvpbdQwSZSfJ+qdb+uvIA9u4T30X
-q1SqpIBgX9K1yeJWMH3O
-=AB23
+iQIcBAEBCAAGBQJN5DkqAAoJELHSF2kinlg4zeEP/38aBSkv+1mEJLHyW6e1u/Xp
+lXVfNO1UI72alo6pyT8hzbe/9ZBuDoxgKdFzaOEuweLFTD98FTjpMfY6kvlAmwNG
+GLvWZ5LEygnSRhSBjkMGW9CJajb4p+0REVYuvf9AtgTRAgqehUr8qnVCh7lkDoAQ
+2PoUJgW54JHhOs9v/sX5W5jD6+10YOpiNGHW6qTyv089mS4VSOQigqNJQKbKx/GA
+lu//5IYH86DDcV3Z3JTGeCV3V4IhnOONr/rL0/8yFiOMqtscnBk+PniIH9/Xw5Bu
+yedjzj8zIv7uwDBhkFJwmt5rziIjDPIXUp+K35EZGDjZCRe9a8MQYCU4TN0dQUsO
+jBzO/JuS9WylyYOlWB/httem30fnRcCd4urC5PLd1cubLasH9FmGjfDGAQBZhYiW
+OuQYHAJDK79dyxvj/N1Yj3nhXoqQsMOTpTIz1Inygre7QI0F38F9iEMx3qCtjoGg
+YMRYw0kEAbPEzQzb7eDoaZR6gor7WfHH/zGcZCR617puJaPgTCq1kOJTVlIAfeea
+1U3eWtGXA3p31b6cte3Dk3V6WE1YjIBKG+oFVViO1toDpce3vLDLD5IbH7E1cYY8
+oQ0c8ALZwkkgN2FQcfvKcy7vr64cNpBCr+OHNTdF6YCxgm8IoFUj8F3TrI5ZBsgQ
+AeUQsu3+38u7TiU0LSqc
+=bxQ8
 -----END PGP SIGNATURE-----
diff --git a/kde-base/okular/okular-4.6.9999.ebuild b/kde-base/okular/okular-4.6.9999.ebuild
index 0f4f99d6268..7caa83ed488 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 0f4f99d6268..dbf9007859b 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
 }