mgorny 15/07/25 12:34:34 Modified: metadata.xml oyranos-9999.ebuild ChangeLog Log: Update the live ebuild. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/157 by a17r. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.3 media-libs/oyranos/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/metadata.xml?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/metadata.xml?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/metadata.xml?r1=1.2&r2=1.3 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/metadata.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- metadata.xml 15 Jun 2015 15:08:26 -0000 1.2 +++ metadata.xml 25 Jul 2015 12:34:34 -0000 1.3 @@ -6,6 +6,6 @@ <name>Michael Weber</name> </maintainer> <upstream> - <remote-id type="sourceforge">oyranos</remote-id> + <remote-id type="github">oyranos-cms/oyranos</remote-id> </upstream> </pkgmetadata> 1.8 media-libs/oyranos/oyranos-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild?r1=1.7&r2=1.8 Index: oyranos-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- oyranos-9999.ebuild 27 May 2015 20:31:04 -0000 1.7 +++ oyranos-9999.ebuild 25 Jul 2015 12:34:34 -0000 1.8 @@ -1,35 +1,35 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.7 2015/05/27 20:31:04 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.8 2015/07/25 12:34:34 mgorny Exp $ EAPI=5 inherit eutils flag-o-matic cmake-utils cmake-multilib -DESCRIPTION="colour management system allowing to share various settings across applications and services" +DESCRIPTION="Colour management system allowing to share various settings across applications and services" HOMEPAGE="http://www.oyranos.org/"; if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git"; inherit git-r3 KEYWORDS="" else - SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.9/${P}.tar.bz2" + SRC_URI="https://github.com/oyranos-cms/oyranos/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi LICENSE="BSD" SLOT="0" -IUSE="X cairo cups doc exif fltk qt4 raw test" +IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff" -RDEPEND=" +#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}] ) >=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}] @@ -37,19 +37,29 @@ 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 ) + 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="${RDEPEND} +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.md ChangeLog.md README.md" +DOCS=( AUTHORS.md ChangeLog.md README.md ) RESTRICT="test" MULTILIB_CHOST_TOOLS=( @@ -65,8 +75,6 @@ einfo remove bundled libs rm -rf elektra* yajl || die - epatch "${FILESDIR}/${P}"-buildsystem.patch - if use fltk ; then #src/examples does not include fltk flags append-cflags $(fltk-config --cflags) @@ -80,17 +88,20 @@ 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 "") + -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 1.29 media-libs/oyranos/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?rev=1.29&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?rev=1.29&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?r1=1.28&r2=1.29 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- ChangeLog 27 May 2015 20:31:04 -0000 1.28 +++ ChangeLog 25 Jul 2015 12:34:34 -0000 1.29 @@ -1,6 +1,11 @@ # ChangeLog for media-libs/oyranos # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.28 2015/05/27 20:31:04 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.29 2015/07/25 12:34:34 mgorny Exp $ + + 25 Jul 2015; Michał Górny <[email protected]> + -files/oyranos-9999-buildsystem.patch, metadata.xml, oyranos-9999.ebuild: + Update the live ebuild. https://github.com/gentoo/gentoo-portage-rsync- + mirror/pull/157 by a17r. 27 May 2015; Matthias Maier <[email protected]> oyranos-0.9.4-r2.ebuild, oyranos-0.9.5.ebuild, oyranos-9999.ebuild:
