Revbump to adapt to new elektra include names, drop old.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 24 insertions, 168 deletions

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 <xmw@gentoo.org> -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/Manifest b/media-libs/oyranos/Manifest
index 3b3dcc14be59..1f3f7e937f89 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX oyranos-0.3.2-buildsystem.patch 2705 RMD160 6eea7619ece7366a38b6ea6feab97842b8424f82 SHA1 f520abada2f0abacf00927b8ef1b7ab83a90462d SHA256 99c9099f1d62ae7e6ec7add2429f64502f544898cf563d0ce278868d9a7dd5fd
-AUX oyranos-0.3.2-test.patch 963 RMD160 dbacdec0e72d4db8e8994bf2926ab308e3fa7b63 SHA1 bcc5510ef08a93728a75600a53aaebf04cfbb8d4 SHA256 b637e9be5395b9efe8f5ebc5a3255dcdfd4457752672b9087d2f68ab098e8466
-AUX oyranos-0.4.0-buildsystem.patch 2621 RMD160 1963e4937d5c6f7d3c954846a34b092b8607ec10 SHA1 4e440fbbb6993dbb8007393cc4bef2d8545ef847 SHA256 6f93da323034d819242c4f71d96ffc873ff58d9fe4f6bbab83206f0d907c9d69
-DIST oyranos-0.3.2.tar.bz2 1247164 RMD160 1943af1a79ff3d41b5cd482e3e9ea6e573ef3122 SHA1 a216254b8d0cd2563d3781fea57169d5b70a71e8 SHA256 db8d104c8dc1fd24129a20ddea40ca4b4bf30adc4985e0a8f90bde28229c0e54
-DIST oyranos-0.4.0.tar.bz2 1265839 RMD160 8e01746a7d4a330fec9133306a1bf93bcb7596dd SHA1 4841e1271a24071600494fc0c1281c65b007de76 SHA256 6fcff9d5f8dc1aaeef55e238a30c65df390a9206ed76cf473f7f0ae348c23ed9
-EBUILD oyranos-0.3.2.ebuild 1908 RMD160 988ed9103456f9c5d3f5cb6dfe07736a2934e4eb SHA1 bbc79bbfd0d4306e5486147619b618eab8215193 SHA256 ede937555ffaf80008ce8b97f072e87a2560141ca8a9b16ba0ee688c9d0ecc18
-EBUILD oyranos-0.4.0.ebuild 1934 RMD160 49fcd365eda20c0e0173495c8e4242d43e7c9711 SHA1 d9a7339456be2058035ecc8340eb7203f95ea697 SHA256 fa1c37fcd9f6ebafb8b44f85a45fa0e9aa0cba420c108bac080555dc3a0f1158
-MISC ChangeLog 694 RMD160 8a23857aec0f82d111d4b5026d5eaff1b6d26021 SHA1 b72d35cea25e99b10c94b495bd7453016b4507f8 SHA256 b1d8093e2fe7493413877ec4a9b6ce6378917bc4455c5a986afc62e81d879620
-MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
+AUX oyranos-0.3.2-test.patch 963 SHA256 b637e9be5395b9efe8f5ebc5a3255dcdfd4457752672b9087d2f68ab098e8466 SHA512 53273cde26dfc8d254ae59446f3874eb5cf251e6a9f9b703d3bed723b4ca850f492e94bec7a031b38be5997df75decb730961ec202d191484296bc64eea040a5 WHIRLPOOL 78d859d935e0c69f81dbb7032bc1382188cc3723c10e43b1dfae883a9589c6b6b9ab10b6b05d6a67163877c6ff0d579a00e7362e78b97fda9227c7a6f4e751c8
+AUX oyranos-0.4.0-buildsystem.patch 2621 SHA256 6f93da323034d819242c4f71d96ffc873ff58d9fe4f6bbab83206f0d907c9d69 SHA512 0b07affb94928a0136ce81940d1d0e65652d9dd06b658c7539ea6f5f3bafc8f3c2055932580c9edda9bc785b48fb489206ad55fc6d9e1909ba16f2d169a7c10d WHIRLPOOL 56b2a0ea8509cb23e6bfff8c3e5721eabc832cd75b060cc905130ac12aaed034a985da8ea5837ce89d602ddda13645365bfd58d3cee1087bd960a53a13fa26df
+DIST oyranos-0.4.0.tar.bz2 1265839 SHA256 6fcff9d5f8dc1aaeef55e238a30c65df390a9206ed76cf473f7f0ae348c23ed9 SHA512 edd11dfbe3aa5613fdc8b38536e1a9cffd3809e4bd0c179d7c8d55d8546613580ed010942f014ca2c9c5fad7531dd9083529e73c2aacf17e4b54b7cf422b1934 WHIRLPOOL a1a9f16e0a7e3d8b396dc0b56357ae91a4f42132e75cc60ec7bd5ce581c657ff3b3f569bd7b3f2d7c593257597e6199042ae587fc054d365d87af29fbb3a15c3
+EBUILD oyranos-0.4.0-r1.ebuild 2038 SHA256 4fa0179812ef2ea79307b88b0096b034c586f56f841001c55befd34a1f4da141 SHA512 b6f35c6108d2997b4201b80851ffb7a4f8b1373e6b04b627618035208aee87121177edfc881443ab63e12a1937ca0583bda74a2de2e6016ef691c8bbc8b090aa WHIRLPOOL 0be82bcaeec36febdc04cdfb19ae8ff747204fbb067f55d8a97ecf2dcd362c3639db90b7bcc3bb50e7821807042185e501fc1d05c036b1dcd9e2974cd82faad1
+MISC ChangeLog 949 SHA256 04d073e124b3ed7997e2bdd173810e5cced01252b321cec38f27c4eab51eead1 SHA512 9b0ff18fb39ff8bbb44d81aa69285a3024be48e7b087372f5fd612375484e14ce600120561757d986d3899c889a7a8da3190526373d0cc1a235da503a7f1dff0 WHIRLPOOL 317e635e9567846a430b0e439cd8d9409cdd6b331753c291ab011956f4056afe71ad56344d1ac012b7b906702550a625e2c76a51ba44ae0fb4b933c17d6a9044
+MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9bZUQACgkQ/ejvha5XGaPcaACglGBKNXOKkWGlRo5EFDHXpM7O
-J/4AnikYFQNKOGYu8iSHHs4Fh9mUV+cy
-=IvNi
+iF4EAREIAAYFAlCWUQgACgkQknrdDGLu8JCYcQEAiolhfFJ0Usl1iHlHvBKJsbNZ
+cJ/y7yVOrw7L68LfbvgBAIDAP3X47DblUWiadWfzrpwFKUALqohjWleM36ZtGIcq
+=IHnQ
 -----END PGP SIGNATURE-----
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.ebuild b/media-libs/oyranos/oyranos-0.4.0-r1.ebuild
index 07f6a5a7d099..9953ab4b0518 100644
--- a/media-libs/oyranos/oyranos-0.4.0.ebuild
+++ b/media-libs/oyranos/oyranos-0.4.0-r1.ebuild
@@ -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.4.0.ebuild,v 1.1 2012/03/09 19:26:45 xmw Exp $
+# $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
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X doc static-libs test xinerama"
 
-RDEPEND="app-admin/elektra
+RDEPEND="<app-admin/elektra-0.8.3
 	dev-libs/libxml2
 	dev-libs/yajl
 	media-gfx/exiv2
@@ -50,6 +50,9 @@ src_prepare() {
 
 	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() {