Add bump to fix include path and libdir handling, bug 495096

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)

5 files changed, 186 insertions, 1 deletions

diff --git a/media-libs/libraw/ChangeLog b/media-libs/libraw/ChangeLog
index e7546ba6f295..4fff716cb488 100644
--- a/media-libs/libraw/ChangeLog
+++ b/media-libs/libraw/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libraw
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/ChangeLog,v 1.72 2013/11/23 23:10:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/ChangeLog,v 1.73 2013/12/23 14:11:05 dilfridge Exp $
+
+*libraw-0.16.0_beta1-r1 (23 Dec 2013)
+
+  23 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +libraw-0.16.0_beta1-r1.ebuild, +files/libraw-0.16.0_beta1-include.patch,
+  +files/libraw-0.16.0_beta1-libsuffix.patch,
+  +files/libraw-0.16.0_beta1-libsuffixpc.patch:
+  Add bump to fix include path and libdir handling, bug 495096
 
   23 Nov 2013; Tim Harder <radhermit@gentoo.org> -libraw-0.16.0_alpha2.ebuild,
   -libraw-0.16.0_alpha2-r1.ebuild:
diff --git a/media-libs/libraw/files/libraw-0.16.0_beta1-include.patch b/media-libs/libraw/files/libraw-0.16.0_beta1-include.patch
new file mode 100644
index 000000000000..d0d2355d4981
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.16.0_beta1-include.patch
@@ -0,0 +1,20 @@
+diff --git a/cmake/data/libraw.pc.cmake b/cmake/data/libraw.pc.cmake
+index abe6c03..aede5f2 100644
+--- a/cmake/data/libraw.pc.cmake
++++ b/cmake/data/libraw.pc.cmake
+@@ -9,4 +9,4 @@ URL: http://www.libraw.org
+ Requires:
+ Version: @RAW_LIB_VERSION_STRING@
+ Libs: -L${libdir} -lraw
+-Cflags: -I${includedir}/libraw
++Cflags: -I${includedir}
+diff --git a/cmake/data/libraw_r.pc.cmake b/cmake/data/libraw_r.pc.cmake
+index d74e49a..16134e8 100644
+--- a/cmake/data/libraw_r.pc.cmake
++++ b/cmake/data/libraw_r.pc.cmake
+@@ -9,4 +9,4 @@ URL: http://www.libraw.org
+ Requires:
+ Version: @RAW_LIB_VERSION_STRING@
+ Libs: -L${libdir} -lraw_r
+-Cflags: -I${includedir}/libraw
++Cflags: -I${includedir}
diff --git a/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffix.patch b/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffix.patch
new file mode 100644
index 000000000000..aa2a813051f9
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffix.patch
@@ -0,0 +1,64 @@
+Backport of
+From ce720038ed40e4c4554e0d8c0e4e003834ed1652 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Fri, 29 Nov 2013 20:53:46 +0100
+Subject: [PATCH] Allow specifying a suffix of the libdir
+To allow installing to lib32/64 e.g.
+
+
+diff -ruN LibRaw-0.16.0-Beta1.orig/CMakeLists.txt LibRaw-0.16.0-Beta1/CMakeLists.txt
+--- LibRaw-0.16.0-Beta1.orig/CMakeLists.txt	2013-12-23 14:36:05.569116564 +0100
++++ LibRaw-0.16.0-Beta1/CMakeLists.txt	2013-12-23 14:39:37.716121606 +0100
+@@ -95,6 +95,8 @@
+ # ==================================================================================================
+ # General definitions rules
+ 
++SET(LIB_SUFFIX "" CACHE STRING "Define suffix of lib directory name (32/64)" )
++
+ # To prevent warnings from M$ compiler
+ IF(WIN32 AND MSVC)
+     ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+@@ -560,10 +562,10 @@
+ # Configure and install data file for packaging.
+ IF(NOT WIN32)
+     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/data/libraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc @ONLY)
+-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc DESTINATION lib/pkgconfig)
++    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ 
+     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/data/libraw_r.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libraw_r.pc @ONLY)
+-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw_r.pc DESTINATION lib/pkgconfig)
++    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw_r.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ 
+     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/data/libraw.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/libraw.lsm)
+ ENDIF()
+@@ -584,14 +586,14 @@
+ # Install Shared binary files.
+ INSTALL(TARGETS raw
+         RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        LIBRARY DESTINATION lib${LIB_SUFFIX}
++        ARCHIVE DESTINATION lib${LIB_SUFFIX}
+        )
+ 
+ INSTALL(TARGETS raw_r
+         RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        LIBRARY DESTINATION lib${LIB_SUFFIX}
++        ARCHIVE DESTINATION lib${LIB_SUFFIX}
+        )
+ 
+ # Install find cmake script to the system for client applications.
+@@ -633,8 +635,9 @@
+ 
+     INSTALL(TARGETS ${_target}
+             RUNTIME DESTINATION bin
+-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++            LIBRARY DESTINATION lib${LIB_SUFFIX}
++            ARCHIVE DESTINATION lib${LIB_SUFFIX}
++    )
+ 
+ ENDMACRO(LIBRAW_BUILD_SAMPLES)
+ 
diff --git a/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffixpc.patch b/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffixpc.patch
new file mode 100644
index 000000000000..7d140c713c73
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.16.0_beta1-libsuffixpc.patch
@@ -0,0 +1,24 @@
+diff --git a/cmake/data/libraw.pc.cmake b/cmake/data/libraw.pc.cmake
+index 9d34612..abe6c03 100644
+--- a/cmake/data/libraw.pc.cmake
++++ b/cmake/data/libraw.pc.cmake
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib
++libdir=${prefix}/lib@LIB_SUFFIX@
+ includedir=${prefix}/include/libraw
+ 
+ Name: @PROJECT_NAME@
+diff --git a/cmake/data/libraw_r.pc.cmake b/cmake/data/libraw_r.pc.cmake
+index bf779d9..d74e49a 100644
+--- a/cmake/data/libraw_r.pc.cmake
++++ b/cmake/data/libraw_r.pc.cmake
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib
++libdir=${prefix}/lib@LIB_SUFFIX@
+ includedir=${prefix}/include/libraw
+ 
+ Name: @PROJECT_NAME@
diff --git a/media-libs/libraw/libraw-0.16.0_beta1-r1.ebuild b/media-libs/libraw/libraw-0.16.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..e2cc1e79be2a
--- /dev/null
+++ b/media-libs/libraw/libraw-0.16.0_beta1-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/libraw-0.16.0_beta1-r1.ebuild,v 1.1 2013/12/23 14:11:05 dilfridge Exp $
+
+EAPI=5
+
+inherit cmake-multilib toolchain-funcs
+
+MY_PN=LibRaw
+MY_PV=${PV/_b/-B}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
+HOMEPAGE="http://www.libraw.org/"
+SRC_URI="http://www.libraw.org/data/${MY_P}.tar.gz
+	demosaic? (
+		http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
+		http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
+	)"
+
+# Libraw also has it's own license, which is a pdf file and
+# can be obtained from here:
+# http://www.libraw.org/data/LICENSE.LibRaw.pdf
+LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3"
+SLOT="0/10" # subslot = libraw soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
+
+RDEPEND="jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/jasper[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( Changelog.txt README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.16.0_alpha2-docs.patch
+	"${FILESDIR}"/${PN}-0.16.0_alpha2-automagic-jasper.patch
+	"${FILESDIR}"/${PN}-0.16.0_alpha2-libdir.patch
+	"${FILESDIR}"/${PN}-0.16.0_alpha2-lcms2-first.patch
+	"${FILESDIR}"/${PN}-0.16.0_alpha2-custom-demosaic-paths.patch
+	"${FILESDIR}"/${PN}-0.16.0_beta1-libsuffix.patch
+	"${FILESDIR}"/${PN}-0.16.0_beta1-libsuffixpc.patch
+	"${FILESDIR}"/${PN}-0.16.0_beta1-include.patch
+)
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable openmp OPENMP)
+		$(cmake-utils_use_enable jpeg JPEG)
+		$(cmake-utils_use_enable jpeg2k JASPER)
+		$(cmake-utils_use_enable lcms LCMS)
+		$(cmake-utils_use_enable examples EXAMPLES)
+		$(cmake-utils_use_enable demosaic DEMOSAIC_PACK_GPL2)
+		$(cmake-utils_use_enable demosaic DEMOSAIC_PACK_GPL3)
+		-DDEMOSAIC_PACK_GPL2_PATH="${WORKDIR}/${MY_PN}-demosaic-pack-GPL2-${MY_PV}"
+		-DDEMOSAIC_PACK_GPL3_PATH="${WORKDIR}/${MY_PN}-demosaic-pack-GPL3-${MY_PV}"
+	)
+	cmake-multilib_src_configure
+}