aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <seb@cayenne.ist.utl.pt>2010-02-02 21:08:02 +0000
committerSebastien Fabbro <seb@cayenne.ist.utl.pt>2010-02-02 21:08:42 +0000
commit6d231c1b83fda6094cee16853ea12cc63fdad3d1 (patch)
tree9fe1f550762f4a81c3a00c5a31e17696fec53e04
parentVersion bump (diff)
downloadsci-6d231c1b83fda6094cee16853ea12cc63fdad3d1.tar.gz
sci-6d231c1b83fda6094cee16853ea12cc63fdad3d1.tar.bz2
sci-6d231c1b83fda6094cee16853ea12cc63fdad3d1.zip
brlcad version bump
(Portage version: 2.2_rc62/git/Linux x86_64) (Signed Manifest commit)
-rw-r--r--sci-misc/brlcad/ChangeLog12
-rw-r--r--sci-misc/brlcad/Manifest18
-rw-r--r--sci-misc/brlcad/brlcad-7.10.4.ebuild83
-rw-r--r--sci-misc/brlcad/brlcad-7.16.4.ebuild87
-rw-r--r--sci-misc/brlcad/files/brlcad-7.16.4-as-needed.patch25
-rw-r--r--sci-misc/brlcad/files/brlcad-tcltk-man_install.patch49
6 files changed, 135 insertions, 139 deletions
diff --git a/sci-misc/brlcad/ChangeLog b/sci-misc/brlcad/ChangeLog
index 767401dad..831b23328 100644
--- a/sci-misc/brlcad/ChangeLog
+++ b/sci-misc/brlcad/ChangeLog
@@ -1,7 +1,15 @@
-# ChangeLog for sci-libs/plplot
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# ChangeLog for sci-misc/brlcad
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*brlcad-7.16.4 (02 Feb 2010)
+
+ 02 Feb 2010; S├ębastien Fabbro <bicatali@gentoo.org>
+ -brlcad-7.10.4.ebuild, +brlcad-7.16.4.ebuild,
+ +files/brlcad-7.16.4-as-needed.patch,
+ -files/brlcad-tcltk-man_install.patch:
+ Version bump. Rewrote from scratch
+
24 Aug 2008; Tim Cera <timcera@earthlink.net> brlcad-7.10.4.ebuild:
* The BDL (BSD Documentation License) was for content on their wiki. Removed
from software licenses. * Changed the copyright year to 2008.
diff --git a/sci-misc/brlcad/Manifest b/sci-misc/brlcad/Manifest
index 08de1be08..f8a16e177 100644
--- a/sci-misc/brlcad/Manifest
+++ b/sci-misc/brlcad/Manifest
@@ -1,7 +1,15 @@
-AUX brlcad-tcltk-man_install.patch 2560 RMD160 52f5671634926b91457ebb7299dee443c1ae3529 SHA1 5b0494880c1e2e484a39790c60bdb44b239b71e2 SHA256 486216c6ec99544101be44450a4d2443ab379d828e5c5c9842d165e0fbe6482d
-DIST brlcad-7.10.4.tar.bz2 22974894 RMD160 a3e13793f96b41e8fa48107e76b6697393559478 SHA1 e8ac7ae38dae0208ea92f66e84a9779a5fc3c568 SHA256 302c40ae3eb54aab4bdf1018effd5b63c3212b1c580edb4340559c4545ccfded
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX brlcad-7.16.4-as-needed.patch 523 RMD160 6517dca7843970851e09b9e3194e2bdef617859a SHA1 feeff9d7a85dc8279e2b7b26f0faef8da607c079 SHA256 ab12e2495092f72caff79c949b50b3a5a1b0375ed0093a1bece01176ae32b219
DIST brlcad-7.16.4.tar.gz 51167790 RMD160 0616e179ff4f6f9a8cfc1f132423f1941b4ca27d SHA1 27cb2defd343e08199ebca77302ca2f3b2a8dd70 SHA256 3c1dbbb264dbbcabe0aa080f566c62748d7bcc44b667172bcbbef20dd1f90f54
-EBUILD brlcad-7.10.4.ebuild 2163 RMD160 d2ca67c0a0754f03cd4a7d87a53d82b9b34b79c1 SHA1 24869b00ae1855967bbadaf4ad70336d22290b95 SHA256 37777dfdbead7ca976732936925202ff48b95727e2b73ce3adff3b903b9deb34
-EBUILD brlcad-7.16.4.ebuild 2122 RMD160 d45a01be1508594ae6786826e1f26ccb9729fe01 SHA1 24cc7c22c35daeef639d7e113bfbd8676f7715c3 SHA256 6b3438e7e8c46935dd44c91b1be322555eb81205bcd2782397bd94159c92fcd7
-MISC ChangeLog 917 RMD160 8d603301d08540e1dc24d06e85ee320fc72f826a SHA1 397005aab5a7dcb12cc01df0417a848db2317ee2 SHA256 ad7d81e21439aec63a8385e06d54f7c568926e81b936ffd268a5c78a0d7be446
+EBUILD brlcad-7.16.4.ebuild 2253 RMD160 2a0247b9bc21859b341737e758d74e714c0d232d SHA1 cdf1a2617ffa311c9ac452324469d8b63c2e100e SHA256 5b47637782c2e8dadec75a5b7240d41aadc29ddd2093c76c859eb61510b46a80
+MISC ChangeLog 1169 RMD160 59f209136706d3adb4dc265d5070d3f213fa4ec1 SHA1 65f280fd78efa3a9a1cdca0ad0f2e81ff78f288d SHA256 725aa8db93847a0a24479d943aee7cc1c1aa35bbf7bc7d2485ddb77ef7aadc31
MISC metadata.xml 993 RMD160 2d5c3e246d2a1ce29f86d2de3e7e1ee1edfc6439 SHA1 a1388baccc66f393c78915d72f2a96a4bcb92156 SHA256 b3dd606feb759dba2840423c656bb78dfd324dd2e95f1def30a8340c090b8c19
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktolDIACgkQ1ycZbhPLE2A1mQCdG3vLuylJjC9Al95KVItFlViV
+jbAAn3btcEETANca8LFwQgfzsMGsJ2V4
+=z88g
+-----END PGP SIGNATURE-----
diff --git a/sci-misc/brlcad/brlcad-7.10.4.ebuild b/sci-misc/brlcad/brlcad-7.10.4.ebuild
deleted file mode 100644
index 39892a87b..000000000
--- a/sci-misc/brlcad/brlcad-7.10.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils multilib
-
-DESCRIPTION="Constructive Solid Geometry (CSG) solid modeling system"
-HOMEPAGE="http://brlcad.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2 BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug examples"
-
-DEPEND="media-libs/libpng
- media-libs/urt
- >=sci-libs/tnt-3
- sci-libs/jama"
-# >=dev-lang/tcl-8.5
-# >=dev-lang/tk-8.5
-# dev-tcltk/blt
-# dev-tcltk/tkimg"
-
-BRLCAD_DIR=/usr/${PN}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/brlcad-tcltk-man_install.patch
-}
-
-src_compile() {
- # add these two when tcl/tk >=8.5 and others are workable alternative
- # together with adding them in DEPEND
- # --disable-itcl-build \
- # --disable-iwidgets-install \
- # --disable-tcl-build \
- # --disable-tk-build \
- # --disable-tkimg-build \
- # --disable-blt-build \
-
- # use configure and not econf to put all stuff in $INSTALLDIR
- ./configure \
- --prefix=${BRLCAD_DIR} \
- --disable-regex-build \
- --disable-termlib-build \
- --disable-png-build \
- --disable-zlib-build \
- --disable-urt-build \
- --disable-jove-build \
- --disable-adrt-build \
- --disable-tnt-build \
- $(use_enable examples models) \
- $(use_enable debug) \
- $(use_enable debug runtime-debug) \
- $(use_enable debug verbose) \
- $(use_enable debug warnings) \
- $(use_enable debug progress) \
- || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- cat <<-EOF > 99brlcad
- PATH=${BRLCAD_DIR}/bin
- LDPATH=${BRLCAD_DIR}/lib
- MANPATH=${BRLCAD_DIR}/man
- INFOPATH=${BRLCAD_DIR}/info
- EOF
- doenvd 99brlcad || die "doenvd failed"
- dodoc README NEWS TODO AUTHORS HACKING ChangeLog || die "dodoc failed"
-}
-
-pkg_postinst() {
- einfo "The standard starting point for BRL-CAD is the mged"
- einfo "command. Examples are available in ${BRLCAD_DIR}/db."
- einfo "To run an example, try:"
- einfo "${BRLCAD_DIR}/bin/mged ${BRLCAD_DIR}/db/havoc.g"
- einfo "In the mged terminal window, type 'draw havoc' to see"
- einfo "the wireframe in the visualization window."
-}
diff --git a/sci-misc/brlcad/brlcad-7.16.4.ebuild b/sci-misc/brlcad/brlcad-7.16.4.ebuild
new file mode 100644
index 000000000..2b28a97f5
--- /dev/null
+++ b/sci-misc/brlcad/brlcad-7.16.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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="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
+}
+
+src_configure() {
+ local myitcl="/usr/$(get_libdir)/itcl3.4"
+ local myitk="/usr/$(get_libdir)/itk3.4"
+ econf \
+ --prefix="${BRLCAD_DIR}" \
+ --datadir="/usr/share/${PN}" \
+ --mandir="/usr/share/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 strict-build) \
+ $(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) \
+ LD_LIBRARY_PATH="${myitcl}:${myitk}:${LD_LIBRARY_PATH}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ echo "PATH=${BRLCAD_DIR}/bin" > 99brlcad
+ echo "MANPATH=${BRLCAD_DIR}/man" >> 99brlcad
+ doenvd 99brlcad || die
+}
diff --git a/sci-misc/brlcad/files/brlcad-7.16.4-as-needed.patch b/sci-misc/brlcad/files/brlcad-7.16.4-as-needed.patch
new file mode 100644
index 000000000..ae83acddd
--- /dev/null
+++ b/sci-misc/brlcad/files/brlcad-7.16.4-as-needed.patch
@@ -0,0 +1,25 @@
+--- 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-tcltk-man_install.patch b/sci-misc/brlcad/files/brlcad-tcltk-man_install.patch
deleted file mode 100644
index 7a61d103c..000000000
--- a/sci-misc/brlcad/files/brlcad-tcltk-man_install.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur brlcad-7.10.2.orig/src/other/tcl/unix/Makefile.in brlcad-7.10.2/src/other/tcl/unix/Makefile.in
---- brlcad-7.10.2.orig/src/other/tcl/unix/Makefile.in 2007-09-16 21:03:57.000000000 -0400
-+++ brlcad-7.10.2/src/other/tcl/unix/Makefile.in 2007-09-16 21:06:36.000000000 -0400
-@@ -839,17 +839,17 @@
- done;
- @echo "Installing and cross-linking top-level (.1) docs";
- @for i in $(TOP_DIR)/doc/*.1; do \
-- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
-+ [ ! -e $(TOP_DIR)/doc/$$i ] || $(UNIX_DIR)/installManPage $(MAN_FLAGS) $(TOP_DIR)/doc/$$i $(MAN1_INSTALL_DIR); \
- done
-
- @echo "Installing and cross-linking C API (.3) docs";
- @for i in $(TOP_DIR)/doc/*.3; do \
-- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
-+ [ ! -e $(TOP_DIR)/doc/$$i ] || $(UNIX_DIR)/installManPage $(MAN_FLAGS) $(TOP_DIR)/doc/$$i $(MAN3_INSTALL_DIR); \
- done
-
- @echo "Installing and cross-linking command (.n) docs";
- @for i in $(TOP_DIR)/doc/*.n; do \
-- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
-+ [ ! -e $(TOP_DIR)/doc/$$i ] || $(UNIX_DIR)/installManPage $(MAN_FLAGS) $(TOP_DIR)/doc/$$i $(MANN_INSTALL_DIR); \
- done
-
- # Optional target to install private headers
-diff -ur brlcad-7.10.2.orig/src/other/tk/unix/Makefile.in brlcad-7.10.2/src/other/tk/unix/Makefile.in
---- brlcad-7.10.2.orig/src/other/tk/unix/Makefile.in 2007-09-16 21:03:59.000000000 -0400
-+++ brlcad-7.10.2/src/other/tk/unix/Makefile.in 2007-09-16 21:08:06.000000000 -0400
-@@ -824,18 +824,18 @@
- done;
- @echo "Installing and cross-linking top-level (.1) docs";
- @for i in $(TOP_DIR)/doc/*.1; do \
-- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
-+ [ ! -e $(TOP_DIR)/doc/$$i ] || $(UNIX_DIR)/installManPage $(MAN_FLAGS) $(TOP_DIR)/doc/$$i $(MAN1_INSTALL_DIR); \
- done
-
- @echo "Installing and cross-linking C API (.3) docs";
- @for i in $(TOP_DIR)/doc/*.3; do \
-- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
-+ [ ! -e $(TOP_DIR)/doc/$$i ] || $(UNIX_DIR)/installManPage $(MAN_FLAGS) $(TOP_DIR)/doc/$$i $(MAN3_INSTALL_DIR); \
- done
-
- @echo "Installing and cross-linking command (.n) docs";
- @for i in $(TOP_DIR)/doc/*.n; do \
- if [ "ttk_dialog.n" = `basename $$i` ] ; then continue ; fi ; \
-- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
-+ [ ! -e $(TOP_DIR)/doc/$$i ] || $(UNIX_DIR)/installManPage $(MAN_FLAGS) $(TOP_DIR)/doc/$$i $(MANN_INSTALL_DIR); \
- done
-
- # Optional target to install private headers