summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-06-22 13:13:02 +0000
committerJustin Lecher <jlec@gentoo.org>2012-06-22 13:13:02 +0000
commit2bb6aaf91585c94a3b7003e2bada6d3e3af587c9 (patch)
tree0cb06100af05f5884393848381b6860c996b363a /sci-libs/opencascade
parentAdd support for x32, bug #421817 (diff)
downloadgentoo-2-2bb6aaf91585c94a3b7003e2bada6d3e3af587c9.tar.gz
gentoo-2-2bb6aaf91585c94a3b7003e2bada6d3e3af587c9.tar.bz2
gentoo-2-2bb6aaf91585c94a3b7003e2bada6d3e3af587c9.zip
sci-libs/opencascade: Fix for automake-1.12, #422115; fix type in check-reqs_pkg_setup
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/opencascade')
-rw-r--r--sci-libs/opencascade/ChangeLog6
-rw-r--r--sci-libs/opencascade/metadata.xml12
-rw-r--r--sci-libs/opencascade/opencascade-6.5.ebuild10
3 files changed, 19 insertions, 9 deletions
diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index af75ead377c9..fdab1ca06990 100644
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -1,6 +1,10 @@
# 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.5 2012/01/07 16:30:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.6 2012/06/22 13:13:02 jlec Exp $
+
+ 22 Jun 2012; Justin Lecher <jlec@gentoo.org> 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 <dilfridge@gentoo.org>
-opencascade-6.3-r3.ebuild, -files/opencascade-6.3-fixed-DESTDIR.patch,
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index 5c77ec0fce9a..82a5d2eb0b34 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
- <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
-</use>
+ <herd>sci</herd>
+ <maintainer>
+ <email>dilfridge@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
+ </use>
</pkgmetadata>
diff --git a/sci-libs/opencascade/opencascade-6.5.ebuild b/sci-libs/opencascade/opencascade-6.5.ebuild
index 134451ad4057..198bd5c357d9 100644
--- a/sci-libs/opencascade/opencascade-6.5.ebuild
+++ b/sci-libs/opencascade/opencascade-6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1 2011/11/13 20:42:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.ebuild,v 1.2 2012/06/22 13:13:02 jlec Exp $
EAPI=4
@@ -38,7 +38,7 @@ CHECKREQS_MEMORY="256M"
CHECKREQS_DISK_BUILD="3584M"
pkg_setup() {
- check_reqs_pkg_setup
+ check-reqs_pkg_setup
java-pkg-opt-2_pkg_setup
# Determine itk, itcl, tix, tk and tcl versions
@@ -58,6 +58,10 @@ pkg_setup() {
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