From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 848AC138247 for ; Tue, 3 Dec 2013 14:53:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14899E0B94; Tue, 3 Dec 2013 14:53:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52734E0BDE for ; Tue, 3 Dec 2013 14:53:05 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BD8C33F444 for ; Tue, 3 Dec 2013 14:53:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 38EB1E5535 for ; Tue, 3 Dec 2013 14:53:02 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1386060479.d98ae7d25685d9ac5a7e2187e637875a3478c2fa.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/opencascade/files/, sci-libs/opencascade/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/opencascade/ChangeLog sci-libs/opencascade/files/env.sh.template sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch sci-libs/opencascade/metadata.xml sci-libs/opencascade/opencascade-6.5.4.ebuild X-VCS-Directories: sci-libs/opencascade/files/ sci-libs/opencascade/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: d98ae7d25685d9ac5a7e2187e637875a3478c2fa X-VCS-Branch: master Date: Tue, 3 Dec 2013 14:53:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 474d8ae4-c9cd-498b-b32b-c9d2ae5e2191 X-Archives-Hash: b359fb765a22c502382edf5ff40a2b77 commit: d98ae7d25685d9ac5a7e2187e637875a3478c2fa Author: Justin Lecher gentoo org> AuthorDate: Tue Dec 3 08:47:59 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Dec 3 08:47:59 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d98ae7d2 Newer version in tree Signed-off-by: Justin Lecher gentoo.org> --- sci-libs/opencascade/ChangeLog | 43 ----- sci-libs/opencascade/files/env.sh.template | 40 ----- .../files/opencascade-6.5.4-fixed-DESTDIR.patch | 47 ------ sci-libs/opencascade/metadata.xml | 10 -- sci-libs/opencascade/opencascade-6.5.4.ebuild | 184 --------------------- 5 files changed, 324 deletions(-) diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog deleted file mode 100644 index bf0a048..0000000 --- a/sci-libs/opencascade/ChangeLog +++ /dev/null @@ -1,43 +0,0 @@ -# ChangeLog for sci-libs/opencascade -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.8 2012/09/16 10:18:52 pacho Exp $ - - 16 Sep 2012; Pacho Ramos opencascade-6.5.ebuild: - Add missing virtual/glu dependency, bug #434438 by Andreas Sturmlechner. - - 24 Aug 2012; Andreas K. Huettel metadata.xml: - Drop maintainership - - 22 Jun 2012; Justin Lecher opencascade-6.5.ebuild, - metadata.xml: - Fix for automake-1.12, #422115; fix type in check-reqs_pkg_setup - - 07 Jan 2012; Andreas K. Huettel - -opencascade-6.3-r3.ebuild, -files/opencascade-6.3-fixed-DESTDIR.patch, - -files/opencascade-6.3-missing-mode.patch, - -files/opencascade-6.3-underlinking.patch, -files/env.ksh.template: - Remove old - -*opencascade-6.5 (13 Nov 2011) - - 13 Nov 2011; Andreas K. Huettel - +opencascade-6.5.ebuild, +files/opencascade-6.5-fixed-DESTDIR.patch, - +files/opencascade-6.5-ftgl.patch, +files/env.sh.template: - Version bump, thanks to Oliver Borm - - 21 Aug 2011; Andreas K. Huettel - opencascade-6.3-r3.ebuild, +files/opencascade-6.3-underlinking.patch: - Fix underlinking, bug 371883 - - 07 Mar 2011; Andreas K. Huettel - opencascade-6.3-r3.ebuild: - Go back to EAPI=3 on user request - -*opencascade-6.3-r3 (03 Mar 2011) - - 03 Mar 2011; Andreas K. Huettel - +opencascade-6.3-r3.ebuild, +files/opencascade-6.3-fixed-DESTDIR.patch, - +files/opencascade-6.3-missing-mode.patch, +files/env.ksh.template, - +metadata.xml: - New library, bug 118656. Imported with cleanups from the sci overlay. - Thanks to all contributors from the bugzilla report. diff --git a/sci-libs/opencascade/files/env.sh.template b/sci-libs/opencascade/files/env.sh.template deleted file mode 100644 index 146c86b..0000000 --- a/sci-libs/opencascade/files/env.sh.template +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -f - -export CASROOT=VAR_CASROOT - -if [ -z "PATH" ]; -then PATH=VAR_CASROOT/Linux/bin; -else PATH=VAR_CASROOT/Linux/bin:$PATH; -fi -export PATH -if [ -z "LD_LIBRARY_PATH" ]; -then LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib; -else LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:$LD_LIBRARY_PATH; -fi -export LD_LIBRARY_PATH -export CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT -export CSF_LANGUAGE=us -export MMGT_CLEAR=1 -export CSF_EXCEPTION_PROMPT=1 -export CSF_SHMessage=VAR_CASROOT/src/SHMessage -export CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures -export CSF_XSMessage=VAR_CASROOT/src/XSMessage -export CSF_StandardDefaults=VAR_CASROOT/src/StdResource -export CSF_PluginDefaults=VAR_CASROOT/src/StdResource -export CSF_XCAFDefaults=VAR_CASROOT/src/StdResource -export CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource -export CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so -export CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat -export CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat -export CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource -export CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource -export CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource -export CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt - -export TCLHOME=VAR_SYS_BIN -export TCLLIBPATH=VAR_SYS_LIB -export ITK_LIBRARY=VAR_SYS_LIB/VAR_ITK -export ITCL_LIBRARY=VAR_SYS_LIB/VAR_ITCL -export TIX_LIBRARY=VAR_SYS_LIB/VAR_TIX -export TK_LIBRARY=VAR_SYS_LIB/VAR_TK -export TCL_LIBRARY=VAR_SYS_LIB/VAR_TCL diff --git a/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch deleted file mode 100644 index 16b7909..0000000 --- a/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- ros/Makefile.am.old 2012-11-14 16:41:30.421527346 +0100 -+++ ros/Makefile.am 2012-11-14 16:42:01.977540655 +0100 -@@ -82,27 +82,27 @@ - cd $(top_builddir)/adm/make && $(MAKE) $(AM_MAKEFLAGS) Draw - - install-exec-local: -- $(INSTALL) -d $(prefix)/$(platform) -- if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \ -- cd $(prefix)/$(platform) && ln -s ../bin bin; \ -+ $(INSTALL) -d $(DESTDIR)$(prefix)/$(platform) -+ if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(platform)/bin ]; then \ -+ cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../bin bin; \ - fi -- if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \ -- cd $(prefix)/$(platform) && ln -s ../lib lib; \ -+ if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(platform)/lib ]; then \ -+ cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../lib lib; \ - fi -- buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(prefix); installd=`pwd`; cd $$buildd; \ -+ buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(DESTDIR)$(prefix); installd=`pwd`; cd $$buildd; \ - if [ "$$installd" != "$$sourced" ]; then \ -- $(INSTALL) -d $(prefix)/inc; \ -- cp -frL $(top_srcdir)/inc $(prefix); \ -- cp -frL $$buildd/config.h $(prefix); \ -+ $(INSTALL) -d $(DESTDIR)$(prefix)/inc; \ -+ cp -frL $(top_srcdir)/inc $(DESTDIR)$(prefix); \ -+ cp -frL $$buildd/config.h $(DESTDIR)$(prefix); \ - for d in $(FoundationClasses_DIRS) $(ModelingData_DIRS) $(ModelingAlgorithms_DIRS) $(Visualization_DIRS) $(ApplicationFramework_DIRS) $(DataExchange_DIRS) $(Draw_DIRS); do \ -- $(INSTALL) -d $(prefix)/src/$$d; \ -- cp -frL $(top_srcdir)/src/$$d $(prefix)/src; \ -+ $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \ -+ cp -frL $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \ - done; \ - fi -- if [ -e $(prefix)/inc/config.h ]; then \ -- unlink $(prefix)/inc/config.h; \ -+ if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \ -+ unlink $(DESTDIR)$(prefix)/inc/config.h; \ - fi -- cd $(prefix)/inc && ln -s ../config.h config.h -- cd $(top_srcdir) && cp *.sh $(prefix) -+ cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h -+ cd $(top_srcdir) && cp *.sh $(DESTDIR)$(prefix) - --.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw -\ No newline at end of file -+.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml deleted file mode 100644 index 8e8fd49..0000000 --- a/sci-libs/opencascade/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - maintainer-needed@gentoo.org - - - Use gl2ps PostScript printing library - - diff --git a/sci-libs/opencascade/opencascade-6.5.4.ebuild b/sci-libs/opencascade/opencascade-6.5.4.ebuild deleted file mode 100644 index 711e3b4..0000000 --- a/sci-libs/opencascade/opencascade-6.5.4.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.ebuild,v 1.3 2012/09/16 10:18:52 pacho Exp $ - -EAPI=4 -inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic versionator - -MY_PV=$(delete_all_version_separators) - -DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange" -HOMEPAGE="http://www.opencascade.org/" -SRC_URI="http://files.opencascade.com/OCCT/OCC_${PV}_release/OpenCASCADE${MY_PV}.tar.gz" - -LICENSE="Open-CASCADE-Technology-Public-License-6.5" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc examples gl2ps java" - -DEPEND=" - media-libs/ftgl - virtual/glu - virtual/opengl - x11-libs/libXmu - >=dev-lang/tcl-8.4 - >=dev-lang/tk-8.4 - >=dev-tcltk/itcl-3.2 - >=dev-tcltk/itk-3.2 - >=dev-tcltk/tix-8.4.2 - gl2ps? ( x11-libs/gl2ps ) -" -RDEPEND=${DEPEND} - -S=${WORKDIR}/ros - -RESTRICT="bindist mirror" -# http://bugs.gentoo.org/show_bug.cgi?id=352435 -# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt - -CHECKREQS_MEMORY="256M" -CHECKREQS_DISK_BUILD="3584M" - -pkg_setup() { - check-reqs_pkg_setup - java-pkg-opt-2_pkg_setup - - # Determine itk, itcl, tix, tk and tcl versions - itk_version=$(grep ITK_VER /usr/include/itk.h | sed 's/^.*"\(.*\)".*/\1/') - itcl_version=$(grep ITCL_VER /usr/include/itcl.h | sed 's/^.*"\(.*\)".*/\1/') - tix_version=$(grep TIX_VER /usr/include/tix.h | sed 's/^.*"\(.*\)".*/\1/') - tk_version=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/') - tcl_version=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/') - - INSTALL_DIR=/usr/$(get_libdir)/${P}/ros - - ewarn " Please note that building OpenCascade takes a lot of time and " - ewarn " hardware ressources: 3.5-4 GB free diskspace and 256 MB RAM are " - ewarn " the minimum requirements. " -} - -src_prepare() { - java-pkg-opt-2_src_prepare - - sed \ - -e '/AM_C_PROTOTYPES/d' \ - -i configure.* || die - - # Substitute with our ready-made env.sh script - cp -f "${FILESDIR}"/env.sh.template env.sh || die - - # Feed environment variables used by Opencascade compilation - sed -i \ - -e "s:VAR_CASROOT:${S}:g" \ - -e 's:VAR_SYS_BIN:/usr/bin:g' \ - -e "s:VAR_SYS_LIB:/usr/$(get_libdir):g" env.sh \ - || die "Environment variables feed in env.sh failed!" - - # Tweak itk, itcl, tix, tk and tcl versions - sed -i \ - -e "s:VAR_ITK:itk${itk_version}:g" \ - -e "s:VAR_ITCL:itcl${itcl_version}:g" \ - -e "s:VAR_TIX:tix${tix_version}:g" \ - -e "s:VAR_TK:tk${tk_version}:g" \ - -e "s:VAR_TCL:tcl${tcl_version}:g" env.sh \ - || die "itk, itcl, tix, tk and tcl version tweaking failed!" - - epatch "${FILESDIR}"/${PN}-${MY_PV}-fixed-DESTDIR.patch - - source env.sh - - append-cxxflags "-fpermissive" - - eautoreconf -} - -src_configure() { - # Add the configure options - local confargs="--prefix=${INSTALL_DIR}/lin --exec-prefix=${INSTALL_DIR}/lin --with-tcl=/usr/$(get_libdir) --with-tk=/usr/$(get_libdir)" - - confargs+=" --with-freetype=/usr" - confargs+=" --with-ftgl=/usr" - - use gl2ps && confargs+=" --with-gl2ps=/usr" - - if use java ; then - confargs+=" --with-java-include=$(java-config -O)/include" - else - confargs+=" --without-java-include" - fi - - econf ${confargs} \ - $(use_enable debug ) $(use_enable !debug production ) \ - || die "Configuration failed" -} - -src_install() { - emake DESTDIR="${D}" install - - # .la files kill cute little kittens - find "${D}" -name '*.la' -exec rm {} + - - # Symlinks for keeping original OpenCascade folder structure and - # add a link lib to $(get_libdir) if we are e.g. on amd64 multilib - if [ "$(get_libdir)" != "lib" ]; then - dosym "$(get_libdir)" "${INSTALL_DIR}/lin/lib" - fi - - # Tweak the environment variables script again with new destination - cp "${FILESDIR}"/env.sh.template env.sh - sed -i "s:VAR_CASROOT:${INSTALL_DIR}/lin:g" env.sh || die - - # Build the env.d environment variables - cp "${FILESDIR}"/env.sh.template 50${PN} || die - sed -i \ - -e 's:export ::g' \ - -e "s:VAR_CASROOT:${INSTALL_DIR}/lin:g" \ - -e '1,2d' \ - -e '4,14d' \ - -e "s:/Linux/lib/:/$(get_libdir)/:g" ./50${PN} \ - || die "Creation of the /etc/env.d/50opencascade failed!" - - sed -i "2i\PATH=${INSTALL_DIR}/lin/bin\nLDPATH=${INSTALL_DIR}/lin/$(get_libdir)" ./50${PN} \ - || die "Creation of the /etc/env.d/50opencascade failed!" - - # Update both env.d and script with the libraries variables - sed -i \ - -e 's:VAR_SYS_BIN:/usr/bin:g' \ - -e "s:VAR_SYS_LIB:/usr/$(get_libdir):g" \ - -e "s:VAR_ITK:itk${itk_version}:g" \ - -e "s:VAR_ITCL:itcl${itcl_version}:g" \ - -e "s:VAR_TIX:tix${tix_version}:g" \ - -e "s:VAR_TK:tk${tk_version}:g" \ - -e "s:VAR_TCL:tcl${tcl_version}:g" env.sh 50${PN} \ - || die "Tweaking of the Tcl/Tk libraries location in env.sh and 50opencascade failed!" - - # Install the env.d variables file - doenvd 50${PN} - - cd "${S}"/../ || die - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r data - - insinto /usr/share/doc/${PF}/examples - doins -r samples - fi - - cd "${S}"/../doc || die - dodoc *.pdf - - # Install the documentation - if use doc; then - insinto /usr/share/doc/${PF} - doins -r {overview,ReferenceDocumentation} - fi -} - -pkg_postinst() { - einfo - elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it." - elog "You get a list by running \"equery depends sci-libs/opencascade\"" - elog "revdep-rebuild does NOT suffice." - einfo -}