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 51A261382FE for ; Sun, 10 Jul 2016 09:14:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DD6EE0B24; Sun, 10 Jul 2016 09:14:17 +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 B2BDAE0B24 for ; Sun, 10 Jul 2016 09:14:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 868AF340FBF for ; Sun, 10 Jul 2016 09:14:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8BA22435 for ; Sun, 10 Jul 2016 09:14:12 +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: <1468142009.9b1f18ac9baa3a1d35a3575bb798d4d03b5b8f65.maekke@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/hugin/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/hugin/Manifest media-gfx/hugin/hugin-2016.2.0_rc1.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: 9b1f18ac9baa3a1d35a3575bb798d4d03b5b8f65 X-VCS-Branch: master Date: Sun, 10 Jul 2016 09:14:12 +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: 8c1129e2-a524-4ea8-8d37-06a2a4ba8662 X-Archives-Hash: 9cb7f10259da5a1654421ddb047d6e02 commit: 9b1f18ac9baa3a1d35a3575bb798d4d03b5b8f65 Author: Markus Meier gentoo org> AuthorDate: Sun Jul 10 09:13:29 2016 +0000 Commit: Markus Meier gentoo org> CommitDate: Sun Jul 10 09:13:29 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b1f18ac media-gfx/hugin: version bump, migrate to I10N Package-Manager: portage-2.3.0 media-gfx/hugin/Manifest | 1 + ...hugin-9999.ebuild => hugin-2016.2.0_rc1.ebuild} | 23 ++++++++++------------ media-gfx/hugin/hugin-9999.ebuild | 15 +++++++------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index 38839a5..5e6e4f9 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,2 +1,3 @@ DIST hugin-2015.0.0.tar.bz2 10611519 SHA256 2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd SHA512 bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2 WHIRLPOOL f9d47da7962a19894f323b85084fc7fda925ed5041188ffb1fbcea09ce7719baa7b26c95c66ec22139d24b683d6b1cba8b821949c166814e435efc5fc0e0a11e DIST hugin-2016.0.0.tar.bz2 10508576 SHA256 b030b05b248b583cf9a26817f5b350303e3ce2c8bc4b43d45f697fbdf55b65e6 SHA512 029b30c39bb29de5cfb3c8d7d713d58662abf14311279e984f62cf7287edb9c9efdafdcb6990ba320d6098c4dd1de09dd9ceec9925eb52dafd234261a9615fd1 WHIRLPOOL 2c21670944ba7fecb969499b21b279abb8bc77c5f9f5c5eab1576601b1d496576c0b53bc1e24d29e974d44f38e95da1ca32eeed198fa53f3f382fc4e3b8ddaa4 +DIST hugin-2016.2.0-rc1.tar.bz2 10396049 SHA256 b1a68b7890b4d463e18408993ea7ef57aefe9c4b3a5a9724e9bbacf9d0d371a3 SHA512 d1f75772db6ab70af0fdbdad32c3c7770fb6660886646ea164f8c7ccf668a1cd2d14af1d61d45f9f9b28f49e78a19fb8678d4d7706e1ddd8989f9c44abe159b7 WHIRLPOOL 6c30aa339d8a0bef7c714b93dddc362eb67b5a333f0e22361eaba6c0f79e486fef0136c5b7296d0425040dd98d514ea364e1afba470489e356954d55fd266288 diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-2016.2.0_rc1.ebuild similarity index 74% copy from media-gfx/hugin/hugin-9999.ebuild copy to media-gfx/hugin/hugin-2016.2.0_rc1.ebuild index 50ecf8a..4b80209 100644 --- a/media-gfx/hugin/hugin-9999.ebuild +++ b/media-gfx/hugin/hugin-2016.2.0_rc1.ebuild @@ -7,20 +7,18 @@ EAPI=5 WX_GTK_VER="3.0" PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -inherit mercurial python-single-r1 wxwidgets versionator cmake-utils +inherit python-single-r1 wxwidgets versionator cmake-utils DESCRIPTION="GUI for the creation & processing of panoramic images" HOMEPAGE="http://hugin.sf.net" -SRC_URI="" -EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin" -EHG_PROJECT="${PN}-${PN}" +SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2" LICENSE="GPL-2 SIFT" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~ppc ~x86" -LANGS=" ca@valencia ca_ES cs_CZ 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//\ /\ linguas_})" +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_})" CDEPEND=" !!dev-util/cocom @@ -66,9 +64,6 @@ pkg_setup() { } src_prepare() { - sed \ - -e 's:-O3::g' \ - -i src/celeste/CMakeLists.txt || die rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die cmake-utils_src_prepare @@ -80,9 +75,11 @@ src_install() { for lang in ${LANGS} ; do case ${lang} in - ca@valencia) dir=ca_ES@valencia;; - *) dir=${lang};; + ca) dir=ca_ES;; + ca-valencia) dir=ca_ES@valencia;; + cs) dir=cs_CZ;; + *) dir=${lang/-/_};; esac - use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir} + use l10n_${lang} || rm -r "${D}"/usr/share/locale/${dir} done } diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild index 50ecf8a..6fbb401 100644 --- a/media-gfx/hugin/hugin-9999.ebuild +++ b/media-gfx/hugin/hugin-9999.ebuild @@ -19,8 +19,8 @@ LICENSE="GPL-2 SIFT" SLOT="0" KEYWORDS="" -LANGS=" ca@valencia ca_ES cs_CZ 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//\ /\ linguas_})" +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_})" CDEPEND=" !!dev-util/cocom @@ -66,9 +66,6 @@ pkg_setup() { } src_prepare() { - sed \ - -e 's:-O3::g' \ - -i src/celeste/CMakeLists.txt || die rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die cmake-utils_src_prepare @@ -80,9 +77,11 @@ src_install() { for lang in ${LANGS} ; do case ${lang} in - ca@valencia) dir=ca_ES@valencia;; - *) dir=${lang};; + ca) dir=ca_ES;; + ca-valencia) dir=ca_ES@valencia;; + cs) dir=cs_CZ;; + *) dir=${lang/-/_};; esac - use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir} + use l10n_${lang} || rm -r "${D}"/usr/share/locale/${dir} done }