Version bump. Backport patch to stable 3.5-r1 version (bug #497852, thanks Patrice Levesque) and for gettext-0.19 (bug #512748, thanks zimous), add internationalization options, switch to autotools-utils, EAPI5

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

9 files changed, 250 insertions, 100 deletions

diff --git a/x11-misc/xaos/ChangeLog b/x11-misc/xaos/ChangeLog
index 63df4b928e47..0384c0426cc2 100644
--- a/x11-misc/xaos/ChangeLog
+++ b/x11-misc/xaos/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-misc/xaos
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.44 2013/06/25 17:27:41 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.45 2014/06/09 18:43:33 bicatali Exp $
+
+*xaos-3.6 (09 Jun 2014)
+
+  09 Jun 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/xaos-3.5-gettext.patch, +files/xaos-3.6-locale-dir.patch,
+  +files/xaos-3.6-no-auto-strip.patch, +xaos-3.6.ebuild, -xaos-3.5-r2.ebuild,
+  metadata.xml, xaos-3.5-r1.ebuild:
+  Version bump. Backport patch to stable 3.5-r1 version (bug #497852, thanks
+  Patrice Levesque) and for gettext-0.19 (bug #512748, thanks zimous), add
+  internationalization options, switch to autotools-utils, EAPI5
 
   25 Jun 2013; Alexis Ballier <aballier@gentoo.org> xaos-3.5-r1.ebuild,
   xaos-3.5-r2.ebuild:
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index e0184ca85825..5749a246f000 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -4,17 +4,21 @@ 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-gettext.patch 3853 SHA256 6c34508de76b95710a442bdbf8e784bd2593c3e4c14e94dcc73fc249cf2421bd SHA512 bd62bfe5c686a8baaf93aeaee96ad916c299168c19e061c9d50696fb6b34054fef9c34b980df57c373fcdba65ac93ce92cb17520443dccd048b0d59b3c319091 WHIRLPOOL abfce9d4ecf10d52bdfd54d7aceef55f620dce600ef98b6cc4c1d06fb437a07c64ee47c144f549f08163c6950ae2d4da4ae84610ab9e2fd2dc4f36cba93ca5a1
 AUX xaos-3.5-libpng15.patch 4260 SHA256 177ac125fe109a8326df3326df5b50f3a416fa8b9e9703202aefaf7e50bcbe8e SHA512 38881e3fa2f03832db271988dcb0a6a1249bb8e99e1c1ed986686207e17bea56a99ee12b9d794c307fb6bb30c375252fe872957f427610d6df86c9414e1518e7 WHIRLPOOL 2ef71a6537a8e645156c5eb922fb4fe44e64e21ef1d8ede283a01e7ff269e430963a40ae9ac3fcccf73e75cc75a8c1c73ed569415b267b1516c8d5c95c565342
+AUX xaos-3.6-locale-dir.patch 346 SHA256 8439106f0600fd671a18f0e9bd44f3b5cb612b63b2269af6d92884d048c88998 SHA512 c62b6c2b77bdb11bbd970f8f3d6ddc6844a86059918c7a54207a0e57bcd31e2f3feeb3c86f8ce58a3c9ee36939dbbe89ec5359d7fa0d5015dc6ad6cd8de24d6f WHIRLPOOL 13a0d9862c87852a26bd24041138caf1645bdd636e6e8b506854efcdbe00f56c77473a55eb5bf897b8f16792decc1c584d33c431a67ea185e547e3c6f6cf98ce
+AUX xaos-3.6-no-auto-strip.patch 1025 SHA256 d56dced8e2faaf7102fa6ec3a485c71bda4b5110cc68a5163a18b38dd58c4b6b SHA512 6a89bb992e2e503576f18a069c6f67b42a92a3f88b958f4b8b54d6ffc309ff30914cbf36b73400449306cd2ce1f646e9745820206c0be5ca39d26bbc4e469c8c WHIRLPOOL 5caf5e298d8162188d4377eaad65afd9b29e4643685112411a1b00afb4e27fd89efaec7e1ee2cf7e2283f763088412353c2a690f4d37e310807e8dd7fcd9a3cd
 DIST xaos-3.5.tar.gz 2930590 SHA256 471fa752154a8e4c4687797fe1241df1b3f82400b2ef4e6a603969a27cd74842 SHA512 c0d9e88de7767a9c62bf2fe6e49e4115d992882cd0780acf61fc14539364d383b275b7f589de353e0b025f43efc54986f19c0722322aedd992027e788295d1df WHIRLPOOL be6b0d5314b19e2a39a46a959ec7e9bf820958eddb43f105b40f02c2a58b00f983aaccce5678ade413b9004bd07a483140b0b6c71313b9fcc6686b74ea6eb82d
+DIST xaos-3.6.tar.gz 2040707 SHA256 989f3e38f7793810cbb1496d5291d44836a7d7c058422b9ee1cffb163a0b8d95 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1 WHIRLPOOL c860b2b16150ffd285a0617ba5f1fcd87d6840df47152258cb54c2ea78171574c96427a8ac2ad05cbe7c80c9dde36b290fe3d2681679bd0135df430873dd2d14
 DIST xaos.png.tar 10240 SHA256 23806369fa304bf58439f39d9c672fe7f2b4293b3b1bfcccffd0c7994faeaa6a SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262 WHIRLPOOL 3c13eaf9c287c035cb6fcdd4150daac9e97bedbc258064b53e68095656cac1faf959c691e847e7a263a3c43938e820bb7da6e1589ced9ed33aa2821252b22298
-EBUILD xaos-3.5-r1.ebuild 1828 SHA256 e667432c909d73a90af0f85b472d3a913d2522f355d5434878b8dd1facdd242c SHA512 e1e86ffd67499be5ac77e77db97211df7300f2d92d2b4c359f8054e85e4177e7eeac70c04b7e274106b1cb6e19f3be5dbf27c864c1183b8dee77866bc43c44b3 WHIRLPOOL 588a4bb91353c135e48f478fb02456ddbfeeb5d4665247175aeb2411fdedbd8e880ce0634fd31f9e574335543eba1759c742898495fec8d522addcc89f727555
-EBUILD xaos-3.5-r2.ebuild 1870 SHA256 8194e79cbda56a56b735d919db852e8307ff81e7621f02457ac002e0a5976168 SHA512 74c482d5becdd52fe1e891502199fa634c6c36b41064922c1a41804d2bfb271cc5467f6a1526c62b5391dbb2dcccf6a8ed4cb42c601ea967e8b8b8d741481f99 WHIRLPOOL aa9724d968123034ecad119328375d278fc6c2bda4b014a4882bb78770172191082453c5dda8ef0b8f8c4c32b797f89e09ec68b036ed6b6018cfcc3521383dbb
-MISC ChangeLog 5972 SHA256 c944f6af1e4435f043ba24aa65c7fe2bf8c72a19ef1e1701c76bdaaa75f15935 SHA512 e51bf5ab4ae4272a7566b3ab9765b03f49756566780b98b5d3aec7d7a8abe0a0c5e2dc1843810be7b82c641601d7fe6dbb5e12d2def04319d47c77aadefff9f7 WHIRLPOOL cf2cd5258e30207ea9c3e7f62c642ff03cdac0ded3ccf7fca46b61fcdf8f102230c0c5195d0e971dd787fa7dc80053a51aca514dc447c2aa0709a4a0895000b3
-MISC metadata.xml 585 SHA256 bdcf6d044e950c098dca5f359539e8e30309c629d960439a521cfb6a2ad1467d SHA512 67002701c4280b1c4a16f5629f51d213dfb536133a3a1853953f0bf438db87177921cad91a55301aa88b5753a895b5c0b459208ba7c950bc51352d9f4822543c WHIRLPOOL e6950706209b84190660dfe2d43b8e4202e0ab95749fcef0342fa46a10e105adf92e4a48511c114dcd689cfd5b5f7e08d84287b7754c58c55c1d45b958e82473
+EBUILD xaos-3.5-r1.ebuild 1919 SHA256 dcfec61a45e8daece1698d839f5eca37d72f85fd8f74bdb77ffa7966e5d9f9e2 SHA512 a194bd2d79e5b4da5389caccdbccf91056254d01a444020e90a558c4e72cb30ab8f6dedbb1b7982e1c627102925bff7ea298a9c5393f2cac245458fae0de1155 WHIRLPOOL 99ce5d4b995e2916386f7ba30f92a01c53b6189e7cfc5cc3ffd32ca929a2bc397a87d54666bc3f699102d43c4443a56af00c6658081c9ef40b98138a49e1ddd5
+EBUILD xaos-3.6.ebuild 2320 SHA256 83d6163d0d27737e07134e27e1e291f30c519a16408c69ba5656417253590658 SHA512 5d473aa9e7d06219078835cebe2c4ff8419ad31a6fa8e37edcb20a8adc804ebffc9368f9079ebb9090f65cb256d7632861d5e67d711f2ad97f28f5c439aa0c92 WHIRLPOOL 180f3a89d0fdf65fe77e2705f0b00ccb8e924f05e2b3fa596e48f9fc82dceb2aa550aece5f4e252c75ae1c779e6cbf5c38da6265e3902fa1ae1a3af9d9c9583b
+MISC ChangeLog 6451 SHA256 733f6fdbe0445f31212eef1e7b6c3b472f167ff4c704b5789168e74ef96eb8dc SHA512 d25350354c4a585cd6703dd56af5e47e2a2ad6b0b8d29acc62de6910463a46ba38c01c6eadad778117e7cb1a039cefb1aa29492d178bc691c23611af511773a4 WHIRLPOOL 0209dab795c62cd48606b07d14ad824247d084ce7e48992d6786480f7b38ce75e39ecc7a2fec232c962c08969a90dc99ef73d29e669f80e2ddec8b3f8f8c81d3
+MISC metadata.xml 583 SHA256 2f0dd73d7c7fc6fd74d7a430ca50e03d390a200346bb9da765fefb8cb901bcf7 SHA512 a278c564c61ba9608f6af4231564a67c215baa61e3b6250e82497b329bd5c509c5ecc85c406547fc2849c241dc736d3e30af563de463b01c0dc9ce7f9b468128 WHIRLPOOL 6da8be5a56048891fe455bb4f69247b940dccf6637bb8b17001398a0fa370d5583ad16e54d4a22a9e3997bcd027e4150bdfca6a5df4ee5f77aad81b426cf565e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlHJ0w4ACgkQvFcC4BYPU0p1zACgyELav6YckmhpYGosBjNeMJDc
-meEAoMiky6cJIwjaOHa/zwje+8nana84
-=9+ap
+iEYEAREIAAYFAlOWAFoACgkQ1ycZbhPLE2BazQCgm8nGwFR3jMSwMl4K17j6XqZK
+QG8AoKgE7BuPBseOw571U+VmPLE49eS9
+=qihy
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xaos/files/xaos-3.5-gettext.patch b/x11-misc/xaos/files/xaos-3.5-gettext.patch
new file mode 100644
index 000000000000..b83b24346cd8
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.5-gettext.patch
@@ -0,0 +1,88 @@
+diff -ur xaos-3.5.orig/src/i18n/cs.po xaos-3.5/src/i18n/cs.po
+--- xaos-3.5.orig/src/i18n/cs.po	2014-06-08 15:19:23.313803520 +0200
++++ xaos-3.5/src/i18n/cs.po	2014-06-08 15:20:35.071009379 +0200
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2002-08-17 21:44+0200\n"
+ "Last-Translator: MadSoft <madsoft@centrum.cz>\n"
+ "Language-Team: Czech\n"
++"Language: cs\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-2\n"
+ "Content-Transfer-Encoding: 8-bit\n"
+diff -ur xaos-3.5.orig/src/i18n/de.po xaos-3.5/src/i18n/de.po
+--- xaos-3.5.orig/src/i18n/de.po	2014-06-08 15:19:23.314803662 +0200
++++ xaos-3.5/src/i18n/de.po	2014-06-08 15:20:59.684508120 +0200
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2008-04-27 21:48+0200\n"
+ "Last-Translator: \n"
+ "Language-Team:  <de@li.org>\n"
++"Language: de\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -ur xaos-3.5.orig/src/i18n/es.po xaos-3.5/src/i18n/es.po
+--- xaos-3.5.orig/src/i18n/es.po	2014-06-08 15:19:23.314803662 +0200
++++ xaos-3.5/src/i18n/es.po	2014-06-08 15:21:10.917104552 +0200
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2002-10-04 15:22+0200\n"
+ "Last-Translator: César Pérez <oroz@users.sourceforge.net>\n"
+ "Language-Team: Spanish <es@li.org>\n"
++"Language: es\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8-bit\n"
+diff -ur xaos-3.5.orig/src/i18n/fr.po xaos-3.5/src/i18n/fr.po
+--- xaos-3.5.orig/src/i18n/fr.po	2014-06-08 15:19:23.315803804 +0200
++++ xaos-3.5/src/i18n/fr.po	2014-06-08 15:21:24.653056586 +0200
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2006-02-05 17:35+0200\n"
+ "Last-Translator: Philippe Wautelet <traduc _at_ fractalzone _dot_ be>\n"
+ "Language-Team: French\n"
++"Language: fr\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8-bit\n"
+diff -ur xaos-3.5.orig/src/i18n/hu.po xaos-3.5/src/i18n/hu.po
+--- xaos-3.5.orig/src/i18n/hu.po	2014-06-08 15:19:23.315803804 +0200
++++ xaos-3.5/src/i18n/hu.po	2014-06-08 15:21:49.950651185 +0200
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2002-08-17 21:44+0200\n"
+ "Last-Translator: Zoltan Kovacs <kovzol@math.u-szeged.hu>\n"
+ "Language-Team: Hungarian\n"
++"Language: hu\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-2\n"
+ "Content-Transfer-Encoding: 8-bit\n"
+diff -ur xaos-3.5.orig/src/i18n/it.po xaos-3.5/src/i18n/it.po
+--- xaos-3.5.orig/src/i18n/it.po	2014-06-08 15:19:23.316803947 +0200
++++ xaos-3.5/src/i18n/it.po	2014-06-08 15:22:00.324125022 +0200
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2008-04-08 10:10+0000\n"
+ "Last-Translator: Sergio Zanchetta <Unknown>\n"
+ "Language-Team: Italian <it@li.org>\n"
++"Language: it\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -ur xaos-3.5.orig/src/i18n/pt.po xaos-3.5/src/i18n/pt.po
+--- xaos-3.5.orig/src/i18n/pt.po	2014-06-08 15:19:23.316803947 +0200
++++ xaos-3.5/src/i18n/pt.po	2014-06-08 15:22:12.961920461 +0200
+@@ -9,6 +9,7 @@
+ "PO-Revision-Date: 2009-06-01 14:07-0300\n"
+ "Last-Translator: Lucio de Araujo <lucio.matema@gmail.com>\n"
+ "Language-Team: Portuguese <zeliagarcia@seed.pr.gov.br>\n"
++"Language: pt\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff -ur xaos-3.5.orig/src/i18n/ro.po xaos-3.5/src/i18n/ro.po
+--- xaos-3.5.orig/src/i18n/ro.po	2014-06-08 15:19:23.317804089 +0200
++++ xaos-3.5/src/i18n/ro.po	2014-06-08 15:22:21.969200049 +0200
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2008-04-28 11:21+0100\n"
+ "Last-Translator: Zoltan Kovacs <kovzol@matek.hu>\n"
+ "Language-Team: The XaoS Development Team <xaos-devel@lists.sf.net>\n"
++"Language: ro\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
diff --git a/x11-misc/xaos/files/xaos-3.6-locale-dir.patch b/x11-misc/xaos/files/xaos-3.6-locale-dir.patch
new file mode 100644
index 000000000000..740f32d18985
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.6-locale-dir.patch
@@ -0,0 +1,11 @@
+--- configure.in.orig	2014-06-09 10:54:18.459186718 -0700
++++ configure.in	2014-06-09 10:56:47.472204763 -0700
+@@ -141,7 +141,7 @@
+ dnl Checks for programs.
+ 
+ DRIVERDIRS=""
+-LOCALEDIR="/usr/share/locale"
++LOCALEDIR="$prefix/share/locale"
+ DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a"
+ AC_PROG_INSTALL
+ 
diff --git a/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch b/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch
new file mode 100644
index 000000000000..ab6e6b56a9b8
--- /dev/null
+++ b/x11-misc/xaos/files/xaos-3.6-no-auto-strip.patch
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2014-06-09 10:42:00.574129368 -0700
++++ Makefile.in	2014-06-09 10:43:04.035568767 -0700
+@@ -36,7 +36,7 @@
+ 	@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
+@@ -49,7 +49,7 @@
+ 
+ 	@INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs
+ 	@INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help
+-	@INSTALL@ -m 444 AUTHORS NEWS COPYING TODO INSTALL ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc
++	@INSTALL@ -m 444 AUTHORS NEWS TODO ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc
+ 	@INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
+ 	test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)"
+ 	@INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info
diff --git a/x11-misc/xaos/metadata.xml b/x11-misc/xaos/metadata.xml
index 4a15ac2a0569..02e05a435d1c 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-r1.ebuild b/x11-misc/xaos/xaos-3.5-r1.ebuild
index ba20dec65420..4a994336efbd 100644
--- a/x11-misc/xaos/xaos-3.5-r1.ebuild
+++ b/x11-misc/xaos/xaos-3.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.5-r1.ebuild,v 1.10 2013/06/25 17:27:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.5-r1.ebuild,v 1.11 2014/06/09 18:43:33 bicatali Exp $
 
 EAPI=4
 
@@ -39,7 +39,9 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-3.4-png.patch \
 		"${FILESDIR}"/${PN}-3.4-include.patch \
-		"${FILESDIR}"/${PN}-3.5-libpng15.patch
+		"${FILESDIR}"/${PN}-3.5-libpng15.patch \
+		"${FILESDIR}"/${PN}-3.5-build-fix-i686.patch \
+		"${FILESDIR}"/${PN}-3.5-gettext.patch
 	sed -i -e 's/-s//' Makefile.in
 	eautoreconf
 }
diff --git a/x11-misc/xaos/xaos-3.5-r2.ebuild b/x11-misc/xaos/xaos-3.5-r2.ebuild
deleted file mode 100644
index 295d1ba16cc4..000000000000
--- a/x11-misc/xaos/xaos-3.5-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 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.2 2013/06/25 17:27:41 aballier 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/texi2dvi )
-	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
-}
diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild
new file mode 100644
index 000000000000..1c28bfc6154e
--- /dev/null
+++ b/x11-misc/xaos/xaos-3.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.6.ebuild,v 1.1 2014/06/09 18:43:33 bicatali Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Very fast real-time fractal zoomer"
+HOMEPAGE="http://matek.hu/xaos/doku.php"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="aalib doc -gtk nls png svga threads X"
+
+RDEPEND="
+	sci-libs/gsl:0=
+	sys-libs/zlib:0=
+	aalib? ( media-libs/aalib:0= )
+	gtk? ( x11-libs/gtk+:2= )
+	nls? ( sys-devel/gettext )
+	png? ( media-libs/libpng:0= )
+	X? ( x11-libs/libX11:0=
+		 x11-libs/libXext:0=
+		 x11-libs/libXxf86vm:0= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( virtual/texi2dvi )
+	X? (
+		x11-proto/xf86vidmodeproto
+		x11-proto/xextproto
+		x11-proto/xproto )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-png.patch
+	"${FILESDIR}"/${PN}-3.4-include.patch
+	"${FILESDIR}"/${PN}-3.5-build-fix-i686.patch
+	"${FILESDIR}"/${PN}-3.6-locale-dir.patch
+	"${FILESDIR}"/${PN}-3.6-no-auto-strip.patch
+)
+
+src_prepare() {
+	autotools-utils_src_prepare
+	if use nls; then
+		if [[ "${LINGUAS+set}" == "set" ]]; then
+			strip-linguas -i src/i18n
+			sed -i -e '/^ALL_LINGUAS=/d' configure || die
+			export ALL_LINGUAS="${LINGUAS}"
+		fi
+	else
+		sed -i -e '/^ALL_LINGUAS=/d' configure || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--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)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	if use doc; then
+		cd "${BUILD_DIR}"/doc
+		emake xaos.dvi
+		dvipdf xaos.dvi || die
+		cd "${BUILD_DIR}"/help
+		emake html
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	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
+}