From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-910202-garchives=archives.gentoo.org@lists.gentoo.org>
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 BB8C61395E2
for <garchives@archives.gentoo.org>; Sun, 6 Nov 2016 18:12:02 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 01D3DE09B9;
Sun, 6 Nov 2016 18:12:02 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id CE152E09B9
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Nov 2016 18:11:56 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CA58B34187F
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Nov 2016 18:11:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C289624B9
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Nov 2016 18:11:47 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1478455901.fd38427c4c5a3fb50e6110a9a1b4eed3141505ca.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/hugin/hugin-2016.2.0.ebuild media-gfx/hugin/hugin-9999.ebuild
X-VCS-Directories: media-gfx/hugin/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: fd38427c4c5a3fb50e6110a9a1b4eed3141505ca
X-VCS-Branch: master
Date: Sun, 6 Nov 2016 18:11:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: d43bc685-3775-4093-b43e-ed88b7aa6c20
X-Archives-Hash: 030a1e4d8e7ccaa4a1f64a800a26065e
commit: fd38427c4c5a3fb50e6110a9a1b4eed3141505ca
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Sep 18 10:02:41 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 18:11:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd38427c
media-gfx/hugin: Switch to EAPI 6, python3_5
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2354
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-gfx/hugin/hugin-2016.2.0.ebuild | 29 ++++++++++++++++++-----------
media-gfx/hugin/hugin-9999.ebuild | 29 ++++++++++++++++++-----------
2 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/media-gfx/hugin/hugin-2016.2.0.ebuild b/media-gfx/hugin/hugin-2016.2.0.ebuild
index 5345e17..8a366e2 100644
--- a/media-gfx/hugin/hugin-2016.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2016.2.0.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit python-single-r1 wxwidgets versionator cmake-utils
@@ -23,7 +23,7 @@ IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
CDEPEND="
!!dev-util/cocom
dev-db/sqlite:3
- >=dev-libs/boost-1.49.0-r1:0=
+ dev-libs/boost:=
dev-libs/zthread
>=media-gfx/enblend-4.0
media-gfx/exiv2:=
@@ -34,7 +34,7 @@ CDEPEND="
media-libs/openexr:=
media-libs/tiff:0
>=media-libs/vigra-1.9.0[openexr]
- sci-libs/fftw:=
+ sci-libs/fftw:3.0=
sys-libs/zlib
virtual/glu
virtual/jpeg:0
@@ -52,27 +52,32 @@ DEPEND="${CDEPEND}
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+DOCS=( authors.txt README TODO )
+
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- -DBUILD_HSI=$(usex python ON OFF)
- -DENABLE_LAPACK=$(usex lapack ON OFF)
- )
use python && python-single-r1_pkg_setup
}
src_prepare() {
+ cmake-utils_src_prepare
rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
+}
- cmake-utils_src_prepare
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_HSI=$(usex python)
+ -DENABLE_LAPACK=$(usex lapack)
+ )
+ cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
use python && python_optimize
+ local lang
for lang in ${LANGS} ; do
case ${lang} in
ca) dir=ca_ES;;
@@ -80,6 +85,8 @@ src_install() {
cs) dir=cs_CZ;;
*) dir=${lang/-/_};;
esac
- use l10n_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+ if ! use l10n_${lang} ; then
+ rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ fi
done
}
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index b739963..d40c3e7 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -2,10 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit mercurial python-single-r1 wxwidgets versionator cmake-utils
@@ -25,7 +25,7 @@ IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
CDEPEND="
!!dev-util/cocom
dev-db/sqlite:3
- >=dev-libs/boost-1.49.0-r1:0=
+ dev-libs/boost:=
dev-libs/zthread
>=media-gfx/enblend-4.0
media-gfx/exiv2:=
@@ -36,7 +36,7 @@ CDEPEND="
media-libs/openexr:=
media-libs/tiff:0
>=media-libs/vigra-1.9.0[openexr]
- sci-libs/fftw:=
+ sci-libs/fftw:3.0=
sys-libs/zlib
virtual/glu
virtual/jpeg:0
@@ -54,27 +54,32 @@ DEPEND="${CDEPEND}
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+DOCS=( authors.txt README TODO )
+
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
pkg_setup() {
- DOCS="authors.txt README TODO"
- mycmakeargs=(
- -DBUILD_HSI=$(usex python ON OFF)
- -DENABLE_LAPACK=$(usex lapack ON OFF)
- )
use python && python-single-r1_pkg_setup
}
src_prepare() {
+ cmake-utils_src_prepare
rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
+}
- cmake-utils_src_prepare
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_HSI=$(usex python)
+ -DENABLE_LAPACK=$(usex lapack)
+ )
+ cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
use python && python_optimize
+ local lang
for lang in ${LANGS} ; do
case ${lang} in
ca) dir=ca_ES;;
@@ -82,6 +87,8 @@ src_install() {
cs) dir=cs_CZ;;
*) dir=${lang/-/_};;
esac
- use l10n_${lang} || rm -r "${D}"/usr/share/locale/${dir}
+ if ! use l10n_${lang} ; then
+ rm -r "${ED%/}"/usr/share/locale/${dir} || die
+ fi
done
}