xmw 15/08/05 11:03:04 Modified: oyranos-0.9.5.ebuild oyranos-9999.ebuild ChangeLog Added: oyranos-0.9.5-r1.ebuild Log: Revbump to implement changes of p/r 164 (thanks a17r). (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path 1.4 media-libs/oyranos/oyranos-0.9.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild?r1=1.3&r2=1.4 Index: oyranos-0.9.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- oyranos-0.9.5.ebuild 27 May 2015 20:31:04 -0000 1.3 +++ oyranos-0.9.5.ebuild 5 Aug 2015 11:03:04 -0000 1.4 @@ -1,22 +1,16 @@ # 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-0.9.5.ebuild,v 1.3 2015/05/27 20:31:04 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild,v 1.4 2015/08/05 11:03:04 xmw 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" - KEYWORDS="~amd64 ~x86" -fi +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" 1.9 media-libs/oyranos/oyranos-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild?r1=1.8&r2=1.9 Index: oyranos-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- oyranos-9999.ebuild 25 Jul 2015 12:34:34 -0000 1.8 +++ oyranos-9999.ebuild 5 Aug 2015 11:03:04 -0000 1.9 @@ -1,22 +1,16 @@ # 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.8 2015/07/25 12:34:34 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.9 2015/08/05 11:03:04 xmw Exp $ EAPI=5 -inherit eutils flag-o-matic cmake-utils cmake-multilib +inherit eutils flag-o-matic git-r3 cmake-utils cmake-multilib 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="https://github.com/oyranos-cms/oyranos/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi +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" 1.30 media-libs/oyranos/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?rev=1.30&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?rev=1.30&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?r1=1.29&r2=1.30 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ChangeLog 25 Jul 2015 12:34:34 -0000 1.29 +++ ChangeLog 5 Aug 2015 11:03:04 -0000 1.30 @@ -1,6 +1,12 @@ # 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.29 2015/07/25 12:34:34 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.30 2015/08/05 11:03:04 xmw Exp $ + +*oyranos-0.9.5-r1 (05 Aug 2015) + + 05 Aug 2015; Michael Weber <[email protected]> +oyranos-0.9.5-r1.ebuild, + oyranos-0.9.5.ebuild, oyranos-9999.ebuild: + Revbump to implement changes of p/r 164 (thanks a17r). 25 Jul 2015; Michał Górny <[email protected]> -files/oyranos-9999-buildsystem.patch, metadata.xml, oyranos-9999.ebuild: 1.1 media-libs/oyranos/oyranos-0.9.5-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.9.5-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.9.5-r1.ebuild?rev=1.1&content-type=text/plain Index: oyranos-0.9.5-r1.ebuild =================================================================== # 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-0.9.5-r1.ebuild,v 1.1 2015/08/05 11:03:04 xmw 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" 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.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/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.md ChangeLog.md 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} 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 }
