9 files changed, 181 insertions, 4 deletions
diff --git a/x11-misc/xaos/ChangeLog b/x11-misc/xaos/ChangeLog
index 772cf4cf9e51..338ef630b0de 100644
--- a/x11-misc/xaos/ChangeLog
+++ b/x11-misc/xaos/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/xaos
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.28 2008/07/31 22:36:54 markusle Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.29 2009/03/28 12:55:30 bicatali Exp $
+
+*xaos-3.4-r1 (28 Mar 2009)
+
+  28 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/xaos-3.4-include.patch, +files/xaos-3.4-makefile.patch,
+  +files/xaos-3.4-png.patch, +files/xaos-3.4-x11.patch, +files/xaos.png,
+  metadata.xml, +xaos-3.4-r1.ebuild:
+  Fixed for forced stripping (bug #252099), png magic (bug #263310), added
+  gtk driver, desktop files, and some patch from debian
 
   31 Jul 2008; Markus Dittrich <markusle@gentoo.org> xaos-3.4.ebuild:
   Force the use of sci-libs/gsl to avoid accidental generation of x86
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index ed0ad28b93a7..ae7f1cb72b01 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -1,6 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xaos-3.4-include.patch 216 RMD160 9ee7b5e3222df188ec655d4e1a3e80af1a363e13 SHA1 281ca3e21fcf5d61404b9494be06c53b84f7c6d9 SHA256 5af6025bab16b6da5619d83aa7ef58688625bcb2ed5b1e1d22832c534675c078
+AUX xaos-3.4-makefile.patch 1091 RMD160 cc0bd0d86f095f2f51dc4bca97046f1e50657994 SHA1 b778ba1024aca3a0a66cee2f63e7eb735eff3d23 SHA256 f54d567c99cd0234304c0c42553b26bbafd092aeb907950e7dae4bc8cfe7a634
+AUX xaos-3.4-png.patch 328 RMD160 8f399021e90abaeb6b5f7f8f31790bc844c23abe SHA1 282b1e4814557bb667e905961eaf6d3789cbfa43 SHA256 4e20fe771648e8fdbfacc3525dfa3341f05b93deacea790c23bb27a7a8d4c3f2
+AUX xaos-3.4-x11.patch 351 RMD160 e121fc6c142f7794382d7734d74782830c253324 SHA1 a015477eea01bf399cc3b6d9a7a1f6dffebe6000 SHA256 b90882ed31053acc9800fd5ba70a8b983adf0219121538fa556e72edeffa89cd
+AUX xaos.png 319 RMD160 0af927dfad2864509101cc93ca14c2442169451e SHA1 0e39df02d1b38c4d11fa671aac76f487ebd3af65 SHA256 5d7c854a3c6441b7040118ec7832aed45942f10d2d51a1fbd218b6e2a65a4994
 DIST XaoS-3.2.tar.gz 1227858 RMD160 b3cbc723bd94fa2c805531500c0d40c239b65382 SHA1 6083420d4d6061c2bc2a4f5e1dc1313e4d986fb3 SHA256 6fb464b9b4f05f1048346bba13c778bb592963d955d3a54ff6e3b72314730c12
 DIST XaoS-3.4.tar.gz 1977108 RMD160 37ce4728940e80c2876792650aa656236893d5f7 SHA1 4e419715ae0479fa3a20ed5f48ede7ad222f2d10 SHA256 2cdba9b356f725b278b20eaf925b54478ba24b722b1ddda3879a84ddc16a8c00
 EBUILD xaos-3.2.ebuild 1935 RMD160 6046880b932581ddff7f9a54c1ea332a8c47bf60 SHA1 1b0560490af021d7edb56326d6de0c50164c4e9b SHA256 5db1faae97ea9f0b717b84a03a2c78611bba76b23d4206db68ed30f10fb0f05c
+EBUILD xaos-3.4-r1.ebuild 2254 RMD160 89d4b7fb131e9955e162519d242009a109c69d19 SHA1 b0cb803209c62e8c78734d3fafe043a376f4b968 SHA256 1601d6b061342156924ef9d107bb1c93048fc3331c121a50c58a7d21f88e98d8
 EBUILD xaos-3.4.ebuild 1517 RMD160 bdb18586af3a7ee0764918237380f05a761a074c SHA1 9a6336b39ee7e8c22d53ad171ff3ffe37cb5f7ee SHA256 9c4b3c1e775b48712a7074eb0ab1167350597519eacff95b7fa1ddb4317cb382
-MISC ChangeLog 3377 RMD160 11585ddb8576584181d711fd47d0baeaf0fb260f SHA1 bdd7269f806fec7e373f1416ab9b8ad91ecc1495 SHA256 2a2e0ba80d6ec720cc4e71ddb9da020496dbb6bd18364239988b31dc6a97b627
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
+MISC ChangeLog 3767 RMD160 b892f675b8e8dbf25f420993c1e160ae5f9f37cf SHA1 634234843e4f45461be14f1fa42e7bf977e475fa SHA256 08f69d32366a094533ef58c87b81f8ea4a0e634f72b858d1070ed9429a0db0c4
+MISC metadata.xml 583 RMD160 5055148d95d127d29f4e963644eb666ac7e0c5eb SHA1 9f9eb601f2c7882611c1c0269b4e041c17335687 SHA256 2f0dd73d7c7fc6fd74d7a430ca50e03d390a200346bb9da765fefb8cb901bcf7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknOHksACgkQ1ycZbhPLE2CZAQCdEyfMg2vUNKvoNLJJOUDTAFpj
+3AkAn27ss5zKC7isUORgU+qdH3AJUN7C
+=KdI3
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xaos/files/xaos-3.4-include.patch b/x11-misc/xaos/files/xaos-3.4-include.patch
new file mode 100644
index 000000000000..65f7b8c5630c
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.4-include.patch
@@ -0,0 +1,7 @@
+--- src/util/thread.c.orig	2009-03-28 10:50:49.817619387 +0000
++++ src/util/thread.c	2009-03-28 10:59:40.048185946 +0000
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #ifndef _plan9_
+ #include <signal.h>
+ #include <stdio.h>
diff --git a/x11-misc/xaos/files/xaos-3.4-makefile.patch b/x11-misc/xaos/files/xaos-3.4-makefile.patch
new file mode 100644
index 000000000000..db387b4ee1f8
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.4-makefile.patch
@@ -0,0 +1,23 @@
+--- Makefile.in.orig	2009-03-28 11:04:21.000000000 +0000
++++ Makefile.in	2009-03-28 12:37:10.000000000 +0000
+@@ -32,11 +32,10 @@
+ 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/tutorial
+ 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/examples
+ 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/catalogs
+-	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/doc
+ 	@INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help
+ 	@INSTALL@ -d $(DESTDIR)$(bindir)
+ 	@INSTALL@ -d $(DESTDIR)$(mandir)/man6
+-	@INSTALL@ -s bin/xaos $(DESTDIR)$(bindir)
++	@INSTALL@ bin/xaos $(DESTDIR)$(bindir)
+ 	@INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial
+ 
+ 	@INSTALL@ -m 444 examples/README $(DESTDIR)$(datadir)/XaoS/examples
+@@ -48,7 +47,6 @@
+ 
+ 	@INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs
+ 	@INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help
+-	@INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt doc/AUTHORS doc/PROBLEMS $(DESTDIR)$(datadir)/XaoS/doc
+ 	@INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
+ 	-@STICKY@
+ 	test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)"
diff --git a/x11-misc/xaos/files/xaos-3.4-png.patch b/x11-misc/xaos/files/xaos-3.4-png.patch
new file mode 100644
index 000000000000..454f8acaa994
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.4-png.patch
@@ -0,0 +1,11 @@
+--- configure.in.orig	2009-03-28 09:50:18.764999182 +0000
++++ configure.in	2009-03-28 09:49:18.685947638 +0000
+@@ -98,7 +98,7 @@
+ AC_ARG_WITH(png,
+         [  --with-png=yes/no       enables/disables PNG saving support],[
+ 	if test x$withval = xyes; then
+-	  png=test
++	  png=yes
+ 	fi
+ 	if test x$withval = xno; then
+ 	  png=no
diff --git a/x11-misc/xaos/files/xaos-3.4-x11.patch b/x11-misc/xaos/files/xaos-3.4-x11.patch
new file mode 100644
index 000000000000..46e8aae30980
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.4-x11.patch
@@ -0,0 +1,10 @@
+--- src/ui/ui-drv/x11/ui_x11.c.orig
++++ src/ui/ui-drv/x11/ui_x11.c
+@@ -430,6 +430,7 @@
+   replay = XCreateFontCursor (d->display, XC_dot);
+   if (d->truecolor || d->privatecolormap)
+     x11_driver.flags &= ~RANDOM_PALETTE_SIZE;
++  xupdate_size (d); /* get real window size (#452284) --JEH */
+   if (!alloc_image (d))
+     {
+       xfree_display (d);
diff --git a/x11-misc/xaos/files/xaos.png b/x11-misc/xaos/files/xaos.png
new file mode 100644
index 000000000000..43853c502234
--- /dev/null
+++ b/x11-misc/xaos/files/xaos.png
diff --git a/x11-misc/xaos/metadata.xml b/x11-misc/xaos/metadata.xml
index b229aec85b8f..02e05a435d1c 100644
--- a/x11-misc/xaos/metadata.xml
+++ b/x11-misc/xaos/metadata.xml
@@ -2,4 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
+<longdescription lang="en">
+  XaoS is a fast, portable real-time interactive fractal zoomer. It
+  displays the Mandelbrot set (among other escape time fractals) and
+  allows you zoom smoothly into the fractal. Various coloring modes are
+  provided for both the points inside and outside the selected set. XaoS
+  supports switching between Julia and Mandelbrot fractal types and
+  on-the-fly plane switching.
+</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/xaos/xaos-3.4-r1.ebuild b/x11-misc/xaos/xaos-3.4-r1.ebuild
new file mode 100644
index 000000000000..d1ee485e64b1
--- /dev/null
+++ b/x11-misc/xaos/xaos-3.4-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.4-r1.ebuild,v 1.1 2009/03/28 12:55:30 bicatali Exp $
+
+EAPI=2
+inherit eutils autotools
+
+MY_PN=XaoS
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A very fast real-time fractal zoomer"
+HOMEPAGE="http://xaos.sf.net/"
+SRC_URI="mirror://sourceforge/xaos/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="aalib doc gtk nls png svga threads X"
+
+RDEPEND="sys-libs/zlib
+	sci-libs/gsl
+	aalib? ( media-libs/aalib )
+	gtk? ( >=x11-libs/gtk+-2 )
+	png? ( media-libs/libpng )
+	svga? ( media-libs/svgalib )
+	X? ( x11-libs/libX11
+		 x11-libs/libXxf86dga
+		 x11-libs/libXext
+		 x11-libs/libXxf86vm )"
+# xaos has ggi support, but it doesn't build
+#	ggi?   ( media-libs/libggi )
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( virtual/latex-base )
+	X? ( x11-proto/xf86vidmodeproto
+		 x11-proto/xextproto
+		 x11-proto/xf86dgaproto
+		 x11-proto/xproto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-png.patch
+	epatch "${FILESDIR}"/${P}-include.patch
+	epatch "${FILESDIR}"/${P}-x11.patch
+	eautoreconf
+}
+
+src_configure() {
+	# use gsl and not nasm (see bug #233318)
+	econf \
+		--with-sffe=yes \
+		--with-ggi-driver=no \
+		--with-i386asm=no \
+		--with-gsl=yes \
+		$(use_enable nls) \
+		$(use_with png) \
+		$(use_with aalib aa-driver) \
+		$(use_with gtk gtk-driver) \
+		$(use_with svga svga-driver) \
+		$(use_with threads pthread) \
+		$(use_with X x11-driver) \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use doc; then
+		cd "${S}"/doc
+		emake xaos.dvi || die
+		dvipdf xaos.dvi || die
+		cd "${S}"/help
+		emake html || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog* TODO RELEASE_NOTES \
+		doc/README{,.bugs} doc/{AUTHORS,PROBLEMS,SPONSORS}
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins doc/xaos.pdf || die
+		dohtml help/* || die
+	fi
+	local driver="x11"
+	use gtk && driver="\"GTK+ Driver\""
+	make_desktop_entry "xaos -driver ${driver}" "XaoS Fractal Zoomer" \
+		xaos "Application;Education;Math;Graphics;"
+	doicon "${FILESDIR}"/${PN}.png
+}