From 4e697f2fa0e7159ea3c9a73b68f48d1088524ffb Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Sun, 4 Nov 2012 11:26:02 +0000 Subject: Revbump to adapt to new elektra include names, drop old. (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) --- media-libs/oyranos/ChangeLog | 9 ++- .../oyranos/files/oyranos-0.3.2-buildsystem.patch | 72 ------------------- media-libs/oyranos/oyranos-0.3.2.ebuild | 79 -------------------- media-libs/oyranos/oyranos-0.4.0-r1.ebuild | 84 ++++++++++++++++++++++ media-libs/oyranos/oyranos-0.4.0.ebuild | 81 --------------------- 5 files changed, 92 insertions(+), 233 deletions(-) delete mode 100644 media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch delete mode 100644 media-libs/oyranos/oyranos-0.3.2.ebuild create mode 100644 media-libs/oyranos/oyranos-0.4.0-r1.ebuild delete mode 100644 media-libs/oyranos/oyranos-0.4.0.ebuild (limited to 'media-libs/oyranos') diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog index 419738d3e84c..3f640b0144cc 100644 --- a/media-libs/oyranos/ChangeLog +++ b/media-libs/oyranos/ChangeLog @@ -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.3 2012/03/09 19:26:45 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.4 2012/11/04 11:26:02 xmw Exp $ + +*oyranos-0.4.0-r1 (04 Nov 2012) + + 04 Nov 2012; Michael Weber -oyranos-0.3.2.ebuild, + -files/oyranos-0.3.2-buildsystem.patch, -oyranos-0.4.0.ebuild, + +oyranos-0.4.0-r1.ebuild: + Revbump to adapt to new elektra include names, drop old. *oyranos-0.4.0 (09 Mar 2012) diff --git a/media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch b/media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch deleted file mode 100644 index 14272e2515b7..000000000000 --- a/media-libs/oyranos/files/oyranos-0.3.2-buildsystem.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- oyranos-0.3.2/configure -+++ oyranos-0.3.2/configure -@@ -30,7 +30,7 @@ - PKGC=$TARGET.pc - VERS_H="$TARGET"_version.h - zeile="$0 $@" --MAKEFILE_DIR=". fl_i18n libXNVCtrl yajl"; export MAKEFILE_DIR -+MAKEFILE_DIR=". fl_i18n libXNVCtrl"; export MAKEFILE_DIR - - if [ `uname` = "Linux" ]; then - v=-v -@@ -68,7 +54,7 @@ - OY_DEVEL_MONTH=05 - OYRANOS_DEVEL_MONTH=5 # numeric - OY_DEVEL_YEAR=2011 --OY_GIT_MASTER="`cat $ROOT_DIR/.git/refs/heads/master`" -+OY_GIT_MASTER="" - time="`date +%y%m%d.%H%M%S`" - DATE="$OY_START_MONTH $OY_START_YEAR - $OY_DEVEL_MONTH $OY_DEVEL_YEAR" - VERSION=$VERSION_A.$VERSION_B.$VERSION_C -@@ -120,7 +107,7 @@ - fi - IFS=$old_IFS - --STRIPOPT="sed s/-O.//" -+STRIPOPT="cat" - - if [ $# -gt 0 ]; then - prefix="" ---- oyranos-0.3.2/configure_tests.sh -+++ oyranos-0.3.2/configure_tests.sh -@@ -3,7 +3,7 @@ - set > testset.txt - ERROR=0 - WARNING=0 --STRIPOPT='s/-O.// ; s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//' -+STRIPOPT='s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//' - - mkdir -p tests - ---- oyranos-0.3.2/oforms/oyranos_xforms.makefile -+++ oyranos-0.3.2/oforms/oyranos_xforms.makefile -@@ -1,7 +1,8 @@ - INCL = $(INCLUDE) -I../ -I./ $(DEBUG) --CC = gcc -+CC ?= gcc -+CXX ?= c++ - DEBUG = -Wall -g -O0 --LDFLAGS_ = $$LDFLAGS -L../fl_i18n -+LDFLAGS += -L../fl_i18n - OY_LIBS := $(shell pkg-config libxml-2.0 --libs --cflags) - OY_FLAGS = -L../ -loyranos -loyranos_object -loyranos_core $(OY_LIBS) - FLTK_FLAGS := $(shell fltk-config --ldflags --cxxflags | sed s/-O2//) -lpthread -@@ -16,15 +17,15 @@ - - oyranos-xforms: $(SRCDIR)oyranos_xforms.c - echo "Compiling $(SRCDIR)$< + Linking $@ ..." -- gcc -Wall -g $(CFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_) -+ $(CC) -Wall -g $(CFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS) - - oyranos-xforms-modules: $(SRCDIR)oyranos_xforms_modules.c - echo "Compiling $(SRCDIR)$< + Linking $@ ..." -- gcc -Wall -g $(CFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_) -+ $(CC) -Wall -g $(CFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS) - - oyranos-xforms-fltk: $(SRCDIR)oyranos_xforms_fltk.cxx $(SRCDIR)oyranos_forms_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.h - echo "Compiling $(SRCDIR)$< + Linking $@ ..." -- c++ $(LDFLAGS_) -Wall -g $(CXXFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS) -+ $(CXX) $(LDFLAGS) -Wall -g $(CXXFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS) - - - # Build commands and filename extensions... diff --git a/media-libs/oyranos/oyranos-0.3.2.ebuild b/media-libs/oyranos/oyranos-0.3.2.ebuild deleted file mode 100644 index d725fb2b07a0..000000000000 --- a/media-libs/oyranos/oyranos-0.3.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# 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.3.2.ebuild,v 1.4 2012/02/08 22:25:06 mr_bones_ 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.3/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X doc static-libs test xinerama" - -RDEPEND="app-admin/elektra - dev-libs/libxml2 - dev-libs/yajl - media-gfx/exiv2 - media-libs/lcms:0 - media-libs/libpng:0 - media-libs/libraw - media-libs/libXcm - X? ( x11-libs/fltk:1 - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXxf86vm - xinerama? ( x11-libs/libXinerama ) )" -DEPEND="${RDEPEND} - app-doc/doxygen - test? ( media-libs/icc-profiles-basiccolor-printing2009 - media-libs/icc-profiles-openicc )" - -src_prepare() { - einfo remove bundled elektra yajl - rm -rf elektra* yajl || die - #keep bundled libXNVCtrl - - epatch "${FILESDIR}"/${P}-buildsystem.patch \ - "${FILESDIR}"/${P}-test.patch - - if ! use X ; then - sed -e '/FLTK_GUI =/s:=.*:=:' \ - -i makefile.in || die - fi - - sed -e '/#include/s:alpha/oyranos_alpha.h:oyranos_alpha.h:' \ - -i examples/libraw/oyranos_file.cpp || 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 -} diff --git a/media-libs/oyranos/oyranos-0.4.0-r1.ebuild b/media-libs/oyranos/oyranos-0.4.0-r1.ebuild new file mode 100644 index 000000000000..9953ab4b0518 --- /dev/null +++ b/media-libs/oyranos/oyranos-0.4.0-r1.ebuild @@ -0,0 +1,84 @@ +# 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.4.0-r1.ebuild,v 1.1 2012/11/04 11:26:02 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="=media-libs/libXcm-0.5.0 + X? ( x11-libs/fltk:1 + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXxf86vm + xinerama? ( x11-libs/libXinerama ) )" +DEPEND="${RDEPEND} + app-doc/doxygen + 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 \ + "${FILESDIR}"/${PN}-0.3.2-test.patch + + if ! use X ; then + sed -e '/FLTK_GUI =/s:=.*:=:' \ + -i makefile.in || die + fi + + sed -e '/#include/s:alpha/oyranos_alpha.h:oyranos_alpha.h:' \ + -i examples/libraw/oyranos_file.cpp || die + + 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 +} diff --git a/media-libs/oyranos/oyranos-0.4.0.ebuild b/media-libs/oyranos/oyranos-0.4.0.ebuild deleted file mode 100644 index 07f6a5a7d099..000000000000 --- a/media-libs/oyranos/oyranos-0.4.0.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# 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.4.0.ebuild,v 1.1 2012/03/09 19:26:45 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 - 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.0 - X? ( x11-libs/fltk:1 - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXxf86vm - xinerama? ( x11-libs/libXinerama ) )" -DEPEND="${RDEPEND} - app-doc/doxygen - 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 \ - "${FILESDIR}"/${PN}-0.3.2-test.patch - - if ! use X ; then - sed -e '/FLTK_GUI =/s:=.*:=:' \ - -i makefile.in || die - fi - - sed -e '/#include/s:alpha/oyranos_alpha.h:oyranos_alpha.h:' \ - -i examples/libraw/oyranos_file.cpp || 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 -} -- cgit v1.2.3-65-gdbad