From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E42C5138336 for ; Sun, 25 Nov 2018 23:41:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C752CE088D; Sun, 25 Nov 2018 23:41:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 842CAE088D for ; Sun, 25 Nov 2018 23:41:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98D41335D91 for ; Sun, 25 Nov 2018 23:41:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E76D4B9 for ; Sun, 25 Nov 2018 23:41:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1543189232.5e66220ed50c76f331ec78dd8d997e1da8bd2873.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/oyranos/oyranos-0.9.6-r1.ebuild media-libs/oyranos/oyranos-9999.ebuild X-VCS-Directories: media-libs/oyranos/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5e66220ed50c76f331ec78dd8d997e1da8bd2873 X-VCS-Branch: master Date: Sun, 25 Nov 2018 23:41:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 392281d4-5249-4dfd-813a-3de0d5324301 X-Archives-Hash: 441515e64d981754019093e7b465cd02 commit: 5e66220ed50c76f331ec78dd8d997e1da8bd2873 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 25 20:29:14 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 25 23:40:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e66220e media-libs/oyranos: Drop cmake-multilib Nothing ever asked for that. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/oyranos/oyranos-0.9.6-r1.ebuild | 105 +++++++++++++++++++++++++++++ media-libs/oyranos/oyranos-9999.ebuild | 79 ++++++++++------------ 2 files changed, 141 insertions(+), 43 deletions(-) diff --git a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild new file mode 100644 index 00000000000..05b026fa3e9 --- /dev/null +++ b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} = *9999 ]]; then + EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~asturm/${P}-patches.tar.xz" + KEYWORDS="~amd64 ~x86" +fi +CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS" +inherit cmake-utils flag-o-matic + +DESCRIPTION="Colour management system allowing to share settings across apps and services" +HOMEPAGE="https://www.oyranos.org/" + +LICENSE="BSD" +SLOT="0" +IUSE="cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff X" + +REQUIRED_USE="qt5? ( X ) test? ( static-libs )" + +COMMON_DEPEND=" + app-admin/elektra + dev-libs/libxml2 + >=dev-libs/yajl-2.0.4-r1 + media-libs/lcms:2 + media-libs/libpng:0= + >=media-libs/libXcm-0.5.4 + media-libs/openicc + cairo? ( x11-libs/cairo ) + cups? ( net-print/cups ) + exif? ( media-gfx/exiv2:= ) + fltk? ( x11-libs/fltk:1 ) + jpeg? ( virtual/jpeg:0 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + ) + raw? ( media-libs/libraw ) + scanner? ( media-gfx/sane-backends ) + tiff? ( media-libs/tiff:0 ) + X? ( + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXmu + x11-libs/libXrandr + x11-libs/libXxf86vm + ) +" +DEPEND="${COMMON_DEPEND} + doc? ( + app-doc/doxygen + media-gfx/graphviz + )" +RDEPEND="${COMMON_DEPEND} + media-libs/icc-profiles-basiccolor-printing2009 + media-libs/icc-profiles-openicc" + +DOCS=( {AUTHORS,ChangeLog,README}.md ) + +RESTRICT="test" + +PATCHES=( "${WORKDIR}/patches" ) + +src_prepare() { + # remove bundled libs + rm -r libxcm openicc yajl || die + cmake-utils_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} + -DUSE_SYSTEM_ELEKTRA=ON + -DUSE_SYSTEM_LIBXCM=ON + -DUSE_SYSTEM_OPENICC=ON + -DUSE_SYSTEM_YAJL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex !cairo) + -DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex !cups) + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex !doc) + -DENABLE_EXAMPLES=$(usex examples) + -DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex !exif) + -DCMAKE_DISABLE_FIND_PACKAGE_FLTK=$(usex !fltk) + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(usex !qt5) + -DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex !raw) + -DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex !scanner) + -DENABLE_STATIC_LIBS=$(usex static-libs) + -DENABLE_TESTS=$(usex test) + -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex !tiff) + -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X) + ) + + cmake-utils_src_configure +} diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild index fc646f0fac2..a44af27aa9e 100644 --- a/media-libs/oyranos/oyranos-9999.ebuild +++ b/media-libs/oyranos/oyranos-9999.ebuild @@ -10,30 +10,31 @@ else SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi -inherit cmake-multilib flag-o-matic +CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS" +inherit cmake-utils flag-o-matic DESCRIPTION="Colour management system allowing to share settings across apps and services" HOMEPAGE="https://www.oyranos.org/" LICENSE="BSD" SLOT="0" -IUSE="X cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff" +IUSE="cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff X" REQUIRED_USE="qt5? ( X ) test? ( static-libs )" COMMON_DEPEND=" - >=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}] - dev-libs/libxml2[${MULTILIB_USEDEP}] - >=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}] - media-libs/lcms:2[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - >=media-libs/libXcm-0.5.4[${MULTILIB_USEDEP}] - media-libs/openicc[${MULTILIB_USEDEP}] - cairo? ( x11-libs/cairo[${MULTILIB_USEDEP}] ) - cups? ( net-print/cups[${MULTILIB_USEDEP}] ) - exif? ( media-gfx/exiv2:=[${MULTILIB_USEDEP}] ) + app-admin/elektra + dev-libs/libxml2 + >=dev-libs/yajl-2.0.4-r1 + media-libs/lcms:2 + media-libs/libpng:0= + >=media-libs/libXcm-0.5.4 + media-libs/openicc + cairo? ( x11-libs/cairo ) + cups? ( net-print/cups ) + exif? ( media-gfx/exiv2:= ) fltk? ( x11-libs/fltk:1 ) - jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) + jpeg? ( virtual/jpeg:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -42,16 +43,16 @@ COMMON_DEPEND=" dev-qt/qtx11extras:5 dev-qt/qtxml:5 ) - raw? ( media-libs/libraw[${MULTILIB_USEDEP}] ) - scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + raw? ( media-libs/libraw ) + scanner? ( media-gfx/sane-backends ) + tiff? ( media-libs/tiff:0 ) X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXinerama[${MULTILIB_USEDEP}] - x11-libs/libXmu[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXmu + x11-libs/libXrandr + x11-libs/libXxf86vm ) " DEPEND="${COMMON_DEPEND} @@ -64,19 +65,11 @@ RDEPEND="${COMMON_DEPEND} media-libs/icc-profiles-openicc" DOCS=( {AUTHORS,ChangeLog,README}.md ) -RESTRICT="test" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/oyranos-config -) -MULTILIB_WRAPPED_HEADERS=( - /usr/include/oyranos/oyranos_version.h -) -CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS" +RESTRICT="test" src_prepare() { - einfo remove bundled libs + # remove bundled libs rm -r libxcm openicc yajl || die cmake-utils_src_prepare } @@ -89,20 +82,20 @@ multilib_src_configure() { -DUSE_SYSTEM_OPENICC=ON -DUSE_SYSTEM_YAJL=ON -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo') - -DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups') - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON) + -DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex !cairo) + -DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex !cups) + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex !doc) -DENABLE_EXAMPLES=$(usex examples) - -DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex '!exif') - -DCMAKE_DISABLE_FIND_PACKAGE_FLTK=$(multilib_native_usex fltk OFF ON) - -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg') - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF ON) - -DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex '!raw') - -DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex '!scanner') + -DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex !exif) + -DCMAKE_DISABLE_FIND_PACKAGE_FLTK=$(usex !fltk) + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(usex !qt5) + -DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex !raw) + -DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex !scanner) -DENABLE_STATIC_LIBS=$(usex static-libs) -DENABLE_TESTS=$(usex test) - -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff') - -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X') + -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex !tiff) + -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X) ) cmake-utils_src_configure