Version bump to snapshot, using CMake build system, should fix bug 374547

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 126 insertions, 16 deletions

diff --git a/media-libs/lensfun/ChangeLog b/media-libs/lensfun/ChangeLog
index e6ccc4ca5a7b..3249149e5cd8 100644
--- a/media-libs/lensfun/ChangeLog
+++ b/media-libs/lensfun/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/lensfun
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.39 2011/10/30 19:13:18 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.40 2012/04/14 16:16:37 dilfridge Exp $
+
+*lensfun-0.2.5_p153 (14 Apr 2012)
+
+  14 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +lensfun-0.2.5_p153.ebuild, +files/lensfun-0.2.5_p153-build.patch:
+  Version bump to snapshot, using CMake build system, should fix bug 374547
 
   30 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   lensfun-0.2.5-r2.ebuild:
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 83446ab7d752..95e54d0060e6 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -2,24 +2,27 @@
 Hash: SHA512
 
 AUX lensfun-0.2.5-libpng15.patch 1254 RMD160 72f6eb784255d2e419368a40496150b64699d11d SHA1 3bf2041a49369a6a6af4a3da4aac8fead139e9da SHA256 19f533bf5c3a1172c7f5ae0b849579c72d3968500cc84de41bc5a13ef2f1e367
+AUX lensfun-0.2.5_p153-build.patch 2296 RMD160 540b9ec1bbd86cfe4792247d76b4093c31e7cfd3 SHA1 d13f9fd7caa2f1fd1f5a67a7190fd47679c5218a SHA256 e5f623ed7edc5d3f6c0f53a710a9d4eb757d9b84795558a13e667f2dde3c1d4f
 DIST lensfun-0.2.5.tar.bz2 470733 RMD160 2f421cefb65d271b937e3d61f41f8536fd078971 SHA1 7e8568cb131b6e2090264274483721a959f6b9bc SHA256 c21498eb1889714af25e4e08474d9faa1e45132c89a8c1ac97340233e988fb87
+DIST lensfun-0.2.5_p153.tar.xz 466656 RMD160 8367b7cb8cd2927e348a87c32ecf010e9650351c SHA1 e50b000b02e74db42f2dfa95ab26a97cfc005f2b SHA256 7677d2cf217ab71985eba82889886784a3466c4435a98b6a996580bc166876ff
 EBUILD lensfun-0.2.5-r2.ebuild 1440 RMD160 f04d998b4c250b62ee5fcced885d8ea9ff64839c SHA1 22a4129519efdbfa5dab272f925283a0a508c523 SHA256 73d54fe6d4b2e2079e94b39d3a947bd5bd9631a617fdefa8b4971dbfeaac334c
-MISC ChangeLog 4920 RMD160 653a4ec6f434bccce0093c7d7ef9d025f7f61802 SHA1 5ff399e0e701f6323a0e107b66c6cca58bc78676 SHA256 27ee0b81114d4d63a18d8e0922020f0f9459fc0ae91dec576fa2a12549fc4a18
+EBUILD lensfun-0.2.5_p153.ebuild 939 RMD160 a12ec9bc3d9f9674a7ac11d8c982eff36241554e SHA1 90013742e8e0aad085dca624b20520286a3ce0cb SHA256 91c6a91e264a886cea315887bcd74db5951100b6867d8307f457553435001bbd
+MISC ChangeLog 5158 RMD160 4c7cb3ffd0c14cf6f171a75c3ba8974ed5cf0b96 SHA1 71fb74c6d7815644630fc214c18b891ba4776bf3 SHA256 ff8b617bf27a48d5f504b01680409a1bdfa29c48836d4a05d9bec22b1a927d1b
 MISC metadata.xml 434 RMD160 50bd60c8f0e7c9da3ca52b50b8b4705c9c0bb219 SHA1 a57ff3680e403b95d6f19138167a103cea711987 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOraHeAAoJENwGBM22xffe5K0P/RztnXEmbRHc5pzi4NapkAgl
-p8MQrcZelqgAcbdUS9XwLCu0e2QHxSgT5cfnEBA9ImDjLB6ekQdYBve43/EQLbT2
-+/1goU5Vy9JBpiiq2v96YAA/RoJ2/i0lsj+w/5s5G57hcldiwdgmiqQch4AXHcos
-hW61CsGNaHnZfmpfDzdx0jbUAQ3NkPYrsyTC84lTKMWYI4Y0N7jJxR7LAEpMiR8l
-stVGo9mmdU8AVeuJqUxaj893QUk1aKLFShrYy7DmMFDKLYL0KuU3Sj3Mbm9sQN90
-6lGwUPKJ540hRW3QedPWif3zNdnXehwLCOAKhPdTmxKtvJFlvpzUY/zlYjFxkrh2
-ctKjVdJkdyuKm4GHKMXh/MoRLIxLnyj3SbMmfAr/0TBdP/IIiouo9zGgfsiFVjXk
-+QqZn5KP8uSHQ5Q0hr2ysM0f2kzqqfPsYRNM/6SXgGeff9RyTUF+pN3dT/6pVE6f
-2yK1a7Uc5HoEkDeinfS4+ZQ6hMh4/oqDGpuuhpY3vCkLhqb9FZMCYELMgNGjFg3Z
-CKK2JDDweknOmuU0qsoieDqaXvNK9bdEltZfrT7/KPUZGRoGPSxUwYkjxgrdc1B8
-qLyKH3SQxAKNmevGwkcrsYj1Wkga37I6oXgEsB7G36XXEgDco2BkWNHq/E5fbbFE
-Gtw5x6IdOgW/iRdWclYo
-=0YcK
+iQIcBAEBCgAGBQJPiaL6AAoJENwGBM22xffe1i0P/AgNL4k8rNxaW735azDcSx4w
+p4N06crB0o5YJoX3ouC720JLQsjVeqRKGMqNbylzI5OWocw35kIijyxb1QvFmgYr
+76uvrpoYmX6UCR9Xge9T36gDKtt5W/xwARH7Zyg47hW9FMVfDKekLgdR0NV2zMXg
+iUqbQ1wLaZh9axBePS5T4oovdhKbQC46NICIYdS7iQMsnGe/pwX4InSsoUjsLSgp
+8yJwbB+8mXQLnObiVpskKkg2EOyjIyRt6HLeAevAyY67zW6ANo7rvi3mo7pXs6pd
+APMj6MKBn/Au9ErI8o5eR27HSOmgfn3MQeHjP4ololmwAMicyT2KqqjrNsF/hOkf
+dwQ3rJqv5kbUJntD802mZRX+OQa2Lz4CoVvalf1rLlBBEE2IAPcpB81LPCFmjij6
+auj2bdQgXB3kfQSYvoCbx8pZQeXopzbeSQ8krHQj7WFSOaQzO5hKjHI9QAHh13a7
+A6s0mXv68akr+oNHbl8jf9bQ40WiK3OHYDXLA01jO2LoVL4aSbGoQUPQ7n29Q33X
+zEGswhz9b3MFKnIpy71e2zfDoxRntzyWxfCWsRk8C9qG4UyBlNNk/gsgZLyZ1CTw
+tcg8ACm/JcvVLtyRjXw3TCEOOAgkJ3xWoSL8ipDybwUUof/a5+AuSKXZOp2akCCZ
+d6DNvI6+vEpwMdH82mfh
+=aPJ7
 -----END PGP SIGNATURE-----
diff --git a/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch b/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch
new file mode 100644
index 000000000000..d204bc66f7a3
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch
@@ -0,0 +1,65 @@
+Index: docs/CMakeLists.txt
+===================================================================
+--- docs/CMakeLists.txt	(Revision 153)
++++ docs/CMakeLists.txt	(Arbeitskopie)
+@@ -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})
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(Revision 153)
++++ CMakeLists.txt	(Arbeitskopie)
+@@ -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)
+@@ -71,13 +71,13 @@
+ IF(BUILD_STATIC)
+   ADD_DEFINITIONS(-DCONF_LENSFUN_STATIC)
+ ENDIF()
+- 
++
+ # define destination dirs (relative to prefix)
+ SET(BINDIR bin)
+-SET(LIBDIR lib)
++# SET(LIBDIR lib)
+ 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)
+   SET(PLATFORM_WINDOWS 1)
+@@ -125,12 +125,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
diff --git a/media-libs/lensfun/lensfun-0.2.5_p153.ebuild b/media-libs/lensfun/lensfun-0.2.5_p153.ebuild
new file mode 100644
index 000000000000..e30a7c39cdf9
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.2.5_p153.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.2.5_p153.ebuild,v 1.1 2012/04/14 16:16:37 dilfridge Exp $
+
+EAPI=4
+inherit python multilib cmake-utils
+
+DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions"
+HOMEPAGE="http://lensfun.berlios.de/"
+SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2
+	>=media-libs/libpng-1.2"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}/${P}-build.patch" )
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build doc)
+		-DLIBDIR=$(get_libdir)
+		-DDOCDIR=/usr/share/doc/${P}
+	)
+	cmake-utils_src_configure
+}