Version bump, set SLOT to 2, backport pkg-config patch as pointed out by Rafał Mużyło (bug 440086), non-maint commit.

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

4 files changed, 98 insertions, 1 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 390205d00e52..9714fe5c70d8 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,13 @@
 # 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.70 2013/06/06 12:10:10 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.71 2013/06/06 13:15:54 xmw Exp $
+
+*openjpeg-2.0.0 (06 Jun 2013)
+
+  06 Jun 2013; Michael Weber <xmw@gentoo.org> +files/openjpeg-2.0.0-build.patch,
+  +files/openjpeg-2.0.0-pkgconfig.patch, +openjpeg-2.0.0.ebuild:
+  Version bump, set SLOT to 2, backport pkg-config patch as pointed out by Rafał
+  Mużyło (bug 440086), non-maint commit.
 
 *openjpeg-1.5.1 (06 Jun 2013)
 
diff --git a/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch b/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch
new file mode 100644
index 000000000000..31ae12f213cb
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch
@@ -0,0 +1,14 @@
+--- openjpeg-2.0.0/CMakeLists.txt
++++ openjpeg-2.0.0/CMakeLists.txt
+@@ -279,11 +279,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()
+-install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-
+ include (cmake/OpenJPEGCPack.cmake)
diff --git a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch b/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch
new file mode 100644
index 000000000000..b10893d3d73f
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch
@@ -0,0 +1,37 @@
+Pkgconfig support http://code.google.com/p/openjpeg/source/detail?r=2250
+
+--- openjpeg-2.0.0/CMakeLists.txt
++++ openjpeg-2.0.0/CMakeLists.txt
+@@ -171,6 +171,16 @@
+ endif()
+ 
+ #-----------------------------------------------------------------------------
++# pkgconfig support
++if(UNIX)
++  # install in lib and not share (see multi-arch note above)
++  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
++    ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
++  install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
++    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
++endif()
++
++#-----------------------------------------------------------------------------
+ # Compiler specific flags:
+ if(CMAKE_COMPILER_IS_GNUCC)
+   # For all builds, make sure openjpeg is std99 compliant:
+--- /dev/null
++++ openjpeg-2.0.0/src/lib/openjp2/libopenjp2.pc.cmake.in
+@@ -0,0 +0,13 @@
++prefix=@CMAKE_INSTALL_PREFIX@
++bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
++mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@
++docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@
++libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
++includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
++
++Name: openjp2
++Description: JPEG2000 library (Part 1 and 2)
++URL: http://www.openjpeg.org/
++Version: @OPENJPEG_VERSION@
++Libs: -L${libdir} -lopenjp2
++Cflags: -I${includedir}
diff --git a/media-libs/openjpeg/openjpeg-2.0.0.ebuild b/media-libs/openjpeg/openjpeg-2.0.0.ebuild
new file mode 100644
index 000000000000..ccb42c405d36
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-2.0.0.ebuild
@@ -0,0 +1,39 @@
+# 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-2.0.0.ebuild,v 1.1 2013/06/06 13:15:54 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="2"
+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 
+	"${FILESDIR}"/${P}-pkgconfig.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
+}