From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BA8CB1381F3 for ; Sun, 6 Oct 2013 19:57:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B158BE0B1B; Sun, 6 Oct 2013 19:57:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE33DE0B0E for ; Sun, 6 Oct 2013 19:57:30 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7CBC433EF0B for ; Sun, 6 Oct 2013 19:57:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5AC46E5468 for ; Sun, 6 Oct 2013 19:57:27 +0000 (UTC) From: "Chris Reffett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chris Reffett" Message-ID: <1381037834.3ed8963a95930c4238f7360f36a0e3415bece8e4.creffett@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/gwenview/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/gwenview/gwenview-4.11.2-r1.ebuild kde-base/gwenview/gwenview-4.11.2.ebuild kde-base/gwenview/gwenview-4.11.49.9999.ebuild kde-base/gwenview/gwenview-9999.ebuild X-VCS-Directories: kde-base/gwenview/ X-VCS-Committer: creffett X-VCS-Committer-Name: Chris Reffett X-VCS-Revision: 3ed8963a95930c4238f7360f36a0e3415bece8e4 X-VCS-Branch: master Date: Sun, 6 Oct 2013 19:57:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7bdf3c32-8bd9-4a65-bba7-cb82509457a8 X-Archives-Hash: 4b420c90a871d3bc310ea5aaf0435a2f commit: 3ed8963a95930c4238f7360f36a0e3415bece8e4 Author: Chris Reffett gentoo org> AuthorDate: Sun Oct 6 05:37:14 2013 +0000 Commit: Chris Reffett gentoo org> CommitDate: Sun Oct 6 05:37:14 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3ed8963a [kde-base/gwenview] Conversion back to semantic-desktop Package-Manager: portage-2.2.7 --- .../{gwenview-4.11.2.ebuild => gwenview-4.11.2-r1.ebuild} | 13 ++++++++++--- kde-base/gwenview/gwenview-4.11.49.9999.ebuild | 11 +++++++++-- kde-base/gwenview/gwenview-9999.ebuild | 11 +++++++++-- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/kde-base/gwenview/gwenview-4.11.2.ebuild b/kde-base/gwenview/gwenview-4.11.2-r1.ebuild similarity index 77% rename from kde-base/gwenview/gwenview-4.11.2.ebuild rename to kde-base/gwenview/gwenview-4.11.2-r1.ebuild index 620fd08..3bd3456 100644 --- a/kde-base/gwenview/gwenview-4.11.2.ebuild +++ b/kde-base/gwenview/gwenview-4.11.2-r1.ebuild @@ -13,13 +13,14 @@ HOMEPAGE=" http://www.kde.org/applications/graphics/gwenview/ http://gwenview.sourceforge.net/ " -KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug kipi" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug kipi semantic-desktop" # tests fail, last checked 4.11.0 RESTRICT="test" DEPEND=" + $(add_kdebase_dep kdelibs 'semantic-desktop?') $(add_kdebase_dep libkonq) $(add_kdebase_dep kactivities) >=media-gfx/exiv2-0.19 @@ -33,14 +34,20 @@ RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( + $(cmake-utils_use_with semantic-desktop Soprano) $(cmake-utils_use_with kipi) ) - # Workaround for bug #479510 if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then mycmakeargs+=( -DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" ) fi + if use semantic-desktop; then + mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Nepomuk) + else + mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None) + fi + kde4-base_src_configure } diff --git a/kde-base/gwenview/gwenview-4.11.49.9999.ebuild b/kde-base/gwenview/gwenview-4.11.49.9999.ebuild index d27f139..f690108 100644 --- a/kde-base/gwenview/gwenview-4.11.49.9999.ebuild +++ b/kde-base/gwenview/gwenview-4.11.49.9999.ebuild @@ -14,12 +14,13 @@ HOMEPAGE=" http://gwenview.sourceforge.net/ " KEYWORDS="" -IUSE="debug kipi" +IUSE="debug kipi semantic-desktop" # tests fail, last checked 4.11.0 RESTRICT="test" DEPEND=" + $(add_kdebase_dep kdelibs 'semantic-desktop?') $(add_kdebase_dep libkonq) $(add_kdebase_dep kactivities) >=media-gfx/exiv2-0.19 @@ -33,14 +34,20 @@ RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( + $(cmake-utils_use_with semantic-desktop Soprano) $(cmake-utils_use_with kipi) ) - # Workaround for bug #479510 if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then mycmakeargs+=( -DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" ) fi + if use semantic-desktop; then + mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Nepomuk) + else + mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None) + fi + kde4-base_src_configure } diff --git a/kde-base/gwenview/gwenview-9999.ebuild b/kde-base/gwenview/gwenview-9999.ebuild index d27f139..f690108 100644 --- a/kde-base/gwenview/gwenview-9999.ebuild +++ b/kde-base/gwenview/gwenview-9999.ebuild @@ -14,12 +14,13 @@ HOMEPAGE=" http://gwenview.sourceforge.net/ " KEYWORDS="" -IUSE="debug kipi" +IUSE="debug kipi semantic-desktop" # tests fail, last checked 4.11.0 RESTRICT="test" DEPEND=" + $(add_kdebase_dep kdelibs 'semantic-desktop?') $(add_kdebase_dep libkonq) $(add_kdebase_dep kactivities) >=media-gfx/exiv2-0.19 @@ -33,14 +34,20 @@ RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( + $(cmake-utils_use_with semantic-desktop Soprano) $(cmake-utils_use_with kipi) ) - # Workaround for bug #479510 if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then mycmakeargs+=( -DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" ) fi + if use semantic-desktop; then + mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Nepomuk) + else + mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None) + fi + kde4-base_src_configure }