From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QREZ0-0007W6-Au for garchives@archives.gentoo.org; Tue, 31 May 2011 02:20:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0C011C0A1; Tue, 31 May 2011 02:20:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AA51B1C0A1 for ; Tue, 31 May 2011 02:20:02 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2AFD01B4015 for ; Tue, 31 May 2011 02:20:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7B47D8050B for ; Tue, 31 May 2011 02:20:01 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: <48f0f88ea04e6fd67b2bf06a8d0f86a3aec2c939.abcd@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/okular/, eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde4-base.eclass kde-base/okular/okular-4.6.9999.ebuild kde-base/okular/okular-9999.ebuild X-VCS-Directories: kde-base/okular/ eclass/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: 48f0f88ea04e6fd67b2bf06a8d0f86a3aec2c939 Date: Tue, 31 May 2011 02:20:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c01e909af164dc7f6099cadad843ea0e commit: 48f0f88ea04e6fd67b2bf06a8d0f86a3aec2c939 Author: Jonathan Callen gentoo org> AuthorDate: Tue May 31 00:41:14 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Tue May 31 00:41:22 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D48f0f88e [kde-base/okular] okular is now using git; branches named ${SLOT}, not KD= E/${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=3D"${SLOT}" ;; marble) diff --git a/kde-base/okular/okular-4.6.9999.ebuild b/kde-base/okular/oku= lar-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=3D4 =20 KDE_HANDBOOK=3D"optional" +KDE_SCM=3D"git" +if [[ ${PV} =3D=3D *9999 ]]; then +kde_eclass=3D"kde4-base" +else KMNAME=3D"kdegraphics" -inherit kde4-meta +kde_eclass=3D"kde4-meta" +fi +inherit ${kde_eclass} =20 DESCRIPTION=3D"Okular is an universal document viewer based on KPDF for = KDE 4." KEYWORDS=3D"" @@ -26,7 +32,9 @@ DEPEND=3D" " RDEPEND=3D"${DEPEND}" =20 +if [[ ${PV} !=3D *9999 ]]; then KMEXTRACTONLY=3D"libs/mobipocket" +fi =20 src_configure() { mycmakeargs=3D( @@ -41,5 +49,5 @@ src_configure() { $(cmake-utils_use_with tiff) ) =20 - 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=3D4 =20 KDE_HANDBOOK=3D"optional" -KMNAME=3D"kdegraphics" -inherit kde4-meta +KDE_SCM=3D"git" +inherit kde4-base =20 DESCRIPTION=3D"Okular is an universal document viewer based on KPDF for = KDE 4." KEYWORDS=3D"" @@ -26,8 +26,6 @@ DEPEND=3D" " RDEPEND=3D"${DEPEND}" =20 -KMEXTRACTONLY=3D"libs/mobipocket" - src_configure() { mycmakeargs=3D( $(cmake-utils_use_with chm) @@ -41,5 +39,5 @@ src_configure() { $(cmake-utils_use_with tiff) ) =20 - kde4-meta_src_configure + kde4-base_src_configure }