Version bump (bug 440086), non-maint commit

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

3 files changed, 93 insertions, 1 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 280426308c2e..390205d00e52 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/openjpeg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.69 2013/04/06 06:45:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.70 2013/06/06 12:10:10 xmw Exp $
+
+*openjpeg-1.5.1 (06 Jun 2013)
+
+  06 Jun 2013; Michael Weber <xmw@gentoo.org> +files/openjpeg-1.5.1-build.patch,
+  +openjpeg-1.5.1.ebuild:
+  Version bump (bug 440086), non-maint commit
 
   06 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> openjpeg-1.5.0.ebuild:
   Use subslotting for lcms, libpng, tiff and zlib dependencies.
diff --git a/media-libs/openjpeg/files/openjpeg-1.5.1-build.patch b/media-libs/openjpeg/files/openjpeg-1.5.1-build.patch
new file mode 100644
index 000000000000..4b5cbfdc849d
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-1.5.1-build.patch
@@ -0,0 +1,40 @@
+Some bits have been loaned from http://pkgs.fedoraproject.org/gitweb/?p=openjpeg.git;a=tree
+
+--- openjpeg-1.5.1/CMakeLists.txt
++++ openjpeg-1.5.1/CMakeLists.txt
+@@ -287,11 +287,4 @@
+   DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
+ )
+ 
+-#-----------------------------------------------------------------------------
+-# install CHANGES and LICENSE
+-IF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
+-  INSTALL(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-ENDIF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
+-INSTALL(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-
+ INCLUDE (CMake/OpenJPEGCPack.cmake)
+--- openjpeg-1.5.1/libopenjpeg/CMakeLists.txt
++++ openjpeg-1.5.1/libopenjpeg/CMakeLists.txt
+@@ -57,6 +57,10 @@
+ INSTALL(FILES openjpeg.h
+   DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} 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(
+--- openjpeg-1.5.1/libopenjpeg1.pc.cmake
++++ openjpeg-1.5.1/libopenjpeg1.pc.cmake
+@@ -2,7 +2,7 @@
+ bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
+ datadir=${prefix}/@OPENJPEG_INSTALL_DATA_DIR@
+ libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_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.1.ebuild b/media-libs/openjpeg/openjpeg-1.5.1.ebuild
new file mode 100644
index 000000000000..a7418a85cf0f
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-1.5.1.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/openjpeg/openjpeg-1.5.1.ebuild,v 1.1 2013/06/06 12:10:10 xmw Exp $
+
+EAPI=5
+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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 )
+
+RESTRICT="test" #409263
+
+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
+}