media-gfx/brlcad: Switch to cmake as supported by upstream

5 files changed, 124 insertions, 2 deletions

diff --git a/media-gfx/brlcad/.brlcad-7.20.2-r1.ebuild.swo b/media-gfx/brlcad/.brlcad-7.20.2-r1.ebuild.swo
new file mode 100644
index 000000000..9ce9b1c1e
--- /dev/null
+++ b/media-gfx/brlcad/.brlcad-7.20.2-r1.ebuild.swo
diff --git a/media-gfx/brlcad/.brlcad-7.20.2-r1.ebuild.swp b/media-gfx/brlcad/.brlcad-7.20.2-r1.ebuild.swp
new file mode 100644
index 000000000..bb157ddb0
--- /dev/null
+++ b/media-gfx/brlcad/.brlcad-7.20.2-r1.ebuild.swp
diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
index 39906ef85..526d2d8bc 100644
--- a/media-gfx/brlcad/ChangeLog
+++ b/media-gfx/brlcad/ChangeLog
@@ -4,8 +4,11 @@
 
 *brlcad-7.18.4 (18 Apr 2011)
 
+  14 Jul 2011; Dongxu Li <dongxuli2011@gmail.com> +brlcad-7.20.2-r1.ebuild:
+  Switch to cmake, have to wait for upstream to fix the itcl/itk link problem to enable using system itcl/itk
+
   13 Jul 2011; Dongxu Li <dongxuli2011@gmail.com> +brlcad-7.20.2.ebuild:
-  media-gfx/brlcad: version bump to 7.20.2, still need to enable cmake building as supported by upstream
+  version bump to 7.20.2, still need to enable cmake building as supported by upstream
 
   18 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   +brlcad-7.18.4.ebuild:
diff --git a/media-gfx/brlcad/Manifest b/media-gfx/brlcad/Manifest
index d080b8a29..6bb3912b3 100644
--- a/media-gfx/brlcad/Manifest
+++ b/media-gfx/brlcad/Manifest
@@ -1,4 +1,5 @@
 DIST brlcad-7.20.2.tar.gz 56219423 RMD160 b366d6956aa63f22ea14ed03f212e1a184eee429 SHA1 6d465398740a67572cfd9a8c3c6771e0b263d806 SHA256 879d21ff87808bf60956eec915b5bd6f1af1b4869145c239345f2a00267434ca
+EBUILD brlcad-7.20.2-r1.ebuild 3430 RMD160 ecd1d0b26e89434c02b122816cdb917743840ec1 SHA1 efa70a06f8145494130dffee83b1732086c919fb SHA256 b0489280c9ee55fba448cead9005ec2c07d46524a51d05f98ec6624e1c9f6ef1
 EBUILD brlcad-7.20.2.ebuild 2584 RMD160 b0e5363f18e894c77fdf18e340f3f354a977d782 SHA1 cb54a0b829fa9a433b37a185119a3c2568e7c42c SHA256 44d8d0987fab07c5e6b482649eb776fff4055bec021d6dbf8a2e8d66a430aec4
-MISC ChangeLog 3372 RMD160 6d15a9df6bcc52a4f878d576c041677039dbe741 SHA1 be3e3385d9a47cd1f5032e89b9e55799442ad1b8 SHA256 b256d949a31a24974c2cdd72af42188023194b40ec65da9c2f4034f0e45c0529
+MISC ChangeLog 3541 RMD160 57154e61cfc571f79c8aa0851a516c6636d6cd78 SHA1 be1c14b93ce18a700fe4a8918630b0dca1e360ff SHA256 b0bdf7bf9af0154ccf139fc30fc664fd59ce8b531da78a5557640a41838dc661
 MISC metadata.xml 1379 RMD160 7407a87496226206896ad41f07cbf1b4900faf05 SHA1 6fb2b9de93b48435f93a968de325d1b483160a63 SHA256 0374773ad63ea0e195813d44eeca951b9b756a73ad1fe034499532aef7e6078d
diff --git a/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild b/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
new file mode 100644
index 000000000..6fee354bd
--- /dev/null
+++ b/media-gfx/brlcad/brlcad-7.20.2-r1.ebuild
@@ -0,0 +1,118 @@
+# 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
+
+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 opengl smp"
+
+RDEPEND="media-libs/libpng
+	sys-libs/zlib
+	>=sci-libs/tnt-3
+	sci-libs/jama
+	=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}
+	>=dev-util/cmake-2.8
+	sys-devel/bison
+	sys-devel/flex
+	dev-tcltk/tktable
+	doc? (
+		dev-libs/libxslt
+		app-doc/doxygen
+	)"
+
+BRLCAD_DIR="${EPREFIX}/usr/${PN}"
+
+src_configure() {
+		#waiting for upstream to fix itck/itk issue for cmake
+		#have to enable tcl/tk local build, otherwise cmake won't be able to link for
+		# -litcl -litk
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${BRLCAD_DIR}"
+		-DBRLCAD-ENABLE_STRICT=OFF
+		-DBRLCAD_BUILD_LOCAL_OPENNURBS=ON
+		-DBUILD_STATIC_LIBS=OFF
+		-DBRLCAD-ENABLE_X11=ON
+		-DBRLCAD_BUILD_LOCAL_INCRTCL=OFF
+		-DBRLCAD_BUILD_LOCAL_TKHTML=OFF
+		-DBRLCAD_BUILD_LOCAL_TKPNG=OFF
+		-DBRLCAD_BUILD_LOCAL_TKTABLE=OFF
+		-DBRLCAD_BUILD_LOCAL_PNG=OFF
+		-DBRLCAD_BUILD_LOCAL_REGEX=OFF
+		-DBRLCAD_BUILD_LOCAL_ZLIB=OFF
+		-DBRLCAD_BUILD_LOCAL_TERMLIB=OFF
+		-DBRLCAD_BUILD_LOCAL_UTAHRLE=OFF
+		-DBRLCAD_BUILD_LOCAL_SCL=OFF
+		-DBRLCAD-ENABLE_RTSERVER=OFF
+		-DBRLCAD-ENABLE_JOVE=OFF
+
+		-DBRLCAD_BUILD_LOCAL_IWIDGETS_FORCE_ON=ON
+		-DBRLCAD_BUILD_LOCAL_TCL_FORCE_ON=ON
+		-DBRLCAD_BUILD_LOCAL_TK_FORCE_ON=ON
+		-DBRLCAD_BUILD_LOCAL_ITCL_FORCE_ON=ON
+		-DBRLCAD_BUILD_LOCAL_ITK_FORCE_ON=ON
+
+		)
+
+			# use flag triggered options
+	if use debug; then
+		mycmakeargs += "-DCMAKE_BUILD_TYPE=Debug"
+	else
+		mycmakeargs += "-DCMAKE_BUILD_TYPE=Release"
+	fi
+	mycmakeargs+=(
+		$(cmake-utils_use amd64 BRLCAD-ENABLE_64BIT)
+		$(cmake-utils_use aqua BRLCAD-ENABLE_AQUA)
+		$(cmake-utils_use examples BRLCAD-INSTALL_EXAMPLE_GEOMETRY)
+		$(cmake-utils_use doc BRLCAD-BUILD_EXTRADOCS)
+		$(cmake-utils_use doc BRLCAD-BUILD_EXTRADOCS_PDF)
+		$(cmake-utils_use doc BRLCAD-BUILD_EXTRADOCS_MAN)
+		$(cmake-utils_use opengl BRLCAD-ENABLE_OPENGL)
+		$(cmake-utils_use smp BRLCAD-ENABLE_SMP)
+		$(cmake-utils_use debug BRLCAD-ENABLE_VERBOSE_PROGRESS)
+#			$(cmake-utils_use !debug BRLCAD-ENABLE_OPTIMIZED_BUILD)
+#			$(cmake-utils_use !debug )
+#			$(cmake-utils_use debug BRLCAD-ENABLE_DEBUG_BUILD)
+#			$(cmake-utils_use debug BRLCAD-ENABLE_RUNTIME_DEBUG)
+#			$(cmake-utils_use debug BRLCAD-ENABLE_COMPILER_WARNINGS_LABEL)
+			)
+	cmake-utils_src_configure
+}
+
+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"
+}