Fix building with GCC 4.5+ wrt #318429 by Kacper Kowalik. Force Python 2.x.

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

4 files changed, 46 insertions, 15 deletions

diff --git a/dev-util/synopsis/ChangeLog b/dev-util/synopsis/ChangeLog
index 8fa4234ad25d..b8671fcaef7d 100644
--- a/dev-util/synopsis/ChangeLog
+++ b/dev-util/synopsis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/synopsis
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/synopsis/ChangeLog,v 1.12 2009/06/20 16:16:07 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/synopsis/ChangeLog,v 1.13 2010/05/06 10:33:53 ssuominen Exp $
+
+  06 May 2010; Samuli Suominen <ssuominen@gentoo.org> synopsis-0.12.ebuild,
+  +files/synopsis-0.12-gcc45.patch:
+  Fix building with GCC 4.5+ wrt #318429 by Kacper Kowalik. Force Python
+  2.x.
 
 *synopsis-0.12 (20 Jun 2009)
 
diff --git a/dev-util/synopsis/Manifest b/dev-util/synopsis/Manifest
index 3cb046663a53..736e38f5c07f 100644
--- a/dev-util/synopsis/Manifest
+++ b/dev-util/synopsis/Manifest
@@ -1,4 +1,5 @@
+AUX synopsis-0.12-gcc45.patch 482 RMD160 8d2d01020f762d77f30dbbaf977e0c215de46678 SHA1 7602cdd4e4f69f4f789902dff301404d35f9d6ba SHA256 2ded05ad8072673f36e49781b84a29947c2a42978b0627355e23c0421470b8b4
 DIST synopsis-0.12.tar.gz 9849309 RMD160 90629ab5fb9bac41e0f35528b9caad420b40d740 SHA1 3197795aba8758a44fefb0ede1db36b3b6a674ab SHA256 42d3c63e31e03afa558bdbab895f6630fe7fee2612bbf52fdfa9b959f36b1110
-EBUILD synopsis-0.12.ebuild 734 RMD160 27d878d37da7ceda5820e778e9c0e1458c901934 SHA1 7c868d09cab225e7d71bed820380cb10084f570a SHA256 086ee3c8bd6b526a9b2c5bfb8ab2c898032ca4dc38bbb7efbef21e9da27fd179
-MISC ChangeLog 1538 RMD160 f4c29e4a6c0b84cfafac3f9e3c973d47d0d4fafe SHA1 35af1edce527e10cf879dd59263adf0521f7cb45 SHA256 22741195de55734238790653fc7cd7a21f9860212de5bd49b997d9ea43a96e37
+EBUILD synopsis-0.12.ebuild 835 RMD160 a34c2d7a8911faed3cc73be202f40cbed069313f SHA1 a29f2afef6147072c73846ff727f459ea6e76f62 SHA256 eb18e6ef373d2e9adf4ccb911fa4815802f50da2a8baecbe4f24ffd1aa30f45b
+MISC ChangeLog 1731 RMD160 9b0f4a0f7a7f0677a502edbbd3966ae12816ba17 SHA1 b1a8cee5aa2aabdc2b3ff1fef710e2a623c815ea SHA256 e4e9a53a68dae9710fc88342ebb172a82832b5b12bafafc9a27f50f38c9606ee
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
diff --git a/dev-util/synopsis/files/synopsis-0.12-gcc45.patch b/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
new file mode 100644
index 000000000000..ff0fe2be5da8
--- /dev/null
+++ b/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
@@ -0,0 +1,17 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=318429
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- Synopsis/Parsers/Cxx/Types.cc
++++ Synopsis/Parsers/Cxx/Types.cc
+@@ -169,7 +169,7 @@
+ // Class Types::FuncPtr
+ //
+ 
+-FuncPtr::FuncPtr(Type::Type* ret, const Mods& premods, const Type::vector& params)
++FuncPtr::FuncPtr(Type* ret, const Mods& premods, const Type::vector& params)
+         : m_return(ret), m_premod(premods), m_params(params)
+ {}
+ 
diff --git a/dev-util/synopsis/synopsis-0.12.ebuild b/dev-util/synopsis/synopsis-0.12.ebuild
index 9587b12dcc06..bc9344fce12b 100644
--- a/dev-util/synopsis/synopsis-0.12.ebuild
+++ b/dev-util/synopsis/synopsis-0.12.ebuild
@@ -1,26 +1,34 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/synopsis/synopsis-0.12.ebuild,v 1.1 2009/06/20 16:16:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/synopsis/synopsis-0.12.ebuild,v 1.2 2010/05/06 10:33:53 ssuominen Exp $
 
-inherit distutils multilib toolchain-funcs
+EAPI=2
+PYTHON_DEPEND="2"
+inherit distutils eutils multilib python toolchain-funcs
 
 DESCRIPTION="General source code documentation tool"
 HOMEPAGE="http://synopsis.fresco.org/index.html"
 SRC_URI="http://synopsis.fresco.org/download/${P}.tar.gz"
 
-RDEPEND="media-gfx/graphviz
-	dev-libs/boehm-gc
-	net-misc/omniORB"
-DEPEND="${RDEPEND}"
-
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-src_compile() {
+DEPEND="media-gfx/graphviz
+	dev-libs/boehm-gc
+	net-misc/omniORB"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc45.patch
+}
+
+src_configure() {
 	tc-export CC CXX
-	${python} setup.py config --libdir=/usr/$(get_libdir) \
+	$(PYTHON) setup.py config --libdir=/usr/$(get_libdir) \
 		--with-gc-prefix=/usr || die
-	distutils_src_compile
 }