public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-libs/oyranos: ChangeLog oyranos-0.9.0.ebuild
@ 2012-11-04 16:28 Michael Weber (xmw)
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Weber (xmw) @ 2012-11-04 16:28 UTC (permalink / raw
  To: gentoo-commits

xmw         12/11/04 16:28:22

  Modified:             ChangeLog
  Added:                oyranos-0.9.0.ebuild
  Log:
  Version bump with upstream fixes (thanks Andreas Sturmlechner, bug 440838)
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

Revision  Changes    Path
1.5                  media-libs/oyranos/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?r1=1.4&r2=1.5

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog	4 Nov 2012 11:26:02 -0000	1.4
+++ ChangeLog	4 Nov 2012 16:28:21 -0000	1.5
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/oyranos
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.4 2012/11/04 11:26:02 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.5 2012/11/04 16:28:21 xmw Exp $
+
+*oyranos-0.9.0 (04 Nov 2012)
+
+  04 Nov 2012; Michael Weber <xmw@gentoo.org> +oyranos-0.9.0.ebuild,
+  +files/oyranos-0.9.0-array.patch, +files/oyranos-0.9.0-buildsystem.patch,
+  +files/oyranos-0.9.0-png.patch:
+  Version bump with upstream fixes (thanks Andreas Sturmlechner, bug 440838)
 
 *oyranos-0.4.0-r1 (04 Nov 2012)
 



1.1                  media-libs/oyranos/oyranos-0.9.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.9.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.9.0.ebuild?rev=1.1&content-type=text/plain

Index: oyranos-0.9.0.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.0.ebuild,v 1.1 2012/11/04 16:28:21 xmw Exp $

EAPI=4

inherit eutils toolchain-funcs

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.4/${P}.tar.bz2"

LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X doc static-libs test xinerama"

RDEPEND="<app-admin/elektra-0.8.3
	dev-libs/libxml2
	dev-libs/yajl
	media-gfx/exiv2
	media-libs/lcms:0
	media-libs/libpng:0
	media-libs/libraw
	>=media-libs/libXcm-0.5.1
	X? ( x11-libs/fltk:1
		x11-libs/libXfixes
		x11-libs/libXrandr
		x11-libs/libXxf86vm
		xinerama? ( x11-libs/libXinerama ) )"
DEPEND="${RDEPEND}
	app-doc/doxygen
	media-gfx/graphviz
	test? ( media-libs/icc-profiles-basiccolor-printing2009
		media-libs/icc-profiles-openicc )"

RESTRICT="test"

src_prepare() {
	einfo remove bundled elektra yajl
	rm -rf elektra* yajl || die
	#keep bundled libXNVCtrl

	epatch "${FILESDIR}"/${P}-buildsystem.patch
	epatch "${FILESDIR}"/${P}-png.patch
	epatch "${FILESDIR}"/${P}-array.patch

	if ! use X ; then
		sed -e '/FLTK_GUI =/s:=.*:=:' \
			-i makefile.in || die
	fi

	sed -e '/^#include/s:kdb.h:elektra-kdb.h:' \
		-i test.c test2.cpp oyranos_elektra.c || die
}

src_configure() {
	tc-export CC CXX
	econf --prefix=/usr \
		--enable-verbose \
		$(use_with X x) \
		$(use_enable X libX11) \
		$(use_enable X libXext) \
		$(use_enable X libXrandr) \
		$(use_enable X libXxf86vm) \
		$(use_enable X fltk) \
		$(use_enable static-libs static) \
		$(use_enable xinerama libXinerama)
}

src_compile() {
	emake all
	use X && emake oforms
	emake docu
}

src_install() {
	emake DESTDIR="${D}" docdir=${EPREFIX}/usr/share/doc/${P} install-main

	if ! use doc ; then
		rm -rf "${ED}/usr/share/doc/${P}/html" || die
	fi
}





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-libs/oyranos: ChangeLog oyranos-0.9.0.ebuild
@ 2012-11-04 16:50 Michael Weber (xmw)
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Weber (xmw) @ 2012-11-04 16:50 UTC (permalink / raw
  To: gentoo-commits

xmw         12/11/04 16:50:44

  Modified:             ChangeLog oyranos-0.9.0.ebuild
  Log:
  Fix for add-admin/elektra-0.8.3.
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

Revision  Changes    Path
1.6                  media-libs/oyranos/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/ChangeLog?r1=1.5&r2=1.6

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog	4 Nov 2012 16:28:21 -0000	1.5
+++ ChangeLog	4 Nov 2012 16:50:44 -0000	1.6
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/oyranos
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.5 2012/11/04 16:28:21 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.6 2012/11/04 16:50:44 xmw Exp $
+
+  04 Nov 2012; Michael Weber <xmw@gentoo.org> oyranos-0.9.0.ebuild:
+  Fix for add-admin/elektra-0.8.3.
 
 *oyranos-0.9.0 (04 Nov 2012)
 



1.2                  media-libs/oyranos/oyranos-0.9.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.9.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.9.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/oyranos/oyranos-0.9.0.ebuild?r1=1.1&r2=1.2

Index: oyranos-0.9.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oyranos-0.9.0.ebuild	4 Nov 2012 16:28:21 -0000	1.1
+++ oyranos-0.9.0.ebuild	4 Nov 2012 16:50:44 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.0.ebuild,v 1.1 2012/11/04 16:28:21 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.0.ebuild,v 1.2 2012/11/04 16:50:44 xmw Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@
 KEYWORDS="~amd64 ~x86"
 IUSE="X doc static-libs test xinerama"
 
-RDEPEND="<app-admin/elektra-0.8.3
+RDEPEND="app-admin/elektra
 	dev-libs/libxml2
 	dev-libs/yajl
 	media-gfx/exiv2
@@ -50,8 +50,10 @@
 			-i makefile.in || die
 	fi
 
-	sed -e '/^#include/s:kdb.h:elektra-kdb.h:' \
-		-i test.c test2.cpp oyranos_elektra.c || die
+	if has_version "<app-admin/elektra-0.8.3" ; then
+		sed -e '/^#include/s:kdb.h:elektra-kdb.h:' \
+			-i test.c test2.cpp oyranos_elektra.c || die
+	fi
 }
 
 src_configure() {





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-11-04 16:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-04 16:28 [gentoo-commits] gentoo-x86 commit in media-libs/oyranos: ChangeLog oyranos-0.9.0.ebuild Michael Weber (xmw)
  -- strict thread matches above, loose matches on Subject: below --
2012-11-04 16:50 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