media-gfx/hugin: Add sci-libs/flann to unbundle it

Package-Manager: portage-2.2.7/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 30 insertions, 21 deletions

diff --git a/media-gfx/hugin/ChangeLog b/media-gfx/hugin/ChangeLog
index 295fb08f23f2..dbe569da4cbc 100644
--- a/media-gfx/hugin/ChangeLog
+++ b/media-gfx/hugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/hugin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.135 2013/11/24 16:42:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.136 2013/11/24 17:03:45 jlec Exp $
+
+  24 Nov 2013; Justin Lecher <jlec@gentoo.org> hugin-2012.0.0-r1.ebuild,
+  hugin-2013.0.0.ebuild, hugin-9999.ebuild:
+  Add sci-libs/flann to unbundle it
 
 *hugin-9999 (24 Nov 2013)
 *hugin-2012.0.0-r1 (24 Nov 2013)
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index fca18b2600ce..60a13ebb874e 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -8,26 +8,26 @@ AUX hugin-2012.0.0-perl.patch 272 SHA256 2e21c6cbffe4d06a9a97787f22fbe6e6eff6130
 AUX hugin-2013.0.0-boost.patch 1690 SHA256 4a4e507546d344811f16390dcfc90f42d70807bc3ace8e7b1df3ceb9dea7cc30 SHA512 280d3555dc3774ccead2a962a8efd3a3942da296d6565185b9f84e79f03b9a6398e103357b80496b121fa07822fd1cfb9b580ef0c4da8fbaf6ddd7665d135cd7 WHIRLPOOL 60770064bb4fb292a4a12308ee4a004b6b114ada751cd713a2df061dc7670e0b0c7f39c50d3f6510f037a9e987a69f9e4aef645d6d9674dfc0306d4e155982fa
 DIST hugin-2012.0.0.tar.bz2 11658665 SHA256 63dfd88ac90d3af4b958111db951bb7fbf2c66ad6b0246e6305403eb5de971b3 SHA512 acf97d383091eca300074a8e207ec5500a8b96a5116708a6ff23fb8f5359a77016867ee2ae21a4e40c4d07d056b5c27844c03c275ec29c0b604ecb31b73ee0a8 WHIRLPOOL d058639202aef1f6beb475bc8c170ac4269bf5050bfcbc48678ddde67188e12eb29c216b6ce8f79571c91ff43e271dac706bd4f432d3f640d549f87b371caa43
 DIST hugin-2013.0.0.tar.bz2 11247583 SHA256 484e1ed58fa6fe4bae1f423967101549345bcca2653b992afbc0ed9ec0dbebd5 SHA512 dea1682c16991441278a881e5e0916ffdbe8e0012f0dcf45875ee97fe7dc698d4d98037916e63c9a651557adc45c89e4e350ad976fec020562bc17a31f608a86 WHIRLPOOL c3d8e175ff23c8761815406039a8027da327925f07a18b00bde4d457228a2562f30f5df3fb5dff17f8003f985d7b51ec39d557a064c7e228b09ff73473c41e6a
-EBUILD hugin-2012.0.0-r1.ebuild 2033 SHA256 223f3ce1c9b3113800d108db937a161e123ce29990fc0023ab10f05422a684f0 SHA512 7703fcd492add7bf8f42059627298a485d641852970cd87c3c81d2edf2b3219c845c10bb27f9f9b3b7a229091d562c8020fff227764cee1829a0fd74a048a2bc WHIRLPOOL 501791acf8cfe7c856fada6e8e251c3ffe6db7fe9e1d6c84512d55e53490c4b2b6748618227b3d21915e1609d4da3abd8240f1873a2c472334150569b02e613f
+EBUILD hugin-2012.0.0-r1.ebuild 2049 SHA256 cb39a7d878649efd2618760838198673f88f840aea76d7d30ccb3bf72f43d64c SHA512 05cac95f7ac060384d771478cce5a99cf000c8d6f07eb28667e2270cf1066a03f860b390d148916dc8eaab482d5f2d2852525ed74a601a063fd649a7092b63a5 WHIRLPOOL 3feb25b14ff281dd8130564f96207e864dcbe0ff7dfafef7007c1b2955b76f8bea447976c3e546587b11f07ec549aa51322cada2d3b5b9c06995857f95826ba1
 EBUILD hugin-2012.0.0.ebuild 1648 SHA256 b49e5866a8ff84c4f5ff4781faa30d94d7fe945b29a217e663c66bc02b7cced6 SHA512 ff7bd929200b93a13dced894633370a5e1abe11d58e78d2001e71832342fe10478bd9c7d9c35da252b8520fd845d960fca1823e053e5afc72d2519ca7b1bc730 WHIRLPOOL 106f4eeed3afa6c4d4ee7c181ce8a2989e88e61511401105d36bc67544901598f31b882d0547e31db89fe5daeb249e435223ddb9985bc274b7c73864daba9421
-EBUILD hugin-2013.0.0.ebuild 2008 SHA256 e092dc461e311d80975a4da2c6265d6f7f069b4e34a5714f06e671cde02d6c5f SHA512 966f11dcf35febea1b2b764e2b993b84ac5420adcacf8a2d460e229d1a38ea512b37a897f8c39d9c3f1b794e42ac1eb10777e779d8c6003c534c9ee426d63ce3 WHIRLPOOL 6b913a808e03f20a2b1a9faa1b28a204162461893b6f4db2693171023f51f3485f06f0b12c5410253ab97fe42c8770f1cb0e75f09a39b08a8f2117a07b3d24ab
-EBUILD hugin-9999.ebuild 1986 SHA256 f2fc22e26a99b4122d82208446054777f38f91921ca51f82c7d1b6b21c8cf346 SHA512 ee9a2a11f05c711f7510a24ca441c49e144cc6c2cb9091827013832e1a79fa2a30e77ebb31b809ec4485454bbef56c9b58b90e22f87bbd104f6c44566c247fa5 WHIRLPOOL 2c47aaf056cf225c5f71b44355dd94513ffb8b3f94e8d0ee3935454ee4517204d1b6d46214bec0c380633f377743e0c64c3b32046a7b979e26e24b0901b9b890
-MISC ChangeLog 21974 SHA256 bb11b0807cc821a219e92ac4efa8e64519505e17f956ea54c80d140ec8ff09c4 SHA512 496fb696e3189ba1ac28fa3412a9b4c629355400bef2856c5ad773adee9ec65afc316c1835319e0006dc504c75637d88419e5df11edb6861b4b65e9196051b86 WHIRLPOOL 0f12b61a4049f8f053d3d09536218719a64d2163cb9e8647fb72abbc85b87ca3acddf92cdde095683d45852d06382a9bd98328d1a54a4484fa153cb4ed57bea5
+EBUILD hugin-2013.0.0.ebuild 2026 SHA256 d1b41c691a5cc06eee67c00a40a2f1f536044b127b62c7b70f79ca84acbedd64 SHA512 c5d381d87bc59ecc82e6f33318cbb966c177de1c9f6283536b10dd262d7003ec98f9be0cf70b18902f8d39b13f089c1b8ef27b97949c14ef1d01cd73ca62dd1b WHIRLPOOL 16d0b137d8b30e1122518bef8dbb1dad497bb322a4747f7f663f99dcaaada23efd5b40f70e9780331957df620ce44d580a1190e4cf896c8901cddd6325fae3a6
+EBUILD hugin-9999.ebuild 2002 SHA256 9f67d136b21e369889a128fb41b074f79a15a87b57b4786b8153a5860a1da61d SHA512 d8a3d0d0231e80f47e0cbe5e6fb9ba58b47bf72541572356ca17630963413b9c0e8c7f3eadaeed4a8ed3c99cee0a488d87b058064ddb1e3d0bdf74ec0b2fcf13 WHIRLPOOL 832a73fde63672b702884abf39fcf1b3086bdb9f7b95d2da87b39589ac5cb0d8331083fa0f70e5e609d31c0a7b9d7aa6e742fcd646a8934d35c42acbd8099dca
+MISC ChangeLog 22128 SHA256 f74c9c94afa9a10d5d75b63040357d23e8b2d2e8a0143e6c5533bb12dd9724e6 SHA512 cf4f79106436d69ee42b3b54632e7cb8b04640199d2a248e234f33f6edead7d583f8dc1376535bb961cf941495dc42733d08adc9ba2e7b4d0b99a9a4ec4af587 WHIRLPOOL 2cccd1e006bb2bd6ccaa4637beda5ea6a81aad7a884b6d5bc18e1d81a8da3683ea95db856f57dd5f7c3761d0a33e735abf23a2862d2cba95c3fc7974b03cc882
 MISC metadata.xml 395 SHA256 1e88681d08863b52f3ae17f149901c3d84b6c6197913f7538d17572b33adbf9b SHA512 52848e953af2d3a398f9309a8af40261df0bb78365a3065f805ad06fbc40bea2a44b23ca70aa898b7dbb39a1c2e1309f036762de81d66824bdea09f767039a21 WHIRLPOOL dbdfadbbd20f6acd3961b786bb7bc5e57fd8fd954373cf4a645a008ddaf9273406072cc5ab1497ca1bdefbb77834996d8210c4d9f8cf1a716a7a788b29431684
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSkix5AAoJELnU8jG9FVir+vQP/j3S8Rad2Ka4tXnWSBeoWNkp
-B4g3fo0gQC90fe2gr1ZHA1EfrNJtV1YZyevhtU4ToNDt70pDaT1qYYrKJOBXQ6nf
-18HxMH8GcC3H16KiYe0qEuFFxRhyw+CZHkaa8uOh93hflQ6p++326/utmyZtATW2
-k0hN/iySVDtaavMfsihLG/vgFaPu/exfh9dD6N+//u95eisP158E+vzOUxtAS7iZ
-Z6eFX7ZXm3KOxLbjrY9zS5zsZplqcJyMXnyl4n3CfnzTG3X/ob0p+v0iYIuTxfqN
-hxajVyvsnwz9/+hcYkKvizzCznNpXDIWQn/R6/pPEeNZWaA1/rOAd8Q2RLmw6bGo
-taA/bWJqCAUw2lv4q6L+l6/AKJGVjpxsLrFIW5AaKCyc5yWvBYO+AkvXnj5ZOg/d
-rYier5yroN1OjUHVlkAT17EtmCVrS3GIemiBYMhN+Gd75TQQKh4XVYlR0ybSOgP4
-Rik5ILhOm7Z+VCNixgUDxzsr8zJIgUXhZH7TMXkT52zz6wUwtv+WCsUdUAYxdhOZ
-Z2t3VFwwsFZ41ZT+SXE/nyJ7y5QmI4tJ5hTYHnBVswR1vzGWTQa2Y3J7AxhP/RKu
-BGTCyfb0VT5YUd3wsieBYGsSYEh3xlhcSfBx7EEQJ5KvQvylpXr1H+epON5faXr7
-TXs8qqO491A2bClWBxWX
-=d9Ma
+iQIcBAEBCgAGBQJSkjFxAAoJELnU8jG9FVirOvkP/2zxs6hcEMNOQPGLlMGQh2qL
+GsZ3mancfEtJlVcaBIi4kll5cOixh0mROYUTMApI9VTx3Zc3rXaXFIZy542a5i4j
+xEpnpIE6r9lovM/18NY7GP+oxwcANB3jC1SL5fVQYsSY8e2rNK141u6mImTiwR5J
+QnA+F1lGAbLrR5uRJpHx0PF/Y3NIcMkY5VjAFnaxwz4kB/ATlz0zDiLtOFmLcv/P
+av4zTPLAhQaWuCI/BrOp24Rkh16hmXKLiSqBYDDKLHhxa0+NF/fKvKW7juekrB+h
+EzmJRuUMmA3dmXza/VKxdHvnt8Jvrykp1RJW/5dce7m0tnRS4n1SYHgih6+FBNcV
+GpX8dkW7nPTOHhcuGT8d+gxWVeZ54MdHZUOs7CJVSdY+Pr55SmZP6dlhSjwtcHB6
+c86T+DVaFICT2UEpzU6ROAjIAfO+x5Ng/ltg0kFO0hdff4fUXw94gbLDJ8e2H06C
+iVolBfpd/ssDWiD/iNeyGjmNjnyKNgdxrpj8bzEaAIb+/ahsGmrVXRWdL3RlqSQl
+8K9ZRD15TzrS+ABm/MlAKp77RAg8d6nC3zuVZDNAzWyTkNzlomVOuNsB1R6FkQ/4
+4HnPXtDgS/G1lE7qsOdPNE9baCX2qOm2nVnBcvgbuefz+HOLXdrtWlc4wVyCuEh3
+qCoexip177IWvkR/+YHV
+=NbFk
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/hugin/hugin-2012.0.0-r1.ebuild b/media-gfx/hugin/hugin-2012.0.0-r1.ebuild
index 438a50a3c276..d75c62a1fb38 100644
--- a/media-gfx/hugin/hugin-2012.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2012.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2012.0.0-r1.ebuild,v 1.1 2013/11/24 16:42:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2012.0.0-r1.ebuild,v 1.2 2013/11/24 17:03:45 jlec Exp $
 
 EAPI=5
 WX_GTK_VER="2.8"
@@ -33,6 +33,7 @@ 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]
diff --git a/media-gfx/hugin/hugin-2013.0.0.ebuild b/media-gfx/hugin/hugin-2013.0.0.ebuild
index 71de720cd155..baa32233c495 100644
--- a/media-gfx/hugin/hugin-2013.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2013.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2013.0.0.ebuild,v 1.2 2013/11/24 16:42:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2013.0.0.ebuild,v 1.3 2013/11/24 17:03:45 jlec Exp $
 
 EAPI=5
 WX_GTK_VER="2.8"
@@ -34,6 +34,7 @@ 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]
@@ -65,6 +66,8 @@ src_prepare() {
 		-e 's:-O3::g' \
 		-i src/celeste/CMakeLists.txt || die
 	rm CMakeModules/{FindLAPACK,FindPkgConfig}.cmake || die
+
+
 	cmake-utils_src_prepare
 }
 
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 010c0fe0b99a..637f9ec944f5 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.1 2013/11/24 16:42:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-9999.ebuild,v 1.2 2013/11/24 17:03:45 jlec Exp $
 
 EAPI=5
 WX_GTK_VER="2.8"
@@ -36,6 +36,7 @@ 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]