[gentoo-commits] repo/gentoo:master commit in: media-libs/openicc/

2019-11-16 Thread Andreas Sturmlechner
commit: 45591f809588db5c248c0f61a6bb04945c5eb732
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 17 01:58:19 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 17 01:58:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45591f80

media-libs/openicc: EAPI-7 bump

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/openicc/openicc-0.1.0.ebuild | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/media-libs/openicc/openicc-0.1.0.ebuild 
b/media-libs/openicc/openicc-0.1.0.ebuild
index c924a25f5f1..b1a307e6ee2 100644
--- a/media-libs/openicc/openicc-0.1.0.ebuild
+++ b/media-libs/openicc/openicc-0.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib
 
@@ -14,13 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc static-libs test"
 
-RDEPEND="
-   dev-libs/yajl[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
+BDEPEND="
sys-devel/gettext
doc? ( app-doc/doxygen )
 "
+DEPEND="
+   dev-libs/yajl[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
 
 REQUIRED_USE="test? ( static-libs )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/openicc/files/, media-libs/openicc/

2016-12-29 Thread Andreas Sturmlechner
commit: ef90f60d94e5510bd7d2a7b307f8b341bb296b5e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 29 20:15:13 2016 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 29 22:02:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef90f60d

media-libs/openicc: New package, required by media-libs/oyranos

Add myself as maintainer.

Package-Manager: portage-2.3.0

 media-libs/openicc/Manifest|   1 +
 .../openicc/files/openicc-0.1.0-buildsystem.patch  | 228 +
 media-libs/openicc/metadata.xml|  11 +
 media-libs/openicc/openicc-0.1.0.ebuild|  46 +
 4 files changed, 286 insertions(+)

diff --git a/media-libs/openicc/Manifest b/media-libs/openicc/Manifest
new file mode 100644
index ..dade83c
--- /dev/null
+++ b/media-libs/openicc/Manifest
@@ -0,0 +1 @@
+DIST openicc-0.1.0.tar.gz 193974 SHA256 
461e567bbb9913b0731914be5efe2992158e169b69783956513f35a0f931ec51 SHA512 
81df4545694e920bea0b24535c1c8d06327f87dee465883c4e3209d7348ab2220f94b9e9785d9da68c5e023e9a59512d5e15b4ad8f82e256b63b7c28459fd029
 WHIRLPOOL 
f2774afb9d51cb6d5ecbab816f2e01717c0f9eb69cc6de97604c51264cf6c3f3ac8d036b7da1591b7244fde3087a543ee6f137a1fba10940175d85f17cf05d11

diff --git a/media-libs/openicc/files/openicc-0.1.0-buildsystem.patch 
b/media-libs/openicc/files/openicc-0.1.0-buildsystem.patch
new file mode 100644
index ..d5a3467
--- /dev/null
+++ b/media-libs/openicc/files/openicc-0.1.0-buildsystem.patch
@@ -0,0 +1,228 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9c3879e..a78b993 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2)
++CMAKE_MINIMUM_REQUIRED (VERSION 2.8.5)
+ 
+ PROJECT (OpenICC)
+ 
+@@ -35,6 +35,16 @@ SET( REVERSE_DOMAIN org.openicc )
+ 
+ SET( ${PROJECT_NAME}_VERSION_MAJORMINOR 
"${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}" )
+ 
++include(GNUInstallDirs)
++
++option(ENABLE_TESTS "Build tests (requires static libs)" ON)
++option(ENABLE_TOOLS "Build tools (currently openicc-device)" ON)
++option(ENABLE_STATIC_LIBS "Build static libs" ON)
++
++IF( ENABLE_TESTS )
++  SET(ENABLE_STATIC_LIBS ON)
++ENDIF()
++
+ IF( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+   SET(PLATFORM "OSX")
+ ELSEIF( ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index 950d3dc..0a89aea 100644
+--- a/cmake/CMakeLists.txt
 b/cmake/CMakeLists.txt
+@@ -16,13 +16,13 @@ SET (TARGET_CMAKE_FOLDER
+ 
+ SET (TARGET_PLUGIN_FOLDER "openicc"
+   CACHE STRING
+-  "Optional folder below system library folder where to install 
openicc plugins. LIB_SUFFIX is honored."
++  "Optional folder below system library folder where to install 
openicc plugins."
+ )
+ 
+ SET (TARGET_PKGCONFIG_FOLDER
+   "pkgconfig"
+   CACHE STRING
+-  "The folder below system library folder where to install 
pkgconfig files. LIB_SUFFIX is honored."
++  "The folder below system library folder where to install 
pkgconfig files."
+ )
+ 
+ SET (TARGET_DOCUMENTATION_FOLDER
+@@ -36,10 +36,6 @@ SET (TARGET_DOCUMENTATION_FOLDER
+ # Misc.
+ #
+ 
+-SET (LIB_SUFFIX ""
+-  CACHE STRING
+-  "Optional suffix to use on lib folders (e.g. 64 for lib64)"
+-)
+ #cmake settings for use by find_package
+ CONFIGURE_FILE (
+   "${CMAKE_CURRENT_SOURCE_DIR}/OpenIccConfig.cmake.in"
+@@ -49,6 +45,6 @@ CONFIGURE_FILE (
+ 
+ INSTALL ( FILES
+   "${CMAKE_CURRENT_BINARY_DIR}/OpenIccConfig.cmake"
+-  DESTINATION lib${LIB_SUFFIX}/cmake/openicc COMPONENT dev
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/openicc COMPONENT dev
+   )
+ 
+diff --git a/cmake/OpenIccConfig.cmake.in b/cmake/OpenIccConfig.cmake.in
+index 46dc1ba..373190f 100644
+--- a/cmake/OpenIccConfig.cmake.in
 b/cmake/OpenIccConfig.cmake.in
+@@ -16,7 +16,7 @@
+ # Set path to the header file.
+ FIND_PATH(OPENICC_INCLUDE_DIR
+   NAMES openicc_version.h
+-  PATHS @CMAKE_INSTALL_PREFIX@/include/@TARGET_INCLUDE_FOLDER@
++  PATHS @CMAKE_INSTALL_FULL_INCLUDEDIR@/@TARGET_INCLUDE_FOLDER@
+   NO_DEFAULT_PATH
+ )
+ MARK_AS_ADVANCED(OPENICC_INCLUDE_DIR)
+@@ -25,7 +25,7 @@ MARK_AS_ADVANCED(OPENICC_INCLUDE_DIR)
+ # Set path to the library.
+ FIND_LIBRARY(OPENICC_LIBRARY
+   NAMES OpenICC openicc-static
+-  PATHS @CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@
++  PATHS @CMAKE_INSTALL_FULL_LIBDIR@
+   NO_DEFAULT_PATH
+ )
+ MARK_AS_ADVANCED(OPENICC_LIBRARY)
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index a60698a..57cf57f 100644
+--- a/docs/CMakeLists.txt
 b/docs/CMakeLists.txt
+@@ -19,5 +19,5 @@ IF( DOXYGEN_FOUND )
+   ADD_CUSTOM_TARGET( docu ALL
+  DEPENDS html )
+ 
+-  INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION 
share/doc/${PACKAGE_NAME} )