From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 385681382C5 for ; Sun, 10 Jan 2021 20:16:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F693E0A7C; Sun, 10 Jan 2021 20:16:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27179E0A7C for ; Sun, 10 Jan 2021 20:16:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEF9A335D5E for ; Sun, 10 Jan 2021 20:16:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5AF8E309 for ; Sun, 10 Jan 2021 20:16:07 +0000 (UTC) From: "Stephan Hartmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stephan Hartmann" Message-ID: <1610309761.625b377858ae4fb9b91f4d9639479ea68eae76a2.sultan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/otter/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/otter/otter-9999.ebuild X-VCS-Directories: www-client/otter/ X-VCS-Committer: sultan X-VCS-Committer-Name: Stephan Hartmann X-VCS-Revision: 625b377858ae4fb9b91f4d9639479ea68eae76a2 X-VCS-Branch: master Date: Sun, 10 Jan 2021 20:16:07 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9f0549c0-3519-47a8-baea-118082e4af2e X-Archives-Hash: a106123a2770f6e1f4a42ccb520024a9 commit: 625b377858ae4fb9b91f4d9639479ea68eae76a2 Author: Stephan Hartmann gentoo org> AuthorDate: Sun Jan 10 20:13:52 2021 +0000 Commit: Stephan Hartmann gentoo org> CommitDate: Sun Jan 10 20:16:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625b3778 www-client/otter: update live ebuild Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Stephan Hartmann gentoo.org> www-client/otter/otter-9999.ebuild | 52 ++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/www-client/otter/otter-9999.ebuild b/www-client/otter/otter-9999.ebuild index 7b5172796e7..79cb3672b46 100644 --- a/www-client/otter/otter-9999.ebuild +++ b/www-client/otter/otter-9999.ebuild @@ -1,22 +1,29 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake desktop git-r3 xdg-utils + +inherit cmake desktop xdg + +if [[ ${PV} == 9999* ]] ; then + EGIT_REPO_URI="https://github.com/OtterBrowser/${PN}-browser" + inherit git-r3 +else + SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~ppc64 ~x86" + S=${WORKDIR}/${PN}-browser-${PV/_p/-dev} +fi DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5" HOMEPAGE="https://otter-browser.org/" -EGIT_REPO_URI="https://github.com/OtterBrowser/${PN}-browser" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="spell" +IUSE="+dbus +spell" DEPEND=" dev-qt/qtconcurrent:5 dev-qt/qtcore:5 - dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 @@ -27,13 +34,14 @@ DEPEND=" dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 - spell? ( kde-frameworks/sonnet ) - >=dev-qt/qtwebengine-5.9:5[widgets] -" -RDEPEND=" - ${DEPEND} + dev-qt/qtwebengine:5[widgets] + dbus? ( dev-qt/qtdbus:5 ) + spell? ( app-text/hunspell:= ) " +RDEPEND="${DEPEND}" + DOCS=( CHANGELOG CONTRIBUTING.md TODO ) + PATCHES=( "${FILESDIR}"/${PN}-1.0.01-webengine.patch ) @@ -52,16 +60,14 @@ src_prepare() { fi done fi - - if ! use spell; then - sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die - fi } src_configure() { - mycmakeargs=( - -DENABLE_QTWEBENGINE=true - -DENABLE_QTWEBKIT=false + local mycmakeargs=( + -DENABLE_DBUS=$(usex dbus) + -DENABLE_QTWEBENGINE=yes + -DENABLE_QTWEBKIT=no + -DENABLE_SPELLCHECK=$(usex spell) ) cmake_src_configure @@ -71,13 +77,3 @@ src_install() { cmake_src_install domenu ${PN}-browser.desktop } - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -}