From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-489328-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 9996D13800E
for <garchives@archives.gentoo.org>; Thu, 26 Jul 2012 20:17:58 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 032ABE0534;
Thu, 26 Jul 2012 20:17:50 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id B78EDE0534
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Jul 2012 20:17:50 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 097281B4132
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Jul 2012 20:17:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id B7962E5436
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Jul 2012 20:17:48 +0000 (UTC)
From: "Markus Meier" <maekke@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, "Markus Meier" <maekke@gentoo.org>
Message-ID: <1343248887.07eaff1032bbf40d21df6397372938ea7af25977.maekke@gentoo>
Subject: [gentoo-commits] dev/maekke:master commit in: media-gfx/hugin/files/, media-gfx/hugin/
X-VCS-Repository: dev/maekke
X-VCS-Files: media-gfx/hugin/ChangeLog media-gfx/hugin/Manifest media-gfx/hugin/files/hugin-2011.4.0-boost148.patch media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch media-gfx/hugin/hugin-2011.0.0.ebuild media-gfx/hugin/hugin-2011.2.0.ebuild media-gfx/hugin/hugin-2011.4.0-r1.ebuild media-gfx/hugin/hugin-2011.4.0.ebuild media-gfx/hugin/hugin-2011.4.0_beta1.ebuild media-gfx/hugin/hugin-2011.4.0_rc1.ebuild
X-VCS-Directories: media-gfx/hugin/files/ media-gfx/hugin/
X-VCS-Committer: maekke
X-VCS-Committer-Name: Markus Meier
X-VCS-Revision: 07eaff1032bbf40d21df6397372938ea7af25977
X-VCS-Branch: master
Date: Thu, 26 Jul 2012 20:17:48 +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: fdfc931b-3488-40f0-b8b0-5568b1868e8d
X-Archives-Hash: fd6450966d36c2b8bd6473e626d93c7d
commit: 07eaff1032bbf40d21df6397372938ea7af25977
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 20:41:27 2012 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 20:41:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=07eaff10
sync with main tree
---
media-gfx/hugin/ChangeLog | 22 +++++++++-
media-gfx/hugin/Manifest | 35 +++++++++++++---
.../hugin/files/hugin-2011.4.0-boost148.patch | 42 ++++++++++++++++++++
media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch | 42 ++++++++++++++++++++
media-gfx/hugin/hugin-2011.0.0.ebuild | 6 +-
media-gfx/hugin/hugin-2011.2.0.ebuild | 6 +-
...011.4.0_rc1.ebuild => hugin-2011.4.0-r1.ebuild} | 14 ++++--
...2011.4.0_beta1.ebuild => hugin-2011.4.0.ebuild} | 6 +-
8 files changed, 150 insertions(+), 23 deletions(-)
diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index 3ce0f62..f55752c 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,24 @@
# 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.119 2011/10/17 20:28:41 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.122 2012/06/30 21:36:05 dilfridge Exp $
+
+*hugin-2011.4.0-r1 (30 Jun 2012)
+
+ 30 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ +hugin-2011.4.0-r1.ebuild, +files/hugin-2011.4.0-boost148.patch,
+ +files/hugin-2011.4.0-gcc47.patch:
+ Add simple build fixes for gcc-4.7 and boost-1.48+ from upstream.
+ Unfortunately boost-1.48 has an ugly bug with gcc-4.7 itself (bug 424319)
+ which means we need boost-1.49.
+
+ 05 May 2012; Jeff Horelick <jdhore@gentoo.org> hugin-2011.0.0.ebuild,
+ hugin-2011.2.0.ebuild, hugin-2011.4.0.ebuild:
+ dev-util/pkgconfig -> virtual/pkgconfig
+
+*hugin-2011.4.0 (18 Dec 2011)
+
+ 18 Dec 2011; Markus Meier <maekke@gentoo.org> +hugin-2011.4.0.ebuild:
+ version bump
17 Oct 2011; Markus Meier <maekke@gentoo.org> -hugin-2010.2.0.ebuild:
old
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 817f671..ea6fa06 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,11 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
AUX hugin-2011.0.0_rc1-libpng15.patch 11844 RMD160 6e922615911c816011ec7bb2cda8d2867a296d3b SHA1 e655023c0c7c2f96b3f5cd2d73bfa464276abd9e SHA256 48c05955b94a34bd5b96e560ebbeb0cdbce04f47fddde793f91c3a0bb37559a6
+AUX hugin-2011.4.0-boost148.patch 1887 RMD160 82ae6c91c1050999a91d81e77a283541c5b19bc4 SHA1 c45dd3cd686400341fb16072d1c60477fb7d67ec SHA256 1ca8641b8bc93c0391cb9596c2d977f8dd9e3345282dc26dad50b4d43820b87d
+AUX hugin-2011.4.0-gcc47.patch 1243 RMD160 b5511d5e6612c002a25659f8092e96fe3e2a5a12 SHA1 165a118045334343a5effe320a66b3a1ee63c32a SHA256 ff1e2f55eb94e22546c3185cde458f51a503f91158456043018f09518652b49f
DIST hugin-2011.0.0.tar.bz2 11439430 RMD160 1388980580ecba70a0d47597ddf06df9b85ab2b5 SHA1 22e1ad3846291a9bbe58570683e213921a6f0116 SHA256 866273f6218d300a52c0148960681faa2c4e05383d97f868a2eb47b457b5f4fc
DIST hugin-2011.2.0.tar.bz2 11506840 RMD160 6bd526c651adb986d7b2f21959c8c390727a9563 SHA1 79dfdac229b4e58f50c893c1238bdd0921ad9da6 SHA256 bd9ef8d2f62c6dbcbadc2b9208cdcf6e4b6512760335c726b697bffd5e89b5be
-DIST hugin-2011.4beta1.tar.bz2 11725685 RMD160 c6af43d1d704fe5b7b1179768d89f1fca96c43ba SHA1 89f6ea1f10fae589357bb51581008d7e8e66ed82 SHA256 b020a9156b4126e87b3b92e14c8013423fd301a682ff38a005fe05beb2d60392
-DIST hugin-2011.4rc1.tar.bz2 11740410 RMD160 2c274a742a41a37892cd8ff897dfba3ebc68aecc SHA1 21ec7331d5e196aca2a8771d3c9101dd181ad93b SHA256 2e4b8eabdb243b24b2dd4a6af82a1a2a7451e2e749f84349f8cdfd8e9fa4ddae
-EBUILD hugin-2011.0.0.ebuild 1507 RMD160 13b606f5056afe2929a5402d2348230e11821f79 SHA1 aafd1a381c4c401c206d81873ae833ffd50e95e5 SHA256 dc53a08d61737945e510ab7b8acec63ded870918c8b586859d11f345477911c4
-EBUILD hugin-2011.2.0.ebuild 1613 RMD160 655a418370413aed003aa4d7ff9933cd0d4b8f1c SHA1 d235abdf58a4ba3723ba4ce5ac009a1b84c61b7b SHA256 e03859cbe9f73a1321392237d026d834a70d2dbfbdaa272bb8520d7650bf479c
-EBUILD hugin-2011.4.0_beta1.ebuild 1619 RMD160 06b34358b45f97cafa53423f58f604d45984239e SHA1 e56673a67662e638d9911ec6d6e1a1c286eb16eb SHA256 cf04ad3416b3c1a5d2891d69845cee01ef71640f94e25e90f9b0393db3369dc1
-EBUILD hugin-2011.4.0_rc1.ebuild 1619 RMD160 06b34358b45f97cafa53423f58f604d45984239e SHA1 e56673a67662e638d9911ec6d6e1a1c286eb16eb SHA256 cf04ad3416b3c1a5d2891d69845cee01ef71640f94e25e90f9b0393db3369dc1
-MISC ChangeLog 19131 RMD160 b874257ac283100c4472ad12f8889c355194797a SHA1 86b0e6b9380f89727af5d6b9330bc2e76875af2d SHA256 4f2b40fff7fa01a57b4aea9065a63ff742c570e0e7a02d03b2526b3064b1dc6b
+DIST hugin-2011.4.0.tar.bz2 11740410 RMD160 2c274a742a41a37892cd8ff897dfba3ebc68aecc SHA1 21ec7331d5e196aca2a8771d3c9101dd181ad93b SHA256 2e4b8eabdb243b24b2dd4a6af82a1a2a7451e2e749f84349f8cdfd8e9fa4ddae
+EBUILD hugin-2011.0.0.ebuild 1502 RMD160 114c2045373d2308cc49bd7364e99ccdfe5c6a03 SHA1 7a27c65bfcafefb8b3c840691565018c20c7e00b SHA256 c1fd7cc171286391d5153296294a7080d8ef39d8fe811d06f7d19212179730bf
+EBUILD hugin-2011.2.0.ebuild 1612 RMD160 4863168607e3ba62bee3577215d1e3f4d6006cd2 SHA1 45a7ff5079582dc8b7f67cd2b2d5dce32c651af5 SHA256 96753f2d1bb6f7922ffe8b53375e1b45e2f77042ea2619470e566a955b308774
+EBUILD hugin-2011.4.0-r1.ebuild 1685 RMD160 f36a8531f941378dde9da379516727bf70e00cda SHA1 749e9fc954951a9827838e72ada414aee081d618 SHA256 dd0e62f72a98f51382729f574f2b82d398f8b06e784d9fc75b95820d63a52c11
+EBUILD hugin-2011.4.0.ebuild 1618 RMD160 c5371216ed22194fc064d0b9e352ad1a2501ef62 SHA1 8005387facefaddd9897d728b356a7943380ed44 SHA256 ca4b46f9a14fcbbc484930dcea4ee99e918654a206e8d395d4828b40fc7b53e8
+MISC ChangeLog 19790 RMD160 58f3bbb5ed5eb3cfaacf2f92bd2cce72ec8942fc SHA1 fc722b50b0284910dd9d3a08e668c1e10de12266 SHA256 e30347759975383295692d30b111d5486c69d557c0bcbaf5cfc5e6963d5f48a3
MISC metadata.xml 389 RMD160 245f5d872a463181d63366d6c76a82c87d020fd7 SHA1 a26b77c69d62bedb9789e79b5ca35f28fa56981d SHA256 6f26cd9c2b64a96c1c86a8a468a261af4cf4dfaa86b4d7ddcfaee1ca98314803
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJP73GdAAoJENwGBM22xffeSAUP/1YrYMhhDM+AG0q7a+OrCfDU
+Xlp3Max6Rw/oSgCJ4jlyCSt8PutFZz4nALocMeEOPLDEpjmyKlMSMHPuSqnprdPm
+DJubJe5FmZE9VQvOsLRRLAVHIbRvQhLhWK6Hf9MLYNwhQdZ+uUEYfkexuD27V/V9
+6DFV4RaLfomzICCfmMh09mt7xLypI0MeC7cbHxnxqW8WukVor2P30r6ZCVkTlX9x
+ybofqJWys2KHmHVBErRWtg6+rAs6Ke3BAWcu/8dme7S0xOgNNYkdh1Njp1BJqmro
+arEOCgKXYV51tdlRie+Pw8yNRyJi6Ycc9kLv+weimkE7CHGgYbRZYxK+NuDov4Mx
+k9uSc6JnbEKL2uHaYeOIV45TP9YisjPmbGysBYDxMguMO3xw3B6w34IavA80BBMl
++bFKcm0+o9COuIHgWn1aQdGQ/homKPtxeRQbJLKCOJ7icvkTbEhd344YSXUqxrd4
+ahapgjldS9xtmVU22oN/Mj+q+3Bt/sCzWkTsHOLzR8sKd1TIHHt3kUP2XhKJkHVK
+5huzHekfXh8NgkAU8hf2KBcWZYmTD2I+wQCME8PwWz/1GgEKe7IhyAerabjeJdnu
+dGtilQK3/CTljUd++u8PEUAjK8me8Bk0W8RhyDD5BkHwcKQF2WN27Fu1NYeg9VRc
+6NkN4TaHp6kWHxRtk0ch
+=HxSG
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch b/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch
new file mode 100644
index 0000000..3c19cc7
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2011.4.0-boost148.patch
@@ -0,0 +1,42 @@
+
+# HG changeset patch
+# User tmodes
+# Date 1324625694 -3600
+# Node ID 7f0674a26bdb85fbcc73f64c8a38d1b353910af7
+# Parent b873e1da31f0fdc4cf19f9630450d1735a040fbe
+Add namespace to compile with Boost 1.48
+
+diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/ImageGraph.cpp
+--- a/src/hugin_base/algorithms/optimizer/ImageGraph.cpp Fri Dec 23 08:34:18 2011 +0100
++++ b/src/hugin_base/algorithms/optimizer/ImageGraph.cpp Fri Dec 23 08:34:54 2011 +0100
+@@ -55,7 +55,7 @@
+
+ CPGraphIndexMap index = get(boost::vertex_index, graph);
+ bool found=false;
+- for (tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph);
++ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(it->image1Nr, graph);
+ ai != ai_end; ++ai)
+ {
+ if (index[*ai] == it->image2Nr) found = true;
+@@ -83,7 +83,7 @@
+
+ CPGraphIndexMap index = get(boost::vertex_index, graph);
+ bool found=false;
+- for (tie(ai, ai_end) = adjacent_vertices(i, graph);
++ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(i, graph);
+ ai != ai_end; ++ai)
+ {
+ if (index[*ai] == j) found = true;
+diff -r b873e1da31f0 -r 7f0674a26bdb src/hugin_base/algorithms/optimizer/PTOptimizer.h
+--- a/src/hugin_base/algorithms/optimizer/PTOptimizer.h Fri Dec 23 08:34:18 2011 +0100
++++ b/src/hugin_base/algorithms/optimizer/PTOptimizer.h Fri Dec 23 08:34:54 2011 +0100
+@@ -233,7 +233,7 @@
+ // collect all optimized neighbours
+ typename boost::graph_traits<CPGraph>::adjacency_iterator ai;
+ typename boost::graph_traits<CPGraph>::adjacency_iterator ai_end;
+- for (tie(ai, ai_end) = adjacent_vertices(v, g);
++ for (boost::tuples::tie(ai, ai_end) = adjacent_vertices(v, g);
+ ai != ai_end; ++ai)
+ {
+ if (*ai != v) {
+
diff --git a/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch b/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch
new file mode 100644
index 0000000..9615ae4
--- /dev/null
+++ b/media-gfx/hugin/files/hugin-2011.4.0-gcc47.patch
@@ -0,0 +1,42 @@
+
+# HG changeset patch
+# User Bruno Postle <bruno@postle.net>
+# Date 1328910737 0
+# Node ID c7ecd541dbd78bfa95dd495c7c4317bba81f4c3b
+# Parent 658ded2153f2773a7e193f48d612d95104495080
+Fixes for gcc-4.7.0
+
+diff -r 658ded2153f2 -r c7ecd541dbd7 src/celeste/Utilities.h
+--- a/src/celeste/Utilities.h Sun Jan 01 13:23:39 2012 +0100
++++ b/src/celeste/Utilities.h Fri Feb 10 21:52:17 2012 +0000
+@@ -33,6 +33,8 @@
+ #include <stdio.h>
+ #ifdef _WINDOWS
+ #include "direct.h"
++#else
++#include <unistd.h>
+ #endif
+
+ using namespace std;
+diff -r 658ded2153f2 -r c7ecd541dbd7 src/foreign/zthread/include/zthread/Guard.h
+--- a/src/foreign/zthread/include/zthread/Guard.h Sun Jan 01 13:23:39 2012 +0100
++++ b/src/foreign/zthread/include/zthread/Guard.h Fri Feb 10 21:52:17 2012 +0000
+@@ -428,7 +428,7 @@
+ template <class U, class V>
+ Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
+
+- LockingPolicy::shareScope(*this, extract(g));
++ LockingPolicy::shareScope(*this, this->extract(g));
+
+ }
+
+@@ -458,7 +458,7 @@
+ template <class U, class V>
+ Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
+
+- LockingPolicy::transferScope(*this, extract(g));
++ LockingPolicy::transferScope(*this, this->extract(g));
+
+ }
+
+
diff --git a/media-gfx/hugin/hugin-2011.0.0.ebuild b/media-gfx/hugin/hugin-2011.0.0.ebuild
index f609973..4162ccf 100644
--- a/media-gfx/hugin/hugin-2011.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2011.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.5 2011/10/17 19:00:41 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.0.0.ebuild,v 1.6 2012/05/05 07:00:18 jdhore Exp $
EAPI=4
WX_GTK_VER="2.8"
@@ -36,7 +36,7 @@ CDEPEND="
RDEPEND="${CDEPEND}
media-libs/exiftool"
DEPEND="${CDEPEND}
- dev-util/pkgconfig"
+ virtual/pkgconfig"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
diff --git a/media-gfx/hugin/hugin-2011.2.0.ebuild b/media-gfx/hugin/hugin-2011.2.0.ebuild
index b20134d..b95d6d4 100644
--- a/media-gfx/hugin/hugin-2011.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2011.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.1 2011/10/02 21:33:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.2 2012/05/05 07:00:18 jdhore Exp $
EAPI=3
WX_GTK_VER="2.8"
@@ -39,7 +39,7 @@ CDEPEND="
RDEPEND="${CDEPEND}
media-libs/exiftool"
DEPEND="${CDEPEND}
- dev-util/pkgconfig
+ virtual/pkgconfig
python? ( >=dev-lang/swig-2.0.4 )"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
diff --git a/media-gfx/hugin/hugin-2011.4.0_rc1.ebuild b/media-gfx/hugin/hugin-2011.4.0-r1.ebuild
similarity index 81%
rename from media-gfx/hugin/hugin-2011.4.0_rc1.ebuild
rename to media-gfx/hugin/hugin-2011.4.0-r1.ebuild
index bfcc4c3..4ba8629 100644
--- a/media-gfx/hugin/hugin-2011.4.0_rc1.ebuild
+++ b/media-gfx/hugin/hugin-2011.4.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.1 2011/10/02 21:33:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.4.0-r1.ebuild,v 1.1 2012/06/30 21:36:05 dilfridge Exp $
EAPI=3
WX_GTK_VER="2.8"
PYTHON_DEPEND="python? 2:2.6 3"
-inherit python wxwidgets versionator cmake-utils
+inherit base python wxwidgets versionator cmake-utils
DESCRIPTION="GUI for the creation & processing of panoramic images"
HOMEPAGE="http://hugin.sf.net"
@@ -22,7 +22,7 @@ CDEPEND="
!!dev-util/cocom
app-arch/zip
dev-cpp/tclap
- >=dev-libs/boost-1.35.0-r5
+ >=dev-libs/boost-1.49.0-r1
dev-libs/zthread
>=media-gfx/enblend-4.0
media-gfx/exiv2
@@ -39,11 +39,15 @@ CDEPEND="
RDEPEND="${CDEPEND}
media-libs/exiftool"
DEPEND="${CDEPEND}
- dev-util/pkgconfig
+ virtual/pkgconfig
python? ( >=dev-lang/swig-2.0.4 )"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+PATCHES=(
+ "${FILESDIR}/${P}"-{boost148,gcc47}.patch
+)
+
pkg_setup() {
DOCS="authors.txt README TODO"
mycmakeargs=(
diff --git a/media-gfx/hugin/hugin-2011.4.0_beta1.ebuild b/media-gfx/hugin/hugin-2011.4.0.ebuild
similarity index 89%
rename from media-gfx/hugin/hugin-2011.4.0_beta1.ebuild
rename to media-gfx/hugin/hugin-2011.4.0.ebuild
index bfcc4c3..aa5f29e 100644
--- a/media-gfx/hugin/hugin-2011.4.0_beta1.ebuild
+++ b/media-gfx/hugin/hugin-2011.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.2.0.ebuild,v 1.1 2011/10/02 21:33:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2011.4.0.ebuild,v 1.2 2012/05/05 07:00:18 jdhore Exp $
EAPI=3
WX_GTK_VER="2.8"
@@ -39,7 +39,7 @@ CDEPEND="
RDEPEND="${CDEPEND}
media-libs/exiftool"
DEPEND="${CDEPEND}
- dev-util/pkgconfig
+ virtual/pkgconfig
python? ( >=dev-lang/swig-2.0.4 )"
S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)