version bump by Mario Kicherer in bug #456990

Package-Manager: portage-2.1.11.57/cvs/Linux x86_64
Manifest-Sign-Key: 0x072AD062

4 files changed, 122 insertions, 17 deletions

diff --git a/media-libs/lensfun/ChangeLog b/media-libs/lensfun/ChangeLog
index 3d50487cd165..4fe8139eeff4 100644
--- a/media-libs/lensfun/ChangeLog
+++ b/media-libs/lensfun/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/lensfun
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.47 2013/03/03 11:05:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.48 2013/03/23 16:58:52 maekke Exp $
+
+*lensfun-0.2.7 (23 Mar 2013)
+
+  23 Mar 2013; Markus Meier <maekke@gentoo.org> +lensfun-0.2.7.ebuild,
+  +files/lensfun-0.2.7-build.patch:
+  version bump by Mario Kicherer in bug #456990
 
   03 Mar 2013; Mike Frysinger <vapier@gentoo.org> lensfun-0.2.5-r2.ebuild,
   lensfun-0.2.5_p153-r1.ebuild, lensfun-0.2.6.ebuild:
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index aaeac88b07ed..1c339d59923d 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -5,28 +5,21 @@ AUX lensfun-0.2.5-libpng15.patch 1254 SHA256 19f533bf5c3a1172c7f5ae0b849579c72d3
 AUX lensfun-0.2.5_p153-build.patch 2051 SHA256 7f944fc1606af58757d64d40776d9636ba43c1ef8db1aca0f20b1d88a30bc80a SHA512 1a252374e21a8943460bde7726e764823c5e94eddcd8cbbbcc441436109b95577f5af154aa3d2e746054efc1e5d110822417728601f60e5b79275764e1d56b43 WHIRLPOOL 21c45eb7a4025b02d90561cf6dd6147a56bccfc09091d014cd80c2ba44ad2e3c752f72cdcd42421ecd444a41cef563a717e516ffe05083fae85786b886f3dcff
 AUX lensfun-0.2.5_p153-pc.patch 650 SHA256 ab4ff4243ce94db8df5ed737292fd9d805e932ec8d9569bb480fb8262addc9d9 SHA512 e51dd5ee8aabdd5ed9ac5aa36fbccd38c71e0aae4625b3529064b18ebb5f1e1321f4d336850938e99b5f6792ca254cef87c71a74be4128ab2ae041e6fe1a0ba1 WHIRLPOOL d8141d3cecb0cbfe082ea47319f1952c6830777ec4ed3cd5816c796a9548db71497677b7cdd67d09b1df0b681bc29ec85ab0b13d0a02db6aa40f10265f4c6cb1
 AUX lensfun-0.2.6-auxfun.patch 500 SHA256 173cd284ba1b4ba61137e09327fae25725f89290bb32c553bf5c48c3534f14ef SHA512 c9ae1b4eaeba1eb0ef822767532f07a819ce2237da1d273804d6a9837a368d53b231edd936d7c715a4b173a5f7e2ab3b5439a8bb94aae8c775f8729e5b296e56 WHIRLPOOL c933a2665188ca846e01642a8e236100aca333c9e32c7296a8aff4efd25ef12be03de5f78a1e7800feafdd9b74fdb4670e3bcc651f39966af1b97cef91e8cd44
-DIST lensfun-0.2.5.tar.bz2 470733 SHA256 c21498eb1889714af25e4e08474d9faa1e45132c89a8c1ac97340233e988fb87
-DIST lensfun-0.2.5_p153.tar.xz 466656 SHA256 7677d2cf217ab71985eba82889886784a3466c4435a98b6a996580bc166876ff
+AUX lensfun-0.2.7-build.patch 2425 SHA256 9678f9fdc90e2930913eb386b8e0d5809c06dab389b95fd65261e431557c9202 SHA512 f4fa88816e0ac4f52c0f927bd5cfec93e3a97aab395c12aa38cc2e6cf1156c9d7e59ac145310e1e0c3b40180cfee30cff4a6ef5ab46df2ff076337aaeb01a26e WHIRLPOOL 2829c6c9ab752ab90f0f04f8d9aeadc106f71cb752daad6d540a33c60dea7ea9fc3f3af13d02e2685fb139b7361dcd804062aad2f7d43f45983c52d1fae431fa
+DIST lensfun-0.2.5.tar.bz2 470733 SHA256 c21498eb1889714af25e4e08474d9faa1e45132c89a8c1ac97340233e988fb87 SHA512 a90292fd53fc12d82ccfd0211b8e544b18e2bd712010bf4c1cad5ad1d18f82145c399371f3699fe004571a845420f8e17f3237b45f861cb58c7ac8df8e503baa WHIRLPOOL 6e85477234988e1a060eb97810ad856360ee81eea15978ac7d9fd93a864ece5a6b3b64f81fa506a50c999ae281a283a269fa59ffb854089ad638ce6d3ce8cbed
+DIST lensfun-0.2.5_p153.tar.xz 466656 SHA256 7677d2cf217ab71985eba82889886784a3466c4435a98b6a996580bc166876ff SHA512 7263ea69d89e710f84e6f1c3c9287f8f54efe3823fd9babe2c3e191c38a8e17664ed3e330771f2c2579c65cbadb56eaa277362860ee39549238d0926a8d9d23d WHIRLPOOL 86f8e0f4f4a43c41d5965aeb9941d1e8b1068dd3a182c9954b4a0600600dcc55a4eef1049d9e19aa5a3e5d0e02201325774cbb5cc47cecd88b2608069a257c96
 DIST lensfun-0.2.6.tar.bz2 505690 SHA256 eebf35851f6d40ecf007578b859f9ecb66af417c1895d1fc0c5776d5d9bdb26e SHA512 209ef807d0cc43dcc021709ab0f5e460fed9192a4f617c8e4e07fd6e3b0ad3863d1e1b716c38025ec5cc8b22f62708ec64b4e02f14b35f25c5767b5db1defbb1 WHIRLPOOL 198a2834d6966c83fdd293b52a3a3b289c932989b123484394dddd9550c9a6ac41d14017894e1288debe2865d5f3bafb34f714040a3523b76335c563bad6ae47
+DIST lensfun-0.2.7.tar.bz2 552960 SHA256 3ddf0747bd6af1ec7d722f8c45dafdd8adfb96c081492b216c14d89f82806477 SHA512 0df48ef824bd562065cc1eaf611870ab526cd64a32f99947f1f1c0c633280f4fc2f248d38da65dc0627d399085da4c35c938a42a64753976c8dfb5fbd97c96f2 WHIRLPOOL 039f93f4a8dcd6d3ec88ad453151346ba6c92b3d36130c406c9aed7cbfad9c2a2bdfcfe866df5070026042f3980ed345604bda0d8faf4130f078d26da9032dc8
 EBUILD lensfun-0.2.5-r2.ebuild 1441 SHA256 33062b3bdffdb3397cd73d6c2409d7f263e7d8ee46949886ee535f38eb5a95b1 SHA512 fd98095a404b7144515dbb9f119d29e426607ae9905daf0d7a69047b99a238bcd20584de38128313444bfef538f0b84034e8d9c36abfadb769f9264fcfa19d97 WHIRLPOOL f45ae814163a54a994868b3051be0a33a59a1248bda0f3440febff38f4c51e3b6cf9a5b0fd8b6674c9d516233f95a0cb6e5769c086464f4c605c3411f3ecef9e
 EBUILD lensfun-0.2.5_p153-r1.ebuild 987 SHA256 b3709a3ecdf9aa08f7feae60c62f57025e0721a83f048c9117be946273e7c93e SHA512 4f0c9c9222d2a76b0d2f81e9dfe3fb5109ab2e8d51badc3f0f68c0b971d5f61cf09e930346740f1d44623b10168d4df1099dd052329062adb28edf30c57326ec WHIRLPOOL 1d855e9fb5369557e0bc3b70c52e628cade1c4463260edb14b89e5bb86013f0a20fd110be2f87c898a59d0735695ad3392e3c5ad5664fb89fa8dc9e950a97b9f
 EBUILD lensfun-0.2.6.ebuild 1330 SHA256 8a514917ef1757f4f445eb1d4266a67f9451763aa65be743068bdafedc0d3434 SHA512 39c15eaeb4216bf7c775c3cb79b2980c176d608cd16675790a9b98458b8b9728419bc06d0bb7c8d8cd777e8dfc1d335e6cc812bfedbb0a5c33012c58e86dcfe0 WHIRLPOOL 85cee200a8a91cac828d565fb3596bd27d4009089e6bcc7d4678173a05690a78a81d5a99e928138730631f08703b943dd5461d9a70584265e81a01b4ab7983a6
-MISC ChangeLog 6155 SHA256 3a3b343a7cbe87660a3ecdae049f829083f9641a664db797144e5feaa698030c SHA512 08077c81481620f202ca3784d7668382a5667b46cacb8e9b8746e14888c60396434916fe762e4539c57026488eb766c6c6583b209a5efb9721f3633aa237fd9b WHIRLPOOL b7f01428e554bfe2d980873136110556fe52135d0af8a0809ea1f4212b484ef035e83a487c9bb7b1b31815483b66dfb8ac2da351138783a6210fc5c3035c7f1a
+EBUILD lensfun-0.2.7.ebuild 1236 SHA256 6e2492fc53efd96b9ffdea663f74bdd6d381e08a85ebe5e7eacacf9518c12be8 SHA512 f0f3bc0fed293ce1a87e93ad2fd98ed4773bb2d28c7fac5a965c43b9a2f061fa9f2bdd58f4876ef0d1a3028d3013431a530281d5b9d9453c48afe25d36998a4f WHIRLPOOL 6eb210df9cd22269b051c325c09bffb3610a79eb9dfd7deafbabe3cb95185c28daf009317e8c2475f5bc141462b497ca03440869661d6488f1b1efd3f1ce42da
+MISC ChangeLog 6341 SHA256 50b1d48f6f090e92b23a5854f56d4770baa9c4a6de2ceeb51b89e314a35a7bd9 SHA512 b0a6b5ba446cbf4d53c172638a75f72e483886aeb6dfee70cea3f1ff211e84047830dbf3c574ef373f3ac29eebaba648587082047f7705dc2ed21fa243ecf600 WHIRLPOOL 941d38f0aa0f4a910fa0233f4595d882eacfe5a29d3aa2b408f981fc65f0c943239fa8e4574a185c80d4d5b9dbbe227820ae5bbf32e463bfd7cbfe9974265457
 MISC metadata.xml 434 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f SHA512 3735e2c7fd32e4b2309ebbfb2f8e3107698a5d722fbbb712bddda7dc665af5d994e8f213c06e247ff0fa04f09f209be2cd4fdac4ef218c5b60c99a65334944bf WHIRLPOOL 21bc12855f7bbcd67f885b6a3e022372d5f55524ec305a9e405b2e7d09f76a571236da65d15e81c631c23fa4e914ff1e5ef68fa26f7a51249d5f0837035cd7ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRMy7iAAoJELEHsLL7fEFWD+IQAIab9ZsIeLivaAGf8XkuwIxi
-msYiW4OTiJX/W4DOTIPDGkb+TpbnOh5Vd49pyCBX1uBoMmLujndfG9Dxyb8NyeIm
-R/HWd3fCsKHFpgVcDMxt/4ruz5lToy+k0BsPqJ7vTrfBgASBxMN53CW578F6aVW2
-XOINCv2HSicJkRx9Ql3zSeCWrK9+4sU6bBgrpX5TIo33+cmLqWPg3QypYEP+eB3u
-COLDy3lV+fZngIYsXFK4f7YNQaRLA6xDm6wW9imgVOhXHK0SwzhB89H1/ZKGGRnb
-ArVZEdB9DOSxAyh2WJORChfUVoUjvMYvP4kcV/nouiVZz6H0kxPqCz+DmSXb5olP
-Da/AeR8jjg3tBtzE9I4zO++BDX/9QglufyxxJqAg7Of/GxU8ztBy+B7jR6b95ia+
-JQmw0erO+8WlZhrEAcs/aifknrxPZuc36mpfcDjx7lSUAGTPZtdhM6ZOTkFtaIQw
-psF+kOvzcLRU88z+uYOrczGVitbmbiNF7BUlV3CCwn2gmse8r4D3POw6t/vhlQNb
-JDxviBbofFfCUIMWqA1mPtXTVqOtcYa6Yc4K6YKuTc5vyECk2hsZu7l6cY7kstaM
-n7rrdqsnwuMn+8KUI559b1F8Gg2zVenzq/qW/FUUyxHtAcKGYr45yt29AAm8HJ1g
-EgU8FsdfddHtF3mwCdS9
-=MBxI
+iEYEAREIAAYFAlFN4IgACgkQkKaRLQcq0GIe6QCeJuCbT/6bYcCN3EqPKc51P8sf
+2zQAnioLTd5xO6cJjioIkzbh6TBHrBS7
+=42f0
 -----END PGP SIGNATURE-----
diff --git a/media-libs/lensfun/files/lensfun-0.2.7-build.patch b/media-libs/lensfun/files/lensfun-0.2.7-build.patch
new file mode 100644
index 000000000000..ebf557c5fe79
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.2.7-build.patch
@@ -0,0 +1,60 @@
+diff -ru lensfun-0.2.7.orig/CMakeLists.txt lensfun-0.2.7/CMakeLists.txt
+--- lensfun-0.2.7.orig/CMakeLists.txt	2013-03-23 17:54:00.000000000 +0100
++++ lensfun-0.2.7/CMakeLists.txt	2013-03-23 17:54:03.000000000 +0100
+@@ -30,7 +30,7 @@
+ 
+ # options controlling the build process
+ OPTION(BUILD_STATIC "Build static library" OFF)
+-OPTION(BUILD_TESTS "Build test programs" ON)
++OPTION(BUILD_TESTS "Build test programs" OFF)
+ OPTION(BUILD_AUXFUN "Build auxfun library (requires libpng)" OFF)
+ OPTION(BUILD_FOR_SSE "Build with support for SSE" OFF)
+ OPTION(BUILD_FOR_SSE2 "Build with support for SSE2" OFF)
+@@ -74,10 +74,10 @@
+  
+ # define destination dirs (relative to prefix)
+ SET(BINDIR bin)
+-SET(LIBDIR lib${LIB_SUFFIX})
++# SET(LIBDIR lib${LIB_SUFFIX})
+ SET(INCLUDEDIR include)
+ SET(DATADIR share/lensfun)
+-SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX})
++# SET(DOCDIR share/doc/lensfun-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX})
+ 
+ IF(WIN32)
+   # install into place in build-dir  
+@@ -131,12 +131,12 @@
+ ENDIF()
+ 
+ # install include files
+-INSTALL(FILES ${CMAKE_BINARY_DIR}/lensfun.h DESTINATION ${INCLUDEDIR}/lensfun)
++INSTALL(FILES ${CMAKE_BINARY_DIR}/lensfun.h DESTINATION ${INCLUDEDIR})
+ IF(NOT HAVE_REGEX_H)
+   INSTALL(FILES include/regex/regex.h DESTINATION ${INCLUDEDIR}/regex)
+ ENDIF()
+ IF(BUILD_AUXFUN)
+-  INSTALL(FILES include/auxfun/image.h include/auxfun/rgbpixel.h DESTINATION ${INCLUDEDIR}/auxfun)
++  INSTALL(FILES include/auxfun/image.h include/auxfun/rgbpixel.h DESTINATION ${INCLUDEDIR})
+ ENDIF()
+ 
+ # install db files
+Only in lensfun-0.2.7: CMakeLists.txt.orig
+diff -ru lensfun-0.2.7.orig/docs/CMakeLists.txt lensfun-0.2.7/docs/CMakeLists.txt
+--- lensfun-0.2.7.orig/docs/CMakeLists.txt	2013-03-23 17:54:00.000000000 +0100
++++ lensfun-0.2.7/docs/CMakeLists.txt	2013-03-23 17:54:03.000000000 +0100
+@@ -11,7 +11,7 @@
+ CONFIGURE_FILE(doxyfile.in.cmake ${DOXYFILE} @ONLY)
+ 
+ # now build documentation
+-ADD_CUSTOM_TARGET(doc
++ADD_CUSTOM_TARGET(doc ALL
+   COMMAND "${DOXYGEN_EXECUTABLE}"
+   DEPENDS doxyfile.in.cmake manual-main.txt ../include/lensfun/lensfun.h.in
+   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+@@ -19,5 +19,4 @@
+ )
+ 
+ # install documentation  
+-FILE(GLOB doc_files "${CMAKE_DOC_OUT}/*.*")
+-INSTALL(FILES ${doc_files} DESTINATION ${DOCDIR})
++INSTALL(DIRECTORY "${CMAKE_BINARY_DIR}/doc_doxygen/" DESTINATION ${DOCDIR})
diff --git a/media-libs/lensfun/lensfun-0.2.7.ebuild b/media-libs/lensfun/lensfun-0.2.7.ebuild
new file mode 100644
index 000000000000..dd865f25644c
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.2.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.7.ebuild,v 1.1 2013/03/23 16:58:52 maekke Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_6 )
+
+inherit multilib python-single-r1 cmake-utils
+
+DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions"
+HOMEPAGE="http://lensfun.berlios.de/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc sse sse2"
+
+RDEPEND=">=dev-libs/glib-2.28
+	media-libs/libpng:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${PN}-0.2.6-auxfun.patch
+	)
+
+DOCS=( README docs/mounts.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+		-DLIBDIR=$(get_libdir)
+		-DBUILD_AUXFUN=ON
+		$(cmake-utils_use_build doc)
+		$(cmake-utils_use_build sse FOR_SSE)
+		$(cmake-utils_use_build sse2 FOR_SSE2)
+		-DBUILD_STATIC=OFF
+		-DBUILD_TESTS=OFF
+		)
+
+	cmake-utils_src_configure
+}