Now X is forced (does not build without), itcl/itk paths removed from ebuild. Switched to EAPI3

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 27 insertions, 154 deletions

diff --git a/sci-misc/brlcad/ChangeLog b/sci-misc/brlcad/ChangeLog
index 014ca86f3104..f44fd4046fa5 100644
--- a/sci-misc/brlcad/ChangeLog
+++ b/sci-misc/brlcad/ChangeLog
@@ -1,6 +1,12 @@
 # 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.6 2010/05/26 20:29:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/brlcad/ChangeLog,v 1.7 2010/06/18 21:08:37 bicatali Exp $
+
+  18 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -brlcad-7.16.6-r1.ebuild, -files/brlcad-7.16.6-as-needed.patch,
+  -files/brlcad-7.16.6-stl-headers.patch, brlcad-7.16.8.ebuild:
+  Now X is forced (does not build without), itcl/itk paths removed from
+  ebuild. Switched to EAPI3.
 
 *brlcad-7.16.8 (26 May 2010)
 
diff --git a/sci-misc/brlcad/brlcad-7.16.6-r1.ebuild b/sci-misc/brlcad/brlcad-7.16.6-r1.ebuild
deleted file mode 100644
index c5ed96e735a8..000000000000
--- a/sci-misc/brlcad/brlcad-7.16.6-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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-r1.ebuild,v 1.2 2010/03/09 03:31:52 bicatali Exp $
-
-EAPI=2
-inherit eutils java-pkg-opt-2
-
-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 X"
-
-RDEPEND="media-libs/libpng
-	sys-libs/zlib
-	>=sci-libs/tnt-3
-	sci-libs/jama
-	dev-tcltk/itcl
-	dev-tcltk/itk
-	dev-tcltk/iwidgets
-	dev-tcltk/tkimg
-	sys-libs/libtermcap-compat
-	media-libs/urt
-	java? ( >=virtual/jre-1.5 )
-	X? ( x11-libs/libXt x11-libs/libXi )"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	java? ( >=virtual/jdk-1.5 )
-	doc? ( dev-libs/libxslt )"
-
-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
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-stl-headers.patch
-}
-
-src_configure() {
-	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="${BRLCAD_DIR}/man" \
-		--disable-almost-everything \
-		--disable-regex-build \
-		--disable-png-build \
-		--disable-zlib-build \
-		--disable-urt-build \
-		--disable-tcl-build \
-		--disable-tk-build \
-		--disable-itcl-build \
-		--disable-tkimg-build \
-		--disable-jove-build \
-		--disable-tnt-install \
-		--disable-iwidgets-install \
-		--enable-opennurbs-build \
-		--with-ldflags="-L${myitcl} -L${myitk}" \
-		$(use_enable debug) \
-		$(use_enable debug optimization) \
-		$(use_enable debug runtime-debug) \
-		$(use_enable debug verbose) \
-		$(use_enable debug warnings) \
-		$(use_enable debug progress) \
-		$(use_enable doc documentation) \
-		$(use_enable examples models-install) \
-		$(use_enable smp parallel) \
-		$(use_with java jdk $(java-config -O)) \
-		$(use_with opengl ogl) \
-		$(use_with X x) \
-		$(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/brlcad-7.16.8.ebuild b/sci-misc/brlcad/brlcad-7.16.8.ebuild
index eac799497d5d..4a3f5bcdab9c 100644
--- a/sci-misc/brlcad/brlcad-7.16.8.ebuild
+++ b/sci-misc/brlcad/brlcad-7.16.8.ebuild
@@ -1,8 +1,8 @@
 # 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.8.ebuild,v 1.1 2010/05/26 20:29:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/brlcad/brlcad-7.16.8.ebuild,v 1.2 2010/06/18 21:08:37 bicatali Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils java-pkg-opt-2
 
 DESCRIPTION="Constructive solid geometry modeling system"
@@ -12,20 +12,21 @@ 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 X"
+IUSE="benchmarks debug doc examples java opengl smp"
 
 RDEPEND="media-libs/libpng
 	sys-libs/zlib
 	>=sci-libs/tnt-3
 	sci-libs/jama
-	dev-tcltk/itcl
-	dev-tcltk/itk
+	=dev-tcltk/itcl-3.4*
+	=dev-tcltk/itk-3.4*
 	dev-tcltk/iwidgets
 	dev-tcltk/tkimg
 	sys-libs/libtermcap-compat
 	media-libs/urt
-	java? ( >=virtual/jre-1.5 )
-	X? ( x11-libs/libXt x11-libs/libXi )"
+	x11-libs/libXt
+	x11-libs/libXi
+	java? ( >=virtual/jre-1.5 )"
 
 DEPEND="${RDEPEND}
 	sys-devel/bison
@@ -33,15 +34,16 @@ DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.5 )
 	doc? ( dev-libs/libxslt )"
 
-BRLCAD_DIR="/usr/${PN}"
+BRLCAD_DIR="${EPREFIX}/usr/${PN}"
 
 src_configure() {
-	myitcl="/usr/$(get_libdir)/itcl3.4" myitk="/usr/$(get_libdir)/itk3.4"
-	export LD_LIBRARY_PATH="${myitcl}:${myitk}:${LD_LIBRARY_PATH}"
+	local myconf="--without-jdk"
+	use java &&	myconf="--with-jdk=$(java-config -O)"
+
 	econf \
 		--disable-strict-build \
 		--prefix="${BRLCAD_DIR}" \
-		--datadir="/usr/share/${PN}" \
+		--datadir="${BRLCAD_DIR}/share" \
 		--mandir="${BRLCAD_DIR}/man" \
 		--disable-almost-everything \
 		--disable-regex-build \
@@ -56,7 +58,9 @@ src_configure() {
 		--disable-tnt-install \
 		--disable-iwidgets-install \
 		--enable-opennurbs-build \
-		--with-ldflags="-L${myitcl} -L${myitk}" \
+		--with-ldflags="-L${EPREFIX}/usr/$(get_libdir)/itcl3.4 -L${EPREFIX}/usr/$(get_libdir)/itk3.4" \
+		--with-x \
+		--with-x11 \
 		$(use_enable debug) \
 		$(use_enable debug optimization) \
 		$(use_enable debug runtime-debug) \
@@ -66,10 +70,8 @@ src_configure() {
 		$(use_enable doc documentation) \
 		$(use_enable examples models-install) \
 		$(use_enable smp parallel) \
-		$(use_with java jdk $(java-config -O)) \
 		$(use_with opengl ogl) \
-		$(use_with X x) \
-		$(use_with X x11)
+		${myconf}
 }
 
 src_test() {
@@ -81,11 +83,10 @@ src_test() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -f "${D}"usr/share/brlcad/${README,NEWS,AUTHORS,HACKING,INSTALL,COPYING}
+	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
+	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/sci-misc/brlcad/files/brlcad-7.16.6-as-needed.patch b/sci-misc/brlcad/files/brlcad-7.16.6-as-needed.patch
deleted file mode 100644
index ae83acddd43b..000000000000
--- a/sci-misc/brlcad/files/brlcad-7.16.6-as-needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/conv/step/Makefile.in.orig	2010-02-02 19:37:34.000000000 +0000
-+++ src/conv/step/Makefile.in	2010-02-02 19:38:15.000000000 +0000
-@@ -894,6 +894,11 @@
- 	VolumeSiUnit.h \
- 	VolumeUnit.h 
- 
-+libstep2g_nil_la_LIBADD = \
-+	${BU} \
-+	${WDB} \
-+	${RT} \
-+	${STEP_LIBS}
- 
- # FIXME: these declarations are required for proper distchecking if
- # the files do not exist before configure is run.
-@@ -903,10 +908,6 @@
- 
- step_g_SOURCES = 
- step_g_LDADD = \
--	${BU} \
--	${WDB} \
--	${RT} \
--	${STEP_LIBS} \
- 	libstep2g_nil.la
- 
- 
diff --git a/sci-misc/brlcad/files/brlcad-7.16.6-stl-headers.patch b/sci-misc/brlcad/files/brlcad-7.16.6-stl-headers.patch
deleted file mode 100644
index 5f45c78b3fe2..000000000000
--- a/sci-misc/brlcad/files/brlcad-7.16.6-stl-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/other/openNURBS/opennurbs_system.h.orig	2010-02-25 06:10:58.000000000 +0000
-+++ src/other/openNURBS/opennurbs_system.h	2010-02-25 06:12:17.000000000 +0000
-@@ -244,6 +244,7 @@
- #define ON_CPLUSPLUS
- #endif
- 
-+#include <cstddef>
- #include <new> // for declaration of placement versions of new used in onClassArray<>.
- 
- #endif