From 2faa6f14b1d26bab13257f08cbe5a519df279e40 Mon Sep 17 00:00:00 2001 From: Markus Meier Date: Sun, 2 Oct 2011 21:33:48 +0000 Subject: [PATCH] version bump, remove old Package-Manager: portage-2.1.10.20/cvs/Linux i686 --- media-gfx/hugin/ChangeLog | 9 ++- media-gfx/hugin/Manifest | 17 +++--- .../files/hugin-2010.0.0_rc1-libpng14.patch | 15 ----- media-gfx/hugin/hugin-2010.0.0.ebuild | 61 ------------------- ...-2010.4.0.ebuild => hugin-2011.2.0.ebuild} | 30 ++++----- 5 files changed, 31 insertions(+), 101 deletions(-) delete mode 100644 media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch delete mode 100644 media-gfx/hugin/hugin-2010.0.0.ebuild rename media-gfx/hugin/{hugin-2010.4.0.ebuild => hugin-2011.2.0.ebuild} (62%) diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog index 0a322ea505b8..a375f5745e29 100644 --- a/media-gfx/hugin/ChangeLog +++ b/media-gfx/hugin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/hugin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.116 2011/09/14 18:54:43 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.117 2011/10/02 21:33:47 maekke Exp $ + +*hugin-2011.2.0 (02 Oct 2011) + + 02 Oct 2011; Markus Meier -hugin-2010.0.0.ebuild, + -files/hugin-2010.0.0_rc1-libpng14.patch, -hugin-2010.4.0.ebuild, + +hugin-2011.2.0.ebuild: + version bump, remove old 15 Sep 2011; Andreas Schuerch hugin-2011.0.0.ebuild: x86 stable, Thanks JD, bug 379089 diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index c7132e368c81..8d6b4faafe76 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,22 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX hugin-2010.0.0_rc1-libpng14.patch 722 RMD160 83a65c1c8931490c339b87d8302495180750c17f SHA1 0396e246c4ec90aa21a7a0076836d8ebb4d052ed SHA256 2cd425ff1c6036e13b33b83d2772f7c4282fbfb8872c4402efb4e074318d295a AUX hugin-2011.0.0_rc1-libpng15.patch 11844 RMD160 6e922615911c816011ec7bb2cda8d2867a296d3b SHA1 e655023c0c7c2f96b3f5cd2d73bfa464276abd9e SHA256 48c05955b94a34bd5b96e560ebbeb0cdbce04f47fddde793f91c3a0bb37559a6 -DIST hugin-2010.0.0.tar.gz 12085453 RMD160 e2b03fe00a4a0242a1f3c4fd641cf8a3e312d516 SHA1 41eb7253aab12b913a5c9b6d9975d8652390dcb5 SHA256 ed30c5021709b8970a43f1e4c2295b5c899bc0fb87ffb63135a3c0ecde3bb523 DIST hugin-2010.2.0.tar.gz 12412050 RMD160 c39d279bf95cdf5686e5994030bb4eb61ba285aa SHA1 f0676f28cd3fbebcf4086f55af7cf09566772899 SHA256 70fd1d5ffa017b3eb14e0760cd70185aab641aa343d129f9590826b01d5df2e2 -DIST hugin-2010.4.0.tar.bz2 11009978 RMD160 f97b8d37470443eb81c3e915e5f5efa91227b135 SHA1 47f25c0a8b97c27108e567bcd22203c87f268d07 SHA256 d45cc65df6b424ef5bf1c5d2cd99a360ecfda46688782c75f36dd5341cb9c38e DIST hugin-2011.0.0.tar.bz2 11439430 RMD160 1388980580ecba70a0d47597ddf06df9b85ab2b5 SHA1 22e1ad3846291a9bbe58570683e213921a6f0116 SHA256 866273f6218d300a52c0148960681faa2c4e05383d97f868a2eb47b457b5f4fc -EBUILD hugin-2010.0.0.ebuild 1497 RMD160 d6eb0b943c827c1e15481dda7ec200f17a657b54 SHA1 ad98c63c71a685b416295e7fe305eafac6b86a64 SHA256 9726e127e191065da8da53c58e979baccdf1df6902202d2abf6cfce2c8773077 +DIST hugin-2011.2.0.tar.bz2 11506840 RMD160 6bd526c651adb986d7b2f21959c8c390727a9563 SHA1 79dfdac229b4e58f50c893c1238bdd0921ad9da6 SHA256 bd9ef8d2f62c6dbcbadc2b9208cdcf6e4b6512760335c726b697bffd5e89b5be EBUILD hugin-2010.2.0.ebuild 1455 RMD160 97fc580fad0db0e9e42c9f540fa663a0e7522ec7 SHA1 f8b6db7cc1e1883c37e4c196acc2bd06dfe8da36 SHA256 495302c92a8e86cffaf0c7ad14f0e7005d349d22910dc44f5c79a59251a917ce -EBUILD hugin-2010.4.0.ebuild 1621 RMD160 bf69636ab52c4cb43741dbfa58dd35e6ae4310c5 SHA1 b58ad517685ddeebdf2a050ceda09f03e000de0a SHA256 349d713053bdb5fc93592d18b7fe7655d7a395b5487dff50b9361ec5b1492360 EBUILD hugin-2011.0.0.ebuild 1507 RMD160 4469d9b547816d8c46d401b8b79f01aa6afa7cd3 SHA1 d5cc55fcc90c0fbdf6ca016625aa44b8fc4cbce1 SHA256 96fc5b8a0dce3179569f40a2436423aaa2fcd884ab977821a66d5da1acc7d589 -MISC ChangeLog 18727 RMD160 ea424a2f7ffd5b2bfa9e6a512499037786f0b111 SHA1 aa6f15a01fd19be1a72ffb23a94aeb0abee6b856 SHA256 f5b412cb2c99102198135c4e2edd97d8e53dba708c85d38c8ad9052a9d136042 +EBUILD hugin-2011.2.0.ebuild 1613 RMD160 655a418370413aed003aa4d7ff9933cd0d4b8f1c SHA1 d235abdf58a4ba3723ba4ce5ac009a1b84c61b7b SHA256 e03859cbe9f73a1321392237d026d834a70d2dbfbdaa272bb8520d7650bf479c +MISC ChangeLog 18949 RMD160 f85ba60a12686e14afab380509a79ef67ebf8e13 SHA1 268045fba9aaf3929d7af3692aa0bba32b7639ab SHA256 4c80eb211938794b6551efcc7b8cbd4850564356ab6ca422e7f791a71022854f MISC metadata.xml 389 RMD160 245f5d872a463181d63366d6c76a82c87d020fd7 SHA1 a26b77c69d62bedb9789e79b5ca35f28fa56981d SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5xaKQACgkQB6aLYPQCwOBJvACfYjZZENKAkdgPhqhUoCX0fECo -GCAAoLO0EMSmPh8/vwB4TyWWNZY+lmTP -=xz+a +iEYEARECAAYFAk6I2UgACgkQkKaRLQcq0GIEMQCcCGFUXufPTAvbb8fkwVwGwYXi +vc4An2VFmWLTHq4SaXXDxXZEl28busPq +=e3RB -----END PGP SIGNATURE----- diff --git a/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch b/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch deleted file mode 100644 index fdc026368c4d..000000000000 --- a/media-gfx/hugin/files/hugin-2010.0.0_rc1-libpng14.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://repos.archlinux.org/wsvn/packages/hugin/trunk/libpng14.patch - ---- src/foreign/vigra/vigra_impex/png.cxx -+++ src/foreign/vigra/vigra_impex/png.cxx -@@ -271,8 +271,8 @@ - // expand gray values to at least one byte size - if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { - if (setjmp(png->jmpbuf)) -- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); -- png_set_gray_1_2_4_to_8(png); -+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); -+ png_set_expand_gray_1_2_4_to_8(png); - bit_depth = 8; - } - diff --git a/media-gfx/hugin/hugin-2010.0.0.ebuild b/media-gfx/hugin/hugin-2010.0.0.ebuild deleted file mode 100644 index 904aee6f7519..000000000000 --- a/media-gfx/hugin/hugin-2010.0.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.0.0.ebuild,v 1.9 2011/07/05 19:41:43 maekke Exp $ - -EAPI=2 -WX_GTK_VER="2.8" - -inherit 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.gz" -LICENSE="GPL-2 SIFT" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW" -IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})" - -CDEPEND=" - !!dev-util/cocom - app-arch/zip - >=dev-libs/boost-1.35.0-r5 - >=media-gfx/enblend-3.0_p20080807 - media-gfx/exiv2 - media-libs/freeglut - >=media-libs/libpano13-2.9.14 - media-libs/libpng - media-libs/openexr - media-libs/tiff - sys-libs/zlib - virtual/jpeg - x11-libs/wxGTK:2.8[X,opengl,-odbc] - lapack? ( virtual/lapack ) - sift? ( media-gfx/autopano-sift-C )" -RDEPEND="${CDEPEND} - media-libs/exiftool" -DEPEND="${CDEPEND} - dev-util/pkgconfig" - -S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) - -PATCHES=( "${FILESDIR}/${P}_rc1-libpng14.patch" ) - -pkg_setup() { - DOCS="AUTHORS README TODO" - mycmakeargs="$(cmake-utils_use_enable lapack)" -} - -src_install() { - cmake-utils_src_install - - 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 -} diff --git a/media-gfx/hugin/hugin-2010.4.0.ebuild b/media-gfx/hugin/hugin-2011.2.0.ebuild similarity index 62% rename from media-gfx/hugin/hugin-2010.4.0.ebuild rename to media-gfx/hugin/hugin-2011.2.0.ebuild index b7d2c951e49a..b20134d76074 100644 --- a/media-gfx/hugin/hugin-2010.4.0.ebuild +++ b/media-gfx/hugin/hugin-2011.2.0.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2010.4.0.ebuild,v 1.3 2011/07/05 19:41:43 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.1 2011/10/02 21:33:47 maekke Exp $ -EAPI=2 +EAPI=3 WX_GTK_VER="2.8" +PYTHON_DEPEND="python? 2:2.6 3" -inherit wxwidgets versionator cmake-utils +inherit python wxwidgets versionator cmake-utils DESCRIPTION="GUI for the creation & processing of panoramic images" HOMEPAGE="http://hugin.sf.net" @@ -14,17 +15,19 @@ LICENSE="GPL-2 SIFT" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -LANGS=" bg ca cs de en_GB es fi fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW" -IUSE="lapack sift $(echo ${LANGS//\ /\ linguas_})" +LANGS=" bg ca cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ro ru sk sl sv uk zh_CN zh_TW" +IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})" CDEPEND=" !!dev-util/cocom app-arch/zip + dev-cpp/tclap >=dev-libs/boost-1.35.0-r5 - >=media-gfx/enblend-3.0_p20080807 + dev-libs/zthread + >=media-gfx/enblend-4.0 media-gfx/exiv2 media-libs/freeglut - >=media-libs/libpano13-2.9.17 + >=media-libs/libpano13-2.9.18 media-libs/libpng media-libs/openexr media-libs/tiff @@ -36,13 +39,17 @@ CDEPEND=" RDEPEND="${CDEPEND} media-libs/exiftool" DEPEND="${CDEPEND} - dev-util/pkgconfig" + dev-util/pkgconfig + python? ( >=dev-lang/swig-2.0.4 )" S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) pkg_setup() { DOCS="authors.txt README TODO" - mycmakeargs=( $(cmake-utils_use_enable lapack LAPACK) ) + mycmakeargs=( + $(cmake-utils_use_enable lapack LAPACK) + $(cmake-utils_use_build python HSI) + ) } src_install() { @@ -57,8 +64,3 @@ src_install() { use linguas_${lang} || rm -r "${D}"/usr/share/locale/${dir} done } - -pkg_postinst() { - elog "Please note that the sift USE-flag has been disabled by default" - elog "as hugin ships its own control point generator with 2010.4" -} -- 2.26.2