* [gentoo-commits] gentoo-x86 commit in media-libs/oyranos: oyranos-9999.ebuild oyranos-0.9.5.ebuild ChangeLog
@ 2015-05-10 21:02 Michael Weber (xmw)
0 siblings, 0 replies; only message in thread
From: Michael Weber (xmw) @ 2015-05-10 21:02 UTC (permalink / raw
To: gentoo-commits
xmw 15/05/10 21:02:57
Modified: oyranos-9999.ebuild oyranos-0.9.5.ebuild ChangeLog
Log:
Fix port changes from 0.9.5 to live ebuild, update buildsystem patch. Thanks DrSlony (bug 548572)
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path
1.6 media-libs/oyranos/oyranos-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild?r1=1.5&r2=1.6
Index: oyranos-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- oyranos-9999.ebuild 22 Jun 2014 12:38:50 -0000 1.5
+++ oyranos-9999.ebuild 10 May 2015 21:02:57 -0000 1.6
@@ -1,32 +1,41 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.5 2014/06/22 12:38:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.6 2015/05/10 21:02:57 xmw Exp $
EAPI=5
-inherit eutils flag-o-matic cmake-utils cmake-multilib git-r3
+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/"
-EGIT_REPO_URI="git://www.${PN}.org/git/${PN}"
+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
LICENSE="BSD"
SLOT="0"
-KEYWORDS=""
IUSE="X cairo cups doc exif fltk qt4 raw test"
-RDEPEND="=app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}]
- >=app-admin/elektra-0.7.1-r5:0[${MULTILIB_USEDEP}]
+RDEPEND="
+ || (
+ =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-basiccolor-printing2009
+ media-libs/icc-profiles-openicc
|| (
>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
>=media-libs/lcms-1.19-r1:0[${MULTILIB_USEDEP}]
)
>=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}]
- >=media-libs/libXcm-0.5.2-r1[${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}] )
@@ -38,9 +47,12 @@
>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
- app-doc/doxygen
- media-gfx/graphviz"
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ )"
+DOCS="AUTHORS.md ChangeLog.md README.md"
RESTRICT="test"
MULTILIB_CHOST_TOOLS=(
@@ -50,13 +62,13 @@
/usr/include/oyranos/oyranos_version.h
)
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindCUPS"
+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}"-9999-buildsystem.patch
+ epatch "${FILESDIR}/${P}"-buildsystem.patch
if use fltk ; then
#src/examples does not include fltk flags
@@ -72,11 +84,12 @@
local mycmakeargs=(
-DLIB_SUFFIX=${libdir#lib}
- $(usex X -DWANT_X11=1 "")
$(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 "")
@@ -85,11 +98,3 @@
cmake-utils_src_configure
}
-
-multilib_src_install_all() {
- dodoc AUTHORS ChangeLog README
- if use doc ; then
- mv "${ED}/usr/share/doc/${PN}/*" "${ED}/usr/share/doc/${P}" || die
- fi
- rm -rf "${ED}/usr/share/doc/${PN}" || die
-}
1.2 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.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild?r1=1.1&r2=1.2
Index: oyranos-0.9.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oyranos-0.9.5.ebuild 30 Jul 2014 22:59:45 -0000 1.1
+++ oyranos-0.9.5.ebuild 10 May 2015 21:02:57 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.1 2014/07/30 22:59:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.5.ebuild,v 1.2 2015/05/10 21:02:57 xmw Exp $
EAPI=5
@@ -9,8 +9,8 @@
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="git://www.${PN}.org/git/${PN}"
- inherit git-2
+ 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"
1.26 media-libs/oyranos/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?r1=1.25&r2=1.26
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog 30 Jul 2014 22:59:45 -0000 1.25
+++ ChangeLog 10 May 2015 21:02:57 -0000 1.26
@@ -1,6 +1,13 @@
# ChangeLog for media-libs/oyranos
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.25 2014/07/30 22:59:45 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.26 2015/05/10 21:02:57 xmw Exp $
+
+ 10 May 2015; Michael Weber <xmw@gentoo.org>
+ files/oyranos-0.9.5-buildsystem-r1.patch,
+ files/oyranos-9999-buildsystem.patch, oyranos-0.9.5.ebuild,
+ oyranos-9999.ebuild:
+ Fix port changes from 0.9.5 to live ebuild, update buildsystem patch. Thanks
+ DrSlony (bug 548572)
*oyranos-0.9.5 (30 Jul 2014)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-05-10 21:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-10 21:02 [gentoo-commits] gentoo-x86 commit in media-libs/oyranos: oyranos-9999.ebuild oyranos-0.9.5.ebuild ChangeLog Michael Weber (xmw)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox