Add USE=static-libs

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

3 files changed, 34 insertions, 22 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index cc2fc8ea5f5a..e2747bd9655e 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.74 2013/06/06 22:19:04 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.75 2013/06/08 00:20:19 xmw Exp $
+
+  08 Jun 2013; Michael Weber <xmw@gentoo.org> files/openjpeg-1.5.1-build.patch,
+  openjpeg-1.5.1.ebuild:
+  Add USE=static-libs
 
   06 Jun 2013; Michael Weber <xmw@gentoo.org> +files/openjpeg-9999-mupdf.patch,
   openjpeg-9999.ebuild:
diff --git a/media-libs/openjpeg/files/openjpeg-1.5.1-build.patch b/media-libs/openjpeg/files/openjpeg-1.5.1-build.patch
index 4b5cbfdc849d..9c16a3c05f92 100644
--- a/media-libs/openjpeg/files/openjpeg-1.5.1-build.patch
+++ b/media-libs/openjpeg/files/openjpeg-1.5.1-build.patch
@@ -14,19 +14,6 @@ Some bits have been loaned from http://pkgs.fedoraproject.org/gitweb/?p=openjpeg
 -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 @@
diff --git a/media-libs/openjpeg/openjpeg-1.5.1.ebuild b/media-libs/openjpeg/openjpeg-1.5.1.ebuild
index a7418a85cf0f..cc9f16c71c89 100644
--- a/media-libs/openjpeg/openjpeg-1.5.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.1.ebuild
@@ -1,9 +1,9 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.5.1.ebuild,v 1.2 2013/06/08 00:20:19 xmw Exp $
 
 EAPI=5
-inherit cmake-utils multilib
+inherit cmake-utils multilib toolchain-funcs
 
 DESCRIPTION="An open-source JPEG 2000 library"
 HOMEPAGE="http://code.google.com/p/openjpeg/"
@@ -12,12 +12,12 @@ 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"
+IUSE="doc test static-libs"
 
-RDEPEND="media-libs/lcms:2=
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	sys-libs/zlib:="
+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 )"
 
@@ -35,12 +35,33 @@ src_configure() {
 		)
 
 	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
 
-	# 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
 }