xmw         15/07/22 12:48:53

  Modified:             opencascade-6.6.0.ebuild opencascade-6.7.1.ebuild
                        opencascade-6.5.5.ebuild ChangeLog
  Added:                opencascade-6.9.0.ebuild
  Log:
  Version bump and backport mesa fix (bug 533412).
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
62EEF090)

Revision  Changes    Path
1.5                  sci-libs/opencascade/opencascade-6.6.0.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/opencascade-6.6.0.ebuild?rev=1.5&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/opencascade-6.6.0.ebuild?rev=1.5&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/opencascade-6.6.0.ebuild?r1=1.4&r2=1.5

Index: opencascade-6.6.0.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.6.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- opencascade-6.6.0.ebuild    31 Mar 2015 20:17:21 -0000      1.4
+++ opencascade-6.6.0.ebuild    22 Jul 2015 12:48:53 -0000      1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.6.0.ebuild,v 1.4 
2015/03/31 20:17:21 ulm Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.6.0.ebuild,v 1.5 
2015/07/22 12:48:53 xmw Exp $
 
 EAPI=5
 
@@ -49,7 +49,8 @@
        java-pkg-opt-2_src_prepare
 
        epatch \
-               "${FILESDIR}"/${PN}-6.6.0-fixed-DESTDIR.patch \
+               "${FILESDIR}"/${P}-deprecated-glx-api.patch \
+               "${FILESDIR}"/${P}-fixed-DESTDIR.patch \
                "${FILESDIR}"/${PN}-6.5.4-fixed-tbb-VERSION.patch
 
        # Feed environment variables used by Opencascade compilation



1.7                  sci-libs/opencascade/opencascade-6.7.1.ebuild

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

Index: opencascade-6.7.1.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.7.1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- opencascade-6.7.1.ebuild    31 Mar 2015 20:17:21 -0000      1.6
+++ opencascade-6.7.1.ebuild    22 Jul 2015 12:48:53 -0000      1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.7.1.ebuild,v 1.6 
2015/03/31 20:17:21 ulm Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.7.1.ebuild,v 1.7 
2015/07/22 12:48:53 xmw Exp $
 
 EAPI=5
 
@@ -47,7 +47,7 @@
        java-pkg-opt-2_src_prepare
 
        epatch \
-               "${FILESDIR}"/${PN}-6.7.1-deprecated-glx-api.patch \
+               "${FILESDIR}"/${P}-deprecated-glx-api.patch \
                "${FILESDIR}"/${PN}-6.7.0-fixed-DESTDIR.patch \
                "${FILESDIR}"/${PN}-6.5.4-fixed-tbb-VERSION.patch
 



1.7                  sci-libs/opencascade/opencascade-6.5.5.ebuild

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

Index: opencascade-6.5.5.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.5.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- opencascade-6.5.5.ebuild    31 Mar 2015 20:17:21 -0000      1.6
+++ opencascade-6.5.5.ebuild    22 Jul 2015 12:48:53 -0000      1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.5.ebuild,v 1.6 
2015/03/31 20:17:21 ulm Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.5.ebuild,v 1.7 
2015/07/22 12:48:53 xmw Exp $
 
 EAPI=5
 
@@ -49,6 +49,7 @@
        java-pkg-opt-2_src_prepare
 
        epatch \
+               "${FILESDIR}"/${P}-deprecated-glx-api.patch \
                "${FILESDIR}"/${PN}-6.5.4-fixed-DESTDIR.patch \
                "${FILESDIR}"/${PN}-6.5.4-tcl8.6.patch \
                "${FILESDIR}"/${PN}-6.5.4-fixed-tbb-VERSION.patch



1.22                 sci-libs/opencascade/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/ChangeLog?rev=1.22&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/ChangeLog?rev=1.22&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/ChangeLog?r1=1.21&r2=1.22

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog   31 Mar 2015 20:17:21 -0000      1.21
+++ ChangeLog   22 Jul 2015 12:48:53 -0000      1.22
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/opencascade
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.21 
2015/03/31 20:17:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.22 
2015/07/22 12:48:53 xmw Exp $
+
+*opencascade-6.9.0 (22 Jul 2015)
+
+  22 Jul 2015; Michael Weber <[email protected]>
+  +files/opencascade-6.5.5-deprecated-glx-api.patch,
+  +files/opencascade-6.6.0-deprecated-glx-api.patch, +opencascade-6.9.0.ebuild,
+  opencascade-6.5.5.ebuild, opencascade-6.6.0.ebuild, opencascade-6.7.1.ebuild:
+  Version bump and backport mesa fix (bug 533412).
 
   31 Mar 2015; Ulrich Müller <[email protected]> opencascade-6.5.5.ebuild,
   opencascade-6.6.0.ebuild, opencascade-6.7.0.ebuild, opencascade-6.7.1.ebuild,



1.1                  sci-libs/opencascade/opencascade-6.9.0.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/opencascade-6.9.0.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/opencascade-6.9.0.ebuild?rev=1.1&content-type=text/plain

Index: opencascade-6.9.0.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.9.0.ebuild,v 1.1 
2015/07/22 12:48:53 xmw Exp $

EAPI=5

inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic

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-${PV}.tgz";

LICENSE="|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )"
SLOT="${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="debug doc examples freeimage gl2ps java qt4 +tbb"

DEPEND="app-eselect/eselect-opencascade
        dev-lang/tcl:0=
        dev-lang/tk:0=
        dev-tcltk/itcl
        dev-tcltk/itk
        dev-tcltk/tix
        media-libs/ftgl
        virtual/glu
        virtual/opengl
        x11-libs/libXmu
        freeimage? ( media-libs/freeimage )
        gl2ps? ( x11-libs/gl2ps )
        java? ( virtual/jdk:= )
        tbb? ( dev-cpp/tbb )"
RDEPEND="${DEPEND}"

# http://bugs.gentoo.org/show_bug.cgi?id=352435
# 
http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
RESTRICT="bindist mirror"

CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"

pkg_setup() {
        check-reqs_pkg_setup
        java-pkg-opt-2_pkg_setup
}

src_prepare() {
        java-pkg-opt-2_src_prepare

        epatch \
                "${FILESDIR}"/${PN}-6.8.0-fixed-DESTDIR.patch

        # Feed environment variables used by Opencascade compilation
        my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros
        local my_env_install="#!/bin/sh -f
if [ -z \"\$PATH\" ]; then
        export PATH=VAR_CASROOT/Linux/bin
else
        export PATH=VAR_CASROOT/Linux/bin:\$PATH
fi
if [ -z \"\$LD_LIBRARY_PATH\" ]; then
        export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib
else
        export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:\$LD_LIBRARY_PATH
fi"
        local my_sys_lib=${EROOT}usr/$(get_libdir)
        local my_env="CASROOT=VAR_CASROOT
CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
CSF_LANGUAGE=us
MMGT_CLEAR=1
CSF_EXCEPTION_PROMPT=1
CSF_SHMessage=VAR_CASROOT/src/SHMessage
CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures
CSF_XSMessage=VAR_CASROOT/src/XSMessage
CSF_StandardDefaults=VAR_CASROOT/src/StdResource
CSF_PluginDefaults=VAR_CASROOT/src/StdResource
CSF_XCAFDefaults=VAR_CASROOT/src/StdResource
CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource
CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so
CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat
CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource
CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource
CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource
CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt
TCLHOME=${EROOT}usr/bin
TCLLIBPATH=${my_sys_lib}
ITK_LIBRARY=${my_sys_lib}/itk$(grep ITK_VER /usr/include/itk.h | sed 
's/^.*"\(.*\)".*/\1/')
ITCL_LIBRARY=${my_sys_lib}/itcl$(grep ITCL_VER /usr/include/itcl.h | sed 
's/^.*"\(.*\)".*/\1/')
TIX_LIBRARY=${my_sys_lib}/tix$(grep TIX_VER /usr/include/tix.h | sed 
's/^.*"\(.*\)".*/\1/')
TK_LIBRARY=${my_sys_lib}/tk$(grep TK_VER /usr/include/tk.h | sed 
's/^.*"\(.*\)".*/\1/')
TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 
's/^.*"\(.*\)".*/\1/')"

        (       echo "${my_env_install}"
                echo "${my_env}" | sed -e "s:^:export :" ) \
        | sed -e "s:VAR_CASROOT:${S}:g" > env.sh || die
        source env.sh

        (       echo "PATH=${my_install_dir}/lin/bin"
                echo "LDPATH=${my_install_dir}/lin/$(get_libdir)"
                echo "${my_env}" | sed \
                        -e "s:VAR_CASROOT:${my_install_dir}/lin:g" \
                        -e "s:/Linux/lib/:/$(get_libdir)/:g" || die
        ) > 50${PN}

        append-cxxflags "-fpermissive"

        sed -e "/^AM_C_PROTOTYPES$/d" \
                -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
                -e "s:\$qt/include:\$qt/include/qt4:g"\
                -e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\
                -i configure.ac || die
        eautoreconf
}

src_configure() {
        econf \
                --prefix=${my_install_dir}/lin 
--exec-prefix=${my_install_dir}/lin \
                --with-tcl="${EROOT}usr/$(get_libdir)" 
--with-tk="${EROOT}usr/$(get_libdir)" \
                --with-freetype="${EROOT}usr" \
                --with-ftgl="${EROOT}usr" \
                $(usex freeimage "--with-freeimage=${EROOT}usr" "") \
                $(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
                $(usex qt4 "--with-qt=${EROOT}usr" "") \
                $(usex tbb "--with-tbb-include=${EROOT}usr" "") \
                $(usex tbb "--with-tbb-library=${EROOT}usr" "") \
                $(use java && echo "--with-java-include=$(java-config 
-O)/include" || echo "--without-java-include") \
                $(use_enable debug) \
                $(use_enable !debug production)
}

src_install() {
        emake DESTDIR="${D}" install

        prune_libtool_files

        # 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)" "${my_install_dir}/lin/lib"
        fi

        insinto /etc/env.d/${PN}
        newins 50${PN} ${PV}

        if use examples ; then
                insinto /usr/share/doc/${PF}/examples
                doins -r data
                doins -r samples
        fi
        if use doc; then
                insinto /usr/share/doc/${PF}
                doins -r doc/{overview,pdf,refman}
        fi
}

pkg_postinst() {
        eselect ${PN} set ${PV}
        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
}




Reply via email to