Version bump. tidy

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

6 files changed, 89 insertions, 19 deletions

diff --git a/media-libs/lensfun/ChangeLog b/media-libs/lensfun/ChangeLog
index 5b7a77f14bd0..e73d0bab2a2c 100644
--- a/media-libs/lensfun/ChangeLog
+++ b/media-libs/lensfun/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/lensfun
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.43 2012/05/29 16:39:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/ChangeLog,v 1.44 2012/07/02 16:15:00 ssuominen Exp $
+
+*lensfun-0.2.6 (02 Jul 2012)
+
+  02 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> +lensfun-0.2.6.ebuild,
+  +files/lensfun-0.2.6-auxfun.patch:
+  Version bump.
 
   29 May 2012; Alexis Ballier <aballier@gentoo.org>
   lensfun-0.2.5_p153-r1.ebuild:
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index f8e3d86569ef..31e6c0791b4c 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -2,18 +2,25 @@
 Hash: SHA1
 
 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
-AUX lensfun-0.2.5_p153-pc.patch 783 RMD160 ecd426ffcfb209a04f904c81fee317fe3090ef17 SHA1 423205eb8da0f7855946f4d18e9c51fd3a5c17f5 SHA256 95bbac238875bcd198c0f91ab502fc991b5dd5649a943f0a46beee0a2cba5d45
+AUX lensfun-0.2.5_p153-build.patch 2051 RMD160 8ae9378afeb05a134ca6c9860b95596d74677c12 SHA1 2e926b467b8b4480e239acc2fda11ad2d3556bcb SHA256 7f944fc1606af58757d64d40776d9636ba43c1ef8db1aca0f20b1d88a30bc80a
+AUX lensfun-0.2.5_p153-pc.patch 650 RMD160 c01d16fa44efc241e8aaba20f6fe1634fb8735d8 SHA1 5cabf3e9afc9487d09239ebe46d7372c6793812b SHA256 ab4ff4243ce94db8df5ed737292fd9d805e932ec8d9569bb480fb8262addc9d9
+AUX lensfun-0.2.6-auxfun.patch 500 RMD160 35e71a8437418622f3ea4785c5dbdb1e80fc3da5 SHA1 9794611f05b4aa26342a433419c4242cad7efa0b SHA256 173cd284ba1b4ba61137e09327fae25725f89290bb32c553bf5c48c3534f14ef
 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
+DIST lensfun-0.2.6.tar.bz2 505690 RMD160 03d3513ae2d66464313eb6f0587e8ec8a1c33387 SHA1 0d7ffbae5c54159308114f69a9e2bc5f4d24d836 SHA256 eebf35851f6d40ecf007578b859f9ecb66af417c1895d1fc0c5776d5d9bdb26e
 EBUILD lensfun-0.2.5-r2.ebuild 1436 RMD160 f24acb1df676931426f58fc3c2e2873f89b8bb0d SHA1 9589d149297df53351d0b3cec5098ae7f28c66b7 SHA256 deaac90cd89871e460f0d3445cb3a38266cc689461985449120a973066177c4d
 EBUILD lensfun-0.2.5_p153-r1.ebuild 983 RMD160 44bd4e74e6b152660ab4983e1a4043c13903d202 SHA1 b0ec45f7968e8549b4c8ee07d1fd7280394870df SHA256 05af7bcc908e07ce8482923817c720b5b425da9612bed1be0a1346e936f4a878
-MISC ChangeLog 5614 RMD160 2fbd00e980e6b0b2789bee7f5e8e432fa05f6cea SHA1 aa58f2ca5bf0918d5de8d4fdbd129081664318c6 SHA256 ad2a3517dd9f0df920fd77cbb2483cdfba9d473e9545dc0aadf7875c376aaaa3
+EBUILD lensfun-0.2.6.ebuild 1310 RMD160 e32f818e8b3e6f7d7476156f030cb6b8ca9b41df SHA1 71cb6851e13f3fcf558bf8a9cc7c6a1392a95225 SHA256 642b8e3f380fdc325d0b7291de18e2fe406a92ec8bb55d8e96181c84c6d340a1
+MISC ChangeLog 5776 RMD160 356f98a86974978ee87acb4e8b42f4d708764aa6 SHA1 7a56064d9c9beb5212b49a0aff665d2194514c10 SHA256 7842d73cecfd5620282640c2b0f9b8a78c69797bde6bf933429ff99d2381792c
 MISC metadata.xml 434 RMD160 50bd60c8f0e7c9da3ca52b50b8b4705c9c0bb219 SHA1 a57ff3680e403b95d6f19138167a103cea711987 SHA256 cdad31489c1592f642177d2c6c152262fc5bba1e6322098a95cbe496d03c3c2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/E+90ACgkQvFcC4BYPU0pXsACfbu/yoJ5mZYa8vbXwlvvnS2N3
-tpcAn3t6QOJw19SD/zD3DboWK0/b9o9V
-=j/mC
+iQEcBAEBAgAGBQJP8cfGAAoJEEdUh39IaPFNZ38H/1lXv5vhd1F2Ay8QZc2X8zu5
+MmMqGq7rs5IrlEAo3yaYBL/eQGqjdUmQeNo9AIGAVvfYvYba+9QGk8aRTxzOwfrC
+TP4dXcNhqP2XPKVUjhE+Z9HdCURSatsI4qrC7mQngWkoYN2yNjW7xHJDg/pMoqjz
+o6XhGzzP4FQ3iMj2ShbBKhM32e255OlUturL//TUfMZ4lKcP1Uib2PgjCtgKCS4z
+jOBc13O+W58/bWe1WBI3ekYbEp4WJdkFZssU7/7Dbftf87Kkb4hIYh5Etm1Kta5+
+2PwW4oKD0Keyw/VSqS90Tkzjh3+ehLcQL68ujKBCJRWCiTFb3nrZ4DUcHh36LMo=
+=24v5
 -----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
index d204bc66f7a3..425031dd511f 100644
--- a/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch
+++ b/media-libs/lensfun/files/lensfun-0.2.5_p153-build.patch
@@ -1,7 +1,5 @@
-Index: docs/CMakeLists.txt
-===================================================================
---- docs/CMakeLists.txt	(Revision 153)
-+++ docs/CMakeLists.txt	(Arbeitskopie)
+--- docs/CMakeLists.txt
++++ docs/CMakeLists.txt
 @@ -11,7 +11,7 @@
  CONFIGURE_FILE(doxyfile.in.cmake ${DOXYFILE} @ONLY)
  
@@ -18,10 +16,8 @@ Index: docs/CMakeLists.txt
 -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)
+--- CMakeLists.txt
++++ CMakeLists.txt
 @@ -30,7 +30,7 @@
  
  # options controlling the build process
diff --git a/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch b/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch
index a74acf8fe70d..a68cf55521f5 100644
--- a/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch
+++ b/media-libs/lensfun/files/lensfun-0.2.5_p153-pc.patch
@@ -1,7 +1,5 @@
-Index: libs/lensfun/CMakeLists.txt
-===================================================================
---- libs/lensfun/CMakeLists.txt	(Revision 158)
-+++ libs/lensfun/CMakeLists.txt	(Arbeitskopie)
+--- libs/lensfun/CMakeLists.txt
++++ libs/lensfun/CMakeLists.txt
 @@ -26,3 +26,12 @@
          RUNTIME DESTINATION ${BINDIR}
          LIBRARY DESTINATION ${LIBDIR}
diff --git a/media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch b/media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch
new file mode 100644
index 000000000000..c8d989f745ab
--- /dev/null
+++ b/media-libs/lensfun/files/lensfun-0.2.6-auxfun.patch
@@ -0,0 +1,11 @@
+--- libs/auxfun/CMakeLists.txt
++++ libs/auxfun/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ ADD_LIBRARY(auxfun SHARED ${AUXFUN_SRC})
+ ENDIF()
+ 
+-SET_TARGET_PROPERTIES(auxfun PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}).${VERSION_MICRO}.${VERSION_BUGFIX}")  
++SET_TARGET_PROPERTIES(auxfun PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX}")  
+ TARGET_LINK_LIBRARIES(auxfun ${PNG_LIBRARY} ${ZLIB_LIBRARY})
+ INSTALL(TARGETS auxfun 
+     RUNTIME DESTINATION ${BINDIR}
diff --git a/media-libs/lensfun/lensfun-0.2.6.ebuild b/media-libs/lensfun/lensfun-0.2.6.ebuild
new file mode 100644
index 000000000000..b3558a4cf502
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.2.6.ebuild
@@ -0,0 +1,52 @@
+# 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.6.ebuild,v 1.1 2012/07/02 16:15:00 ssuominen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+
+inherit cmake-utils multilib python
+
+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 CCPL-Attribution-ShareAlike-3.0" # See README for reasoning.
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd"
+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}-auxfun.patch
+	"${FILESDIR}"/${PN}-0.2.5_p153-build.patch
+	"${FILESDIR}"/${PN}-0.2.5_p153-pc.patch
+	)
+
+DOCS=( README docs/mounts.txt )
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOCDIR=/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
+}