[gentoo-commits] repo/gentoo:master commit in: x11-misc/fracplanet/, x11-misc/fracplanet/files/

2023-08-21 Thread Marek Szuba 
commit: e15137c43be58fab48f6aa455b7f3b84429dca74
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 21 15:35:38 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 21 15:49:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e15137c4

x11-misc/fracplanet: fix building against musl

__STRING() is a glibc idiom. Fortunately, it is trivial to emulate.

While at it, update EAPI 7 -> 8.

Closes: https://bugs.gentoo.org/833106
Signed-off-by: Marek Szuba  gentoo.org>

 x11-misc/fracplanet/files/fracplanet-0.5.1-musl.patch | 12 
 x11-misc/fracplanet/fracplanet-0.5.1.ebuild   |  8 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/x11-misc/fracplanet/files/fracplanet-0.5.1-musl.patch 
b/x11-misc/fracplanet/files/fracplanet-0.5.1-musl.patch
new file mode 100644
index ..ddd64f4a386d
--- /dev/null
+++ b/x11-misc/fracplanet/files/fracplanet-0.5.1-musl.patch
@@ -0,0 +1,12 @@
+--- a/common.h
 b/common.h
+@@ -44,6 +44,9 @@
+ #include 
+ #include 
+ 
++#ifndef __STRING
++#define __STRING(x) #x
++#endif
+ #define stringify(S) __STRING(S)
+ 
+ typedef unsigned int uint;

diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild 
b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
index 5f89bd2b1b43..6d08682f6cf4 100644
--- a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmake-utils
 
@@ -25,6 +25,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.5.1-musl.patch
+)
+
 HTML_DOCS=( fracplanet.{htm,css} )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: x11-misc/fracplanet/

2021-05-17 Thread Marek Szuba 
commit: 62c70b4a85c1c0bcc93af1c56020b51fd43b8215
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon May 17 15:22:37 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon May 17 15:24:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c70b4a

x11-misc/fracplanet: require dev-qt/qtopengl[-gles2-only]

Closes: https://bugs.gentoo.org/790644
Signed-off-by: Marek Szuba  gentoo.org>

 x11-misc/fracplanet/fracplanet-0.5.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild 
b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
index 86a237d3189..5f89bd2b1b4 100644
--- a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ RDEPEND="
dev-libs/boost:=
dev-qt/qtcore:5
dev-qt/qtgui:5
-   dev-qt/qtopengl:5
+   dev-qt/qtopengl:5[-gles2-only]
dev-qt/qtwidgets:5
virtual/glu
virtual/opengl

[gentoo-commits] repo/gentoo:master commit in: x11-misc/fracplanet/

2020-11-29 Thread Marek Szuba 
commit: 9ca45da93072717bf0cdfaf6a5c9643f91d8b391
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Nov 29 22:32:57 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Nov 29 22:51:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca45da9

x11-misc/fracplanet: take over from desktop-misc

Signed-off-by: Marek Szuba  gentoo.org>

 x11-misc/fracplanet/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-misc/fracplanet/metadata.xml b/x11-misc/fracplanet/metadata.xml
index 3d9147f83aa..56dac63e44c 100644
--- a/x11-misc/fracplanet/metadata.xml
+++ b/x11-misc/fracplanet/metadata.xml
@@ -1,9 +1,9 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   desktop-m...@gentoo.org
-   Gentoo Desktop Miscellaneous Project
+   
+   mare...@gentoo.org
+   Marek Szuba


fracplanet

[gentoo-commits] repo/gentoo:master commit in: x11-misc/fracplanet/

2020-11-26 Thread Jonas Stein 
commit: 9dac33b71b200e42d8dd6c86e5d0f4307bd384cb
Author: Jonas Stein  gentoo  org>
AuthorDate: Thu Nov 26 19:57:10 2020 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Thu Nov 26 19:57:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dac33b7

x11-misc/fracplanet: fix HOMEPAGE

Drop dead HOMEPAGE.
Closes: https://bugs.gentoo.org/724632
Package-Manager: Portage-3.0.10, Repoman-3.0.1
Signed-off-by: Jonas Stein  gentoo.org>

 x11-misc/fracplanet/fracplanet-0.5.1.ebuild | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild 
b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
index d7c7c844b28..86a237d3189 100644
--- a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
@@ -6,10 +6,7 @@ EAPI=7
 inherit qmake-utils
 
 DESCRIPTION="Fractal planet and terrain generator"
-HOMEPAGE="
-   http://www.bottlenose.net/share/fracplanet/index.htm
-   https://sourceforge.net/projects/fracplanet/
-"
+HOMEPAGE="https://sourceforge.net/projects/fracplanet/;
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/fracplanet/

2020-05-20 Thread Andreas Sturmlechner 
commit: 92e91aa064901c1ceb3ebd09d3cf2b8c9cb9b039
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 20 16:06:30 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 20 17:42:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92e91aa0

x11-misc/fracplanet: EAPI-7 bump

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/fracplanet/fracplanet-0.5.1.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild 
b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
index 69e53bf216c..d7c7c844b28 100644
--- a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit qmake-utils
 
 DESCRIPTION="Fractal planet and terrain generator"
@@ -15,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+BDEPEND="dev-libs/libxslt"
 RDEPEND="
dev-libs/boost:=
dev-qt/qtcore:5
@@ -24,10 +26,8 @@ RDEPEND="
virtual/glu
virtual/opengl
 "
-DEPEND="
-   ${RDEPEND}
-   dev-libs/libxslt
-"
+DEPEND="${RDEPEND}"
+
 HTML_DOCS=( fracplanet.{htm,css} )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: x11-misc/fracplanet/files/, x11-misc/fracplanet/

2017-12-25 Thread Jeroen Roovers 
commit: b45eb7d0faa64046eec1140eb21250bd8c584364
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Dec 25 08:48:51 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Dec 25 08:49:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b45eb7d0

x11-misc/fracplanet: Old.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 x11-misc/fracplanet/Manifest   |  1 -
 .../fracplanet/files/fracplanet-0.4.0-gcc6.patch   | 44 ---
 .../fracplanet/files/fracplanet-0.4.0-gold.patch   | 22 --
 x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild | 50 --
 4 files changed, 117 deletions(-)

diff --git a/x11-misc/fracplanet/Manifest b/x11-misc/fracplanet/Manifest
index 81485925d69..d0af0f249e9 100644
--- a/x11-misc/fracplanet/Manifest
+++ b/x11-misc/fracplanet/Manifest
@@ -1,2 +1 @@
-DIST fracplanet-0.4.0.tar.gz 101700 BLAKE2B 
d222e342d3238f84b03f9637a3d11af1f27a7935fbb769ff093dd54ff10cafb80f1180eebcca93e5920b8f3f86da56f74d0ca42e692a998f969a2a03c22c97db
 SHA512 
09eed764df60929e5aa22b3f5c34defa11a91c4f6b588259fe0c3c7736fa03a9d138e05fd6ec4800e7943f36e73949804d8a7ed3e29bda6ffdc883ecadf9abf6
 DIST fracplanet-0.5.1.tar.gz 111911 BLAKE2B 
81f5986bdf7a0ddc1a7ef8fd08bf07fbc23ae38ac1cdc452de6696354d291205cb1183d16c3a7fa8bfb250158229d84d94f3c24dafa09d20518fb5d19b31471f
 SHA512 
40aeb6c33c2cb3403cc85193319a63bdc90637110c8bb40d9b0f4bd816a80018ca1cf81296337fc5a13fac583d7864adfde8d22dcc3a3cd65314c34ec63b508e

diff --git a/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch 
b/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch
deleted file mode 100644
index 4d760d672f8..000
--- a/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Fix compilation with gcc-6
-Author: Gert Wollny 
-Last-Updated: 2016-07-09
-Forwarded: No
-Bug-Debian: https://bugs.debian.org/811642
-
 fracplanet-0.4.0.orig/image.cpp
-+++ fracplanet-0.4.0/image.cpp
-@@ -85,7 +85,7 @@ template <> bool Raster::write_pg
-   out.write(reinterpret_cast(&(*(row->begin(,row->size());
- }
-   out.close();
--  return out;
-+  return out.good();
- }
- 
- template <> bool Raster::write_pgmfile(const std::string& 
filename,Progress* target) const
-@@ -101,7 +101,7 @@ template <> bool Raster::write_p
-   progress.step();
-   for (const ushort* it=row->begin();it!=row->end();++it)
-   {
--const uchar p[2]={((*it)>>8),(*it)};
-+const uchar 
p[2]={static_cast((*it)>>8),static_cast((*it) & 0x00FF)};
- if (m>=256)
-   {
- // PGM spec is most significant byte first
-@@ -115,7 +115,7 @@ template <> bool Raster::write_p
-   }
- }
-   out.close();
--  return out;
-+  return out.good();
- }
- 
- template <> bool Raster::write_ppmfile(const std::string& 
filename,Progress* target) const
-@@ -132,7 +132,7 @@ template <> bool Raster::write
-   out.write(reinterpret_cast(&((*it).r)),3);
- }
-   out.close();
--  return out;
-+  return out.good();
- }
- 
- 

diff --git a/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch 
b/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch
deleted file mode 100644
index 4a52d1c44a6..000
--- a/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 a/triangle_mesh_viewer.h
-+++ b/triangle_mesh_viewer.h
-@@ -24,6 +24,7 @@
- #ifndef _triangle_mesh_viewer_h_
- #define _triangle_mesh_viewer_h_
- 
-+#include 
- #include "parameters_render.h"
- #include "random.h"
- #include "triangle_mesh.h"
-
 a/fracplanet.pro
-+++ b/fracplanet.pro
-@@ -8,7 +8,7 @@
- 
- HEADERS += $$system(ls *.h)
- SOURCES += $$system(ls *.cpp)
--LIBS += -lboost_program_options
-+LIBS += -lboost_program_options -lGLU
- 
- DEFINES += QT_DLL
- 

diff --git a/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild 
b/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild
deleted file mode 100644
index 798e453cef7..000
--- a/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qmake-utils
-
-DESCRIPTION="Fractal planet and terrain generator"
-HOMEPAGE="https://sourceforge.net/projects/fracplanet/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-   dev-libs/boost:=
-   dev-qt/qtcore:4
-   dev-qt/qtgui:4
-   dev-qt/qtopengl:4
-   virtual/glu
-   virtual/opengl
-"
-DEPEND="${RDEPEND}
-   dev-libs/libxslt"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-   "${FILESDIR}/${P}-gold.patch"
-   "${FILESDIR}/${P}-gcc6.patch"
-)
-
-HTML_DOCS=( fracplanet.{htm,css} )
-
-src_configure() {
-   eqmake4 fracplanet.pro
-}
-
-src_compile() {
-   xsltproc -stringparam version ${PV} -html htm_to_qml.xsl fracplanet.htm 
\
-   | sed

[gentoo-commits] repo/gentoo:master commit in: x11-misc/fracplanet/

2017-11-18 Thread Jeroen Roovers 
commit: 257dc3eb83630f15ff614581b53686b5e6f53e9a
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Nov 18 11:31:45 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Nov 18 11:33:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=257dc3eb

x11-misc/fracplanet: Add missing dependency.

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 x11-misc/fracplanet/fracplanet-0.5.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild 
b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
index 413b4851dc9..69e53bf216c 100644
--- a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtopengl:5
+   dev-qt/qtwidgets:5
virtual/glu
virtual/opengl
 "

[gentoo-commits] repo/gentoo:master commit in: x11-misc/fracplanet/

2017-11-18 Thread Jeroen Roovers 
commit: 7d9136988d3853c6c2b3953e971d7c7207d0e8ac
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Nov 18 11:13:11 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Nov 18 11:13:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d913698

x11-misc/fracplanet: Add official HOMEPAGE.

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 x11-misc/fracplanet/fracplanet-0.5.1.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild 
b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
index 3439fceb999..413b4851dc9 100644
--- a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
@@ -5,7 +5,10 @@ EAPI=6
 inherit qmake-utils
 
 DESCRIPTION="Fractal planet and terrain generator"
-HOMEPAGE="https://sourceforge.net/projects/fracplanet/;
+HOMEPAGE="
+   http://www.bottlenose.net/share/fracplanet/index.htm
+   https://sourceforge.net/projects/fracplanet/
+"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/fracplanet/

2017-11-18 Thread Jeroen Roovers 
commit: 9a20236af5cc1a2ae68a062425b5441f944aba71
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Nov 18 11:09:41 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Nov 18 11:10:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a20236a

x11-misc/fracplanet: Version bump.

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 x11-misc/fracplanet/Manifest|  1 +
 x11-misc/fracplanet/fracplanet-0.5.1.ebuild | 43 +
 2 files changed, 44 insertions(+)

diff --git a/x11-misc/fracplanet/Manifest b/x11-misc/fracplanet/Manifest
index 5aadc7fd40a..5ec48547fd2 100644
--- a/x11-misc/fracplanet/Manifest
+++ b/x11-misc/fracplanet/Manifest
@@ -1 +1,2 @@
 DIST fracplanet-0.4.0.tar.gz 101700 SHA256 
38d56aba3c5cf19d4f2c218bece471d3860b161d2210a24ba94550356723482a SHA512 
09eed764df60929e5aa22b3f5c34defa11a91c4f6b588259fe0c3c7736fa03a9d138e05fd6ec4800e7943f36e73949804d8a7ed3e29bda6ffdc883ecadf9abf6
 WHIRLPOOL 
f5779e46463c07527a8b3063493893701831e8b8773b30904aa8180c314be4cb7339030d90be575dcbefe7cdf6a7d9270b7bcfbfe15408fa58e235c9edf18023
+DIST fracplanet-0.5.1.tar.gz 111911 SHA256 
435dd07e1798f810280260d09d2ee85e870eb466411e49b859eb1bef6f336ade SHA512 
40aeb6c33c2cb3403cc85193319a63bdc90637110c8bb40d9b0f4bd816a80018ca1cf81296337fc5a13fac583d7864adfde8d22dcc3a3cd65314c34ec63b508e
 WHIRLPOOL 
9923e0d8661bcd65a6042ef19049845de1ebbc16d2d5b397ee26f04714863ce2912c1cd03a6a85f20d9af2311c7009e346efbfc6b6e8db1d6fc5de4ce221f63f

diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild 
b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
new file mode 100644
index 000..3439fceb999
--- /dev/null
+++ b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qmake-utils
+
+DESCRIPTION="Fractal planet and terrain generator"
+HOMEPAGE="https://sourceforge.net/projects/fracplanet/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   dev-libs/boost:=
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtopengl:5
+   virtual/glu
+   virtual/opengl
+"
+DEPEND="
+   ${RDEPEND}
+   dev-libs/libxslt
+"
+HTML_DOCS=( fracplanet.{htm,css} )
+
+src_configure() {
+   eqmake5 fracplanet.pro
+}
+
+src_compile() {
+   xsltproc -stringparam version ${PV} -html htm_to_qml.xsl fracplanet.htm 
\
+   | sed 's/"/\\"/g' | sed 's/^/"/g' | sed 's/$/\\n"/g'> 
usage_text.h || die
+   default
+}
+
+src_install() {
+   dobin ${PN}
+   doman man/man1/${PN}.1
+   einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/fracplanet/, x11-misc/fracplanet/files/

2017-02-28 Thread David Seifert 
commit: 63864fecd34ba9106b6b8269368430af66b75c2a
Author: Harri Nieminen  gmail  com>
AuthorDate: Sun Feb 26 16:19:39 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Feb 28 19:10:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63864fec

x11-misc/fracplanet: EAPI bump, fix build with gcc6 (Bug #602414)

Gentoo-Bug: https://bugs.gentoo.org/602414

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4085

 .../fracplanet/files/fracplanet-0.4.0-gcc6.patch   | 44 ++
 .../fracplanet/files/fracplanet-0.4.0-gold.patch   |  8 ++--
 ...net-0.4.0.ebuild => fracplanet-0.4.0-r1.ebuild} | 34 +++--
 3 files changed, 70 insertions(+), 16 deletions(-)

diff --git a/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch 
b/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch
new file mode 100644
index 00..4d760d672f
--- /dev/null
+++ b/x11-misc/fracplanet/files/fracplanet-0.4.0-gcc6.patch
@@ -0,0 +1,44 @@
+Description: Fix compilation with gcc-6
+Author: Gert Wollny 
+Last-Updated: 2016-07-09
+Forwarded: No
+Bug-Debian: https://bugs.debian.org/811642
+
+--- fracplanet-0.4.0.orig/image.cpp
 fracplanet-0.4.0/image.cpp
+@@ -85,7 +85,7 @@ template <> bool Raster::write_pg
+   out.write(reinterpret_cast(&(*(row->begin(,row->size());
+ }
+   out.close();
+-  return out;
++  return out.good();
+ }
+ 
+ template <> bool Raster::write_pgmfile(const std::string& 
filename,Progress* target) const
+@@ -101,7 +101,7 @@ template <> bool Raster::write_p
+   progress.step();
+   for (const ushort* it=row->begin();it!=row->end();++it)
+   {
+-const uchar p[2]={((*it)>>8),(*it)};
++const uchar 
p[2]={static_cast((*it)>>8),static_cast((*it) & 0x00FF)};
+ if (m>=256)
+   {
+ // PGM spec is most significant byte first
+@@ -115,7 +115,7 @@ template <> bool Raster::write_p
+   }
+ }
+   out.close();
+-  return out;
++  return out.good();
+ }
+ 
+ template <> bool Raster::write_ppmfile(const std::string& 
filename,Progress* target) const
+@@ -132,7 +132,7 @@ template <> bool Raster::write
+   out.write(reinterpret_cast(&((*it).r)),3);
+ }
+   out.close();
+-  return out;
++  return out.good();
+ }
+ 
+ 

diff --git a/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch 
b/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch
index c980dfdd6b..4a52d1c44a 100644
--- a/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch
+++ b/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch
@@ -1,5 +1,5 @@
 triangle_mesh_viewer.h
-+++ triangle_mesh_viewer.h
+--- a/triangle_mesh_viewer.h
 b/triangle_mesh_viewer.h
 @@ -24,6 +24,7 @@
  #ifndef _triangle_mesh_viewer_h_
  #define _triangle_mesh_viewer_h_
@@ -9,8 +9,8 @@
  #include "random.h"
  #include "triangle_mesh.h"
 
 fracplanet.pro
-+++ fracplanet.pro
+--- a/fracplanet.pro
 b/fracplanet.pro
 @@ -8,7 +8,7 @@
  
  HEADERS += $$system(ls *.h)

diff --git a/x11-misc/fracplanet/fracplanet-0.4.0.ebuild 
b/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild
similarity index 67%
rename from x11-misc/fracplanet/fracplanet-0.4.0.ebuild
rename to x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild
index 518fa738b3..254e38f2f6 100644
--- a/x11-misc/fracplanet/fracplanet-0.4.0.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
-inherit qt4-r2
+EAPI=6
+inherit qmake-utils
 
 DESCRIPTION="Fractal planet and terrain generator"
 HOMEPAGE="https://sourceforge.net/projects/fracplanet/;
@@ -14,28 +14,38 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-libs/boost
-   virtual/glu
-   virtual/opengl
+RDEPEND="
+   dev-libs/boost:=
dev-qt/qtcore:4
dev-qt/qtgui:4
-   dev-qt/qtopengl:4"
+   dev-qt/qtopengl:4
+   virtual/glu
+   virtual/opengl
+"
 DEPEND="${RDEPEND}
dev-libs/libxslt"
 
 S=${WORKDIR}/${PN}
 
-PATCHES=( "${FILESDIR}/${P}-gold.patch" )
+PATCHES=(
+   "${FILESDIR}/${P}-gold.patch"
+   "${FILESDIR}/${P}-gcc6.patch"
+)
+
+HTML_DOCS=( fracplanet.{htm,css} )
+
+src_configure() {
+   eqmake4 fracplanet.pro
+}
 
 src_compile() {
xsltproc -stringparam version ${PV} -html htm_to_qml.xsl fracplanet.htm 
\
-   | sed 's/"/\\"/g' | sed 's/^/"/g' | sed 's/$/\\n"/g'> 
usage_text.h
-   qt4-r2_src_compile
+   | sed 's/"/\\"/g' | sed 's/^/"/g' | sed 's/$/\\n"/g'> 
usage_text.h || die
+   default
 }
 
 src_install() {
dobin ${PN}
doman man/man1/${PN}.1
-   dodoc BUGS NEWS README THANKS TODO
-   dohtml *.{css,htm}
+   einstalldocs
 }