Version bump wrt #409203 by Agostino Sarubbo

(Portage version: 2.2.0_alpha92/cvs/Linux x86_64)

3 files changed, 124 insertions, 2 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 32ec1d118d26..f32353348078 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/openjpeg
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.56 2011/11/13 11:24:33 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.57 2012/03/21 19:35:02 ssuominen Exp $
+
+*openjpeg-1.5.0 (21 Mar 2012)
+
+  21 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> +openjpeg-1.5.0.ebuild,
+  +files/openjpeg-1.5.0-build.patch:
+  Version bump wrt #409203 by Agostino Sarubbo
 
   13 Nov 2011; Justin Lecher <jlec@gentoo.org> openjpeg-1.4-r1.ebuild:
   Corrected Slotting of media-libs/tiff and media-libs/libpng
diff --git a/media-libs/openjpeg/files/openjpeg-1.5.0-build.patch b/media-libs/openjpeg/files/openjpeg-1.5.0-build.patch
new file mode 100644
index 000000000000..b335b9eeeccf
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-1.5.0-build.patch
@@ -0,0 +1,72 @@
+Some bits have been loaned from http://pkgs.fedoraproject.org/gitweb/?p=openjpeg.git;a=tree
+
+--- CMake/OpenJPEGConfig.cmake.in
++++ CMake/OpenJPEGConfig.cmake.in
+@@ -11,13 +11,13 @@
+ SET(OPENJPEG_BUILD_VERSION "@OPENJPEG_VERSION_BUILD@")
+ 
+ # The libraries.
+-SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARIES@")
++SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARY_NAME@")
+ 
+ # The CMake macros dir.
+-SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_CMAKE_DIR_CONFIG@")
++SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_INSTALL_PACKAGE_DIR@")
+ 
+ # The configuration options.
+-SET(OPENJPEG_BUILD_SHARED_LIBS "@OPENJPEG_BUILD_SHARED_LIBS@")
++SET(OPENJPEG_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
+ 
+ # The "use" file.
+ SET(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -146,7 +146,7 @@
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
+   INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
+-    ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig )
++    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
+   INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
+   \"libopenjpeg1.pc\"
+   \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
+@@ -252,11 +252,4 @@
+   DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
+ )
+ 
+-#-----------------------------------------------------------------------------
+-# install CHANGES and LICENSE
+-INSTALL(
+-  FILES       CHANGES 
+-              LICENSE
+-  DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-
+ INCLUDE (CMake/OpenJPEGCPack.cmake)
+--- libopenjpeg/CMakeLists.txt
++++ libopenjpeg/CMakeLists.txt
+@@ -57,6 +57,10 @@
+ INSTALL(FILES openjpeg.h
+   DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
+ )
++INSTALL( CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
++  \"${OPENJPEG_INSTALL_SUBDIR}/openjpeg.h\"
++  \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h\")"
++)
+ 
+ # install man page of the library
+ INSTALL(
+--- libopenjpeg1.pc.cmake
++++ libopenjpeg1.pc.cmake
+@@ -1,8 +1,8 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=@OPENJPEG_INSTALL_BIN_DIR@
+-datadir=@OPENJPEG_INSTALL_DATA_DIR@
+-libdir=@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
++datadir=${prefix}/@OPENJPEG_INSTALL_DATA_DIR@
++libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
++includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjpeg
+ Description: JPEG2000 files library
diff --git a/media-libs/openjpeg/openjpeg-1.5.0.ebuild b/media-libs/openjpeg/openjpeg-1.5.0.ebuild
new file mode 100644
index 000000000000..e839d3061aac
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-1.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.5.0.ebuild,v 1.1 2012/03/21 19:35:02 ssuominen Exp $
+
+EAPI=4
+inherit cmake-utils multilib
+
+DESCRIPTION="An open-source JPEG 2000 library"
+HOMEPAGE="http://code.google.com/p/openjpeg/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc test"
+
+RDEPEND="media-libs/lcms:2
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS CHANGES NEWS README THANKS )
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
+		$(cmake-utils_use_build doc)
+		$(cmake-utils_use_build test TESTING)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# See broken -E create_symlink(s) in the -build.patch!
+	dosym openjpeg-1.5/openjpeg.h /usr/include/openjpeg.h
+	dosym libopenjpeg1.pc /usr/$(get_libdir)/pkgconfig/libopenjpeg.pc
+}