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

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 106 insertions, 5 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/Manifest b/media-libs/openjpeg/Manifest
index 0c792d60eebb..0602141800d4 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -7,18 +7,22 @@ AUX openjpeg-1.4-linking.patch 595 SHA256 cc79c403d8c9530fe753c5f9cf58d4ab8f9593
 AUX openjpeg-1.4-pkgconfig.patch 1573 SHA256 f026fc520583943dc5b079d3838fe61d230862cd7e7622a0dd3720427b5de594 SHA512 11e75711e267acec79bd06c441687405d41cfe929c229c502d989999449ba0253db57fd012512a0be4de33d0c528723cd6a8685a2a54f7c813d9b5deb67c5d1e WHIRLPOOL 99438cd1578f96452910a17aee2625f73ab773f5c93862b90045d8e5107752b07d4f7d4008534578db4eff1d26f6d1e6e09befe455e0e5e4a84239a2e072a4bc
 AUX openjpeg-1.5.0-build.patch 2529 SHA256 be2e7ddbdfd4e9d8c73a5d5d56b318cdab083cdbd7cb3ec2ce33beaf7fd674bb SHA512 f21f87bdff99e7bd291e120d2fb6bd74ab08618067370a0e150cc8980164752b43afa54e771d4a6ae4714a2a200931fa50dd49d6c92866510f171321f9d8024c WHIRLPOOL ada782b28e60bd8b9d468f11c3eed0db5e934e24de825b53122913812df5eca020cb022b02be8fe59b8d3104e727515494a0ffc619739cf1c8ef7a71113586cc
 AUX openjpeg-1.5.1-build.patch 1466 SHA256 ce27ce56235d88e462ffa3fbfc1952d526a71d34a1dad8552def9c467ee1cb4f SHA512 34457410d19824d6dd5daf03f978c335142e180f9a97eca8294d396a554aa71091615015b0d5b1f9ab41336a84fab40e06744bfaa710afd79b4031e8344e1659 WHIRLPOOL b754e87e7ea7c4e2cdcb8ff655b2663f29a88b55faf453a484eca1612a13251a9affcdefad8794da028d92578378420068fe8078b6121fa6c2e4797f01bc0f30
+AUX openjpeg-2.0.0-build.patch 473 SHA256 21f5d1f465c99c41e05d461c1d184aad4bf0c359b08262e8da7625f3e59d1161 SHA512 1ff2ada7fb502f25e8154e0e1dd82073db8a009fe309dcbe209dee98f2787bb2df03643754ae2627fbb78bb60d9cc0110e8f821a8bd70db1bc9790514150e32a WHIRLPOOL 7189cf91e412946e9ebe9a79f27c0eb4061697530b837bea937d8f25a1e50183e288176e2e9661adfff11f1d1e821969c5a109a7db5533114044c0f46a6f3788
+AUX openjpeg-2.0.0-pkgconfig.patch 1341 SHA256 1a4c81e8db794a8c346ce96a15b3ecee556e67a1ac603c5b6cd3604fb071a9c5 SHA512 c1995cc8c5ea6e3941b46d2ab55f606d74dbb5715a00939ada78ace7eb50308884a2866644358cd252881e508055366faba6436c5aad0e521469ca79d73896fc WHIRLPOOL e98339d20837f790df4c42a1eaafbbebb81d9468b9a0d23aab01c0f8a7f94754a685529ee3132fa2a1714731ce987308b933f65d7971f5ac246ceac3b4c4a3ad
 DIST openjpeg-1.5.0.tar.gz 2117572 SHA256 c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace SHA512 59501fde86a7f0ab5a1b7e369feb9c4dcb8ea67ead8ffd706592cbba1e0ee7b2a2a9aaa32778632febe0c3dc4171c7af738c5899c732eb420358df3b16d7cf47 WHIRLPOOL 5267edb2809ce8ed96b1a0680049e84c5edefff959b35017dc6d9f645ba180860f89f12dd32b629f777e272ae0c5a25dc2e72a8ff308c02c66ce709f07154865
 DIST openjpeg-1.5.1.tar.gz 2112443 SHA256 6cfb3097a1c8e9550131b17663daf927f42707bc3f84196c1390642e87f3ab8d SHA512 7b6c6889eb478008bd659cf2f2dcc0551ebb0c15f6765d1df04bc75208acb300929e399d0ea9b5c69a6d43b39cd1e58ab94bc71c3b6efdfba35903f46b54dd2d WHIRLPOOL 9b28ac807ad6a2b118a0f1cf4322852002bba993feeb07d57f4bf0320a4b92a577ef1ca4fd17644f3f71f3b374cc0bb672eb3dadd2cd5aa9d044411ba049a6fb
+DIST openjpeg-2.0.0.tar.gz 1770392 SHA256 334df538051555381ee3bbbe3a804c9c028a021401ba2960d6f35da66bf605d8 SHA512 4ef6b3b6933190c845cc376efbfe8bf655954668eb35c2b878c572107fb5d620fc2fc4df0e7de177c8798bee031f33350715c6da44ef07978df29762d89f29a6 WHIRLPOOL cfcc567a292c0a42d618c9f37b8665f98c580b768a74f63caa9f50b0747fed927c1fafe0b1bb86772ff56768c7a102e645792b960051a44da7a556ba4b41195d
 DIST openjpeg_v1_4_sources_r697.tgz 2365447 SHA256 493e4db087bf5c5485618a1e1cfd827c4fb2ad421a4342903b166b76cf094b73
 EBUILD openjpeg-1.4-r1.ebuild 1407 SHA256 e3432ae9d9487e2b5ac396aa4745dcb288a56a25f7acae3bfd572d42139c1c8d SHA512 98552b4da4c604a74d9cf9c403baa770dd7ac84a68e8de6fec5133f2afed492de96d37d6588b1523babd7dd6e8f3ffd7932ae75e3807559385cc821412b0a9d4 WHIRLPOOL 429f720349ace14bad35d11095252a9194bd22026770e53d71a74eb5f8e8ab745ef5de5c37c0d733dac797bd9cbac186a0f5b9d32d6e02093e58e777eab0cb55
 EBUILD openjpeg-1.5.0.ebuild 1371 SHA256 9591572691142c5cb4c1bce0e3ad92ae7fb165498bf858f592707cbb32f7a623 SHA512 5ef56f4cbb9c881d57d9739581ebdd2c69236e78e8d78e9e81eeab20d32b90eba0e032848203cf5b0864a8dcfe51fe10b8fd47ea49fc10400310aa257f833cef WHIRLPOOL 3833e33679156d594184e58feb17280228fdab0aeeae0bbfd504ce4ea064755e13a2e2d15ed43b44fca95d19437acf63f64338b17de0c7c030f030c282902b7b
 EBUILD openjpeg-1.5.1.ebuild 1375 SHA256 377fef622e4d04f61f30de962067b5ce472c36f9b74e14fdcacfb783fc682ff1 SHA512 669596a8b0ad01bbb66e3d65610e143118fb16e111e8a1eae42137f14fdd112ef71bbff3c8f2245512d7f52363c394a9cdaf798c17f06ecb497fb7541aeb2e97 WHIRLPOOL cea81626344c47205e9009e68a82bb3aaab458fbd6a7353ccba7152c70164cb3bad3ffbb9e9f979d21a534804736cf9061e49d2bef6a4fb1016463ca0c8ef0cf
-MISC ChangeLog 9906 SHA256 553fccae5d3e7e62f61de9850d5c712c53994d3fe5cff403dcf6c40432e89a12 SHA512 736ce1e3e5dae3842eacc9fac3c11d3a60a0e55b34ce7862e95227eb7ef0177ad4f7faa3908ac57b3edfd908cef87b98a198bf819470588208dbbab3e090ee44 WHIRLPOOL e8dc6d9e7a2264a7c1e7e79fc749af6b2c0554d7474f0d24ac21cebd6b206f2478ddce6577019ea994108c81d2de6b50933bb68a86f629bfd69fbcf2c8f33b49
+EBUILD openjpeg-2.0.0.ebuild 1189 SHA256 9b79d499a04e838253d5de9c5b4bab0582c976557bfc0c2cde162ad92f7a892d SHA512 83b7f2ac77848347320e4dbb2318a188f0f219caf82106218b0ace5bbdb35e7f530a6252099a14ac8bcf33acd5c2213cd5ac0886558908037dc231c2394d9085 WHIRLPOOL 0e8bfb5e4a82df7820613c7cecfd3fc64ef6d070ded5cfdf60616e0bdac2c43c991814a514a6a98e0fd9a6d6cd7fd941d336f6322e726e5b4249a682e852c2a3
+MISC ChangeLog 10209 SHA256 58ab5a745bf282bbd96e1ada0f1aa67a5affb98d8b26d1da59f3f3d1e3e41a17 SHA512 2d10e7e73a4273345a73a065534abbdeab240190c4923b03f40a7bec66ae55124b83997deac80b97b1e363288f101e70ad8ad84fa24455984ed4898bba12a7fd WHIRLPOOL 20dcf854ac15a25c27b837beffe816d10e53826f457dc4c23a9e8a3dbceac4b17ee9645a769e77eba4bdf7a326e37fdd4ff8e201515876d5ba0d20ff22fec007
 MISC metadata.xml 240 SHA256 798e4e23637a9ded9dae0967f92aa498b39ad088a555aa94b4f716ba040db68c SHA512 c12ab1993f8b10c50a87bf215eb22613dc54cf8f3c049877959228694afcb1e848d9e13247c376c249b39af35945775f736bcf956c7f50e3d49f456e621ef979 WHIRLPOOL b8b0ff194273de5396bfb4d13c2f169eb481dab034aee85f1ebca948babded8851a1cc6c6047e51b6a20bb40654be025677a9872da63526c78eaa64854436f8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGwfDIACgkQknrdDGLu8JBBrQD/T11dM+kYYTMruNy/t9PX/6oc
-atats+MC6XdWuWptkFYA/RvCEZPaAsK26DQdSW5msj4uwETD78IfjY26dj/qfZCe
-=ptlb
+iF4EAREIAAYFAlGwi/oACgkQknrdDGLu8JBaqwD+P5DrJfufnbypXtpeNRFMX2U0
+20QUCiQKjCBU6sIKKDsA/ikfk0glW4DWw9IMM4FhOhb5L3hzm264b7nkCSqh7xjz
+=l2MJ
 -----END PGP SIGNATURE-----
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
+}