java dependency, automake 1.13 fix

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 28 insertions, 16 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/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
 }