Switch to cmake build system (fixes bug #488598) and add multilib support (bug #474652).

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

8 files changed, 254 insertions, 10 deletions

diff --git a/media-libs/libraw/ChangeLog b/media-libs/libraw/ChangeLog
index a7376d2e9663..8730b4c6fcbe 100644
--- a/media-libs/libraw/ChangeLog
+++ b/media-libs/libraw/ChangeLog
@@ -1,6 +1,18 @@
 # 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.67 2013/10/18 02:57:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libraw/ChangeLog,v 1.68 2013/10/20 11:06:50 radhermit Exp $
+
+*libraw-0.16.0_alpha2-r1 (20 Oct 2013)
+
+  20 Oct 2013; Tim Harder <radhermit@gentoo.org>
+  +libraw-0.16.0_alpha2-r1.ebuild,
+  +files/libraw-0.16.0_alpha2-automagic-jasper.patch,
+  +files/libraw-0.16.0_alpha2-custom-demosaic-paths.patch,
+  +files/libraw-0.16.0_alpha2-docs.patch,
+  +files/libraw-0.16.0_alpha2-lcms2-first.patch,
+  +files/libraw-0.16.0_alpha2-libdir.patch:
+  Switch to cmake build system (fixes bug #488598) and add multilib support
+  (bug #474652).
 
 *libraw-0.16.0_alpha2 (18 Oct 2013)
 
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 1cc6dbcd7b6b..e69881883bf1 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -2,6 +2,11 @@
 Hash: SHA256
 
 AUX libraw-0.13.4-docs.patch 440 SHA256 d9807623a7d8d43deba5c89da2c320dd2badf5f6180b53b7b97ae60b55bfd84f SHA512 107c6bf01dbe694ac017b0cda8ee9b70e6b651d14f18e380399713cb038cdd45130d2b73e9e83e081ba0ccf21ca261cca0b2692e391012834d9d9ab52362cdd5 WHIRLPOOL 03baaad04afe45be8e289a68649f9c31f9762997901a881e09e80483a1da977df21f5d3126c424041060791c180d8921ea2e50ae5563a56b756078fd3256d3cb
+AUX libraw-0.16.0_alpha2-automagic-jasper.patch 1220 SHA256 ec59ebfb24690f7e5bfee043f05710b87b1f0089bc5c1492ac99e142c21021a0 SHA512 c30dbf7cb174108c236d6e9cf911cdb38d7cbf2cce06be12eb85fb20d5c849f87d1240490e956e39599932083c2f20d721cce745f14acdaf37561ecb0e2844ea WHIRLPOOL 54ba10153876f7286a2379897613f1f36ef8046418904181151499038506344e187840e497770c4c452a23aab70193733787c69b9d43953cd8fb9c25c08cd8d2
+AUX libraw-0.16.0_alpha2-custom-demosaic-paths.patch 1099 SHA256 487eebc9cd75e57fd7fe97aa57b6ef33d0c706ecd82ee19710bc87e0c8753908 SHA512 fdead76d022b6ace7c83421d966172c68bb715c6de940376faa4be861d06ae896aaa22f56104eb2d7be2e9da0d7db576bca722f92fb1e18f0a9dee4aaddf2e75 WHIRLPOOL bb51945aa2637bb41a3bd5032ebb5d65b15cbfbb1f19c6d17ff916fb3361c17dfb253a35a281ca734da9e8243db48722b576edb17806a7e5ce123f15bfc71681
+AUX libraw-0.16.0_alpha2-docs.patch 929 SHA256 447003d63cb85f7ebb34de8b7a7f907f53263504a7af1e7cc9f04b002c50acde SHA512 4cf3305c3ded6a185783468c413626684a6f2173e1adae62f7e990b8ca3efa9e28882bcff82df5ba6e235d89e347d9d5dd81dc507937486dcd2e9bd76b8f641c WHIRLPOOL 823e4d6d6715ee572701af9e3ecd69152e47e59d87d6a72f70430fa1547efaa98b2cc87090f36b0f92c11bbf5d1f00c2359afbaf66b0792dd54fbdf2c11b8e3b
+AUX libraw-0.16.0_alpha2-lcms2-first.patch 2641 SHA256 4483d8e3fd5b620b4d302c50e3c5a129acc82198e89e349a95244726f51b1609 SHA512 31ba032f67720fb55308aad0782e509bfca9dac92e9da055bfaa3fbc85b84b34f27fc86a0c40becf4fce0c007e713c3c18517bef5724c12f3d3a5c9d0bf8a070 WHIRLPOOL b0934aa18e232d65af4cae4070ebba9c319f15b6106c85cd3f7d7dc5138bb2507e1be32a32d69e09503ad4c316884e96c9d3dfa3ddc271ebb87ab090e4f97491
+AUX libraw-0.16.0_alpha2-libdir.patch 997 SHA256 51a2a9b13dec73349a3efb931d34120c2f5fa41f426491545f5dd6e719adc89b SHA512 07fdead0e86eab6f7b76511928cdafaf4a4b09802f87f72c6d558fea4e4026166bbe5434c597cbb332948475a61d81e814369e0804893dca05babc1a9718144c WHIRLPOOL 9c8fada2775f057f7ca750c9adad5eed92d9c7eca746a81bb9e293defa89f1a56a7a6e5eadf2db84cf77f12b71cf3d19e798238c0dbc6331b5788b17a9418036
 DIST LibRaw-0.15.4.tar.gz 1427757 SHA256 b3fcfee33bc34ae5869a9741880e28a62f029f196cb1d1a007ab156f4a110f79 SHA512 86a0c3bd8e019b415e75ef8e505e317188d8c24fdcf1aae804234e10cc3dcfd452537cc9a25a2a94f27c3b2ee70ab503af6ab189be3449b2ace3a61353fc255e WHIRLPOOL f8ef7dcb88685326348d5a713bc6c107093e3e2081dbf28e3368b8acfb30a3bafe5bcc9be7d02bd35c8f464a6b7bfb2a4070018cd0d559676c0670d4a86c82e7
 DIST LibRaw-0.16.0-Alpha2.tar.gz 710507 SHA256 6ca75ad19d193e595d2191d0d176f25c8653d2c9770a42e349bc51c61094b868 SHA512 29e1cf7975a4f3ca3a6f87581c7f41f431967a035f515a4c13debd2ac9a0612bf320f6ae3cc08310dfbf2a72ec3a379275c460c85319078ee2ff11bce96a7cdc WHIRLPOOL 1e13d0d0af41d11e15fb6db055cf4346e741ac5acb78e9bd232f8b43113ad6f32e1e91a8546c3fe5e1bf9f218546425fb5f703fad171bb1743ba7136df867c8f
 DIST LibRaw-demosaic-pack-GPL2-0.15.4.tar.gz 31271 SHA256 4c4dc9328edab4af6af7a76ea24c91c81b8181ec347016ea4697fb67c34678ba SHA512 c75c9823f5c888a81c5e8240999d3facf9a5ed9518c6c1ec93930281cfb055d93b4a44cc80f384032bdc36abc843ed75f53c1c1ee03127221d478a17d26fa0ad WHIRLPOOL 1f371dc6d74c9302b03e3264f82f224d3b6e95fb59090e0d44949a5bcfe3c6fd05cc62830c7f83b27ff9e586b2c9ccea1ccad10e8295b30bef188726f7bc04e0
@@ -9,17 +14,18 @@ DIST LibRaw-demosaic-pack-GPL2-0.16.0-Alpha2.tar.gz 31732 SHA256 576755d29062fa3
 DIST LibRaw-demosaic-pack-GPL3-0.15.4.tar.gz 38196 SHA256 1868c252ae0fc67d5a06862d93119f818a9208eef93f0e7832f6112ac6ef208a SHA512 0a369349ed11bb888d042724fe85e5c2bd3b553c68aeb6637877560f733956211201fc30940b168e06f3bfaa0f564190b1ab7b999a7a854227db4a9219874e36 WHIRLPOOL df54fc93f88862b4a736fc7500a740439cbe7ec7d897ca9fb73953d60e77e440b470270f7b5ec1fe5a5bec91e1cddbf2eac44bd262b1b1d1d1a5b3d878dbe588
 DIST LibRaw-demosaic-pack-GPL3-0.16.0-Alpha2.tar.gz 39295 SHA256 f549de9cd0e29f94170b5af8c3554a4954a172054cbeaae9ee782915239ad97a SHA512 506eb512759e770dcef91ba580e04340163d99363563523d26673b5436734042ef0ac2efcbcc9f04fd78f62757d35a5731c1e58ccf30edc0184af9dd367f109d WHIRLPOOL 642c858510f3e659ea03228e6e1bba99901c88f7486c2584a34e4b65eb9dd8368dad9c4ea8f3f50fd1cebb7cab7631c7a0c329d965f9c59fae1916b3450fc982
 EBUILD libraw-0.15.4.ebuild 1722 SHA256 fb906f9053ace2b852de273e81db0e23a6bed78ed15bc667111b9ae6fccb595b SHA512 4a1f668c42cce2dce6edf2a15349c508a171069a274bc6f02592bc5fa29420fbd4fb2c747cae2a69407bfc3b897adaec0f65e7e126b2cbf0651aaa520bbbf90e WHIRLPOOL 2b1fcfadc3d00f701bc3aa4cf7095b60c44cdb1ada825d717eed8f3a8313976bb1cefe9429b449b3f8dbe303349223e5a66bd2e466f35147f47911391cebdcd2
+EBUILD libraw-0.16.0_alpha2-r1.ebuild 2147 SHA256 e6a2dd235efcb629bc7994db20fabb03c5e9bd4c1d73bd7f06cc46518ddc81e1 SHA512 20754203c89037bdcbd96f9dfa6c6e06a85634db1b5d10bf9b0d7cffb3e92e714e6c2156628f436565645c50da5dc2772b954fd2be6e8f6fc255600b56ce229a WHIRLPOOL 25f5ada00bef5d739fe018e72db7c0ff9e665cd7dba8d11580f1799fa96f0b9fb6969c4731e0eeacceb7d7083bd776bc8d25f6bd647d55571b7ff5eef8e2b52d
 EBUILD libraw-0.16.0_alpha2.ebuild 1739 SHA256 791c9b58ab19d5ef9c92ac3e8294fa1de804f4d890121e0da58421d6bf7ba517 SHA512 9e46eb6aa9dcdc855959909ba0432f9f5699e776f38a524b009b76a37bc5d3dd6c3713c5b3c878f44c9840e45582b8cb628143d1b65d964acfefcd53216ed9ed WHIRLPOOL 666c4c8367b94212f119e970d1f6a57d3ace01a41524192378580dc61b0fa1ce400154eaee6b588e23a4e12a02adb768f561294daca40b2bcb1638002e320727
-MISC ChangeLog 8867 SHA256 26a74d1dd0f6bf7c93317fb144e1a1404655a16ae75d0e5fdc6e3eaaf6995d29 SHA512 fb1d083e361051a1836697ae66340b87f67c9414275a034d649f77a931a64046f9d9735a540f3d4a393848312732278d489b47c6f4d0df0fbd90c376b4d4144a WHIRLPOOL 837fd0c990b551f6ad51b8899118cbb6934f3d857edca47bedd2308f00b53ae3042bcc187db672017d1ac0f7b5d12c60b83c088b74220b2523a3592df48d9c4f
+MISC ChangeLog 9333 SHA256 24b55dcd278b260b1af04af8e54e29b5e2bd5e924d9fe904006ebb2274527c02 SHA512 4ac81fb07fc3577657803266ad91ab78fb768c20691f6897e3d3ce7f465b86fa46d68810dfb21df1dbec944d28dcadbd39e2e9887cbe5c95228a242c55ab6267 WHIRLPOOL 7a929904bb58a04ce11ee9b541c7d8b1287e1a305124f47eb5e7cb2a407f2efadcd1e99583305fd011d554ac9675ebb7938d6497819b1efd6c5c212a995ac3a1
 MISC metadata.xml 262 SHA256 6f1ac2a15c2ecd16625930728f1f9ab4b7f62533b1b8356171d2fb613afcb9f7 SHA512 6c03f109a820c23c167711f1f673f46817e683bcb68706f41ca1b49c687668b26a91412d6ac059e0b7e1768b17713f66d8332423723bd8f6fa74f9a0f73b595f WHIRLPOOL 771a0a900c3cfbb4a996475348ae522d931a484f2da1d7ef19d76b97db926d7db281cda7cab74def0bb4ddd28f01db3c22b9e77e52f76a5ccc975a24acc44c44
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSYKOTAAoJEEqz6FtPBkyjDcYH/34Mcf7tCg0FzVedUttSnvPJ
-Fgkl9HIISrTFlXf7tIZoF+aTQz7P1zFLMm1uA8PJCXRvjDWv12jyUCpsMM+itOGc
-5D2alCCy9/IZ6sQMIHJw6VfH4T1qNQOzIN8CyByzcN4/tbPZbVmgqLXEeMXCabnn
-i1VIRwUkNVMuvmIJu97dNsjOh+D7uwYryTr/PAZvy3N1pfzu6BXnJefqdVdPOCWK
-4QLPjKkfQ9ayhPNb+zNEL2Ky4sHGlOmog6wohhaqRR3U7rOkTylzIBgWQmUF6Sq3
-0FNHqf+u8mepNMGMQFbRT/hYHroLdYguBX3XbdZ25S1JUoDE7ZBa/1U9gjykkb0=
-=xx77
+iQEcBAEBCAAGBQJSY7lLAAoJEEqz6FtPBkyjdF0H/3UwM14QddUO61Piopvvsy8P
+F/H7mVfzWH7pwLm+YqOrSfKT489MbMWvAkhpIog1Qxbx+TSxTWE0EvXgFRBsaTNn
+sALZzTm8LQA8waU+qfhTqDvlvNGrFDISCWmNvEdshOvU0EYIgacUALcOSbpouM+2
+VVoeTvIzYBdAaiwx+PAp3Zxu6hazt0+QmLWS6O2azpB4/OHeog/P7lq2DqmjbrmZ
+DQ3ohAS0R+Jf0xzn0FT3FyPICT86RVO+vrqsjKiTPV6KzGTplQScCg+8vUVMivNa
+9j26bWL3DWckVk+fa+LvhigsSjC4gM/K9BgAmGYN6AmRus7MpV2QXYLXmzgIUhQ=
+=o2vc
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch b/media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch
new file mode 100644
index 000000000000..9f158f4ec5bb
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.16.0_alpha2-automagic-jasper.patch
@@ -0,0 +1,32 @@
+--- LibRaw-0.16.0-Alpha2/CMakeLists.txt
++++ LibRaw-0.16.0-Alpha2/CMakeLists.txt
+@@ -65,6 +65,7 @@
+ # Project Options
+ 
+ OPTION(ENABLE_OPENMP               "Build library with OpenMP support               (default=ON)"                 ON)
++OPTION(ENABLE_JASPER               "Build library with RedCine codec support        (default=ON)"                 ON)
+ OPTION(ENABLE_LCMS                 "Build library with LCMS support                 (default=ON)"                 ON)
+ OPTION(ENABLE_EXAMPLES             "Build library with sample command-line programs (default=ON)"                 ON)
+ OPTION(ENABLE_RAWSPEED             "Build library with extra RawSpeed codec support (default=OFF)"                OFF)
+@@ -207,12 +208,16 @@
+ 
+ # Jasper library check
+ 
+-FIND_PACKAGE(Jasper)
++SET(JASPER_FOUND false)
+ 
+-# Flag to use libjasper with LibRaw RedCine codec
+-IF(JASPER_FOUND)
+-    ADD_DEFINITIONS(-DUSE_JASPER)
+-    INCLUDE_DIRECTORIES(${JASPER_INCLUDE_DIR})
++IF(ENABLE_JASPER)
++	FIND_PACKAGE(Jasper)
++
++	# Flag to use libjasper with LibRaw RedCine codec
++	IF(JASPER_FOUND)
++		ADD_DEFINITIONS(-DUSE_JASPER)
++		INCLUDE_DIRECTORIES(${JASPER_INCLUDE_DIR})
++	ENDIF()
+ ENDIF()
+ 
+ # For registration to libraw_config.h
diff --git a/media-libs/libraw/files/libraw-0.16.0_alpha2-custom-demosaic-paths.patch b/media-libs/libraw/files/libraw-0.16.0_alpha2-custom-demosaic-paths.patch
new file mode 100644
index 000000000000..85a1df495947
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.16.0_alpha2-custom-demosaic-paths.patch
@@ -0,0 +1,23 @@
+Use externally defined paths for demosaic packs and rawspeed before falling back to defaults.
+
+--- LibRaw-0.16.0-Alpha2/CMakeLists.txt
++++ LibRaw-0.16.0-Alpha2/CMakeLists.txt
+@@ -81,9 +81,15 @@
+ SET(RAWSPEED_RPATH           "RawSpeed"           CACHE STRING 
+     "Relavive path to extra RawSpeed codec     (default=RawSpeed)")
+ 
+-SET(DEMOSAIC_PACK_GPL2_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${DEMOSAIC_PACK_GPL2_RPATH}")
+-SET(DEMOSAIC_PACK_GPL3_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${DEMOSAIC_PACK_GPL3_RPATH}")
+-SET(RAWSPEED_PATH           "${CMAKE_CURRENT_SOURCE_DIR}/${RAWSPEED_RPATH}")
++IF(NOT DEMOSAIC_PACK_GPL2_PATH)
++    SET(DEMOSAIC_PACK_GPL2_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${DEMOSAIC_PACK_GPL2_RPATH}")
++ENDIF()
++IF(NOT DEMOSAIC_PACK_GPL3_PATH)
++    SET(DEMOSAIC_PACK_GPL3_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${DEMOSAIC_PACK_GPL3_RPATH}")
++ENDIF()
++IF(NOT RAWSPEED_PATH)
++    SET(RAWSPEED_PATH           "${CMAKE_CURRENT_SOURCE_DIR}/${RAWSPEED_RPATH}")
++ENDIF()
+ 
+ # ==================================================================================================
+ # General definitions rules
diff --git a/media-libs/libraw/files/libraw-0.16.0_alpha2-docs.patch b/media-libs/libraw/files/libraw-0.16.0_alpha2-docs.patch
new file mode 100644
index 000000000000..442bfdc5471e
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.16.0_alpha2-docs.patch
@@ -0,0 +1,21 @@
+--- LibRaw-0.16.0-Alpha2/CMakeLists.txt
++++ LibRaw-0.16.0-Alpha2/CMakeLists.txt
+@@ -579,18 +579,6 @@
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/FindLibRaw.cmake
+         DESTINATION ${CMAKE_ROOT}/Modules)
+ 
+-# Install doc data files.
+-IF(NOT WIN32)
+-    INSTALL(FILES       ${CMAKE_CURRENT_SOURCE_DIR}/COPYRIGHT
+-                        ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.CDDL
+-                        ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.LGPL
+-                        ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.LibRaw.pdf
+-                        ${CMAKE_CURRENT_SOURCE_DIR}/Changelog.txt
+-            DESTINATION share/libraw
+-            COMPONENT main
+-           )
+-ENDIF()
+-
+ # Uninstall rules
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/Uninstall.cmake ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake COPYONLY)
+ ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake")
diff --git a/media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch b/media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch
new file mode 100644
index 000000000000..8b96df08257a
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.16.0_alpha2-lcms2-first.patch
@@ -0,0 +1,52 @@
+Check for lcms2 before falling back to lcms1.
+
+--- LibRaw-0.16.0-Alpha2/CMakeLists.txt
++++ LibRaw-0.16.0-Alpha2/CMakeLists.txt
+@@ -119,27 +119,27 @@
+ SET(LCMS_SUPPORT_CAN_BE_COMPILED false)
+ 
+ IF (ENABLE_LCMS)
+-    MESSAGE(STATUS "Check for LCMS1 availability...")
+-    FIND_PACKAGE(LCMS)
+-    IF (LCMS_FOUND)
+-        MESSAGE(STATUS "Found LCMS1: ${LCMS_LIBRARIES} ${LCMS_INCLUDE_DIR}")
+-        INCLUDE_DIRECTORIES(${LCMS_INCLUDE_DIR})
+-        MACRO_LOG_FEATURE(LCMS_FOUND "LCMS1" "A small-footprint color management engine" "http://www.littlecms.com" TRUE "" "Needed by libkdcraw")
+-        # Flag to compile Little CMS version 1 with LibRaw
+-        ADD_DEFINITIONS(-DUSE_LCMS)
+-        # For compatibility
+-        SET(LCMS2_LIBRARIES ${LCMS_LIBRARIES})
+-        SET(LCMS_SUPPORT_CAN_BE_COMPILED true)
++	MESSAGE(STATUS "Check for LCMS2 availability...")
++	FIND_PACKAGE(LCMS2)
++	IF (LCMS2_FOUND AND (LCMS2_VERSION VERSION_EQUAL 2.1 OR LCMS2_VERSION VERSION_GREATER 2.1))
++		MESSAGE(STATUS "Found LCMS2: ${LCMS2_LIBRARIES} ${LCMS2_INCLUDE_DIR}")
++		INCLUDE_DIRECTORIES(${LCMS2_INCLUDE_DIR})
++		MACRO_LOG_FEATURE(LCMS2_FOUND "LCMS2" "A small-footprint color management engine" "http://www.littlecms.com" FALSE "" "Needed by libkdcraw")
++		# Flag to compile Little CMS version 2 with LibRaw
++		ADD_DEFINITIONS(-DUSE_LCMS2)
++		SET(LCMS_SUPPORT_CAN_BE_COMPILED true)
+     ELSE ()
+-        MESSAGE(STATUS "Check for LCMS2 availability instead LCMS1...")
+-        FIND_PACKAGE(LCMS2)
+-        IF (LCMS2_FOUND AND (LCMS2_VERSION VERSION_EQUAL 2.1 OR LCMS2_VERSION VERSION_GREATER 2.1))
+-            MESSAGE(STATUS "Found LCMS2 instead LCMS1: ${LCMS2_LIBRARIES} ${LCMS2_INCLUDE_DIR}")
+-            INCLUDE_DIRECTORIES(${LCMS2_INCLUDE_DIR})
+-            MACRO_LOG_FEATURE(LCMS2_FOUND "LCMS2" "A small-footprint color management engine" "http://www.littlecms.com" FALSE "" "Needed by libkdcraw")
+-            # Flag to compile Little CMS version 2 with LibRaw
+-            ADD_DEFINITIONS(-DUSE_LCMS2)
+-            SET(LCMS_SUPPORT_CAN_BE_COMPILED true)
++		MESSAGE(STATUS "Check for LCMS1 availability...")
++		FIND_PACKAGE(LCMS)
++		IF (LCMS_FOUND)
++			MESSAGE(STATUS "Found LCMS1: ${LCMS_LIBRARIES} ${LCMS_INCLUDE_DIR}")
++			INCLUDE_DIRECTORIES(${LCMS_INCLUDE_DIR})
++			MACRO_LOG_FEATURE(LCMS_FOUND "LCMS1" "A small-footprint color management engine" "http://www.littlecms.com" TRUE "" "Needed by libkdcraw")
++			# Flag to compile Little CMS version 1 with LibRaw
++			ADD_DEFINITIONS(-DUSE_LCMS)
++			# For compatibility
++			SET(LCMS2_LIBRARIES ${LCMS_LIBRARIES})
++			SET(LCMS_SUPPORT_CAN_BE_COMPILED true)
+         ENDIF ()
+     ENDIF ()
+ ENDIF()
diff --git a/media-libs/libraw/files/libraw-0.16.0_alpha2-libdir.patch b/media-libs/libraw/files/libraw-0.16.0_alpha2-libdir.patch
new file mode 100644
index 000000000000..ae21f625c44b
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.16.0_alpha2-libdir.patch
@@ -0,0 +1,32 @@
+--- LibRaw-0.16.0-Alpha2/CMakeLists.txt
++++ LibRaw-0.16.0-Alpha2/CMakeLists.txt
+@@ -565,14 +565,14 @@
+ # Install Shared binary files.
+ INSTALL(TARGETS raw
+         RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        )
+ 
+ INSTALL(TARGETS raw_r
+         RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        )
+ 
+ # Install find cmake script to the system for client applications.
+@@ -626,8 +626,8 @@
+ 
+     INSTALL(TARGETS ${_target}
+             RUNTIME DESTINATION bin
+-            LIBRARY DESTINATION lib
+-            ARCHIVE DESTINATION lib)
++            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDMACRO(LIBRAW_BUILD_SAMPLES)
+ 
diff --git a/media-libs/libraw/libraw-0.16.0_alpha2-r1.ebuild b/media-libs/libraw/libraw-0.16.0_alpha2-r1.ebuild
new file mode 100644
index 000000000000..fdf0ffc28f36
--- /dev/null
+++ b/media-libs/libraw/libraw-0.16.0_alpha2-r1.ebuild
@@ -0,0 +1,66 @@
+# 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_alpha2-r1.ebuild,v 1.1 2013/10/20 11:06:50 radhermit Exp $
+
+EAPI=5
+
+inherit cmake-multilib toolchain-funcs
+
+MY_PN=LibRaw
+MY_PV=${PV/_a/-A}
+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}"/${P}-docs.patch
+	"${FILESDIR}"/${P}-automagic-jasper.patch
+	"${FILESDIR}"/${P}-libdir.patch
+	"${FILESDIR}"/${P}-lcms2-first.patch
+	"${FILESDIR}"/${P}-custom-demosaic-paths.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
+}