Version bump wrt #409203 by Agostino Sarubbo

Package-Manager: portage-2.2.0_alpha92/cvs/Linux x86_64

4 files changed, 136 insertions, 7 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/Manifest b/media-libs/openjpeg/Manifest
index 4d27383efe62..28c59615b7d5 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,18 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX openjpeg-1.4-cmake-stdbool.patch 1317 RMD160 fca6d38a19d66701808414c30abfd7dff0ad0024 SHA1 8f3964e8b0d6700bfcde3389730667d6e9e0203c SHA256 8e3d68216d392ad2529c00aeca9c30189911e52b44a02b159109b72bccd9a469
 AUX openjpeg-1.4-libpng15.patch 524 RMD160 1f7828677ce4dee97a42a5d412341624ceee3790 SHA1 2f168a0ecfefcec5bc7b0bd59f9064fdd104b266 SHA256 12ed8c1108fc0592f6d007db08c8c374725ef36f52c3cd76f2b378b2ffbae25a
 AUX openjpeg-1.4-linking.patch 595 RMD160 6177609274bd222c2a73c4f56db0b234306c5b20 SHA1 41fbd01354e004f2333a8f4cc74ee5847e9340f8 SHA256 cc79c403d8c9530fe753c5f9cf58d4ab8f95935cf88e02edfe31c98f445b3d0a
 AUX openjpeg-1.4-pkgconfig.patch 1573 RMD160 9de432a117e36ca80c493a50708053010f39b374 SHA1 f755e6aa220c0f107c13a46398aafe60b7189b01 SHA256 f026fc520583943dc5b079d3838fe61d230862cd7e7622a0dd3720427b5de594
+AUX openjpeg-1.5.0-build.patch 2529 RMD160 50d2014ca3456ea99ae78c89caa8febbdce92fc6 SHA1 18ae7cd389a1db814362447502e61957a2adb376 SHA256 be2e7ddbdfd4e9d8c73a5d5d56b318cdab083cdbd7cb3ec2ce33beaf7fd674bb
+DIST openjpeg-1.5.0.tar.gz 2117572 RMD160 ffa85dbb0a3ba1545bc6974f4950f466789c04ef SHA1 dce705ae45f137e4698a8cf39d1fbf22bc434fa8 SHA256 c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace
 DIST openjpeg_v1_4_sources_r697.tgz 2365447 RMD160 c0d88c4a312651bac17d50bd6917e1b678fcf8f7 SHA1 9ef6a08ecf5944962b4e2cd7569ac01a8eaa66d0 SHA256 493e4db087bf5c5485618a1e1cfd827c4fb2ad421a4342903b166b76cf094b73
 EBUILD openjpeg-1.4-r1.ebuild 1407 RMD160 b885c49ff7615f282fabc860aa55756b442e351e SHA1 c598b840b8e865db7074d1ea0ed8bfe00329d3b4 SHA256 e3432ae9d9487e2b5ac396aa4745dcb288a56a25f7acae3bfd572d42139c1c8d
-MISC ChangeLog 8107 RMD160 928e5479102cce11a9de973a088a87318254a82d SHA1 23daa56835fe05bab2a098dc4b17eae0354002ab SHA256 9b0ba4981d8527b8c2c0be10931fd48707187ced389d747508f0b8a8380de681
+EBUILD openjpeg-1.5.0.ebuild 1191 RMD160 55f18acaadfb6d79518a5b5fa49c11b2f5d02592 SHA1 6d7e86e9c60683d67b4f64bd21204a23785c3b45 SHA256 d6e73cdb5ef43ee015f400435299ddf98d4bb0d3984534c79b75f36e11029ac4
+MISC ChangeLog 8306 RMD160 be384ef33d6560b3d1d4dd6f5a6cad1833fba35a SHA1 3737d76626b58c203a94366cc406dda78d1d8da5 SHA256 abd73b00fed23bb7eb86ea5625e7c28ad28a3203dd371bd8ff1809b750244360
 MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6/qP0ACgkQgAnW8HDreRZ5NwCfZZzJ8uZpCwHikEeKjMVXSVDc
-oKkAn2QP7AQ0A7uPJZA4HL0QdQC/BjcG
-=hYTC
+iQEcBAEBAgAGBQJPai1lAAoJEEdUh39IaPFNBUwH/itZvJRGWC5gm5MsuTF1VnXl
+beJj2TxqOeh1vaOeSj0FrXuBoR+A/Qb7BBbmClUULkEo0GvwllgHtBTRHAfBcZDo
+SG+lcEgcnrd4ijgT/6gHZk+geC4hL7/MWzE0yse6jGpxgohlc/Umh47ffnr9Ndqi
+3rm14MER2I9RjqCXqlxVEuK8Nsg3f8Bb2d7q+3g8ABg1EN5L3PP2CoUjIwVph2DW
+/ijFogzJR6XO6YDCDPBgWvV74o/BmZXw4woLXIE6qXOh9p84t7HOs+5BWeDL2Oro
+FZMeiYZfRZ8Dph4hl9qK1CY4Kaz85Jk+mKVswQy7l7q0RVVxvSyTIjeha3IbtJY=
+=RFbj
 -----END PGP SIGNATURE-----
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
+}