maekke 14/10/12 17:57:08 Modified: hugin-9999.ebuild ChangeLog hugin-2014.0.0.ebuild Added: hugin-2014.0.0-r1.ebuild Log: add new revision with x11-libs/wxGTK:3.0 support for bug #506972, add python-3.4 support, sync live ebuild (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 072AD062)
Revision Changes Path 1.4 media-gfx/hugin/hugin-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild?r1=1.3&r2=1.4 Index: hugin-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hugin-9999.ebuild 12 Jan 2014 19:45:37 -0000 1.3 +++ hugin-9999.ebuild 12 Oct 2014 17:57:08 -0000 1.4 @@ -1,10 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.3 2014/01/12 19:45:37 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.4 2014/10/12 17:57:08 maekke Exp $ EAPI=5 -WX_GTK_VER="2.8" -PYTHON_COMPAT=( python{2_7,3_2,3_3} ) + +WX_GTK_VER="3.0" +PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) inherit base mercurial python-single-r1 wxwidgets versionator cmake-utils @@ -19,7 +20,7 @@ KEYWORDS="" LANGS=" 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="lapack python sift $(echo ${LANGS//\ /\ linguas_})" +IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})" CDEPEND=" !!dev-util/cocom @@ -36,15 +37,15 @@ media-libs/libpng:0= media-libs/openexr:= media-libs/tiff - sci-libs/flann sys-libs/zlib virtual/jpeg - x11-libs/wxGTK:2.8=[X,opengl,-odbc] + x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/lapack ) sift? ( media-gfx/autopano-sift-C )" RDEPEND="${CDEPEND} media-libs/exiftool" DEPEND="${CDEPEND} + sys-devel/gettext virtual/pkgconfig python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )" @@ -58,7 +59,7 @@ $(cmake-utils_use_enable lapack LAPACK) $(cmake-utils_use_build python HSI) ) - python-single-r1_pkg_setup + use python && python-single-r1_pkg_setup } src_prepare() { @@ -66,12 +67,13 @@ -e 's:-O3::g' \ -i src/celeste/CMakeLists.txt || die rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die + cmake-utils_src_prepare } src_install() { cmake-utils_src_install - python_optimize + use python && python_optimize for lang in ${LANGS} ; do case ${lang} in 1.151 media-gfx/hugin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/ChangeLog?rev=1.151&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/ChangeLog?rev=1.151&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/ChangeLog?r1=1.150&r2=1.151 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- ChangeLog 10 Oct 2014 20:12:04 -0000 1.150 +++ ChangeLog 12 Oct 2014 17:57:08 -0000 1.151 @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/hugin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.150 2014/10/10 20:12:04 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.151 2014/10/12 17:57:08 maekke Exp $ + +*hugin-2014.0.0-r1 (12 Oct 2014) + + 12 Oct 2014; Markus Meier <mae...@gentoo.org> hugin-2014.0.0.ebuild, + +hugin-2014.0.0-r1.ebuild, hugin-9999.ebuild: + add new revision with x11-libs/wxGTK:3.0 support for bug #506972, add + python-3.4 support, sync live ebuild *hugin-2014.0.0 (10 Oct 2014) 1.2 media-gfx/hugin/hugin-2014.0.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2014.0.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2014.0.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2014.0.0.ebuild?r1=1.1&r2=1.2 Index: hugin-2014.0.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hugin-2014.0.0.ebuild 10 Oct 2014 20:12:04 -0000 1.1 +++ hugin-2014.0.0.ebuild 12 Oct 2014 17:57:08 -0000 1.2 @@ -1,11 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0.ebuild,v 1.1 2014/10/10 20:12:04 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0.ebuild,v 1.2 2014/10/12 17:57:08 maekke Exp $ EAPI=5 WX_GTK_VER="2.8" -PYTHON_COMPAT=( python{2_7,3_2,3_3} ) +PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) inherit base python-single-r1 wxwidgets versionator cmake-utils @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~x86" LANGS=" 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="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})" +IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})" CDEPEND=" !!dev-util/cocom 1.1 media-gfx/hugin/hugin-2014.0.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2014.0.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2014.0.0-r1.ebuild?rev=1.1&content-type=text/plain Index: hugin-2014.0.0-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2014.0.0-r1.ebuild,v 1.1 2014/10/12 17:57:08 maekke Exp $ EAPI=5 WX_GTK_VER="3.0" PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) inherit base python-single-r1 wxwidgets versionator cmake-utils DESCRIPTION="GUI for the creation & processing of panoramic images" HOMEPAGE="http://hugin.sf.net"; SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2 SIFT" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" LANGS=" 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//\ /\ linguas_})" CDEPEND=" !!dev-util/cocom app-arch/zip dev-cpp/tclap >=dev-libs/boost-1.49.0-r1:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2 media-libs/freeglut media-libs/glew:= media-libs/lensfun >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff sys-libs/zlib virtual/jpeg x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/lapack ) sift? ( media-gfx/autopano-sift-C )" RDEPEND="${CDEPEND} media-libs/exiftool" DEPEND="${CDEPEND} sys-devel/gettext virtual/pkgconfig python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) PATCHES=( "${FILESDIR}"/${P}-lensfun-0.3.0.patch ) pkg_setup() { DOCS="authors.txt README TODO" mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) $(cmake-utils_use_build python HSI) ) use python && python-single-r1_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 } src_install() { cmake-utils_src_install use python && python_optimize for lang in ${LANGS} ; do case ${lang} in ca) dir=ca_ES;; cs) dir=cs_CZ;; *) dir=${lang};; esac use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir} done }
