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 EE8261382C5 for ; Sun, 20 Dec 2020 09:14:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15851E0903; Sun, 20 Dec 2020 09:14:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 CC5D3E0903 for ; Sun, 20 Dec 2020 09:14:40 +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 AC52534126D for ; Sun, 20 Dec 2020 09:14:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C60FCA for ; Sun, 20 Dec 2020 09:14:38 +0000 (UTC) From: "Markus Meier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Markus Meier" Message-ID: <1608455667.38451c38409c18f28b17e83043f1e396b6c4643d.maekke@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/hugin/hugin-2020.0.0-r1.ebuild media-gfx/hugin/hugin-2020.0.0.ebuild media-gfx/hugin/hugin-9999.ebuild X-VCS-Directories: media-gfx/hugin/ X-VCS-Committer: maekke X-VCS-Committer-Name: Markus Meier X-VCS-Revision: 38451c38409c18f28b17e83043f1e396b6c4643d X-VCS-Branch: master Date: Sun, 20 Dec 2020 09:14:38 +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: 574c2dfc-3626-4ac1-832c-e990f3a9b908 X-Archives-Hash: 42f2a082141f680140bf4d5bfbe3df73 commit: 38451c38409c18f28b17e83043f1e396b6c4643d Author: Markus Meier gentoo org> AuthorDate: Sun Dec 20 09:14:27 2020 +0000 Commit: Markus Meier gentoo org> CommitDate: Sun Dec 20 09:14:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38451c38 media-gfx/hugin: bump EAPI and fix repoman warnings Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Markus Meier gentoo.org> ...gin-2020.0.0.ebuild => hugin-2020.0.0-r1.ebuild} | 14 +++++++------- media-gfx/hugin/hugin-9999.ebuild | 21 +++++++++++---------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/media-gfx/hugin/hugin-2020.0.0.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild similarity index 90% rename from media-gfx/hugin/hugin-2020.0.0.ebuild rename to media-gfx/hugin/hugin-2020.0.0-r1.ebuild index 7c7d2c57f26..60bec67bbd9 100644 --- a/media-gfx/hugin/hugin-2020.0.0.ebuild +++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -WX_GTK_VER="3.0" +WX_GTK_VER="3.0-gtk3" PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg +inherit python-single-r1 wxwidgets cmake xdg DESCRIPTION="GUI for the creation & processing of panoramic images" HOMEPAGE="http://hugin.sf.net" @@ -39,7 +39,7 @@ CDEPEND=" virtual/glu virtual/jpeg:0 virtual/opengl - x11-libs/wxGTK:3.0=[X,opengl] + x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( ${PYTHON_DEPS} ) sift? ( media-gfx/autopano-sift-C )" @@ -68,7 +68,7 @@ src_prepare() { -e "/COMMAND.*GZIP/d" \ -e "s/\.gz//g" \ "${S}"/doc/CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -76,11 +76,11 @@ src_configure() { -DBUILD_HSI=$(usex python) -DENABLE_LAPACK=$(usex lapack) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install use python && python_optimize local lang diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild index 3eb92a7c66c..0c9e3ac20a0 100644 --- a/media-gfx/hugin/hugin-9999.ebuild +++ b/media-gfx/hugin/hugin-9999.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -WX_GTK_VER="3.0" -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +WX_GTK_VER="3.0-gtk3" +PYTHON_COMPAT=( python3_{6,7,8} ) -inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg +inherit mercurial python-single-r1 wxwidgets cmake xdg DESCRIPTION="GUI for the creation & processing of panoramic images" HOMEPAGE="http://hugin.sf.net" @@ -19,7 +19,7 @@ SLOT="0" KEYWORDS="" LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW" -IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})" +IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})" CDEPEND=" !!dev-util/cocom @@ -41,12 +41,13 @@ CDEPEND=" virtual/glu virtual/jpeg:0 virtual/opengl - x11-libs/wxGTK:3.0=[X,opengl] + x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( ${PYTHON_DEPS} ) sift? ( media-gfx/autopano-sift-C )" RDEPEND="${CDEPEND} - media-libs/exiftool" + media-libs/exiftool + raw? ( media-gfx/dcraw )" DEPEND="${CDEPEND} dev-cpp/tclap sys-devel/gettext @@ -65,7 +66,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -73,11 +74,11 @@ src_configure() { -DBUILD_HSI=$(usex python) -DENABLE_LAPACK=$(usex lapack) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install use python && python_optimize local lang