commit: 4d853addf087de543950ddca6be326a48315df7e
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 11 18:58:23 2014 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct 11 18:58:23 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=4d853add
sync 2014 and live ebuilds
Package-Manager: portage-2.2.14_rc1
Manifest-Sign-Key: 072AD062
---
media-gfx/hugin/Manifest | 10 +++++-----
media-gfx/hugin/hugin-2014.0.0.ebuild | 2 +-
media-gfx/hugin/hugin-9999.ebuild | 11 ++++++-----
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index 5514e9d..a9d4dad 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -12,13 +12,13 @@ DIST hugin-2013.0.0.tar.bz2 11247583 SHA256
484e1ed58fa6fe4bae1f423967101549345b
DIST hugin-2014.0.0.tar.bz2 10974274 SHA256
f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29 SHA512
f4dd7a59f96d4574d420691d221265309d1ff18b7df04df2c2f0946f3d669e78823e2a53f038ac7bddaaf2037e21c45bf54f19d2a90ce9d5d95a836331e34ca5
WHIRLPOOL
e8915454fcc5d54037289b0e91b8c441288706874891b72541414cad83556f6587d15d18be38405917da6c69b590121bc74a2ffa130bb9f1abea223c6fb1375d
EBUILD hugin-2012.0.0.ebuild 1648 SHA256
b49e5866a8ff84c4f5ff4781faa30d94d7fe945b29a217e663c66bc02b7cced6 SHA512
ff7bd929200b93a13dced894633370a5e1abe11d58e78d2001e71832342fe10478bd9c7d9c35da252b8520fd845d960fca1823e053e5afc72d2519ca7b1bc730
WHIRLPOOL
106f4eeed3afa6c4d4ee7c181ce8a2989e88e61511401105d36bc67544901598f31b882d0547e31db89fe5daeb249e435223ddb9985bc274b7c73864daba9421
EBUILD hugin-2013.0.0-r1.ebuild 2035 SHA256
5b5e04d44ce36f657c2b9743f93ed34a272ebb8f282c1863f68c9dcf0d18dac1 SHA512
c4b4c22b4c24678000f0659c83193e590072bf3fcb9b507a0e74e1ef7fcaf628facd12a7e74e9d1bc014bc924daa217cad001bae8f4985ff5faf163f75409139
WHIRLPOOL
d5f274f9ea86ac5e0679b2dfc2ffc5ce0cd74fdd32191308aaabdeb159c9a2fc1973677c359b765c493236c0231cf1490ac173282c33b2d74e6459759da40dba
-EBUILD hugin-2014.0.0.ebuild 2069 SHA256
60d14d60f7daa4101d47a04263e5c97aacf0d9799d388b26791a7801823797b0 SHA512
0cf29b45dfc3ea8a5acb1672e88aef8ae98fd82d2b601535a738f9c3a86405393d672347e8471c2afa59eeaef84bce5db719e8088dab6c6e0c394dde6e09776c
WHIRLPOOL
72d2ea2123b975f09244b2bf45fc662e5fb1057a59375b9d01c4da69b6ca97a79b1f0568a5a17eb92ad576263521d75bbf2cf3fa54465963f208194be7eede94
-EBUILD hugin-9999.ebuild 1998 SHA256
f5ef9355806eaed940e3a820cab87c55d99016a67ee1fdfeaf8b6ce969ca5a31 SHA512
e633c703e88d6c5e96e8f602d088d906f3c7c58a13d5672853eca3382133bafc31b03204ed5f78191ee8ece6ad44bb9f8d128c874edf715e7e0b493d1ec16d6f
WHIRLPOOL
6258802424c0b048428966609472085f89b94722ef5ac6d6f4622bc20b30595db5d9b780f973e36913d2c3167acd13c0ee8f3ecc4902f9509520748928179d27
+EBUILD hugin-2014.0.0.ebuild 2069 SHA256
411a78e9073329a7a493ad87c4f2e30ec2b8420114e2855df1079bf033f3a59e SHA512
845e985fd713a91830af1cb6b3d626dbc4beafebb40598fd04462f329304fe475b8398076c37f7527604d900fa1f3f39449792d01c02496d8c87690fcaecd690
WHIRLPOOL
11c9378c606d2017c3325243b8053d526c7c9eee149dd8fd92dab3036edfc6f822d4c7d3aef99c3d6f94a4dd00fe80e6b256cf41ef6d2ab339c40a44577d5cf7
+EBUILD hugin-9999.ebuild 2040 SHA256
3b6408fd20b1f57b0f22653f670c81ee01ae085a54c10cf77cd16d9d27d6ab88 SHA512
130b705faeac85d7db7f67c5ae5a2e0f5faad8d14a9f6d45f8943c6df75793253a0484266aade11f529e070c24c0cf7b3f4c786ff4ccc3ae88b5212f7fbd34e0
WHIRLPOOL
dc5bf9bc83614e0636c3e2479f7d346eaab1fbc6648aeffb0b615397e4eb0fabb44453f8a7c52093819483041b7a0a981e65fd8afe74355f37998a41abb8aa38
MISC metadata.xml 395 SHA256
1e88681d08863b52f3ae17f149901c3d84b6c6197913f7538d17572b33adbf9b SHA512
52848e953af2d3a398f9309a8af40261df0bb78365a3065f805ad06fbc40bea2a44b23ca70aa898b7dbb39a1c2e1309f036762de81d66824bdea09f767039a21
WHIRLPOOL
dbdfadbbd20f6acd3961b786bb7bc5e57fd8fd954373cf4a645a008ddaf9273406072cc5ab1497ca1bdefbb77834996d8210c4d9f8cf1a716a7a788b29431684
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlQ5fLEACgkQkKaRLQcq0GK1DwCZAWDvGAKCMzucNL8UHI1P+9XE
-u+YAoJnrdQc9t2M/TUVcCuFa8NKUUDCc
-=tJLn
+iEYEAREIAAYFAlQ5fc8ACgkQkKaRLQcq0GJQSACgslF9ujXHjpEQ6pQaqRJL5KyO
+6zQAn1Z7anZLqckiv+51ub8VTZpWZr8V
+=eh+z
-----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/hugin-2014.0.0.ebuild
b/media-gfx/hugin/hugin-2014.0.0.ebuild
index 34f84f0..904813c 100644
--- a/media-gfx/hugin/hugin-2014.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2014.0.0.ebuild
@@ -18,7 +18,7 @@ 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="lapack python sift debug $(echo ${LANGS//\ /\ linguas_})"
+IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
CDEPEND="
!!dev-util/cocom
diff --git a/media-gfx/hugin/hugin-9999.ebuild
b/media-gfx/hugin/hugin-9999.ebuild
index 2a35474..9e8b68e 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -4,7 +4,7 @@
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 mercurial python-single-r1 wxwidgets versionator cmake-utils
@@ -19,7 +19,7 @@ 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"
-IUSE="lapack python sift $(echo ${LANGS//\ /\ linguas_})"
+IUSE="debug lapack python sift $(echo ${LANGS//\ /\ linguas_})"
CDEPEND="
!!dev-util/cocom
@@ -36,7 +36,6 @@ CDEPEND="
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]
@@ -45,6 +44,7 @@ CDEPEND="
RDEPEND="${CDEPEND}
media-libs/exiftool"
DEPEND="${CDEPEND}
+ sys-devel/gettext
virtual/pkgconfig
python? ( ${PYTHON_DEPS} >=dev-lang/swig-2.0.4 )"
@@ -58,7 +58,7 @@ pkg_setup() {
$(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 +66,13 @@ src_prepare() {
-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
