sci-libs/opencascade: Fix for automake-1.12, #422115; fix type in check-reqs_pkg_setup

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 27 insertions, 26 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/Manifest b/sci-libs/opencascade/Manifest
index 4fb6940ba140..d1ff1fc271b0 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -5,23 +5,14 @@ AUX env.sh.template 1485 RMD160 cc835658881384315348fb4f70a65425e934061e SHA1 fe
 AUX opencascade-6.5-fixed-DESTDIR.patch 8023 RMD160 0d235368201a1c4a531bed0876aea7ce268372f5 SHA1 0fbb699f81824a17250606bdfec05f90dcf8b225 SHA256 fac8e3453cf08e9a4d4240921664cb1c3b07105d4165e049aeaf38ba809a1d54
 AUX opencascade-6.5-ftgl.patch 3253 RMD160 90701e8ec2be5433e2303af9c90282e6dc5a5bc2 SHA1 3fc240e0130c5cc2d5579b5080396275258e35e6 SHA256 b9134979f2a1ace891b84bbb2c5c084c519c35419bb2f047e9d7725bb6e42398
 DIST OpenCASCADE650.tar.gz 214819922 RMD160 6532933a71cf54039a734ebc7e8c16be1d358e2e SHA1 7e4b5bda3cf84bf4ec9ecd1e31899c8741fcf6f9 SHA256 fb95d8a542bbfc26af6186495f752a683b40137b34d6afd8f9bb02730c2436c6
-EBUILD opencascade-6.5.ebuild 5294 RMD160 1c13f8e754ff8258bbe943eda0d9ec889de31dfd SHA1 9d6f338be6397a9c752c3f71fe29856787d26941 SHA256 4d26ea8b307424e78060077e33c77ba953851088ed290958109281c340f56918
-MISC ChangeLog 1401 RMD160 821e599d68f986314488b0336dbe14d53b665a3e SHA1 a5888cbcd746867c8beb67e0ca6b8a10e625f611 SHA256 c6b0256813bd2cbf7f12d989e75f77fc8ee680f4611d299a9c3ac07eb6bde683
-MISC metadata.xml 296 RMD160 b167ae389607dcab7bb223652cda5a54c2ef33a2 SHA1 b621204348e5ec584862e39709d6bcf06845e9c7 SHA256 44f3807b360102f9b7e3bb70abdbdce18e5e0ba2d4f2424e8f2e5ef485ae1c14
+EBUILD opencascade-6.5.ebuild 5349 RMD160 6335b6b822e73d0412b8373b8544acd28c5461a7 SHA1 3d13e6a005f6133ff146ad5038c41c0e29ee77c6 SHA256 3859452d4bf67f4e226a679de4ae7d9f926a7734e42191df70f222a6df3ee015
+MISC ChangeLog 1551 RMD160 61b7bed89aafde3d9db3043f30188fb9bf695227 SHA1 9c36e39a6f7031c7e5c6be1794f76b2e8e1eb3b3 SHA256 12413a32aa90ad8c76208d9b0f501b2592afda07ebc41de7c204b3ec9fa4d885
+MISC metadata.xml 305 RMD160 1a586f71082cd74cbcfba88ea892f3ac94e2bcc8 SHA1 27362a97a59f929990f00f4f23b783764c5c1d51 SHA256 b6c4da4d3f9c763cebf4703197fb12bb74dc5222575276a1893b6518e7afb8cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQIcBAEBCgAGBQJPCHMxAAoJEEb+UGWnxTyHmGIQAKLKlM3RDDoxA1FPj9MTXbJ5
-7yE6Y2f6Q4ZaCQPT56AEaMPTtevovixwpD9YGn3qPh7EXssRj4TsbNJHEzQogvLo
-eYbSHQGfPc1/szrJYr9wdZBewPLrzFF4miTwrnEAV05U6P0idBUCOh2Ck14OYdnE
-uDSEybbRrE9cP/2eLZ3dG3rUSW4iP+7Z8itSXPZwNOCoYqR7PjndQjsm9Ob0nrWw
-Ai/S+90NXIV4VndTBDaE3kZ/Ud1yxP37DlVHDzp8zvpJUWiZDMV27Li02SDNUkNt
-Ha57Y4GwfIusskhq5jy2qjK3oxpViwfpR/6r+QBHyN1QeO0QFvu4wKxlAvFx9zwu
-+U/NbtiewYeFjb9C0V4OZQe25Y89eYiATTRtTv/Bsbr1hLgQPh47Q4Yro1cECMtd
-xBv8QhnoJm6KB8yI3br5qBuKH/mdoX3BZbZbermBAdnyJT2svOmAvrhDEiys23zB
-S2IILrJ6psNun914Y28+qblyH3mIPdGWJgV08VUqjLMx9YFw0YBeTFNBp+H+ZiM7
-uarwM6NjVGem1/O0ik+nLA7CCLOQeBj3+jXVW/64sNcC96W9tRk/XdyqhWfqW3au
-kL/chv8Wp/uPl5txowJkasyOXVRdkpNUhAZX7yNf2DVT3K8K1Y4GUCoF7grAMUOv
-L6FXltcJhdtvRwau733U
-=aXBc
+iEYEAREKAAYFAk/kb2QACgkQgAnW8HDreRbBxACfSxMCgVZYG0yWnVlWsh6Y1j2Z
+HuQAn04Y0utbUYhblfsHEVZdYvtcYrjW
+=xDhQ
 -----END PGP SIGNATURE-----
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