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
