[gentoo-commits] gentoo-x86 commit in sci-misc/brlcad: brlcad-7.16.8.ebuild ChangeLog brlcad-7.16.6-r1.ebuild

[gentoo-commits] gentoo-x86 commit in sci-misc/brlcad: brlcad-7.16.8.ebuild ChangeLog brlcad-7.16.6-r1.ebuild

[Sebastien Fabbro (bicatali)]

bicatali    10/06/18 21:08:38

  Modified:             brlcad-7.16.8.ebuild ChangeLog
  Removed:              brlcad-7.16.6-r1.ebuild
  Log:
  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)

Revision  Changes    Path
1.2                  sci-misc/brlcad/brlcad-7.16.8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/brlcad/brlcad-7.16.8.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/brlcad/brlcad-7.16.8.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/brlcad/brlcad-7.16.8.ebuild?r1=1.1&r2=1.2

Index: brlcad-7.16.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-misc/brlcad/brlcad-7.16.8.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- brlcad-7.16.8.ebuild	26 May 2010 20:29:15 -0000	1.1
+++ brlcad-7.16.8.ebuild	18 Jun 2010 21:08:37 -0000	1.2
@@ -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 @@
 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 @@
 	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 @@
 		--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 @@
 		$(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_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"



1.7                  sci-misc/brlcad/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/brlcad/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/brlcad/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/brlcad/ChangeLog?r1=1.6&r2=1.7

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-misc/brlcad/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog	26 May 2010 20:29:15 -0000	1.6
+++ ChangeLog	18 Jun 2010 21:08:37 -0000	1.7
@@ -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)