Version bump wrt #518556

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 165 insertions, 17 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index b8a7334d70dd..6eb2bdda20be 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/openjpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.95 2014/03/23 17:15:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.96 2014/08/24 15:20:59 ssuominen Exp $
+
+*openjpeg-2.1.0 (24 Aug 2014)
+*openjpeg-1.5.2 (24 Aug 2014)
+
+  24 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> +openjpeg-1.5.2.ebuild,
+  +openjpeg-2.1.0.ebuild:
+  Version bump wrt #518556
 
   23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> openjpeg-2.0.0.ebuild:
   Stable for sparc, wrt bug #482788
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index a5502d0eb33f..ca4be8ab4aef 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX openjpeg-1.4-cmake-stdbool.patch 1317 SHA256 8e3d68216d392ad2529c00aeca9c30189911e52b44a02b159109b72bccd9a469 SHA512 0204281e7e96f694dbe3d564086b652d3cd051a54c6b7df6216aad81ec05eff9a38453d30eb4025cb7d7b0b7cf00bfc07f379dc287c3c451acc468240949b603 WHIRLPOOL b758af3352bb95036ca0f732d3513cedd92e4e4e50d547db085656892f8ae7b81145677cb9e44d7ce95acdc65b160251c4d8b22a066316bf11cd2a5d50e91986
 AUX openjpeg-1.4-libpng15.patch 524 SHA256 12ed8c1108fc0592f6d007db08c8c374725ef36f52c3cd76f2b378b2ffbae25a SHA512 49fcf279dddf2cd98b70d7817694b14ded05f0d0e9d2dc5f881968a43c0befbd2bd45d5a14b383be15c249b63bfba902ce5067f7b435dc23aa3514c90f88284c WHIRLPOOL ec26f3c792d83447e1c149e6b3cbb6220a7cb57bc41ac47c47a77ed2b956663346fdaf991ea4e3bac4965f15f6408644e91f744ad3c6c8b64bab78f2ae330fdb
@@ -14,30 +14,28 @@ AUX openjpeg-9999-build.patch 553 SHA256 26e39ee9bb58aec36db06814b7f0889ef353be1
 AUX openjpeg-9999-mupdf.patch 8762 SHA256 046e6a0c1a29fd8aa839c05858d9d32a66ca37fac25c5ac2b6adf625afc16164 SHA512 33823a7841bfb690ee623f5d395812342e6dbffdad04566b8f6960899b7cfb6a2acfbd9af8ae0ab9d6e75a37d1c4e669f1290ce9447e442792ffe99ebbedadf5 WHIRLPOOL 8a7e31bae2b11e03c6181c3d3b6e9c26c3b7dabac387ca72a04b89763123a04912df47a432723de562a2e71abb253f352669817a3d679a32a212b1a8236ae7a8
 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-1.5.2.tar.gz 1385702 SHA256 15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862 WHIRLPOOL 4ca974b411baa1fad7821b3ea88ad5c6a39643098af32bd8e92f66ccaa534d36ef15f55711eba489e91254f667d5f917febdb09539ac9698709c00bf680d45fe
 DIST openjpeg-2.0.0.tar.gz 1770392 SHA256 334df538051555381ee3bbbe3a804c9c028a021401ba2960d6f35da66bf605d8 SHA512 4ef6b3b6933190c845cc376efbfe8bf655954668eb35c2b878c572107fb5d620fc2fc4df0e7de177c8798bee031f33350715c6da44ef07978df29762d89f29a6 WHIRLPOOL cfcc567a292c0a42d618c9f37b8665f98c580b768a74f63caa9f50b0747fed927c1fafe0b1bb86772ff56768c7a102e645792b960051a44da7a556ba4b41195d
+DIST openjpeg-2.1.0.tar.gz 1789675 SHA256 1232bb814fd88d8ed314c94f0bfebb03de8559583a33abbe8c64ef3fc0a8ff03 SHA512 3da84d7828a82c738f6ea5fe776c989283ba257cc6884aebfc090cee7e33c88471dee1a93f4a87a300b11f43b98f6624b838171f06227add24afcb1d57208df1 WHIRLPOOL 547dc65906a5dd6d34148675ec2be869ed18b0fef99f7f8632ebca0843e8764e575ca16ea1f7f839576f6de9464d29154171ca2187141e8141239f46468c8c2f
 DIST openjpeg_v1_4_sources_r697.tgz 2365447 SHA256 493e4db087bf5c5485618a1e1cfd827c4fb2ad421a4342903b166b76cf094b73 SHA512 3b7e07f9c41b007b45e607806073a42ee736d1fea7ab4286ed5046710adac910f656e5b40b420849852100b0fa1fd241597be90e0b2eb58e336fb73b757e1417 WHIRLPOOL 20b689cc0c1d65513b65531ff5909a790176cab3e80587c69f1d74ed4d48c8c75489546f10a6b08a7e1f30add292c578c55d1c7cb5578e1a4af122a87541fc8c
 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-r1.ebuild 1993 SHA256 8de9237dd4948c91c8c35b8ec175d59e1671010c049daf4711c9d4e3886eca5c SHA512 d9bc7bfb44f35d3cb4a2d9097bddbd1452fc4e5874d7a1ae0faace07c5739ad2f773d6719507b59aecc556d8d1a8211ef35ea05444a54798893bcf52ddc15d18 WHIRLPOOL 7e673370c40fad96a6aab6fe9e5953fd48bb0b073b114b409d5107dc7e0772e4fcecd38ebd8745758d82e1fa24ac3276cf29dc81f45fab2e4e8459ffcf397175
 EBUILD openjpeg-1.5.1.ebuild 1868 SHA256 10f466e93eb5e73369d9312adbd6e2dbfe41d0b01cf460063027494f843818b6 SHA512 377d02e0990a3c2c1c97529d1d7f539834f185e4c8f7f956cd611983c8a40ec848b19ddfb892d1d1ac008782a067e4646536a243a9c4ee2638ac8fa787527eb0 WHIRLPOOL 6f6cb4e803587ab4aa8e2687efc491d9a26e55aea1cccdfab3a251c9bd21599635a39bc3b148c611728de9237fdbb81841a91454c356792936285d41a33c62e3
+EBUILD openjpeg-1.5.2.ebuild 2126 SHA256 d35e5080361fffba7cae731e6bc6f29f262078ed3e64d6e745ab7d33048f169a SHA512 c36ffac88d8a9f5b03432ba7abf381b2cf541894f87a2d8d51ceb8ab32d25cc69ee078ded97de97719a658d208fa1e1ceab42b2a3d273234fc5967d31eb320cd WHIRLPOOL 7f2049516379abd33aca8923147be18d754b039752e650cf40c8b00f523192b8f4c9aff132891a3c6122bf6df00610e234ab72292c55539217ebaa0187fc4dee
 EBUILD openjpeg-2.0.0.ebuild 1825 SHA256 bddbe215e0c22f58261710e357425ce4b3f0efcfb6b4df57c428137535de1580 SHA512 38f560e0998408f0b3720864efc2f4afe287932a20c683a48dd9c42c690f2707c309cd4f9505de46e1f7d049f9eb4e3ae805b15d1210f3b8c75bf7108f1d3bf5 WHIRLPOOL e39402e4d3a4613b4823790a25ed8d614a6a8147c91449a5400d57b8e6cd8846fbf58f18986faf313161710d87ec34114f4e76ec24a6358788b222018cbc94b8
+EBUILD openjpeg-2.1.0.ebuild 1899 SHA256 00b1cc67a81d636167c2c94fc100d34065f839dc0bd3cce0b7f41faaa83744aa SHA512 bec289f013fa5a434a8dbb41bed46006cde7a7922b96553719d0953e45048a3c291f082e46ee572c373fe8528060e03c98e05ad00d0acf46b472ec0d960cea03 WHIRLPOOL d3bbeb856c550929142e3f41373af698d0d026601b0b0544fd4f83fd0f707d57ea20183fbec9d93a47dff19f0973247f2b1eed1647a4e950c950632593c2e15d
 EBUILD openjpeg-9999.ebuild 1662 SHA256 f2d4374e07b629a471ac65f0b774a87f67bde7130a759912ba2b5c56d3391cf1 SHA512 02a6327ecea076952dae8c9156ca11236f2bef68cfb876a907b96e2cf78969bdaf48ce53dc65beaadf3460a713e07bcd297965f50b5fa673fd139b697893dd21 WHIRLPOOL 691826227be196cda0818c1f0d90f99fa2a7f1416ff94e076281f2dce5538ed930e2b1b6fbe28aeade6fce2c535f4241b1a25fadde3d5277336f0602b44aebf2
-MISC ChangeLog 13130 SHA256 936fc61aeb2901e588e1274076c83ddcec559f568d699bc667d2faf8fba36405 SHA512 4b3901b7766f92f057d38351006b99840d1d5e8800707ab38e2a34af18cfdaec4b6ba882acb557b67ae1af692e77098743311176750fc1980e99d1e888ba9a1f WHIRLPOOL ce335fe0378a39bee6eb9f49ab79d8ab453199f4216f179a84061707f698835872ed7f4c65e8533f825df544b3d093cba05700c4192480fe4c188b69f5cee19e
+MISC ChangeLog 13329 SHA256 16db7b47ab33331bde3d671c7c7fd2fdb59ee7aa41be77420a4444051912af91 SHA512 84cf2672dd484da12617da9a7907000758ad89cf98d31119b005962b241027f8cdda1c81db7e9b4829fb9eb70a978d647e786bbafdf6f0a7473dbad637522203 WHIRLPOOL f1c44f06ded24f18f3d21f7a9a044fc24828479f9edc85924edff660c3c1bc769b7a4fa9a33919f3d999699b5a0f7b703efaf8f47f04be7613fe15efe3fb493d
 MISC metadata.xml 240 SHA256 798e4e23637a9ded9dae0967f92aa498b39ad088a555aa94b4f716ba040db68c SHA512 c12ab1993f8b10c50a87bf215eb22613dc54cf8f3c049877959228694afcb1e848d9e13247c376c249b39af35945775f736bcf956c7f50e3d49f456e621ef979 WHIRLPOOL b8b0ff194273de5396bfb4d13c2f169eb481dab034aee85f1ebca948babded8851a1cc6c6047e51b6a20bb40654be025677a9872da63526c78eaa64854436f8b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCgAGBQJTLxW1AAoJELp701BxlEWf4BcQAMQE2okGs5ElrgUGkoL2sk++
-3MIk+jmPrBt47AKa5bnyH55f/fNAEVt8VzvSGLaArsU3o1UWvUxP9XqgjHdYwCFX
-1aWNiSMTLJ9pRgfjDo+l9C3UUGBbapZBzCuqCQC43c9nFUDDYC89YNjEwlilmGRp
-2PQmnkg2p2RmK8ukBKYWD0tf9wB8lAAwydMjb+br1fog6JjYSaxY0wu9nE00XBuL
-qH84sa0MsWgOJz1IRZXTXAi9fjN4hsiJaHYP1qqAhsR9KakizWd92MgBEoaggTzY
-SQ4E9Joxy57U58SvFnml9IywnPQp+9LZYv6hOuOMQNERHAmuRyQecQMmvLvniNXe
-5eStU3H6hvIvbCTSHak/6ER64/8M9OtQpM3MuNqNhn9RzhF14DkY7kra6pEI91g4
-3oxS9YZ7fTgcTqyD5IyGThDfGAY25U7oi+M2NVIROU1QUtMiF+lNDJ6JaqNSQy69
-Y/TUdKeO1NuRCQBvu/L08ke29r3rP717PVK/bl7cDyKLu8C6qNk+2bdymIxLdPFV
-ZkKXX6w6Nec/BhTM0pBst7PJJVAQj6i6scvaErc4nNlngquXKE2FzB/i1Bjy0gbl
-p9XzrY4tmCcKe44MyDPbzTX/iylUdET5aDSjT6o3jyPmBW24HnqQtP0D+hG9v56S
-wWpMsirjoT9W4KbWvHFJ
-=Jy1N
+iQEcBAEBCAAGBQJT+gJeAAoJEEdUh39IaPFN23MH+QEuCIZghDL5azvb9Ew9BW80
+JZLKKNLjC6fCdlkEbK7Kh/wUmvHfbJ0AL9OzfagQFHPLkdS+4MtS+jo5z6il+CqH
+Q8SxhwGPPWlL5tz2imuFQiwydAHuY0RCFtka7e04om2Yz2+Ui3hUtK0GtXNsmuN/
+9a5ylaIfkl9yPw1fo0fjbWuo2P79dfAdDCblJ/XM+kTsBEbvy7Ab5vunVauLzTbI
+XaObCFVzegxitmMDrFAw0gOPQySsJCZ6sgFTCV6XsLpwZx9Xoccwq6752L9DeF0c
+DE8BmNQeM1IHMsF6zMRtIpe8sdT4eert/r0gpxMt0Pj05l3fTfx0kmrBYNbQxAY=
+=umqY
 -----END PGP SIGNATURE-----
diff --git a/media-libs/openjpeg/openjpeg-1.5.2.ebuild b/media-libs/openjpeg/openjpeg-1.5.2.ebuild
new file mode 100644
index 000000000000..dc4925277778
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-1.5.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.5.2.ebuild,v 1.1 2014/08/24 15:20:59 ssuominen Exp $
+
+EAPI=5
+inherit multilib cmake-utils multilib-minimal
+
+DESCRIPTION="An open-source JPEG 2000 library"
+HOMEPAGE="http://code.google.com/p/openjpeg/"
+SRC_URI="mirror://sourceforge/${PN}.mirror/${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 static-libs 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 )
+
+RESTRICT="test" #409263
+
+src_prepare() {
+	# Stop installing LICENSE file, and install CHANGES from DOCS instead:
+	sed -i -e '/INSTALL.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
+		$(cmake-utils_use_build test TESTING)
+		)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=( $(cmake-utils_use_build doc) )
+	else
+		mycmakeargs+=( -DBUILD_CODEC=OFF )
+	fi
+
+	cmake-utils_src_configure
+
+	if use static-libs; then
+		mycmakeargs=(
+			-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
+			$(cmake-utils_use_build test TESTING)
+			-DBUILD_SHARED_LIBS=OFF
+			-DBUILD_CODEC=OFF
+			)
+		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
+	fi
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	if use static-libs; then
+		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if use static-libs; then
+		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
+		#static bins overwritten by shared install
+	fi
+
+	cmake-utils_src_install
+
+	dosym openjpeg-1.5/openjpeg.h /usr/include/openjpeg.h
+	dosym libopenjpeg1.pc /usr/$(get_libdir)/pkgconfig/libopenjpeg.pc
+}
diff --git a/media-libs/openjpeg/openjpeg-2.1.0.ebuild b/media-libs/openjpeg/openjpeg-2.1.0.ebuild
new file mode 100644
index 000000000000..b2d517524e64
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-2.1.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-2.1.0.ebuild,v 1.1 2014/08/24 15:20:59 ssuominen Exp $
+
+EAPI=5
+inherit cmake-utils multilib
+
+DESCRIPTION="An open-source JPEG 2000 library"
+HOMEPAGE="http://code.google.com/p/openjpeg/"
+SRC_URI="mirror://sourceforge/${PN}.mirror/${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 static-libs test"
+
+RDEPEND="media-libs/lcms:2=[static-libs?]
+	media-libs/libpng:0=[static-libs?]
+	media-libs/tiff:0=[static-libs?]
+	sys-libs/zlib:=[static-libs?]"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS CHANGES NEWS README THANKS )
+
+RESTRICT="test" #409263
+
+src_prepare() {
+	# Stop installing LICENSE file, and install CHANGES from DOCS instead:
+	sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' CMakeLists.txt || die
+}
+
+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
+
+	if use static-libs ; then
+		mycmakeargs=(
+			-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
+			$(cmake-utils_use_build test TESTING)
+			-DBUILD_SHARED_LIBS=OFF
+			)
+		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use static-libs ; then
+		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_compile
+	fi
+}
+
+src_install() {
+	if use static-libs ; then
+		BUILD_DIR=${BUILD_DIR}_static cmake-utils_src_install
+		#static bins overwritten by shared install
+	fi
+
+	cmake-utils_src_install
+}