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 5D954138359 for ; Tue, 29 Sep 2020 20:46:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9EDFBE0AF0; Tue, 29 Sep 2020 20:46:21 +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 83F87E0AF0 for ; Tue, 29 Sep 2020 20:46:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 6D07134087C for ; Tue, 29 Sep 2020 20:46:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22F08339 for ; Tue, 29 Sep 2020 20:46:19 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1601412340.bbaf7b5944a0cff48ff7a0796f99aa53e30cb1bc.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/fbreader/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/fbreader/fbreader-0.99.4-r5.ebuild X-VCS-Directories: app-text/fbreader/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: bbaf7b5944a0cff48ff7a0796f99aa53e30cb1bc X-VCS-Branch: master Date: Tue, 29 Sep 2020 20:46:19 +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: 87f15b2c-669a-4d4b-aa85-0ba0249b73a2 X-Archives-Hash: fc3ccf1dd7d1521e98a6e38bc0582d14 commit: bbaf7b5944a0cff48ff7a0796f99aa53e30cb1bc Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 28 17:13:03 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 29 20:45:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbaf7b59 app-text/fbreader: EAPI-7, unused eclass, missing || die, sort deps Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/fbreader/fbreader-0.99.4-r5.ebuild | 33 +++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild index 7c47fc4ac07..75cd8347fff 100644 --- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild +++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils multilib flag-o-matic qmake-utils +inherit flag-o-matic qmake-utils DESCRIPTION="E-Book Reader. Supports many e-book formats" -HOMEPAGE="http://www.fbreader.org/" -SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz" +HOMEPAGE="https://www.fbreader.org/" +SRC_URI="https://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz" LICENSE="GPL-2" SLOT="0" @@ -16,18 +16,19 @@ IUSE="debug" RDEPEND=" app-arch/bzip2 + dev-db/sqlite dev-libs/expat - dev-libs/libunibreak dev-libs/fribidi - dev-db/sqlite - net-misc/curl - sys-libs/zlib + dev-libs/libunibreak dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl] + dev-qt/qtwidgets:5 + net-misc/curl + sys-libs/zlib " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig " @@ -61,15 +62,15 @@ src_prepare() { sed -e "s:MOC = moc-qt4:MOC = $(qt5_get_bindir)/moc:" \ -i makefiles/arch/desktop.mk || die "updating desktop.mk failed" - echo "TARGET_ARCH = desktop" > makefiles/target.mk - echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk + echo "TARGET_ARCH = desktop" > makefiles/target.mk || die + echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk || die - echo "UI_TYPE = qt4" >> makefiles/target.mk + echo "UI_TYPE = qt4" >> makefiles/target.mk || die if use debug; then - echo "TARGET_STATUS = debug" >> makefiles/target.mk + echo "TARGET_STATUS = debug" >> makefiles/target.mk || die else - echo "TARGET_STATUS = release" >> makefiles/target.mk + echo "TARGET_STATUS = release" >> makefiles/target.mk || die fi }