maekke      15/07/28 16:31:52

  Modified:             ChangeLog hugin-9999.ebuild
  Added:                hugin-2015.0.0_rc3-r1.ebuild
                        hugin-2015.0.0_rc3.ebuild
  Log:
  version bump: fix dependencies by Nikoli in bug #551800, should also fix 
problems with newer boost from bug #549986
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
072AD062)

Revision  Changes    Path
1.160                media-gfx/hugin/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/ChangeLog?rev=1.160&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/ChangeLog?rev=1.160&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/ChangeLog?r1=1.159&r2=1.160

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- ChangeLog   18 Jul 2015 10:04:45 -0000      1.159
+++ ChangeLog   28 Jul 2015 16:31:52 -0000      1.160
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.159 
2015/07/18 10:04:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.160 
2015/07/28 16:31:52 maekke Exp $
+
+*hugin-2015.0.0_rc3-r1 (28 Jul 2015)
+*hugin-2015.0.0_rc3 (28 Jul 2015)
+
+  28 Jul 2015; Markus Meier <[email protected]> +hugin-2015.0.0_rc3.ebuild,
+  +hugin-2015.0.0_rc3-r1.ebuild, hugin-9999.ebuild:
+  version bump: fix dependencies by Nikoli in bug #551800, should also fix
+  problems with newer boost from bug #549986
 
   18 Jul 2015; Markus Meier <[email protected]> -hugin-2013.0.0-r1.ebuild,
   -files/hugin-2013.0.0-boost.patch:



1.7                  media-gfx/hugin/hugin-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild?rev=1.7&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild?rev=1.7&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild?r1=1.6&r2=1.7

Index: hugin-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hugin-9999.ebuild   20 Dec 2014 16:36:16 -0000      1.6
+++ hugin-9999.ebuild   28 Jul 2015 16:31:52 -0000      1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.6 
2014/12/20 16:36:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.7 
2015/07/28 16:31:52 maekke Exp $
 
 EAPI=5
 
@@ -19,32 +19,35 @@
 SLOT="0"
 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"
+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_})"
 
 CDEPEND="
        !!dev-util/cocom
-       app-arch/zip
-       dev-cpp/tclap
+       dev-db/sqlite:3
        >=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
+       media-libs/tiff:0
+       >=media-libs/vigra-1.9.0[openexr]
+       sci-libs/fftw:=
        sys-libs/zlib
-       virtual/jpeg
+       virtual/opengl
+       virtual/jpeg:0
+       virtual/opengl
        x11-libs/wxGTK:3.0=[X,opengl]
-       lapack? ( virtual/lapack )
+       lapack? ( virtual/blas virtual/lapack )
        sift? ( media-gfx/autopano-sift-C )"
 RDEPEND="${CDEPEND}
        media-libs/exiftool"
 DEPEND="${CDEPEND}
+       dev-cpp/tclap
        sys-devel/gettext
        virtual/pkgconfig
        python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
@@ -77,8 +80,7 @@
 
        for lang in ${LANGS} ; do
                case ${lang} in
-                       ca) dir=ca_ES;;
-                       cs) dir=cs_CZ;;
+                       ca@valencia) dir=ca_ES@valencia;;
                        *) dir=${lang};;
                esac
                use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}



1.1                  media-gfx/hugin/hugin-2015.0.0_rc3-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2015.0.0_rc3-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2015.0.0_rc3-r1.ebuild?rev=1.1&content-type=text/plain

Index: hugin-2015.0.0_rc3-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2015.0.0_rc3-r1.ebuild,v 1.1 
2015/07/28 16:31:52 maekke Exp $

EAPI=5

WX_GTK_VER="3.0"
PYTHON_COMPAT=( python{2_7,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="https://launchpad.net/${PN}/2015.0/2015.0rc3/+download/${P}.tar.bz2";

LICENSE="GPL-2 SIFT"
SLOT="0"
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_})"

CDEPEND="
        !!dev-util/cocom
        dev-db/sqlite:3
        >=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/libpano13-2.9.19_beta1:0=
        media-libs/libpng:0=
        media-libs/openexr:=
        media-libs/tiff:0
        >=media-libs/vigra-1.9.0[openexr]
        sci-libs/fftw:=
        sys-libs/zlib
        virtual/glu
        virtual/jpeg:0
        virtual/opengl
        x11-libs/wxGTK:3.0=[X,opengl]
        lapack? ( virtual/blas virtual/lapack )
        sift? ( media-gfx/autopano-sift-C )"
RDEPEND="${CDEPEND}
        media-libs/exiftool"
DEPEND="${CDEPEND}
        dev-cpp/tclap
        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)

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@valencia) dir=ca_ES@valencia;;
                        *) dir=${lang};;
                esac
                use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
        done
}



1.1                  media-gfx/hugin/hugin-2015.0.0_rc3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2015.0.0_rc3.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/hugin-2015.0.0_rc3.ebuild?rev=1.1&content-type=text/plain

Index: hugin-2015.0.0_rc3.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2015.0.0_rc3.ebuild,v 
1.1 2015/07/28 16:31:52 maekke Exp $

EAPI=5

WX_GTK_VER="2.8"
PYTHON_COMPAT=( python{2_7,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="https://launchpad.net/${PN}/2015.0/2015.0rc3/+download/${P}.tar.bz2";

LICENSE="GPL-2 SIFT"
SLOT="0"
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_})"

CDEPEND="
        !!dev-util/cocom
        dev-db/sqlite:3
        >=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/libpano13-2.9.19_beta1:0=
        media-libs/libpng:0=
        media-libs/openexr:=
        media-libs/tiff:0
        >=media-libs/vigra-1.9.0[openexr]
        sci-libs/fftw:=
        sys-libs/zlib
        virtual/glu
        virtual/jpeg:0
        virtual/opengl
        x11-libs/wxGTK:2.8=[X,opengl,-odbc]
        lapack? ( virtual/blas virtual/lapack )
        sift? ( media-gfx/autopano-sift-C )"
RDEPEND="${CDEPEND}
        media-libs/exiftool"
DEPEND="${CDEPEND}
        dev-cpp/tclap
        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)

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@valencia) dir=ca_ES@valencia;;
                        *) dir=${lang};;
                esac
                use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir}
        done
}




Reply via email to