media-gfx/brlcad: version bumped 7.20.4

5 files changed, 114 insertions, 68 deletions

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index 150102ad2..a1a141439 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -4,7 +4,7 @@
 
 *brlcad-7.20.2 (15 Jul 2011)
 
-  16 Dec 2011; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild:
+  5 Feb 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild:
   Use system libraries
 
   16 Dec 2011; Dongxu Li <dongxuli2011@gmail.com> +brlcad-7.20.4.ebuild brlcad-9999.ebuild:
diff --git a/media-gfx/brlcad/Manifest b/media-gfx/brlcad/Manifest
index 190dce2c1..84659e302 100644
--- a/media-gfx/brlcad/Manifest
+++ b/media-gfx/brlcad/Manifest
@@ -1 +1,2 @@
 DIST brlcad-7.20.2.tar.gz 56219423 RMD160 b366d6956aa63f22ea14ed03f212e1a184eee429 SHA1 6d465398740a67572cfd9a8c3c6771e0b263d806 SHA256 879d21ff87808bf60956eec915b5bd6f1af1b4869145c239345f2a00267434ca
+DIST brlcad-7.20.4.tar.gz 70674938 SHA256 ee6210890f9f2115613b40dc25af95091dc700b5cc1ae390758a62b64854b65e SHA512 ac75675af04bfad444f66c0597aae6738883f49a92b775e1324d981968671adb8ac2a9aec921135498be84d4f6724741a2eeab7c3b3da64add2b20681f87dfdd WHIRLPOOL 8ba8093428c8aeb281538dd0a17c871dd8500affc118e524b0b12356d5dec082db3b136af7f80b524ad25fab6e49b3590dd9ef1f8e1310936ef106d53ee33a29
diff --git a/media-gfx/brlcad/brlcad-7.20.4.ebuild b/media-gfx/brlcad/brlcad-7.20.4.ebuild
new file mode 100644
index 000000000..f150a459c
--- /dev/null
+++ b/media-gfx/brlcad/brlcad-7.20.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/brlcad-7.18.4.ebuild,v 1.1 2011/04/18 22:47:37 dilfridge Exp $
+
+EAPI=4
+inherit cmake-utils eutils java-pkg-2 flag-o-matic
+
+DESCRIPTION="Constructive solid geometry modeling system"
+HOMEPAGE="http://brlcad.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="benchmarks debug doc examples java opengl smp"
+
+RDEPEND="media-libs/libpng
+	sys-libs/zlib
+	>=sci-libs/tnt-3
+	sci-libs/jama
+	>=dev-lang/tcl-8.5
+	>=dev-lang/tk-8.5
+	=dev-tcltk/itcl-3.4*
+	=dev-tcltk/itk-3.4*
+	dev-tcltk/iwidgets
+	dev-tcltk/tkimg
+	dev-tcltk/tkpng
+	sys-libs/libtermcap-compat
+	media-libs/urt
+	x11-libs/libXt
+	x11-libs/libXi
+	java? ( >=virtual/jre-1.5 )
+	"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	dev-tcltk/tktable
+	>=virtual/jre-1.5
+	doc? (
+		dev-libs/libxslt
+		app-doc/doxygen
+	)"
+
+BRLCAD_DIR="${EPREFIX}/usr/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-9999-cmake.patch"
+}
+
+src_configure() {
+filter-flags -std=c++0x
+filter-ldflags -Wl,--as-needed
+	if use Debug; then
+		CMAKE_BUILD_TYPE=Debug
+		else
+		CMAKE_BUILD_TYPE=Release
+		fi
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}"
+		-DBRLCAD_ENABLE_STRICT=OFF
+		-DBRLCAD-ENABLE_STRICT=OFF
+		-DBRLCAD-ENABLE_COMPILER_WARNINGS=OFF
+		-DBRLCAD_FLAGS_OPTIMIZATION=ON
+		-DBRLCAD_ENABLE_X11=ON
+		-DBRLCAD_BUNDLED_LIBS=AUTO
+		)
+
+			# use flag triggered options
+	if use debug; then
+		mycmakeargs += "-DCMAKE_BUILD_TYPE=Debug"
+	else
+		mycmakeargs += "-DCMAKE_BUILD_TYPE=Release"
+	fi
+	mycmakeargs+=(
+		$(cmake-utils_use opengl BRLCAD_ENABLE_OPENGL)
+#experimental RTGL support
+	#	$(cmake-utils_use opengl BRLCAD_ENABLE_RTGL)
+		$(cmake-utils_use amd64 BRLCAD_ENABLE_64BIT)
+		$(cmake-utils_use smp BRLCAD_ENABLE_SMP)
+	#	$(cmake-utils_use java BRLCAD_ENABLE_RTSERVER)
+		$(cmake-utils_use examples BRLCAD_INSTALL_EXAMPLE_GEOMETRY)
+		$(cmake-utils_use doc BRLCAD_EXTRADOCS)
+		$(cmake-utils_use doc BRLCAD_EXTRADOCS_PDF)
+		$(cmake-utils_use doc BRLCAD_EXTRADOCS_MAN)
+		$(cmake-utils_use debug BRLCAD_ENABLE_VERBOSE_PROGRESS)
+			)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+	#emake check || die "emake check failed"
+	if use benchmarks; then
+		emake benchmark || die "emake benchmark failed"
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	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
+	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/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch b/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch
deleted file mode 100644
index 7635211f9..000000000
--- a/media-gfx/brlcad/files/brlcad-7.20.2-cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- old/CMakeLists.txt	2011-07-14 16:14:18.053187225 -0400
-+++ new/CMakeLists.txt  2011-07-14 16:14:39.073507247 -0400
-@@ -1187,14 +1187,14 @@
- 	SET(PATH_LABELS CMAKE_INSTALL_PREFIX BIN_DIR MAN_DIR CONF_DIR DATA_DIR)
- 	SET(PATH_LABEL_LENGTH 0)
- 	FOREACH(path_label ${PATH_LABELS})
--		STRING(LENGTH ${${path_label}_LABEL} CURRENT_LENGTH)
-+		STRING(LENGTH "${${path_label}_LABEL}" CURRENT_LENGTH)
- 		if (${CURRENT_LENGTH} GREATER ${PATH_LABEL_LENGTH})
- 			SET(PATH_LABEL_LENGTH ${CURRENT_LENGTH})
- 		endif()
- 	ENDFOREACH()
- 	FOREACH(path_label ${PATH_LABELS})
- 		SET(CURRENT_LABEL ${${path_label}_LABEL})
--		STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
-+		STRING(LENGTH "${CURRENT_LABEL}" CURRENT_LENGTH)
- 		WHILE(${PATH_LABEL_LENGTH} GREATER ${CURRENT_LENGTH})
- 			SET(CURRENT_LABEL " ${CURRENT_LABEL}")
- 			STRING(LENGTH ${CURRENT_LABEL} CURRENT_LENGTH)
\ No newline at end of file
diff --git a/media-gfx/brlcad/files/png_patch.diff b/media-gfx/brlcad/files/png_patch.diff
deleted file mode 100644
index bdae6ba53..000000000
--- a/media-gfx/brlcad/files/png_patch.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: src/other/libpng.dist
-===================================================================
---- src/other/libpng.dist	(revision 45616)
-+++ src/other/libpng.dist	(revision 45617)
-@@ -8,7 +8,6 @@
- configure.ac
- contrib
- example.c
--libpng-1.4.5.txt
- libpng-config.in
- libpng.3
- libpng.pc.in
-Index: src/libged/png.c
-===================================================================
---- src/libged/png.c	(revision 45616)
-+++ src/libged/png.c	(revision 45617)
-@@ -30,6 +30,7 @@
- #include <string.h>
- #include "bio.h"
- 
-+#include "zlib.h"
- #include "png.h"
- #include "bu.h"
- #include "vmath.h"
-Index: src/fb/fb-png.c
-===================================================================
---- src/fb/fb-png.c	(revision 45616)
-+++ src/fb/fb-png.c	(revision 45617)
-@@ -38,6 +38,7 @@
- #  include <unistd.h>
- #endif
- 
-+#include "zlib.h"
- #include "png.h"
- #include "bu.h"
- #include "fb.h"
-Index: src/util/pix-png.c
-===================================================================
---- src/util/pix-png.c	(revision 45616)
-+++ src/util/pix-png.c	(revision 45617)
-@@ -36,7 +36,6 @@
- #include "bio.h"
- 
- #include "zlib.h"
--#include "pngconf.h"
- #include "png.h"
- 
- #include "bu.h"