media-gfx/brlcad: version bumped to 7.22.0, bug#467456

4 files changed, 119 insertions, 7 deletions

diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index a22b70a8c..aade60ce9 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -2,7 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/ChangeLog,v 1.3 2011/04/18 22:47:37 dilfridge Exp $
 
-*brlcad-7.20.4 (27 Mar 2012)
+*brlcad-7.22.0 (6 May 2013)
+
+  5 May 2013; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild +brlcad-7.22.0.ebuild:
+  version bumped to 7.22.0
 
   27 Mar 2012; Dongxu Li <dongxuli2011@gmail.com> brlcad-9999.ebuild +files/brlcad-7.20.4-cmake.patch:
   added missing patch for 7.20.4
diff --git a/media-gfx/brlcad/Manifest b/media-gfx/brlcad/Manifest
index 85d73fe59..cd637e6b3 100644
--- a/media-gfx/brlcad/Manifest
+++ b/media-gfx/brlcad/Manifest
@@ -1 +1,2 @@
 DIST brlcad-7.20.4.tar.gz 70674938 SHA256 ee6210890f9f2115613b40dc25af95091dc700b5cc1ae390758a62b64854b65e SHA512 ac75675af04bfad444f66c0597aae6738883f49a92b775e1324d981968671adb8ac2a9aec921135498be84d4f6724741a2eeab7c3b3da64add2b20681f87dfdd WHIRLPOOL 8ba8093428c8aeb281538dd0a17c871dd8500affc118e524b0b12356d5dec082db3b136af7f80b524ad25fab6e49b3590dd9ef1f8e1310936ef106d53ee33a29
+DIST brlcad-7.22.0.tar.gz 80633583 SHA256 4cc10161efbf9713c9b5810d259a039431096a37c95eb87b52f4ac669e16bcb1 SHA512 515df65cf0e6a7a2109309c05a31abfad80889a40236f79bf09fe92528cd35742be76a3074d3aa12320c8e85a32d35661af8c7e2acef0b2a2a588de885a0e30d WHIRLPOOL bb5f30edbaf9455330df69406b07ab955b0dfc5d1dffd44c9a94ab0cb0438c5d938d67caeeb2be75e38c88761f1036425881eb3a8cb872b514b1eb480c371bf7
diff --git a/media-gfx/brlcad/brlcad-7.22.0.ebuild b/media-gfx/brlcad/brlcad-7.22.0.ebuild
new file mode 100644
index 000000000..bfd9356dd
--- /dev/null
+++ b/media-gfx/brlcad/brlcad-7.22.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2013 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.6
+	<dev-lang/tk-8.6
+	<dev-tcltk/itcl-4.0
+	<dev-tcltk/itk-4.0
+	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}/${P}-cmake.patch"
+#}
+
+src_configure() {
+filter-flags -std=c++0x
+append-ldflags $(no-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/brlcad-9999.ebuild b/media-gfx/brlcad/brlcad-9999.ebuild
index e7cfb1c0f..ffc2b938a 100644
--- a/media-gfx/brlcad/brlcad-9999.ebuild
+++ b/media-gfx/brlcad/brlcad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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 $
 
@@ -18,10 +18,6 @@ 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
@@ -58,7 +54,7 @@ filter-flags -std=c++0x
 		-DBRLCAD_ENABLE_COMPILER_WARNINGS=OFF
 		-DBRLCAD_FLAGS_OPTIMIZATION=ON
 		-DBRLCAD_ENABLE_X11=ON
-		-DBRLCAD_BUNDLED_LIBS=System
+		-DBRLCAD_BUNDLED_LIBS=ON
 		)
 
 			# use flag triggered options