summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-misc/brlcad/ChangeLog9
-rw-r--r--sci-misc/brlcad/brlcad-7.16.6-r1.ebuild (renamed from sci-misc/brlcad/brlcad-7.16.6.ebuild)31
-rw-r--r--sci-misc/brlcad/metadata.xml34
3 files changed, 47 insertions, 27 deletions
diff --git a/sci-misc/brlcad/ChangeLog b/sci-misc/brlcad/ChangeLog
index eb501c3ec980..30a7130230f4 100644
--- a/sci-misc/brlcad/ChangeLog
+++ b/sci-misc/brlcad/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-misc/brlcad
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/brlcad/ChangeLog,v 1.3 2010/02/28 03:35:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/brlcad/ChangeLog,v 1.4 2010/03/03 15:47:50 bicatali Exp $
+
+*brlcad-7.16.6-r1 (03 Mar 2010)
+
+ 03 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
+ -brlcad-7.16.6.ebuild, +brlcad-7.16.6-r1.ebuild, metadata.xml:
+ Added benchmarks which can be run if the tests are enabled. Added a
+ desktop entry, and itk/itcl library path to the LDPATH environment
28 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org> brlcad-7.16.6.ebuild:
Filtered -Werror, still creating problems (bug #307061)
diff --git a/sci-misc/brlcad/brlcad-7.16.6.ebuild b/sci-misc/brlcad/brlcad-7.16.6-r1.ebuild
index f7e123ce55c7..561bd4555dda 100644
--- a/sci-misc/brlcad/brlcad-7.16.6.ebuild
+++ b/sci-misc/brlcad/brlcad-7.16.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/brlcad/brlcad-7.16.6.ebuild,v 1.3 2010/02/28 03:35:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/brlcad/brlcad-7.16.6-r1.ebuild,v 1.1 2010/03/03 15:47:50 bicatali Exp $
EAPI=2
inherit eutils java-pkg-opt-2
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+debug doc examples java opengl smp X"
+IUSE="benchmarks +debug doc examples java opengl smp X"
RDEPEND="media-libs/libpng
sys-libs/zlib
@@ -37,20 +37,19 @@ BRLCAD_DIR="/usr/${PN}"
src_prepare() {
#patch a simple Makefile.in since the Makefile.am would need
- #a full and slow autoreconf of many directories
+ # a full and slow autoreconf of many directories
epatch "${FILESDIR}"/${P}-as-needed.patch
epatch "${FILESDIR}"/${P}-stl-headers.patch
- # hack for 7.16.6 only (bug #307061)
- sed -i -e 's/-Werror//g' configure || die
}
src_configure() {
- local myitcl="/usr/$(get_libdir)/itcl3.4"
- local myitk="/usr/$(get_libdir)/itk3.4"
+ local myitcl="/usr/$(get_libdir)/itcl3.4" myitk="/usr/$(get_libdir)/itk3.4"
+ export LD_LIBRARY_PATH="${myitcl}:${myitk}:${LD_LIBRARY_PATH}"
econf \
+ --disable-strict-build \
--prefix="${BRLCAD_DIR}" \
--datadir="/usr/share/${PN}" \
- --mandir="${BRLCAR_DIR}/man" \
+ --mandir="${BRLCAD_DIR}/man" \
--disable-almost-everything \
--disable-regex-build \
--disable-png-build \
@@ -68,7 +67,6 @@ src_configure() {
$(use_enable debug) \
$(use_enable debug optimization) \
$(use_enable debug runtime-debug) \
- $(use_enable debug strict-build) \
$(use_enable debug verbose) \
$(use_enable debug warnings) \
$(use_enable debug progress) \
@@ -78,13 +76,24 @@ src_configure() {
$(use_with java jdk $(java-config -O)) \
$(use_with opengl ogl) \
$(use_with X x) \
- $(use_with X x11) \
- LD_LIBRARY_PATH="${myitcl}:${myitk}:${LD_LIBRARY_PATH}"
+ $(use_with X x11)
+}
+
+src_test() {
+ emake check || die "emake check failed"
+ if use benchmarks; then
+ emake benchmark || die "emake benchmark failed"
+ fi
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
+ rm -f "${D}"usr/share/brlcad/${README,NEWS,AUTHORS,HACKING,INSTALL,COPYING}
+ dodoc AUTHORS NEWS README HACKING TODO BUGS ChangeLog
echo "PATH=${BRLCAD_DIR}/bin" > 99brlcad
echo "MANPATH=${BRLCAD_DIR}/man" >> 99brlcad
+ echo "LDPATH=${myitcl}:${myitk}" >> 99brlcad
doenvd 99brlcad || die
+ newicon misc/macosx/Resources/ReadMe.rtfd/brlcad_logo_tiny.png brlcad.png
+ make_desktop_entry mged "BRL-CAD" brlcad "Graphics;Engineering"
}
diff --git a/sci-misc/brlcad/metadata.xml b/sci-misc/brlcad/metadata.xml
index ce48108a6e6c..c3f3490ea05e 100644
--- a/sci-misc/brlcad/metadata.xml
+++ b/sci-misc/brlcad/metadata.xml
@@ -3,20 +3,24 @@
<pkgmetadata>
<herd>sci</herd>
<longdescription lang="en">
-BRL-CAD is a Combinatorial/Constructive Solid Geometry (CSG)
-solid modeling system that includes an interactive geometry editor,
-ray-tracing support for rendering and geometric analysis,
-network-distributed framebuffer support, image and signal-processing
-tools, and an embedded scripting language.
-
-The package is a collection of over 400 tools and utilities. Included
-is support for various geometric data format conversions, image and
-signal processing capabilities, ray-tracing based lighting models,
-network distributed ray-tracing, parallel ray-tracing, animation
-capabilities, data compression, image handling, and interactive 3-D
-geometric editing, and also an implementation of Weiler's n-Manifold
-Geometry (NMG) data structures for surface-based solid models and
-photon mapping.
+ BRL-CAD is a Combinatorial/Constructive Solid Geometry (CSG)
+ solid modeling system that includes an interactive geometry editor,
+ ray-tracing support for rendering and geometric analysis,
+ network-distributed framebuffer support, image and signal-processing
+ tools, and an embedded scripting language.
+
+ The package is a collection of over 400 tools and utilities. Included
+ is support for various geometric data format conversions, image and
+ signal processing capabilities, ray-tracing based lighting models,
+ network distributed ray-tracing, parallel ray-tracing, animation
+ capabilities, data compression, image handling, and interactive 3-D
+ geometric editing, and also an implementation of Weiler's n-Manifold
+ Geometry (NMG) data structures for surface-based solid models and
+ photon mapping.
</longdescription>
+<use>
+ <flag name="benchmarks">
+ Run benchmarks during test phase (need test option enabled)
+ </flag>
+</use>
</pkgmetadata>
-