Version bump with upstream fixes (thanks Andreas Sturmlechner, bug 440838)

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

6 files changed, 282 insertions, 5 deletions

diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog
index 3f640b0144cc..cb430e54f1cc 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.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)
 
diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index 1f3f7e937f89..ed78282acff8 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -3,14 +3,19 @@ Hash: SHA256
 
 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
+AUX oyranos-0.9.0-array.patch 1154 SHA256 79d4628cb20f310627f50caa76b383e68ccdbde3849c0cefa2389da825078757 SHA512 b48a902f7d09fcf2f08195417aa0e77b21d27659177383d76362e278247376ef6d639ef15abfe8025dcbb68a8e7d3896fd602a74a3ea2671fbde128057299cd9 WHIRLPOOL 66d97d256661884113ee10c988a83b19bb53b35f2426d0f610d7610744102f03c769f220ca1182648fa51a1429892fe9d16c806dbbc9c46a59cfa9246d2e8ea1
+AUX oyranos-0.9.0-buildsystem.patch 4581 SHA256 1b9384c27f72980608940838a08ba7e2c8f1e8835a73b8a77e299dd3482c7931 SHA512 8fa5f782ad4f2e9cc5d4c7d6b1d00944e0bb686191b58660fc4c35fdaf95f09a0e46527700430365dd08aa60777fb5c3149a05b66646030cccc8bcb620060bab WHIRLPOOL 30fd4a8af959b24e6b677e90ddb90e4f1f6eccc5aeb51a9f18bb897b6adae5210477b08f98994cff6b555baeeec6b5e2eb98e88ff2e0dfed723f6fcd1dc49432
+AUX oyranos-0.9.0-png.patch 1194 SHA256 dff9024a3c51a5b1c8df0d3e8955b9d42b992f5bd0622162a3ddf7b053d9ae20 SHA512 bf6bcd3a8668e62e3e6d1385620c93ff94db1bd10b40205dff27a0864c1a555815561df31bda025700cfb7046a430f84c6ab00596417fcab7687b7f5f98b7c4e WHIRLPOOL 236b4b8e58e9dbd59e3b504d596892763b4c6dd76f106c93c0c1726f893d2abc35a228d82ee1e2a9ae26c013e0352a2d4ae7badcb6af2fa81f0b0adcc9deb1ac
 DIST oyranos-0.4.0.tar.bz2 1265839 SHA256 6fcff9d5f8dc1aaeef55e238a30c65df390a9206ed76cf473f7f0ae348c23ed9 SHA512 edd11dfbe3aa5613fdc8b38536e1a9cffd3809e4bd0c179d7c8d55d8546613580ed010942f014ca2c9c5fad7531dd9083529e73c2aacf17e4b54b7cf422b1934 WHIRLPOOL a1a9f16e0a7e3d8b396dc0b56357ae91a4f42132e75cc60ec7bd5ce581c657ff3b3f569bd7b3f2d7c593257597e6199042ae587fc054d365d87af29fbb3a15c3
+DIST oyranos-0.9.0.tar.bz2 1476759 SHA256 9279ba03ce0efcbda4e6a37726714261c24b3b518a07a2dea255a1dcf840caa0 SHA512 89f2160958da792fe093159b0c3ad12d043fc2073b546a61aa884ed69a11f66da430dc90cfe9b249af5b6b75a7f755940239a1ea5cdcdf50770bda228978c6f8 WHIRLPOOL bc17f9a742d605b5e672512be623dfc005a54af0f6f1ee585a0a0ebe41aa4cb4be5f59484dbbfee5af81e6e995510a9e96bbf7b59e1e8de0cae9be0290c3de82
 EBUILD oyranos-0.4.0-r1.ebuild 2038 SHA256 4fa0179812ef2ea79307b88b0096b034c586f56f841001c55befd34a1f4da141 SHA512 b6f35c6108d2997b4201b80851ffb7a4f8b1373e6b04b627618035208aee87121177edfc881443ab63e12a1937ca0583bda74a2de2e6016ef691c8bbc8b090aa WHIRLPOOL 0be82bcaeec36febdc04cdfb19ae8ff747204fbb067f55d8a97ecf2dcd362c3639db90b7bcc3bb50e7821807042185e501fc1d05c036b1dcd9e2974cd82faad1
-MISC ChangeLog 949 SHA256 04d073e124b3ed7997e2bdd173810e5cced01252b321cec38f27c4eab51eead1 SHA512 9b0ff18fb39ff8bbb44d81aa69285a3024be48e7b087372f5fd612375484e14ce600120561757d986d3899c889a7a8da3190526373d0cc1a235da503a7f1dff0 WHIRLPOOL 317e635e9567846a430b0e439cd8d9409cdd6b331753c291ab011956f4056afe71ad56344d1ac012b7b906702550a625e2c76a51ba44ae0fb4b933c17d6a9044
+EBUILD oyranos-0.9.0.ebuild 1981 SHA256 56e64387aea5cc826d76a41029c2ca0847ffb1fae69c7841c77ead5bf7f6e023 SHA512 874147234183bcf4b5c1c6819c529187fe855312449fb1ed2326a2512a0c080fcfccb6910be5f1a3abf06a9d12a7f20130e30ef0011b8204cc9aa06bac603ed7 WHIRLPOOL 71f34e907d7dce7096e6270058ac9452a922b357164a2560ba7325d76e1bcf53a14406716094b3978a8f5634ae80c5c3e835150718b3bc9cd550b6b80cbc3176
+MISC ChangeLog 1236 SHA256 8f2dc6da4a23626e8915618d5ffc8f90a94444597222a208d0a0a7af8cf748db SHA512 25712bb198d42f76f33810b627fb47b59feea78dcd949e15e642b54536426b6411598f0a9284f37793e8faecfc3e3abd549286a80ef21beab39287d94790ddcd WHIRLPOOL b629324c2e2b71adac3d9451a04cff69f9df70727116dfb79bef418867f8f186c6e60dfcc08781eeb5bb651623a7f3c5bf4a540579c2981316661857889c995e
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCWUQgACgkQknrdDGLu8JCYcQEAiolhfFJ0Usl1iHlHvBKJsbNZ
-cJ/y7yVOrw7L68LfbvgBAIDAP3X47DblUWiadWfzrpwFKUALqohjWleM36ZtGIcq
-=IHnQ
+iF4EAREIAAYFAlCWl60ACgkQknrdDGLu8JCSFQD/RJ8IgW5Imyzp/BR1cKd093sx
+z1gPrJwEQ/3SkXe4PiIA/1lRbSMpwrU//7bcEcnsEmg227ZGUozLdfN0A0LA6gjH
+=yHQq
 -----END PGP SIGNATURE-----
diff --git a/media-libs/oyranos/files/oyranos-0.9.0-array.patch b/media-libs/oyranos/files/oyranos-0.9.0-array.patch
new file mode 100644
index 000000000000..bd8ee069e443
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.0-array.patch
@@ -0,0 +1,37 @@
+from http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff;h=0ed3aef1320ccc168c2753ac4cf426290fac6639
+--- a/API_generated/oyArray2d_s_.c
++++ b/API_generated/oyArray2d_s_.c
+@@ -13,7 +13,7 @@
+  *  @author   Kai-Uwe Behrmann <ku.b@gmx.de>
+  *  @par License:
+  *            new BSD - see: http://www.opensource.org/licenses/bsd-license.php
+- *  @date     2012/10/24
++ *  @date     2012/11/02
+  */
+ 
+ 
+@@ -404,9 +404,9 @@
+  *
+  *  @param[in,out] obj                 struct object
+  *
+- *  @version Oyranos: 0.1.11
++ *  @version Oyranos: 0.9.1
++ *  @date    2012/11/02
+  *  @since   2010/09/07 (Oyranos: 0.1.11)
+- *  @date    2010/09/07
+  */
+ int          oyArray2d_ReleaseArray_ ( oyArray2d_s       * obj )
+ {
+@@ -428,10 +428,10 @@
+     {
+       if((s->own_lines == 1 && y == s->data_area.y) ||
+          s->own_lines == 2)
+-        deallocateFunc( &s->array2d[y][dsize * (int)s->data_area.x] );
++	deallocateFunc( &s->array2d[y][dsize * (int)OY_ROUND(s->data_area.x)] );
+       s->array2d[y] = 0;
+     }
+-    deallocateFunc( s->array2d + (size_t)s->data_area.y );
++    deallocateFunc( s->array2d + (int)OY_ROUND(s->data_area.y) );
+     s->array2d = 0;
+   }
+ 
diff --git a/media-libs/oyranos/files/oyranos-0.9.0-buildsystem.patch b/media-libs/oyranos/files/oyranos-0.9.0-buildsystem.patch
new file mode 100644
index 000000000000..9821fd44be40
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.0-buildsystem.patch
@@ -0,0 +1,114 @@
+--- oyranos-0.4.0/configure_tests.sh
++++ oyranos-0.4.0/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.9.0/oforms/oyranos_xforms.makefile
++++ oyranos-0.9.0/oforms/oyranos_xforms.makefile
+@@ -1,8 +1,8 @@
+-INCL    = $(INCLUDE) -I../ -I./ $(DEBUG)
+-CC      = gcc
+-DEBUG  = -Wall -g -O0
++INCL    = $(INCLUDE) -I../ -I./
++CC      ?= gcc
++CXX     ?= c++
+ LDFLAGS_ = $$LDFLAGS -L../fl_i18n
+-OY_LIBS := $(shell pkg-config oyranos libxml-2.0 --libs --cflags)
++OY_LIBS := $(shell pkg-config libxml-2.0 --libs --cflags) ../liboyranos.so ../liboyranos_object.so ../liboyranos_core.so ../liboyranos_config.so ../liboyranos_modules.so
+ OY_FLAGS = -L../ $(OY_LIBS)
+ FLTK_FLAGS := $(shell fltk-config --ldflags --cxxflags | sed s/-O2//) -lpthread
+ 
+@@ -15,15 +15,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 $(CFLAGS) $(LDFLAGS) $(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 $(CFLAGS) $(LDFLAGS) $(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 $(CXXFLAGS) $(LDFLAGS) $(INCL)  $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS)
+ 
+ 
+ # Build commands and filename extensions...
+--- oyranos-0.9.0/oyranos-config.in
++++ oyranos-0.9.0/oyranos-config.in
+@@ -109,7 +109,7 @@
+ 
+ if [ "$echo_ldflags" = "yes" ]; then
+   if [ -f liboyranos.so ]; then
+-    echo "-L. -loyranos -loyranos_config -loyranos_modules -loyranos_object -loyranos_core $elektra $oyranos_add"
++    echo "lliboyranos.so liboyranos_config.so liboyranos_modules.so liboyranos_object.so liboyranos_core.so $elektra $oyranos_add"
+   else
+     echo "-L$libdir -loyranos -loyranos_config -loyranos_modules -loyranos_object -loyranos_core $elektra $oyranos_add"
+   fi
+--- oyranos-0.9.0/configure
++++ oyranos-0.9.0/configure
+@@ -121,8 +121,6 @@
+ fi
+ IFS=$old_IFS
+ 
+-STRIPOPT="sed s/-O.//"
+-
+ if [ $# -gt 0 ]; then
+   prefix=""
+   while [ $# -gt 0 ]; do
+@@ -680,17 +678,8 @@
+ test -n "$ECHO" && $ECHO "CC = $CC" >> $CONF_NV
+ export CC CXX
+ 
+-# many constant strings are much longer than the C90 allowed, skip the warning
+-CFLAGS_COMMON="`echo $CFLAGS_COMMON | $STRIPOPT` \$(DEBUG) \$(OPENMP)"
+-CXXFLAGS_COMMON="`echo $CXXFLAGS_COMMON | $STRIPOPT` \$(DEBUG) \$(OPENMP)"
+-CFLAGS="`echo $CFLAGS | $STRIPOPT`"
+-CXXFLAGS="`echo $CXXFLAGS | $STRIPOPT`"
+ 
+-if [ -z "$LDFLAGS" ]; then
+-  LDFLAGS="-L./ -L$libdir"
+-else
+-  LDFLAGS="`echo $LDFLAGS | $STRIPOPT` -L./ -L$libdir"
+-fi
++#LDFLAGS="-L./ -L$libdir"
+ 
+ 
+ # detect Libraries
+@@ -760,12 +749,12 @@
+         --copyright-holder='Kai-Uwe Behrmann' \
+         --msgid-bugs-address='ku.b@gmx.de' \
+         --from-code=utf-8" >> $CONF
+-  oyranos_add="-L\$libdir \$ltdl \$xml2 \$iconv \$intl \$yajl"
++  oyranos_add="\$ltdl \$xml2 \$iconv \$intl \$yajl"
+   if [ $OSUNAME = "Linux" ]; then
+     COPY="cp -vdpa"
+     MOVE="mv -v"
+     RM="rm -vf"
+-    LDFLAGS="$LDFLAGS -L."
++    LDFLAGS="$LDFLAGS"
+     test -n "$ECHO" && $ECHO "LINK_FLAGS_STATIC =" >> $CONF
+     if [ -n "$rpath" ]; then 
+       test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,--rpath -Wl," >> $CONF
+@@ -1294,9 +1283,9 @@
+ test -n "$ECHO" && $ECHO "" >> $VERS_H
+ test -n "$ECHO" && $ECHO "#endif /*OYRANOS_VERSION_H*/" >> $VERS_H
+ 
+-CFLAGS="$CFLAGS_COMMON `echo $CFLAGS | $STRIPOPT`"
+-CXXFLAGS="$CXXFLAGS_COMMON `echo $CXXFLAGS | $STRIPOPT`"
+-LDFLAGS="`echo $LDFLAGS | $STRIPOPT` \$(dl) \$(DEVEL_LIBS)"
++CFLAGS="$CFLAGS_COMMON $CFLAGS"
++CXXFLAGS="$CXXFLAGS_COMMON $CXXFLAGS"
++LDFLAGS="$LDFLAGS \$(dl) \$(DEVEL_LIBS)"
+ 
+ test -n "$ECHO" && $ECHO "CFLAGS=$CFLAGS"     >> $CONF_NV
+ test -n "$ECHO" && $ECHO "CFLAGS = $CFLAGS"   >> $CONF_I18N
diff --git a/media-libs/oyranos/files/oyranos-0.9.0-png.patch b/media-libs/oyranos/files/oyranos-0.9.0-png.patch
new file mode 100644
index 000000000000..7bcc28651f1c
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.0-png.patch
@@ -0,0 +1,31 @@
+from http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff;h=c39976bf5de8a70f71cef2ecafae13d17e811857
+--- a/modules/oyranos_cmm_oPNG.c
++++ b/modules/oyranos_cmm_oPNG.c
+@@ -816,7 +816,8 @@ oyImage_s *  oyImage_FromPNG         ( const char        * filename,
+        spp = 2; break;
+   case PNG_COLOR_TYPE_PALETTE:
+        png_set_palette_to_rgb( png_ptr );
+-       spp = 3; break;
++       /* expect alpha */
++       spp = 4; break;
+   case PNG_COLOR_TYPE_RGB:
+        spp = 3; break;
+   case PNG_COLOR_TYPE_RGB_ALPHA:
+@@ -884,10 +885,15 @@ oyImage_s *  oyImage_FromPNG         ( const char        * filename,
+                                         oyToDataType_m(pixel_layout),
+                                         0 );
+     png_byte ** array2d = (png_byte**) oyArray2d_GetData( a );
+-    int i;
++    int i,y;
+ 
++    /* both variants of libpng access appear equal */
++    if(1)
++      png_read_image( png_ptr, array2d );
++    else
+     for( i = 0; i < num_passes; ++i )
+-      png_read_rows( png_ptr, array2d, NULL, height );
++      for( y = 0; y < height; ++y )
++        png_read_row( png_ptr, array2d[y], NULL );
+ 
+     oyImage_SetData ( image_in, (oyStruct_s**) &a, 0,0,0,0,0,0 );
+   }
diff --git a/media-libs/oyranos/oyranos-0.9.0.ebuild b/media-libs/oyranos/oyranos-0.9.0.ebuild
new file mode 100644
index 000000000000..39fd9f8c7aca
--- /dev/null
+++ b/media-libs/oyranos/oyranos-0.9.0.ebuild
@@ -0,0 +1,83 @@
+# 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
+}