gcc 4.3 fix, closes bug #237421. Patch from Nikolay Orlyuk

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 99 insertions, 2 deletions

diff --git a/dev-python/visual/ChangeLog b/dev-python/visual/ChangeLog
index 26be3aac0fbe..e39c87dd1508 100644
--- a/dev-python/visual/ChangeLog
+++ b/dev-python/visual/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/visual
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/ChangeLog,v 1.24 2009/01/08 21:39:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/ChangeLog,v 1.25 2009/02/03 17:59:47 patrick Exp $
+
+*visual-3.2.9-r2 (03 Feb 2009)
+
+  03 Feb 2009; Patrick Lauer <patrick@gentoo.org>
+  +files/visual-3.2.9-gcc43.patch, +visual-3.2.9-r2.ebuild:
+  gcc 4.3 fix, closes bug #237421. Patch from Nikolay Orlyuk
 
   08 Jan 2009; Patrick Lauer <patrick@gentoo.org> -visual-4_beta0.ebuild:
   Removing old
diff --git a/dev-python/visual/Manifest b/dev-python/visual/Manifest
index bba62e67a005..4f73d9c101ce 100644
--- a/dev-python/visual/Manifest
+++ b/dev-python/visual/Manifest
@@ -1,9 +1,11 @@
+AUX visual-3.2.9-gcc43.patch 325 RMD160 551ec6bc9926b2e8ef8ce264816c9238ea93b2e5 SHA1 2d73eb8efdc946afb580ba5916c0c4e646496f61 SHA256 9c9f65c3bfad6a38752e91cfb2ae48fc2d2ffc8be17358d4623374f51def005b
 AUX visual-3.2.9-import_bug143237.patch 1152 RMD160 965f3102ac7e471ce7121f25fff009eec21bb391 SHA1 3f4412ec02c829427865732c4df6d6fb7c0a816f SHA256 840a6dcd7e4310b4488b8815903b33b1d29069f5ac3e4ab0e5944f4d669ab36a
 AUX visual-4_beta26-gcc43.patch 259 RMD160 115ae2dbd193705c4054c4b236065d9db006e9a1 SHA1 2ae4ddbaa8dad634c998128b9bc25c368a413144 SHA256 d810452a09928d6b4f2d4d9b83f360632d4d276df03ff0fa51f4da40fbff0137
 DIST visual-3.2.9.tar.bz2 419962 RMD160 49cfd441577c2a49dda1cd48b55b5e72e0968c27 SHA1 d64f32ffacc75a59e7703d2c51bd93b842038421 SHA256 613df56208b668f7ebe9fbebc862d5684883ab27658fb8a89c8c05d5e1720f49
 DIST visual-4.beta26.tar.bz2 614231 RMD160 564c950bcf887b93c1a8ded017952381b432cf31 SHA1 b0e5fc4d7098bd4b5ee3c88df45e9eb7c7230205 SHA256 9d55a4fb1d3a84659ef7d8514a52447863176160b51c6771f11bebebdd4c931c
 EBUILD visual-3.2.9-r1.ebuild 1934 RMD160 ccf49d9809b8e6ea398c4131174c8646f2af01f4 SHA1 b4bbe40d247d51e3038096acfc82aff778e2d8f5 SHA256 1c42253be24dbcbf177c570197065af9e9891508092154bc40be1a1e4483e770
+EBUILD visual-3.2.9-r2.ebuild 1982 RMD160 b8d7a344c67ebb489000af80c97f77507068600f SHA1 66a42a77f952a1e6a70e55ee6f33fa0464b9adde SHA256 18b62dfff495657b8778e10c2c1d563f87e07227e07dd336df4c9f7c8a728979
 EBUILD visual-3.2.9.ebuild 1969 RMD160 dba3c0af98a049f70659983c250f1889b007dea9 SHA1 5f1e89bd37e5e1ed8e5326825d8a316a9a7e0d6c SHA256 353787d004b9fa55c005dcd13e72083be162817417ca7725fa4c3edb6d4fe029
 EBUILD visual-4_beta26.ebuild 1388 RMD160 8e150ab651bc4c822b5169a77227c23b300708ea SHA1 8862e747e0bf8d73e24412d18585b9f96267bb43 SHA256 53ee0b8234118c6f634b991866de937288f371ef6c39449d570edd9663f7d4a1
-MISC ChangeLog 3247 RMD160 5bf600b202230cede8c1b6df84385d2a2d47dfbc SHA1 7529bb64f4ebdf88fc6c05b470fc0e8b6a27e62c SHA256 b1a20f273d966c6f0c8cfde1790c90bf9f58ea5bfa575f34c25cbf24fee2e1f1
+MISC ChangeLog 3451 RMD160 b07f98426bbdac6c18d8f67bc46ea9dd5ecb9e02 SHA1 eb2579e77e0b83a26ed0288f02876a672935d9cf SHA256 56e2fd05f8eb26fd4dc98891afb6804396341df6115c6bb2075185de9ed50031
 MISC metadata.xml 291 RMD160 662d443be30d4e3acc2724449378f2a56ba2a76a SHA1 31e8e34265ea7af352151fc108592dec4233acee SHA256 dc73bd0f985299d5e46e3e261ba139542e22e88df7752067ad3103bcbb26b06a
diff --git a/dev-python/visual/files/visual-3.2.9-gcc43.patch b/dev-python/visual/files/visual-3.2.9-gcc43.patch
new file mode 100644
index 000000000000..aba6a0253eac
--- /dev/null
+++ b/dev-python/visual/files/visual-3.2.9-gcc43.patch
@@ -0,0 +1,11 @@
+--- visual-3.2.9/include/platlinux.h.orig	2008-10-12 13:08:26.000000000 +0300
++++ visual-3.2.9/include/platlinux.h	2008-10-12 13:08:29.000000000 +0300
+@@ -24,7 +24,7 @@
+ 	pthread_mutex_t mtx;
+   
+  public:
+-	typedef lock<mutex> lock;
++	typedef ::visual::lock<mutex> lock;
+ 
+ 	mutex(int spincount=0, int count=1);
+ 	~mutex();
diff --git a/dev-python/visual/visual-3.2.9-r2.ebuild b/dev-python/visual/visual-3.2.9-r2.ebuild
new file mode 100644
index 000000000000..25b598eb87eb
--- /dev/null
+++ b/dev-python/visual/visual-3.2.9-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-3.2.9-r2.ebuild,v 1.1 2009/02/03 17:59:47 patrick Exp $
+
+inherit distutils
+
+DESCRIPTION="An easy to use Real-time 3D graphics library for Python."
+SRC_URI="http://www.vpython.org/download/${P}.tar.bz2"
+HOMEPAGE="http://www.vpython.org/"
+
+IUSE="doc examples numeric numarray"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+LICENSE="visual"
+
+RDEPEND="virtual/python
+	virtual/opengl
+	=x11-libs/gtk+-1.2*
+	=x11-libs/gtkglarea-1.2*
+	>=dev-libs/boost-1.31
+	numeric? ( dev-python/numeric )
+	numarray? ( >=dev-python/numarray-1.0 )
+	!numeric? ( !numarray? ( dev-python/numeric ) )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"/site-packages
+	epatch "${FILESDIR}/${P}"-import_bug143237.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc43.patch
+}
+
+src_compile() {
+	local myconf="--without-numarray --without-numeric"
+
+	echo
+	if useq numeric; then
+		elog "Building with Numeric support"
+		myconf=${myconf/--without-numeric}
+	fi
+	if useq numarray; then
+		elog "Building with Numarray support"
+		myconf=${myconf/--without-numarray}
+	fi
+	if ! useq numeric && ! useq numarray; then
+		elog "Support for Numeric or Numarray was not specified."
+		elog "Building with Numeric support"
+		myconf=${myconf/--without-numeric}
+	fi
+	echo
+
+	econf \
+	--with-html-dir=/usr/share/doc/${PF}/html \
+	--with-example-dir=/usr/share/doc/${PF}/examples \
+	$(use_enable doc docs ) \
+	$(use_enable examples ) \
+	${myconf} \
+	|| die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	python_version
+
+	insinto $(python_get_sitedir)
+	doins -r "${WORKDIR}/${P}"/site-packages/*
+
+	#the vpython script does not work, and is unnecessary.
+	#Also nuke directories that are empty so we don't have
+	#empty directories hanging around.
+	rm -rf "${D}"/usr/bin/
+
+}