x11-misc/xaos: Add fix for gcc in i686, #445638; http://code.google.com/p/gnuxaos/issues/detail?id=61

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

5 files changed, 137 insertions, 11 deletions

diff --git a/x11-misc/xaos/ChangeLog b/x11-misc/xaos/ChangeLog
index 9443d1605456..31f89d2f761a 100644
--- a/x11-misc/xaos/ChangeLog
+++ b/x11-misc/xaos/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xaos
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.42 2012/05/05 04:53:41 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.43 2012/12/03 09:50:41 jlec Exp $
+
+*xaos-3.5-r2 (03 Dec 2012)
+
+  03 Dec 2012; Justin Lecher <jlec@gentoo.org> +xaos-3.5-r2.ebuild,
+  +files/xaos-3.5-build-fix-i686.patch, metadata.xml:
+  Add fix for gcc in i686, #445638;
+  http://code.google.com/p/gnuxaos/issues/detail?id=61
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> xaos-3.5-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index 4f3d3e249d16..65fb0d057b91 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -1,8 +1,20 @@
-AUX xaos-3.4-include.patch 216 RMD160 9ee7b5e3222df188ec655d4e1a3e80af1a363e13 SHA1 281ca3e21fcf5d61404b9494be06c53b84f7c6d9 SHA256 5af6025bab16b6da5619d83aa7ef58688625bcb2ed5b1e1d22832c534675c078
-AUX xaos-3.4-png.patch 328 RMD160 8f399021e90abaeb6b5f7f8f31790bc844c23abe SHA1 282b1e4814557bb667e905961eaf6d3789cbfa43 SHA256 4e20fe771648e8fdbfacc3525dfa3341f05b93deacea790c23bb27a7a8d4c3f2
-AUX xaos-3.5-libpng15.patch 4260 RMD160 da1bb6ce7f76f44695808a407c9676ed9a7edb22 SHA1 6c51cb2ee1c5f28973680ffc3a040c2cea65fd33 SHA256 177ac125fe109a8326df3326df5b50f3a416fa8b9e9703202aefaf7e50bcbe8e
-DIST xaos-3.5.tar.gz 2930590 RMD160 193553818646fbf2d7c9f0c855ca3123446e16bc SHA1 6d16a58187fba7276e6bd0547cc2fd6bb073b801 SHA256 471fa752154a8e4c4687797fe1241df1b3f82400b2ef4e6a603969a27cd74842
-DIST xaos.png.tar 10240 RMD160 383ffd2e0e4fcd39c8a2d090ab06173b91eae207 SHA1 791fd2a0a1d974d736b8a450f3d1a991ff46ec0c SHA256 23806369fa304bf58439f39d9c672fe7f2b4293b3b1bfcccffd0c7994faeaa6a
-EBUILD xaos-3.5-r1.ebuild 1859 RMD160 1ae3c4a2b7682b407e3db7992e410276c7aae8ec SHA1 4da0e45c831ae4fce22cb1457ee25a85b6036ddd SHA256 0927d15dc12bce41c309197ad3739804a6cc34a8e3b8cae339704586225da554
-MISC ChangeLog 5510 RMD160 e46008a3502108307f420d278f178999873e0dbc SHA1 215e1a000a7506b24ef89e556254c23b7047c47d SHA256 10a0319e6ec9b129815c284cb425c79e9aa4e2b5882d79457a552e174b159c14
-MISC metadata.xml 583 RMD160 5055148d95d127d29f4e963644eb666ac7e0c5eb SHA1 9f9eb601f2c7882611c1c0269b4e041c17335687 SHA256 2f0dd73d7c7fc6fd74d7a430ca50e03d390a200346bb9da765fefb8cb901bcf7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xaos-3.4-include.patch 216 SHA256 5af6025bab16b6da5619d83aa7ef58688625bcb2ed5b1e1d22832c534675c078 SHA512 d3ce4cc8a792ca22e63043d89a427cf46be2dd7e3427aefd364dacb7e721782ed8aefa7eee338fb658d5a2f13704eafbcd03e18ae589186d1c1718ff808337c3 WHIRLPOOL 23061985dcbbd32927c9a142a6ab25a8e644c6b371ecc3bcc54cae9416983ab07933a0d91ffb616ab82cfb7277b25ee5a476c60a48b21676f802faee4db3b6af
+AUX xaos-3.4-png.patch 328 SHA256 4e20fe771648e8fdbfacc3525dfa3341f05b93deacea790c23bb27a7a8d4c3f2 SHA512 90ab707e2a6ad6fec1467afe7ed0f6cb44e5ac965eece94642966010b871fb7b7ef71745485869c7a94c4ddd73b176284a3b6a66866e9539f1dfe9b1934ef26b WHIRLPOOL c590951fddd88d330b9a4a80ba915647e171c77a04c2cda984037b751c6c21e7fec9172787707479ed34d8fd863f1adc70ed4984e35332a558048654ded3885b
+AUX xaos-3.5-build-fix-i686.patch 708 SHA256 f17252481e9f59d8a599321a7a48d0a336702112c5f1c4cb173e592b87448475 SHA512 f1732cc5116f92893fc9e560e293e86df10901655dd12a2e6e81a90b13c216a613c5be60bce7adfc99ee21f5a6208c4f30a6730d1d5d3963e5efcba6d728c481 WHIRLPOOL 2f653a4539e66a4350021623e39ee65da671f0012b6a52140851a9e97640eadaa572b1f03b106f267c73347cd372847605bf24c255613c1b80002dfb008bbde6
+AUX xaos-3.5-libpng15.patch 4260 SHA256 177ac125fe109a8326df3326df5b50f3a416fa8b9e9703202aefaf7e50bcbe8e SHA512 38881e3fa2f03832db271988dcb0a6a1249bb8e99e1c1ed986686207e17bea56a99ee12b9d794c307fb6bb30c375252fe872957f427610d6df86c9414e1518e7 WHIRLPOOL 2ef71a6537a8e645156c5eb922fb4fe44e64e21ef1d8ede283a01e7ff269e430963a40ae9ac3fcccf73e75cc75a8c1c73ed569415b267b1516c8d5c95c565342
+DIST xaos-3.5.tar.gz 2930590 SHA256 471fa752154a8e4c4687797fe1241df1b3f82400b2ef4e6a603969a27cd74842 SHA512 c0d9e88de7767a9c62bf2fe6e49e4115d992882cd0780acf61fc14539364d383b275b7f589de353e0b025f43efc54986f19c0722322aedd992027e788295d1df WHIRLPOOL be6b0d5314b19e2a39a46a959ec7e9bf820958eddb43f105b40f02c2a58b00f983aaccce5678ade413b9004bd07a483140b0b6c71313b9fcc6686b74ea6eb82d
+DIST xaos.png.tar 10240 SHA256 23806369fa304bf58439f39d9c672fe7f2b4293b3b1bfcccffd0c7994faeaa6a SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262 WHIRLPOOL 3c13eaf9c287c035cb6fcdd4150daac9e97bedbc258064b53e68095656cac1faf959c691e847e7a263a3c43938e820bb7da6e1589ced9ed33aa2821252b22298
+EBUILD xaos-3.5-r1.ebuild 1859 SHA256 0927d15dc12bce41c309197ad3739804a6cc34a8e3b8cae339704586225da554 SHA512 1324e8fb901cd48e66c53432f6a3b73306602d57807f051df35a19536dd02062cd2ddc7a1744c4810054ef10fc1d2a11aed47f984c033ac9abfeabfa14801026 WHIRLPOOL f2c5011418a8063f896cb5deb2dae2145383403945dc30d38273944b9d035a2b9abded3ad3eda78a2f16ecae26fb4db1d4ad91c4e3a2c9f18639cb6b3343916b
+EBUILD xaos-3.5-r2.ebuild 1900 SHA256 23ecd18c1fef216dcb5660248c0462f1f9eab41099b05bad1a80046326c490ca SHA512 1234d7b90638f2c3ca983f4a429b89d21f3a9174cc8e08dc12a873c443e0f13fe974e73e3bd58638c4cac1776f3213081d05e4ffc43f97b9765e94c41b189cb5 WHIRLPOOL 348e32e69fc0560b16d64791f2b0f990d00270cca6b143c95f2cc56082ea72bec4270359def12e51e9964e1dd1f0b1bc9ca598639c79b3434a75da525492935c
+MISC ChangeLog 5750 SHA256 9c45a1e2468a4a4297deefd0f4bb97faa23ce9b6808ef2d6a9adb6d4cb558182 SHA512 618737cb95b98f53e3cfe19da1390dcbd6a7e9561babf69fafb4ca75a614afebb993cd008d0574495e03b072d9347f63bc15a11f68479adb6547309ccfae625c WHIRLPOOL 2765042887cac47542c27fdbd4c205a02633621e63d85848c3b3ac7cb80cacc0c554b3ec0407503114f480c7e8cc6a3bd870a511e2f50314ccc92390faab6059
+MISC metadata.xml 585 SHA256 bdcf6d044e950c098dca5f359539e8e30309c629d960439a521cfb6a2ad1467d SHA512 67002701c4280b1c4a16f5629f51d213dfb536133a3a1853953f0bf438db87177921cad91a55301aa88b5753a895b5c0b459208ba7c950bc51352d9f4822543c WHIRLPOOL e6950706209b84190660dfe2d43b8e4202e0ab95749fcef0342fa46a10e105adf92e4a48511c114dcd689cfd5b5f7e08d84287b7754c58c55c1d45b958e82473
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlC8dfIACgkQgAnW8HDreRayWwCgsc15go8Nq1FA6o9KSTgrmYki
+zq4AniJqUFC9bIhrp1O4tGKPB+Xzof+a
+=asmL
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch b/x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch
new file mode 100644
index 000000000000..4736dd389b5a
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch
@@ -0,0 +1,20 @@
+--- xaos-3.5/src/engine/zoomd.c.orig	2009-07-18 00:50:31.000000000 +0100
++++ xaos-3.5/src/engine/zoomd.c	2012-05-20 19:04:55.891065437 +0100
+@@ -280,6 +280,7 @@ dosymetry2(void /*@unused@ */ *data, str
+ #endif
+ #undef bpp1
+ 
++REGISTERS(0)
+ static INLINE void fillline(int line)
+ {
+     register unsigned char *RESTRICT vbuff = cimage.currlines[line];
+--- xaos-3.5/src/engine/zoom.c.fix-build	2009-07-18 00:50:31.000000000 +0100
++++ xaos-3.5/src/engine/zoom.c	2012-05-20 19:11:53.625083113 +0100
+@@ -933,6 +933,7 @@ static /*INLINE */ void preparemoveoldpo
+ }
+ 
+ #ifndef USE_i386ASM
++REGISTERS(0)
+ static /*INLINE */ void
+ moveoldpoints(void /*@unused@ */ *data1,
+ 	      struct taskinfo /*@unused@ */ *task,
diff --git a/x11-misc/xaos/metadata.xml b/x11-misc/xaos/metadata.xml
index 02e05a435d1c..4a15ac2a0569 100644
--- a/x11-misc/xaos/metadata.xml
+++ b/x11-misc/xaos/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<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
diff --git a/x11-misc/xaos/xaos-3.5-r2.ebuild b/x11-misc/xaos/xaos-3.5-r2.ebuild
new file mode 100644
index 000000000000..b0e664a5faa7
--- /dev/null
+++ b/x11-misc/xaos/xaos-3.5-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.5-r2.ebuild,v 1.1 2012/12/03 09:50:41 jlec Exp $
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="A very fast real-time fractal zoomer"
+HOMEPAGE="http://xaos.sf.net/"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="aalib doc -gtk nls png svga threads X"
+
+RDEPEND="
+	sci-libs/gsl
+	sys-libs/zlib
+	aalib? ( media-libs/aalib )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng )
+	X? ( x11-libs/libX11
+		 x11-libs/libXext
+		 x11-libs/libXxf86vm )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-texinfo )
+	X? (
+		x11-proto/xf86vidmodeproto
+		x11-proto/xextproto
+		x11-proto/xproto )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.4-png.patch \
+		"${FILESDIR}"/${PN}-3.4-include.patch \
+		"${FILESDIR}"/${P}-libpng15.patch \
+		"${FILESDIR}"/${P}-build-fix-i686.patch
+	sed -i -e 's/-s//' Makefile.in
+	eautoreconf
+}
+
+src_configure() {
+	# use gsl and not nasm (see bug #233318)
+	econf \
+		--with-sffe=yes \
+		--with-gsl=yes \
+		$(use_enable nls) \
+		$(use_with png) \
+		$(use_with aalib aa-driver) \
+		$(use_with gtk gtk-driver) \
+		$(use_with threads pthread) \
+		$(use_with X x11-driver) \
+		$(use_with X x)
+}
+
+src_compile() {
+	default
+	if use doc; then
+		cd "${S}"/doc
+		emake xaos.dvi
+		dvipdf xaos.dvi || die
+		cd "${S}"/help
+		emake html
+	fi
+}
+
+src_install() {
+	default
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins doc/xaos.pdf
+		dohtml -r help/*
+	fi
+	local driver="x11"
+	use gtk && driver="\"GTK+ Driver\""
+	make_desktop_entry "xaos -driver ${driver}" "XaoS Fractal Zoomer" \
+		xaos "Application;Education;Math;Graphics;"
+	doicon "${WORKDIR}"/${PN}.png
+}