public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2016-01-12 10:27 Patrice Clement
  0 siblings, 0 replies; 15+ messages in thread
From: Patrice Clement @ 2016-01-12 10:27 UTC (permalink / raw
  To: gentoo-commits

commit:     8cd9556408e1df3d7883686f74a3fafea412b842
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 10 20:29:09 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 20:34:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cd95564

media-libs/oyranos: Add USE=scanner, missing DEPENDs

Qt4 and Qt5 can now be built in one go.

Package-Manager: portage-2.2.26

 media-libs/oyranos/oyranos-9999.ebuild | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index faf1492..b5780cf 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit eutils flag-o-matic git-r3 cmake-utils cmake-multilib
+inherit cmake-multilib flag-o-matic git-r3
 
 DESCRIPTION="Colour management system allowing to share various settings across applications and services"
 HOMEPAGE="http://www.oyranos.org/"
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"
 KEYWORDS=""
 LICENSE="BSD"
 SLOT="0"
-IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff"
+IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw scanner test tiff"
 
 #OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
 
@@ -32,18 +32,16 @@ COMMON_DEPEND="
 	exif? ( >=media-gfx/exiv2-0.23-r2:=[${MULTILIB_USEDEP}] )
 	fltk? ( x11-libs/fltk:1 )
 	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
-	)
-	!qt5? (
-		qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	)
+	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
 	raw? ( >=media-libs/libraw-0.15.4[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
 	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}]
 		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] )"
 DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-doc/doxygen
@@ -53,6 +51,8 @@ RDEPEND="${COMMON_DEPEND}
 	media-libs/icc-profiles-basiccolor-printing2009
 	media-libs/icc-profiles-openicc"
 
+REQUIRED_USE="qt4? ( X ) qt5? ( X )"
+
 DOCS=( AUTHORS.md ChangeLog.md README.md )
 RESTRICT="test"
 
@@ -84,13 +84,13 @@ multilib_src_configure() {
 		-DLIB_SUFFIX=${libdir#lib}
 		-DUSE_SYSTEM_ELEKTRA=YES
 		-DUSE_SYSTEM_YAJL=YES
-		-DUSE_Qt4=$(usex '!qt5')
 		-DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo')
 		-DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups')
 		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex '!doc')
 		-DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex '!exif')
 		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg')
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex '!raw')
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex '!scanner')
 		-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff')
 		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X')
 		-DCMAKE_DISABLE_FIND_PACKAGE_Fltk=$(multilib_native_usex fltk OFF ON)


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2016-06-21 19:47 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2016-06-21 19:47 UTC (permalink / raw
  To: gentoo-commits

commit:     572d19c1a2aa2f5cf3cb9e4b414407880ea61f3c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 19:46:58 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 19:47:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=572d19c1

media-libs/oyranos: Fix use of := in ||, #586314

 media-libs/oyranos/oyranos-0.9.5-r1.ebuild | 7 ++-----
 media-libs/oyranos/oyranos-0.9.5.ebuild    | 7 ++-----
 media-libs/oyranos/oyranos-9999.ebuild     | 5 +----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
index 844ed97..78081bb 100644
--- a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,10 +18,7 @@ IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff"
 #OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
 
 COMMON_DEPEND="
-	|| (
-		=app-admin/elektra-0.7*:0=[${MULTILIB_USEDEP}]
-		>=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
-	)
+	>=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
 	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]

diff --git a/media-libs/oyranos/oyranos-0.9.5.ebuild b/media-libs/oyranos/oyranos-0.9.5.ebuild
index 183f150..c1124a7 100644
--- a/media-libs/oyranos/oyranos-0.9.5.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,10 +16,7 @@ SLOT="0"
 IUSE="X cairo cups doc exif fltk qt4 raw test"
 
 RDEPEND="
-	|| (
-		=app-admin/elektra-0.7*:0=[${MULTILIB_USEDEP}]
-		>=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
-	)
+	>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
 	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
 	media-libs/icc-profiles-basiccolor-printing2009

diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index b5780cf..54c4b49 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -18,10 +18,7 @@ IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw scanner test tiff"
 #OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
 
 COMMON_DEPEND="
-	|| (
-		=app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}]
-		>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
-	)
+	>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
 	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2016-12-29 22:03 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2016-12-29 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     24b5976fcd99ff7aea9c4730f5026be0135eed59
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 20:17:36 2016 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 22:02:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b5976f

media-libs/oyranos: Fix and sort DEPENDs

Drop sourceforge from metadata.
Shorter DESCRIPTION to make repoman happy.

Package-Manager: portage-2.3.0

 media-libs/oyranos/metadata.xml        |  1 -
 media-libs/oyranos/oyranos-9999.ebuild | 57 +++++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/media-libs/oyranos/metadata.xml b/media-libs/oyranos/metadata.xml
index ab7ceb6..390440d 100644
--- a/media-libs/oyranos/metadata.xml
+++ b/media-libs/oyranos/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">oyranos-cms/oyranos</remote-id>
-		<remote-id type="sourceforge">oyranos</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index 54c4b49..276d782 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit cmake-multilib flag-o-matic git-r3
 
-DESCRIPTION="Colour management system allowing to share various settings across applications and services"
+DESCRIPTION="Colour management system allowing to share settings across apps and services"
 HOMEPAGE="http://www.oyranos.org/"
 EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"
 
@@ -19,26 +19,38 @@ IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw scanner test tiff"
 
 COMMON_DEPEND="
 	>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
 	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}]
+	media-libs/lcms:2[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
 	>=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}]
-	cairo? ( >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] )
-	exif? ( >=media-gfx/exiv2-0.23-r2:=[${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}] )
 	fltk? ( x11-libs/fltk:1 )
 	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
 	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-	raw? ( >=media-libs/libraw-0.15.4[${MULTILIB_USEDEP}] )
+	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[${MULTILIB_USEDEP}] )
 	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
 	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] )"
+	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}]
+	)
+"
 DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-doc/doxygen
@@ -50,7 +62,7 @@ RDEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="qt4? ( X ) qt5? ( X )"
 
-DOCS=( AUTHORS.md ChangeLog.md README.md )
+DOCS=( {AUTHORS,ChangeLog,README}.md )
 RESTRICT="test"
 
 MULTILIB_CHOST_TOOLS=(
@@ -64,7 +76,7 @@ CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUP
 
 src_prepare() {
 	einfo remove bundled libs
-	rm -rf elektra* yajl || die
+	rm -r yajl || die
 
 	if use fltk ; then
 		#src/examples does not include fltk flags
@@ -79,20 +91,21 @@ multilib_src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
 		-DLIB_SUFFIX=${libdir#lib}
-		-DUSE_SYSTEM_ELEKTRA=YES
-		-DUSE_SYSTEM_YAJL=YES
+		-DUSE_SYSTEM_ELEKTRA=ON
+		-DUSE_SYSTEM_YAJL=ON
+		-DUSE_SYSTEM_LIBXCM=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo')
 		-DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups')
 		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex '!doc')
 		-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_Qt4=$(multilib_native_usex qt4 OFF ON)
+		-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_TIFF=$(usex '!tiff')
 		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fltk=$(multilib_native_usex fltk OFF ON)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=$(multilib_native_usex qt4 OFF ON)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF ON)
 	)
 
 	cmake-utils_src_configure


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2017-01-04 18:05 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2017-01-04 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     0115b3ddf062208a29e11acfd1a2125e1b4886e8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 01:06:44 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 18:05:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0115b3dd

media-libs/oyranos: Add USE=examples,static-libs, drop USE=qt4

Adapt to recent upstream changes. Reducing REQUIRED_USE pains.

Package-Manager: portage-2.3.0

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 media-libs/oyranos/oyranos-9999.ebuild | 47 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index 276d782..e752203 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -1,19 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
-inherit cmake-multilib flag-o-matic git-r3
+if [[ ${PV} = *9999 ]]; then
+	GITECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"
+fi
+inherit cmake-multilib flag-o-matic ${GITECLASS}
+unset GITECLASS
 
 DESCRIPTION="Colour management system allowing to share settings across apps and services"
 HOMEPAGE="http://www.oyranos.org/"
-EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"
+[[ ${PV} != *9999 ]] && \
+SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS=""
 LICENSE="BSD"
 SLOT="0"
-IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw scanner test tiff"
+IUSE="X cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff"
+
+REQUIRED_USE="qt5? ( X ) test? ( static-libs )"
 
 #OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
 
@@ -23,14 +31,13 @@ COMMON_DEPEND="
 	>=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.3[${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}] )
 	fltk? ( x11-libs/fltk:1 )
 	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -60,8 +67,6 @@ RDEPEND="${COMMON_DEPEND}
 	media-libs/icc-profiles-basiccolor-printing2009
 	media-libs/icc-profiles-openicc"
 
-REQUIRED_USE="qt4? ( X ) qt5? ( X )"
-
 DOCS=( {AUTHORS,ChangeLog,README}.md )
 RESTRICT="test"
 
@@ -72,38 +77,34 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/oyranos/oyranos_version.h
 )
 
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUPS"
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS"
 
 src_prepare() {
 	einfo remove bundled libs
-	rm -r yajl || die
-
-	if use fltk ; then
-		#src/examples does not include fltk flags
-		append-cflags $(fltk-config --cflags)
-		append-cxxflags $(fltk-config --cxxflags)
-	fi
-
+	rm -r libxcm openicc yajl || die
 	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
-	local libdir=$(get_libdir)
 	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
 		-DUSE_SYSTEM_ELEKTRA=ON
-		-DUSE_SYSTEM_YAJL=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')
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
+		-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_FLTK=$(multilib_native_usex fltk OFF ON)
 		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=$(multilib_native_usex qt4 OFF ON)
 		-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')
+		-DENABLE_STATIC_LIBS=$(usex static-libs)
+		-DENABLE_TESTS=$(usex test)
 		-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff')
 		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X')
 	)


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2017-01-04 18:05 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2017-01-04 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     3f8f40031f86ee15f60a84e9c074aa156ce8936a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 14:58:35 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 18:05:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f8f4003

media-libs/oyranos: Drop old

Package-Manager: portage-2.3.0

Closes: https://github.com/gentoo/gentoo/pull/3231
Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 media-libs/oyranos/Manifest             |  1 -
 media-libs/oyranos/oyranos-0.9.5.ebuild | 88 ---------------------------------
 2 files changed, 89 deletions(-)

diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index 9e473a7..14e59cc 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -1,4 +1,3 @@
-DIST oyranos-0.9.5.tar.bz2 1800977 SHA256 75c2681e6d95cb969336f1e9bdfe12a85ae6a5bd438573d7d2955b37ea466e40 SHA512 18ab90f6d80db2c3d3fda64f80d01be2c83c9e86f14b3a3310eea5dd921b7376afb894fea987357b573a4247d5c285bc9f6ccc044e21dbe7da92f25373b9fd99 WHIRLPOOL 32440b53b7da82baa8299c570c3456c35cbffb17998836240640011ff5a13981e7219213b00c0d9afc367f74bf35ffb297363285d060bd72f73f8f75a18ed025
 DIST oyranos-0.9.5.tar.gz 1801954 SHA256 7cf8d41c3019e91608837cc40de801348b35963853e6d62b3e6dcd46bf24cafa SHA512 836bb7324cd300608cb13381704b6b28aae93485140d2e3f6c7dc21f1d35f9acc44427c861814b13c60cc499ba5495068b1069f6843909744f18ac8998d17ae9 WHIRLPOOL 69b676c6cae8eb878b5e0ea73358ffc59ba78541c9de89d10667a52141d0b37399ea733e1e2aa69bf90208a12e93c63b0b8bb63e6eb2efccc0151b745469491f
 DIST oyranos-0.9.6-patches.tar.xz 11680 SHA256 f4db721a57f9b05c843e2f0739b3b699914240ac9ef985d58131fbf4d5950854 SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493 WHIRLPOOL 6f9361e87a07130d4af1c4f53f5626cdb36c3764edf82b68b1cfd716f713cb14de73baf3444a0b4c4a99eecffd6217d12d8b9044117a0d4f09b26a615481d29d
 DIST oyranos-0.9.6.tar.gz 2247841 SHA256 44b0e451ccd80617484eaa824ce609bf2982f523ffc4c6350bca755037a52b9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111 WHIRLPOOL cd1c1143f02be89d8a45a98e98cbc6ee9cb54036ec7526f3987f141618cb4bb498720b315b891eaa54e081e2c7067fcded063487d9b248d87354618f51ec959d

diff --git a/media-libs/oyranos/oyranos-0.9.5.ebuild b/media-libs/oyranos/oyranos-0.9.5.ebuild
deleted file mode 100644
index c1124a7..00000000
--- a/media-libs/oyranos/oyranos-0.9.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic cmake-utils cmake-multilib
-
-DESCRIPTION="Colour management system allowing to share various settings across applications and services"
-HOMEPAGE="http://www.oyranos.org/"
-SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.9/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE="X cairo cups doc exif fltk qt4 raw test"
-
-RDEPEND="
-	>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
-	media-libs/icc-profiles-basiccolor-printing2009
-	media-libs/icc-profiles-openicc
-	>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}]
-	>=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}]
-	cairo? ( >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] )
-	exif? ( >=media-gfx/exiv2-0.23-r2:=[${MULTILIB_USEDEP}] )
-	fltk? ( x11-libs/fltk:1 )
-	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	raw? ( >=media-libs/libraw-0.15.4[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-DOCS="AUTHORS ChangeLog README"
-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} FindFltk FindXcm FindCUPS"
-
-src_prepare() {
-	einfo remove bundled libs
-	rm -rf elektra* yajl || die
-
-	epatch "${FILESDIR}/${PN}"-0.9.5-buildsystem-r1.patch
-
-	if use fltk ; then
-		#src/examples does not include fltk flags
-		append-cflags $(fltk-config --cflags)
-		append-cxxflags $(fltk-config --cxxflags)
-	fi
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-
-		$(usex cairo -DWANT_CAIRO=1 "")
-		$(usex cups -DWANT_CUPS=1 "")
-		$(usex doc -DWANT_HTML=1 "")
-		$(usex exif -DWANT_EXIV2=1 "")
-		$(usex raw -DWANT_LIBRAW=1 "")
-		$(usex X -DWANT_X11=1 "")
-
-		# only used in programs
-		$(multilib_native_usex fltk -DWANT_FLTK=1 "")
-		$(multilib_native_usex qt4 -DWANT_QT4=1 "")
-	)
-
-	cmake-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2017-01-04 18:05 Johannes Huber
  0 siblings, 0 replies; 15+ messages in thread
From: Johannes Huber @ 2017-01-04 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     78957674864188874b7911d31f6830455c2bbd8b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  1 14:49:59 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 18:05:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78957674

media-libs/oyranos: 0.9.6 version bump

Package-Manager: portage-2.3.0

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 media-libs/oyranos/Manifest             |   2 +
 media-libs/oyranos/oyranos-0.9.6.ebuild | 116 ++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index d0943a2..9e473a7 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -1,2 +1,4 @@
 DIST oyranos-0.9.5.tar.bz2 1800977 SHA256 75c2681e6d95cb969336f1e9bdfe12a85ae6a5bd438573d7d2955b37ea466e40 SHA512 18ab90f6d80db2c3d3fda64f80d01be2c83c9e86f14b3a3310eea5dd921b7376afb894fea987357b573a4247d5c285bc9f6ccc044e21dbe7da92f25373b9fd99 WHIRLPOOL 32440b53b7da82baa8299c570c3456c35cbffb17998836240640011ff5a13981e7219213b00c0d9afc367f74bf35ffb297363285d060bd72f73f8f75a18ed025
 DIST oyranos-0.9.5.tar.gz 1801954 SHA256 7cf8d41c3019e91608837cc40de801348b35963853e6d62b3e6dcd46bf24cafa SHA512 836bb7324cd300608cb13381704b6b28aae93485140d2e3f6c7dc21f1d35f9acc44427c861814b13c60cc499ba5495068b1069f6843909744f18ac8998d17ae9 WHIRLPOOL 69b676c6cae8eb878b5e0ea73358ffc59ba78541c9de89d10667a52141d0b37399ea733e1e2aa69bf90208a12e93c63b0b8bb63e6eb2efccc0151b745469491f
+DIST oyranos-0.9.6-patches.tar.xz 11680 SHA256 f4db721a57f9b05c843e2f0739b3b699914240ac9ef985d58131fbf4d5950854 SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493 WHIRLPOOL 6f9361e87a07130d4af1c4f53f5626cdb36c3764edf82b68b1cfd716f713cb14de73baf3444a0b4c4a99eecffd6217d12d8b9044117a0d4f09b26a615481d29d
+DIST oyranos-0.9.6.tar.gz 2247841 SHA256 44b0e451ccd80617484eaa824ce609bf2982f523ffc4c6350bca755037a52b9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111 WHIRLPOOL cd1c1143f02be89d8a45a98e98cbc6ee9cb54036ec7526f3987f141618cb4bb498720b315b891eaa54e081e2c7067fcded063487d9b248d87354618f51ec959d

diff --git a/media-libs/oyranos/oyranos-0.9.6.ebuild b/media-libs/oyranos/oyranos-0.9.6.ebuild
new file mode 100644
index 00000000..c6cb197
--- /dev/null
+++ b/media-libs/oyranos/oyranos-0.9.6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} = *9999 ]]; then
+	GITECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"
+fi
+inherit cmake-multilib flag-o-matic ${GITECLASS}
+unset GITECLASS
+
+DESCRIPTION="Colour management system allowing to share settings across apps and services"
+HOMEPAGE="http://www.oyranos.org/"
+[[ ${PV} != *9999 ]] && \
+SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	http://dev.gentoo.org/~asturm/${P}-patches.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+SLOT="0"
+IUSE="X cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff"
+
+REQUIRED_USE="qt5? ( X ) test? ( static-libs )"
+
+#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
+
+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}] )
+	fltk? ( x11-libs/fltk:1 )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	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[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	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}]
+	)
+"
+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"
+
+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"
+
+PATCHES=( "${WORKDIR}/patches" )
+
+src_prepare() {
+	einfo 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=$(multilib_native_usex doc OFF ON)
+		-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')
+		-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
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2017-09-06 21:00 Michał Górny
  0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2017-09-06 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ab16c9ec3f19345c9c1a77db43809fa8a3f05a92
Author:     Francesco Turco <fturco <AT> fastmail <DOT> fm>
AuthorDate: Sun Sep  3 16:20:14 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep  6 20:58:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab16c9ec

media-libs/oyranos: use HTTPS for links to dev.gentoo.org

 media-libs/oyranos/oyranos-0.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/oyranos/oyranos-0.9.6.ebuild b/media-libs/oyranos/oyranos-0.9.6.ebuild
index 542fecb370d..d71e0603f7d 100644
--- a/media-libs/oyranos/oyranos-0.9.6.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.6.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Colour management system allowing to share settings across apps and
 HOMEPAGE="http://www.oyranos.org/"
 [[ ${PV} != *9999 ]] && \
 SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	http://dev.gentoo.org/~asturm/${P}-patches.tar.xz"
+	https://dev.gentoo.org/~asturm/${P}-patches.tar.xz"
 
 KEYWORDS="~amd64 ~x86"
 LICENSE="BSD"


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2017-10-14 15:13 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2017-10-14 15:13 UTC (permalink / raw
  To: gentoo-commits

commit:     d563ca25f3e7cf37e84bee5dc79391d948374a88
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 12:43:42 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 15:06:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d563ca25

media-libs/oyranos: Drop old

Gentoo-bug: 565930, 631816
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 media-libs/oyranos/Manifest                |  1 -
 media-libs/oyranos/oyranos-0.9.5-r1.ebuild | 98 ------------------------------
 2 files changed, 99 deletions(-)

diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index 14e59cc31b5..95eacc6b5a7 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -1,3 +1,2 @@
-DIST oyranos-0.9.5.tar.gz 1801954 SHA256 7cf8d41c3019e91608837cc40de801348b35963853e6d62b3e6dcd46bf24cafa SHA512 836bb7324cd300608cb13381704b6b28aae93485140d2e3f6c7dc21f1d35f9acc44427c861814b13c60cc499ba5495068b1069f6843909744f18ac8998d17ae9 WHIRLPOOL 69b676c6cae8eb878b5e0ea73358ffc59ba78541c9de89d10667a52141d0b37399ea733e1e2aa69bf90208a12e93c63b0b8bb63e6eb2efccc0151b745469491f
 DIST oyranos-0.9.6-patches.tar.xz 11680 SHA256 f4db721a57f9b05c843e2f0739b3b699914240ac9ef985d58131fbf4d5950854 SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493 WHIRLPOOL 6f9361e87a07130d4af1c4f53f5626cdb36c3764edf82b68b1cfd716f713cb14de73baf3444a0b4c4a99eecffd6217d12d8b9044117a0d4f09b26a615481d29d
 DIST oyranos-0.9.6.tar.gz 2247841 SHA256 44b0e451ccd80617484eaa824ce609bf2982f523ffc4c6350bca755037a52b9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111 WHIRLPOOL cd1c1143f02be89d8a45a98e98cbc6ee9cb54036ec7526f3987f141618cb4bb498720b315b891eaa54e081e2c7067fcded063487d9b248d87354618f51ec959d

diff --git a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
deleted file mode 100644
index 4b23bcc6606..00000000000
--- a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic cmake-utils cmake-multilib
-
-DESCRIPTION="Colour management system allowing to share various settings across applications and services"
-HOMEPAGE="http://www.oyranos.org/"
-SRC_URI="https://github.com/oyranos-cms/oyranos/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff"
-
-#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
-
-COMMON_DEPEND="
-	>=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}]
-	>=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}]
-	cairo? ( >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] )
-	exif? ( >=media-gfx/exiv2-0.23-r2:=[${MULTILIB_USEDEP}] )
-	fltk? ( x11-libs/fltk:1 )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
-	)
-	!qt5? (
-		qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	)
-	raw? ( >=media-libs/libraw-0.15.4[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
-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 )
-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} FindFltk FindXcm FindCUPS"
-
-src_prepare() {
-	einfo remove bundled libs
-	rm -rf elektra* yajl || die
-
-	if use fltk ; then
-		#src/examples does not include fltk flags
-		append-cflags $(fltk-config --cflags)
-		append-cxxflags $(fltk-config --cxxflags)
-	fi
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DUSE_SYSTEM_ELEKTRA=YES
-		-DUSE_SYSTEM_YAJL=YES
-		-DUSE_Qt4=$(usex '!qt5')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex '!doc')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex '!exif')
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg')
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex '!raw')
-		-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff')
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fltk=$(multilib_native_usex fltk OFF ON)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=$(multilib_native_usex qt4 OFF ON)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF ON)
-	)
-
-	cmake-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2017-10-14 15:57 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2017-10-14 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     617723e27ea7a1aa9e9ee6e5468079f874844935
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 15:56:29 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 15:56:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=617723e2

media-libs/oyranos: Re-add 0.9.5-r1 without USE=qt4

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 media-libs/oyranos/Manifest                |  1 +
 media-libs/oyranos/oyranos-0.9.5-r1.ebuild | 95 ++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index 95eacc6b5a7..14e59cc31b5 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -1,2 +1,3 @@
+DIST oyranos-0.9.5.tar.gz 1801954 SHA256 7cf8d41c3019e91608837cc40de801348b35963853e6d62b3e6dcd46bf24cafa SHA512 836bb7324cd300608cb13381704b6b28aae93485140d2e3f6c7dc21f1d35f9acc44427c861814b13c60cc499ba5495068b1069f6843909744f18ac8998d17ae9 WHIRLPOOL 69b676c6cae8eb878b5e0ea73358ffc59ba78541c9de89d10667a52141d0b37399ea733e1e2aa69bf90208a12e93c63b0b8bb63e6eb2efccc0151b745469491f
 DIST oyranos-0.9.6-patches.tar.xz 11680 SHA256 f4db721a57f9b05c843e2f0739b3b699914240ac9ef985d58131fbf4d5950854 SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493 WHIRLPOOL 6f9361e87a07130d4af1c4f53f5626cdb36c3764edf82b68b1cfd716f713cb14de73baf3444a0b4c4a99eecffd6217d12d8b9044117a0d4f09b26a615481d29d
 DIST oyranos-0.9.6.tar.gz 2247841 SHA256 44b0e451ccd80617484eaa824ce609bf2982f523ffc4c6350bca755037a52b9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111 WHIRLPOOL cd1c1143f02be89d8a45a98e98cbc6ee9cb54036ec7526f3987f141618cb4bb498720b315b891eaa54e081e2c7067fcded063487d9b248d87354618f51ec959d

diff --git a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
new file mode 100644
index 00000000000..d4c57e4345e
--- /dev/null
+++ b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic cmake-utils cmake-multilib
+
+DESCRIPTION="Colour management system allowing to share various settings across applications and services"
+HOMEPAGE="http://www.oyranos.org/"
+SRC_URI="https://github.com/oyranos-cms/oyranos/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+SLOT="0"
+IUSE="X cairo cups doc exif fltk jpeg qt5 raw test tiff"
+
+#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
+
+COMMON_DEPEND="
+	>=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}]
+	>=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}]
+	cairo? ( >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] )
+	exif? ( >=media-gfx/exiv2-0.23-r2:=[${MULTILIB_USEDEP}] )
+	fltk? ( x11-libs/fltk:1 )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	qt5? (
+		dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
+	)
+	raw? ( >=media-libs/libraw-0.15.4[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	X? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
+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 )
+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} FindFltk FindXcm FindCUPS"
+
+src_prepare() {
+	einfo remove bundled libs
+	rm -rf elektra* yajl || die
+
+	if use fltk ; then
+		#src/examples does not include fltk flags
+		append-cflags $(fltk-config --cflags)
+		append-cxxflags $(fltk-config --cxxflags)
+	fi
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIB_SUFFIX=${libdir#lib}
+		-DUSE_SYSTEM_ELEKTRA=YES
+		-DUSE_SYSTEM_YAJL=YES
+		-DUSE_Qt4=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo')
+		-DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups')
+		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex '!doc')
+		-DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex '!exif')
+		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg')
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex '!raw')
+		-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff')
+		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X')
+		-DCMAKE_DISABLE_FIND_PACKAGE_Fltk=$(multilib_native_usex fltk OFF ON)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF ON)
+	)
+
+	cmake-utils_src_configure
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2017-10-14 18:53 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2017-10-14 18:53 UTC (permalink / raw
  To: gentoo-commits

commit:     73ecbff90d62a5c99d4f43f996efa687d77f38bc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 18:52:32 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 18:52:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ecbff9

media-libs/oyranos: Drop 0.9.5-r1

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 media-libs/oyranos/Manifest                |  1 -
 media-libs/oyranos/oyranos-0.9.5-r1.ebuild | 95 ------------------------------
 2 files changed, 96 deletions(-)

diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index 14e59cc31b5..95eacc6b5a7 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -1,3 +1,2 @@
-DIST oyranos-0.9.5.tar.gz 1801954 SHA256 7cf8d41c3019e91608837cc40de801348b35963853e6d62b3e6dcd46bf24cafa SHA512 836bb7324cd300608cb13381704b6b28aae93485140d2e3f6c7dc21f1d35f9acc44427c861814b13c60cc499ba5495068b1069f6843909744f18ac8998d17ae9 WHIRLPOOL 69b676c6cae8eb878b5e0ea73358ffc59ba78541c9de89d10667a52141d0b37399ea733e1e2aa69bf90208a12e93c63b0b8bb63e6eb2efccc0151b745469491f
 DIST oyranos-0.9.6-patches.tar.xz 11680 SHA256 f4db721a57f9b05c843e2f0739b3b699914240ac9ef985d58131fbf4d5950854 SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493 WHIRLPOOL 6f9361e87a07130d4af1c4f53f5626cdb36c3764edf82b68b1cfd716f713cb14de73baf3444a0b4c4a99eecffd6217d12d8b9044117a0d4f09b26a615481d29d
 DIST oyranos-0.9.6.tar.gz 2247841 SHA256 44b0e451ccd80617484eaa824ce609bf2982f523ffc4c6350bca755037a52b9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111 WHIRLPOOL cd1c1143f02be89d8a45a98e98cbc6ee9cb54036ec7526f3987f141618cb4bb498720b315b891eaa54e081e2c7067fcded063487d9b248d87354618f51ec959d

diff --git a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
deleted file mode 100644
index d4c57e4345e..00000000000
--- a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic cmake-utils cmake-multilib
-
-DESCRIPTION="Colour management system allowing to share various settings across applications and services"
-HOMEPAGE="http://www.oyranos.org/"
-SRC_URI="https://github.com/oyranos-cms/oyranos/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE="X cairo cups doc exif fltk jpeg qt5 raw test tiff"
-
-#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
-
-COMMON_DEPEND="
-	>=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}]
-	>=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}]
-	cairo? ( >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] )
-	exif? ( >=media-gfx/exiv2-0.23-r2:=[${MULTILIB_USEDEP}] )
-	fltk? ( x11-libs/fltk:1 )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
-	)
-	raw? ( >=media-libs/libraw-0.15.4[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
-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 )
-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} FindFltk FindXcm FindCUPS"
-
-src_prepare() {
-	einfo remove bundled libs
-	rm -rf elektra* yajl || die
-
-	if use fltk ; then
-		#src/examples does not include fltk flags
-		append-cflags $(fltk-config --cflags)
-		append-cxxflags $(fltk-config --cxxflags)
-	fi
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DUSE_SYSTEM_ELEKTRA=YES
-		-DUSE_SYSTEM_YAJL=YES
-		-DUSE_Qt4=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex '!doc')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex '!exif')
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg')
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex '!raw')
-		-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff')
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fltk=$(multilib_native_usex fltk OFF ON)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF ON)
-	)
-
-	cmake-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2018-11-25 23:41 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2018-11-25 23:41 UTC (permalink / raw
  To: gentoo-commits

commit:     02bb431630eb46f2d14890415fa99c4c62f0e9a9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 20:18:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 23:40:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02bb4316

media-libs/oyranos: Use https, live conditional consolidation

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/oyranos/oyranos-0.9.6.ebuild |  6 ++----
 media-libs/oyranos/oyranos-9999.ebuild  | 17 +++++++----------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/media-libs/oyranos/oyranos-0.9.6.ebuild b/media-libs/oyranos/oyranos-0.9.6.ebuild
index d71e0603f7d..86b7fa8d98d 100644
--- a/media-libs/oyranos/oyranos-0.9.6.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit cmake-multilib flag-o-matic ${GITECLASS}
 unset GITECLASS
 
 DESCRIPTION="Colour management system allowing to share settings across apps and services"
-HOMEPAGE="http://www.oyranos.org/"
+HOMEPAGE="https://www.oyranos.org/"
 [[ ${PV} != *9999 ]] && \
 SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~asturm/${P}-patches.tar.xz"
@@ -23,8 +23,6 @@ IUSE="X cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test
 
 REQUIRED_USE="qt5? ( X ) test? ( static-libs )"
 
-#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
-
 COMMON_DEPEND="
 	>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
 	dev-libs/libxml2[${MULTILIB_USEDEP}]

diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index 11aa763bfd8..fc646f0fac2 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -1,29 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 if [[ ${PV} = *9999 ]]; then
-	GITECLASS="git-r3"
 	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"
+	KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake-multilib flag-o-matic ${GITECLASS}
-unset GITECLASS
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="Colour management system allowing to share settings across apps and services"
-HOMEPAGE="http://www.oyranos.org/"
-[[ ${PV} != *9999 ]] && \
-SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.oyranos.org/"
 
-KEYWORDS=""
 LICENSE="BSD"
 SLOT="0"
 IUSE="X cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff"
 
 REQUIRED_USE="qt5? ( X ) test? ( static-libs )"
 
-#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
-
 COMMON_DEPEND="
 	>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
 	dev-libs/libxml2[${MULTILIB_USEDEP}]


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2018-11-25 23:41 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2018-11-25 23:41 UTC (permalink / raw
  To: gentoo-commits

commit:     5e66220ed50c76f331ec78dd8d997e1da8bd2873
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 20:29:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2018-11-25 23:41 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2018-11-25 23:41 UTC (permalink / raw
  To: gentoo-commits

commit:     2bda07d66d849edbdd2dba2a6ac56b8f6a914ba0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 20:30:24 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 23:40:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bda07d6

media-libs/oyranos: Drop 0.9.6 (r0)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/oyranos/oyranos-0.9.6.ebuild | 113 --------------------------------
 1 file changed, 113 deletions(-)

diff --git a/media-libs/oyranos/oyranos-0.9.6.ebuild b/media-libs/oyranos/oyranos-0.9.6.ebuild
deleted file mode 100644
index 86b7fa8d98d..00000000000
--- a/media-libs/oyranos/oyranos-0.9.6.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *9999 ]]; then
-	GITECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"
-fi
-inherit cmake-multilib flag-o-matic ${GITECLASS}
-unset GITECLASS
-
-DESCRIPTION="Colour management system allowing to share settings across apps and services"
-HOMEPAGE="https://www.oyranos.org/"
-[[ ${PV} != *9999 ]] && \
-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"
-LICENSE="BSD"
-SLOT="0"
-IUSE="X cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff"
-
-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}] )
-	fltk? ( x11-libs/fltk:1 )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	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[${MULTILIB_USEDEP}] )
-	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	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}]
-	)
-"
-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"
-
-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"
-
-PATCHES=( "${WORKDIR}/patches" )
-
-src_prepare() {
-	einfo 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=$(multilib_native_usex doc OFF ON)
-		-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')
-		-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
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2020-02-02 16:19 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-02-02 16:19 UTC (permalink / raw
  To: gentoo-commits

commit:     f6ef93d1936f01a0043e59533f006e99f8dd878e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  2 12:02:21 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  2 16:19:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ef93d1

media-libs/oyranos: yajl was moved into openicc/oyjl subdir

Upstream commits:
e47b731c5d809a204009df041e011fdf82d35127
820379ff85bd5d9df8e337c0be2038537d48f48a

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/oyranos/oyranos-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index 9d14bb4f921..c074e905a4e 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -70,7 +70,7 @@ RESTRICT="test"
 
 src_prepare() {
 	# remove bundled libs
-	rm -r libxcm openicc yajl || die
+	rm -r libxcm openicc || die
 	cmake-utils_src_prepare
 }
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
@ 2020-02-09 19:35 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2020-02-09 19:35 UTC (permalink / raw
  To: gentoo-commits

commit:     17c22822b76d61e4958bc379722fd0f29ddd8575
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 19:35:35 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 19:35:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c22822

media-libs/oyranos: Drop USE qt5, broken by Qt 5.14

Closes: https://bugs.gentoo.org/703528
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/oyranos/oyranos-0.9.6-r1.ebuild | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
index 4eee55d10f7..26ac4c25916 100644
--- a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,9 +19,9 @@ 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"
+IUSE="cairo cups doc examples exif fltk jpeg raw scanner static-libs test tiff X"
 
-REQUIRED_USE="qt5? ( X ) test? ( static-libs )"
+REQUIRED_USE="test? ( static-libs )"
 
 COMMON_DEPEND="
 	app-admin/elektra
@@ -36,14 +36,6 @@ COMMON_DEPEND="
 	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 )
@@ -96,7 +88,7 @@ src_configure() {
 		-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_Qt5=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex !raw)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex !scanner)
 		-DENABLE_STATIC_LIBS=$(usex static-libs)


^ permalink raw reply related	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2020-02-09 19:35 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-25 23:41 [gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2020-02-09 19:35 Andreas Sturmlechner
2020-02-02 16:19 Andreas Sturmlechner
2018-11-25 23:41 Andreas Sturmlechner
2018-11-25 23:41 Andreas Sturmlechner
2017-10-14 18:53 Andreas Sturmlechner
2017-10-14 15:57 Andreas Sturmlechner
2017-10-14 15:13 Andreas Sturmlechner
2017-09-06 21:00 Michał Górny
2017-01-04 18:05 Johannes Huber
2017-01-04 18:05 Johannes Huber
2017-01-04 18:05 Johannes Huber
2016-12-29 22:03 Andreas Sturmlechner
2016-06-21 19:47 Michał Górny
2016-01-12 10:27 Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox