java dependency, automake 1.13 fix

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

6 files changed, 36 insertions, 24 deletions

diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index 8a5d2c14f357..522797caaf34 100644
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/opencascade
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.11 2013/04/27 08:25:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.12 2013/04/27 18:15:48 xmw Exp $
+
+  27 Apr 2013; Michael Weber <xmw@gentoo.org> opencascade-6.5.0.ebuild,
+  opencascade-6.5.4.ebuild, opencascade-6.5.5.ebuild, opencascade-6.5.ebuild:
+  java dependency, automake 1.13 fix
 
 *opencascade-6.5.5 (27 Apr 2013)
 
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index 0e8a8b7185ce..a0aa8a2fbbdc 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -11,16 +11,16 @@ AUX opencascade-6.5.4-tcl8.6.patch 1392 SHA256 92294c760fd127892929640c295c227f1
 DIST OpenCASCADE650.tar.gz 214819922 SHA256 fb95d8a542bbfc26af6186495f752a683b40137b34d6afd8f9bb02730c2436c6 SHA512 ea2c3703e3338584d84fb8e06664e79f5f113a117e94a4eefcf39bac3bcc28d81ace2340c83399ecbe5774c348faa3713e90623f8329562e10700ad7e2048be7 WHIRLPOOL 78e092b9ea892d7686578696bcba67f649b65b8d520f358cf2aac9a2c49baf75ff3717899865d7f752a5577b123f8d0eadce06173e5b1bad3dcf0c31052b09d6
 DIST OpenCASCADE654.tar.gz 162714803 SHA256 bece01fe89046ceb7c6203f866a6bf6e81b9449133c13c6263c4530e584520b6 SHA512 e7bb221f6ca657dc2588fa98334576c90ef84436fdc6df20f11b2f8d39cbd9faf9a16443242268e841c1236e383bd60c291fba86f884af18aca882ae9aca100c WHIRLPOOL a0c616c3b878bcc1a33543bbe21e2c1bb7b557b76321a2f4f7f8797a3f0c11a836068e8f7a678934adcfb7ac2ee6a7ef2f077b0b834bab554cf60e71c4b6dd02
 DIST OpenCASCADE655.tgz 146901035 SHA256 f5c6ab58aeb5c514428ae1b802e2820ca9267d19eecd64776f06baa60098d1b6 SHA512 848057a8a9fd41f1d13c4634c5e3366d37f3b4c81b7b194be9d4e48f5608f0bdfbc8cedd2a466e1724649a04ee87bfd0d1a445be47d832cc12fba5647689ceb2 WHIRLPOOL 18413460491c8a2fd10e97c22dd4b9b4772d97f19d27f59f33faa6618a1aac348877abc3ab9526878b38aba22328986a5c656ac91930cad460d33e93653bb463
-EBUILD opencascade-6.5.0.ebuild 5261 SHA256 c83a9d22a2326db66884dc35d73ad066be16ccf7f156496536ea4cbbed08e9ab SHA512 b36c7620a5d6f15560589806e86e1e01b59b1093b7e640490a9bc3170328618800d5d5ea9271f71d17c726d47c7565cbc1e575bc471d4e5c1d3c1aaae32b387d WHIRLPOOL 0bb4818cf3e1ebfeaeb5329b6a566ece8eb714c7ff0bb2f82f62ccd6a79c3289b896033d42631316784ca88bf50ff38da1c762392b5e26b7ad2a3bdb15870888
-EBUILD opencascade-6.5.4.ebuild 5336 SHA256 ab55992959aff16342e3843875313491a63a3a47323bbc7ba8ef2af97ec4b999 SHA512 7a4b3ddd005c80311afdb6198a57f5652e87b7669cf344317683f9cb1e39287877b88ace6e5cf55aec06f107b964de4a86e3293d084e8805d8fdd975aab5707b WHIRLPOOL 5a437973547d43b99cf6d0fa3de1f12982657e61f73c896a9590e7abd825afb3c114f548f0e2456b2facf5658e9f233d70dffcac605afeaf559db5c53acd66f2
-EBUILD opencascade-6.5.5.ebuild 5356 SHA256 6541cd0d9157be764cf3176e997f3234d5e7db4811b48ec87324db731784779d SHA512 0a9f2b0df8ab17d6b3f90afb905bc7e17bee12f132bce19f3cb1f3b577b164914f024ed1b64949eef074f6cfdb91666d474e8436b11aa5c0a0e5cdeaea7a598b WHIRLPOOL 1ce8f61d3f0035390404453b999f724c6dc997b377124e32271d4c752f0a4e63a695800d7c3c65eeaf9c70e8e1f164699f25bcde38542c099d16b02d55aab092
-EBUILD opencascade-6.5.ebuild 5397 SHA256 fef97efeefa8813817948e058d248e9735010622d5756def3a70b7c158dedcd8 SHA512 6bb6baffab965095602528d91c858268cbca71d1c29684530e4e13275078f53c4d93c90770b1a3eb9095de0bb53d96bb09416f46c6e836cf6eb5d0d78ac3b659 WHIRLPOOL 8b02621724e84978d6b58e0f041eff7fcd6b0b6a2b009a5cfbecd9706b7cc6680ed28aba9cf40c221c1cf9612f339fde11b586f5e1e91812c86aa9608f024753
-MISC ChangeLog 2664 SHA256 624b802ef3072679971490ec9f99f926430979207f814e37125e9f4efab49394 SHA512 2f642252bc4f8e88ce367a4c8c4aff17782d55954a438f5d245d4bd91d465d45d1344634f774737a78313438860eb48014167e8a36a223b239b5f6f32b288f82 WHIRLPOOL 68f507ee22f2ea62e6e9e3521bd44b4a20b9f0fe96641bd50eebe5d19fe81167d2ecb57ddbd6dcaf91ad64e8e1e7d888b65e11608d2d70e3d817ca8ae1158bb0
+EBUILD opencascade-6.5.0.ebuild 5335 SHA256 d74dfa3591083d50e5a9fd21ba6cbea54fa9cceb7a5e2e63ccb8441097040865 SHA512 dd7eb391ed59bc0e34d3b344abf9090b49392b70d9c5855a86117c06a586955b38dab0456b728dd590697cc11e1ac54a6737dfdb420606e972229aec4c99e81e WHIRLPOOL 32c62103422a3b3af3d6a24982f5be1ed43fe07d849ea8d0e694b58bfd6e6c800c27dd610244256806a737f53915264d4161e86b152cf37dcc92591caab03cf6
+EBUILD opencascade-6.5.4.ebuild 5412 SHA256 c394aa742b39380c009f316b02a2beda0c47bce33ca54af834798e66c44ddba0 SHA512 a61257f9071ddc596ed0372e3be557b124144a5196150cbb6ce3c967c29786c73080263d9c1d0eabda6421e70c6e999df3d55a9277310b7db36b8ab561662410 WHIRLPOOL 37ede1b2897f3f6c33c99dc73d29c42757e029b14274bb16eef59c206acb0af12793962698c589df4e2b2bcc97fce87e4e2af7fe3a2f8956ff4b660de5280089
+EBUILD opencascade-6.5.5.ebuild 5430 SHA256 bc08a144d073441c6a074af553f39ac3eb2cbe68b5707a45768c5e8895a93474 SHA512 a6a44f72c01ecc365117e3beeeec96d18884861d98ed3d16a30d6ac1fb57951233d0968c65d69d893d4f41ad3a99a63eabe5cbd433c71c4e5f54c1536efcfb34 WHIRLPOOL 21675cc1724c06e3bda48ff66b27a715a1d71b713fec81da3b3f73205900e2b00d763b0ab163aa1101e796d821d51646e8bc6c74a1557d5fc7971bcd4919162a
+EBUILD opencascade-6.5.ebuild 5436 SHA256 1ec89a54b1db7bb9a4b00b6fc8175daeaba38b810e7673934f0b7cd686fa2484 SHA512 2d2f824c45c78402de53241b1ea3ce7245bb06edfc059132cf3eec1a5b3c055bbfc32248d7c45dfea5908c469867d6349d47a2546881ae0a8f5e616b54b567fc WHIRLPOOL fcd050bd96baef3c014203d1558338552c3b0d26cd0e130e825abb847dedd80fae9ce9b933f9782cf5fc41136209f6ff86535fb0bb0125adfeb322b53d719021
+MISC ChangeLog 2852 SHA256 46a80b337b4207de1e7054b94b08a175297d001a08413028442d6066107e8d74 SHA512 df3a6db94d3da1ce7e8cef006e3afbb4a7b7fab1e669dd9e9a9130c5f3b0411d6fbfd63b027f6e74436e0b1efce5be982f22a8153d359f5bdf0b79c135210848 WHIRLPOOL df84d9742263c006e3d753c1d17f2a5857b0abcb78216c7426f8fa9983cc0dfbb482ae2864ee3408da73d4eaa7cbe531d61bbc7168a6b80b9a3297ab53657d81
 MISC metadata.xml 506 SHA256 fae19891e8b9f1570d1518684e1339704e369a93a72107034089a0391d94b973 SHA512 500798c528f2a099baec8fe93527b185937d5da048b0c2d95eca04d42c3c51717bd0801157eb562d42851ef8a17ddba86964689c40a2d70cfaf117cef2e31c45 WHIRLPOOL 1ecd2b2bcd731d10210c97ec3cafbcb3c6f9bcd9202265d5df2c270966dd5386929ef71fa0236460a8903844ca5b164366ff53c0628ce4011c13840f2983ed37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlF7i3EACgkQknrdDGLu8JADhgD7BoXbBaIenIqLtHY1rWEdbipS
-n2/Xda4VHfPqpQmKHy8A/R9psXWiYW9tIkNMlXFI8Jxm+pf4eOAVBd2L4F1pg4pP
-=b477
+iF4EAREIAAYFAlF8FdwACgkQknrdDGLu8JBymwD+MQdIBvJUZ6JREZ/d78na+Lol
+bkdyKiS3nIfZ4xWWW7cBAIPmXmNHTf/s4+sRr51wAt+A9P5UI9ZOg14bSB8gyiyq
+=vVbD
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/opencascade/opencascade-6.5.0.ebuild b/sci-libs/opencascade/opencascade-6.5.0.ebuild
index 4ea9fca53847..a8e68fe28dda 100644
--- a/sci-libs/opencascade/opencascade-6.5.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.0.ebuild,v 1.2 2013/04/27 08:25:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.0.ebuild,v 1.3 2013/04/27 18:15:48 xmw Exp $
 
 EAPI=5
 
@@ -27,6 +27,7 @@ DEPEND="app-admin/eselect-opencascade
 	x11-libs/libXmu
 	freeimage? ( media-libs/freeimage )
 	gl2ps? ( x11-libs/gl2ps )
+	java? ( >=virtual/jdk-0 )
 	tbb? ( dev-cpp/tbb )"
 RDEPEND="${DEPEND}"
 
@@ -109,6 +110,7 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*
 	append-cxxflags "-fpermissive"
 
 	sed -e "/^AM_C_PROTOTYPES$/d" \
+		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
 		-i configure.* || die
 	eautoreconf
 }
diff --git a/sci-libs/opencascade/opencascade-6.5.4.ebuild b/sci-libs/opencascade/opencascade-6.5.4.ebuild
index 9b2304b91f22..9c0014cbe9ec 100644
--- a/sci-libs/opencascade/opencascade-6.5.4.ebuild
+++ b/sci-libs/opencascade/opencascade-6.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.4.ebuild,v 1.2 2013/04/27 08:25:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.4.ebuild,v 1.3 2013/04/27 18:15:48 xmw Exp $
 
 EAPI=5
 
@@ -27,6 +27,7 @@ DEPEND="app-admin/eselect-opencascade
 	x11-libs/libXmu
 	freeimage? ( media-libs/freeimage )
 	gl2ps? ( x11-libs/gl2ps )
+	java? ( >=virtual/jdk-0 )
 	tbb? ( dev-cpp/tbb )"
 RDEPEND="${DEPEND}"
 
@@ -49,7 +50,7 @@ src_prepare() {
 
 	epatch \
 		"${FILESDIR}"/${P}-fixed-DESTDIR.patch \
-		"${FILESDIR}"/${P}-tcl8.6.patch
+		"${FILESDIR}"/${P}-tcl8.6.patch \
 		"${FILESDIR}"/${P}-fixed-tbb-VERSION.patch
 
 	# Feed environment variables used by Opencascade compilation
@@ -108,6 +109,7 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*
 	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.* || die
diff --git a/sci-libs/opencascade/opencascade-6.5.5.ebuild b/sci-libs/opencascade/opencascade-6.5.5.ebuild
index d4521e7a3586..e9fe9565bc43 100644
--- a/sci-libs/opencascade/opencascade-6.5.5.ebuild
+++ b/sci-libs/opencascade/opencascade-6.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.1 2013/04/27 08:25:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.5.ebuild,v 1.2 2013/04/27 18:15:48 xmw Exp $
 
 EAPI=5
 
@@ -27,6 +27,7 @@ DEPEND="app-admin/eselect-opencascade
 	x11-libs/libXmu
 	freeimage? ( media-libs/freeimage )
 	gl2ps? ( x11-libs/gl2ps )
+	java? ( >=virtual/jdk-0 )
 	tbb? ( dev-cpp/tbb )"
 RDEPEND="${DEPEND}"
 
@@ -108,6 +109,7 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*
 	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.* || die
diff --git a/sci-libs/opencascade/opencascade-6.5.ebuild b/sci-libs/opencascade/opencascade-6.5.ebuild
index 24cbd3634eed..7a28163c87ff 100644
--- a/sci-libs/opencascade/opencascade-6.5.ebuild
+++ b/sci-libs/opencascade/opencascade-6.5.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2013 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.4 2013/03/03 10:08:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.ebuild,v 1.5 2013/04/27 18:15:48 xmw Exp $
 
 EAPI=4
+
 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"
@@ -15,24 +16,25 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug doc examples gl2ps java"
 
 DEPEND="
+	dev-lang/tcl
+	dev-lang/tk
+	dev-tcltk/itcl
+	dev-tcltk/itk
+	dev-tcltk/tix
 	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 )
+	java? ( >=virtual/jdk-0 )
 "
 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
+RESTRICT="bindist mirror"
 
 CHECKREQS_MEMORY="256M"
 CHECKREQS_DISK_BUILD="3584M"
@@ -58,10 +60,6 @@ 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
 
@@ -90,6 +88,10 @@ src_prepare() {
 
 	append-cxxflags "-fpermissive"
 
+	sed -e "/^AM_C_PROTOTYPES/d" \
+		-e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
+		-i configure.* || die
+
 	eautoreconf
 }