summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-04-22 15:25:20 +0000
committerJohannes Huber <johu@gentoo.org>2012-04-22 15:25:20 +0000
commitd4f90ff722f509ca80d05347281f2d8c7469f783 (patch)
tree6fd6f01097572f302710b94de66c430a2686b1a0 /x11-misc/fracplanet
parentRemove old. (diff)
downloadgentoo-2-d4f90ff722f509ca80d05347281f2d8c7469f783.tar.gz
gentoo-2-d4f90ff722f509ca80d05347281f2d8c7469f783.tar.bz2
gentoo-2-d4f90ff722f509ca80d05347281f2d8c7469f783.zip
Move from deprecated qt4 eclass to qt4-r2, bumps EAPI, fixes build with gold linker, install included man page by Michael (kensington) <gentoo@scribeofthenile.com> wrt bug #409775.
(Portage version: 2.2.0_alpha100/cvs/Linux i686)
Diffstat (limited to 'x11-misc/fracplanet')
-rw-r--r--x11-misc/fracplanet/ChangeLog10
-rw-r--r--x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch22
-rw-r--r--x11-misc/fracplanet/fracplanet-0.4.0.ebuild26
3 files changed, 44 insertions, 14 deletions
diff --git a/x11-misc/fracplanet/ChangeLog b/x11-misc/fracplanet/ChangeLog
index e80422a0e24a..179b9809d577 100644
--- a/x11-misc/fracplanet/ChangeLog
+++ b/x11-misc/fracplanet/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-misc/fracplanet
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fracplanet/ChangeLog,v 1.4 2009/12/17 18:59:35 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fracplanet/ChangeLog,v 1.5 2012/04/22 15:25:20 johu Exp $
+
+ 22 Apr 2012; Johannes Huber <johu@gentoo.org>
+ +files/fracplanet-0.4.0-gold.patch, fracplanet-0.4.0.ebuild:
+ Move from deprecated qt4 eclass to qt4-r2, bumps EAPI, fixes build with gold
+ linker, install included man page by Michael (kensington)
+ <gentoo@scribeofthenile.com> wrt bug #409775.
*fracplanet-0.4.0 (17 Dec 2009)
diff --git a/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch b/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch
new file mode 100644
index 000000000000..c980dfdd6b33
--- /dev/null
+++ b/x11-misc/fracplanet/files/fracplanet-0.4.0-gold.patch
@@ -0,0 +1,22 @@
+--- triangle_mesh_viewer.h
++++ triangle_mesh_viewer.h
+@@ -24,6 +24,7 @@
+ #ifndef _triangle_mesh_viewer_h_
+ #define _triangle_mesh_viewer_h_
+
++#include <GL/glu.h>
+ #include "parameters_render.h"
+ #include "random.h"
+ #include "triangle_mesh.h"
+
+--- fracplanet.pro
++++ 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.ebuild b/x11-misc/fracplanet/fracplanet-0.4.0.ebuild
index 0f93ce84da84..f0f84033ffa1 100644
--- a/x11-misc/fracplanet/fracplanet-0.4.0.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fracplanet/fracplanet-0.4.0.ebuild,v 1.1 2009/12/17 18:59:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fracplanet/fracplanet-0.4.0.ebuild,v 1.2 2012/04/22 15:25:20 johu Exp $
-EAPI=2
-inherit qt4
+EAPI=4
+inherit qt4-r2
DESCRIPTION="Fractal planet and terrain generator"
HOMEPAGE="http://sourceforge.net/projects/fracplanet/"
@@ -14,26 +14,28 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="x11-libs/qt-gui:4
- x11-libs/qt-opengl:4
- dev-libs/boost"
+RDEPEND="dev-libs/boost
+ virtual/glu
+ virtual/opengl
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ x11-libs/qt-opengl:4"
DEPEND="${RDEPEND}
dev-libs/libxslt"
S=${WORKDIR}/${PN}
-src_configure() {
- eqmake4
-}
+PATCHES=( "${FILESDIR}/${P}-gold.patch" )
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
- emake || die
+ qt4-r2_src_compile
}
src_install() {
- dobin ${PN} || die
+ dobin ${PN}
+ doman man/man1/${PN}.1
dodoc BUGS NEWS README THANKS TODO
dohtml *.{css,htm}
}