Fix include problem with gcc4.6, #362599

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

4 files changed, 78 insertions, 3 deletions

diff --git a/dev-cpp/tree/ChangeLog b/dev-cpp/tree/ChangeLog
index 42ed05336ff8..8cec29e7fef9 100644
--- a/dev-cpp/tree/ChangeLog
+++ b/dev-cpp/tree/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/tree
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tree/ChangeLog,v 1.7 2010/07/21 20:15:22 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tree/ChangeLog,v 1.8 2011/04/08 13:43:01 jlec Exp $
+
+*tree-2.65-r1 (08 Apr 2011)
+
+  08 Apr 2011; Justin Lecher <jlec@gentoo.org> +tree-2.65-r1.ebuild,
+  +files/tree-2.65-gcc46.patch:
+  Fix include problem with gcc4.6, #362599
 
   21 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> tree-2.65.ebuild:
   ppc64 stable wrt #315687
diff --git a/dev-cpp/tree/Manifest b/dev-cpp/tree/Manifest
index ae62933b72ea..bf28a79af1ad 100644
--- a/dev-cpp/tree/Manifest
+++ b/dev-cpp/tree/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tree-2.62-test.patch 289 RMD160 d7d1b8cb7bdcdf7644408979d37cb77f322b731c SHA1 21cf5c09361360bab45d6e025847410344634b31 SHA256 0812ec2db0b82531c4ae15e4b3a597011d7e8559494b3a9561cd774a9438af6c
+AUX tree-2.65-gcc46.patch 337 RMD160 a9cb199eba6772a820f4a058ba2c28cc52116aa4 SHA1 b3761defd499faeef98b952c0a13330d2efd4362 SHA256 7ed1d661eda2643ebb9b8f08dc88286fdbd474fa3042d6760c4e8c6cd2364cec
 DIST tree-2.65.tar.gz 197695 RMD160 4e88c9d87deb0f490ad1e48bcaa2fa21151973b2 SHA1 3583dfd60bc9e75d3163cdd2034521aecc55ef99 SHA256 0198a86a2f9a72cbf6a46f0d7f25957c4cc0a62d3861f7999600bac94a642ce9
+EBUILD tree-2.65-r1.ebuild 1097 RMD160 17cf0db91c11ece03c4d3fe90f1c6ce3926e9de9 SHA1 0e7b62f4a12a36e70eb0b18f32ef28546b40d61b SHA256 8249772645b1ec7286cc8d40785418e494f3b93430a5ed92f98cd03243af36c7
 EBUILD tree-2.65.ebuild 1057 RMD160 829b63a309c5c4fe95fe5fe02cd2c1610a10c522 SHA1 70d8bdb3a9afea30937cd3a31825a9f52c45aad9 SHA256 900d7cd2d0e184090c51548a5e00088c5a298e0908722fa56ad8cdceb4f3e4c8
-MISC ChangeLog 982 RMD160 c2a4af8e18dbdaababdf7447899a5f37f370cf1b SHA1 bc9bdb520280bcdd8e5147000d6544aad77db7ae SHA256 47c62f93460d767b8139f005d9ba633b62686c95e0c84d43fa7440ef424dc264
+MISC ChangeLog 1151 RMD160 7b4e1944a06a07da63083ae8042669112c0870a7 SHA1 34f7d6693b758f0a13fa5e6fadbc3f75a916c406 SHA256 7bc8ae0456c08f88405caf59eae9f9ebf406753eb00bb196340a0e2632a96285
 MISC metadata.xml 522 RMD160 e970c41a3ffc1383f146c693a087c1c73ebcfd6e SHA1 a267171db9ffcc6682e984e90314872bb6311e54 SHA256 a311b20329421676eac65cded8310198ec24b2f287da28a27da236a27b826d0f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2fEOsACgkQgAnW8HDreRbzPQCfXil2k6eqjrXYjcAoWVz+kxEp
+f5AAoLVaA4vM/uTJx7kwJTHjr2vTCkoG
+=Jg8h
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/tree/files/tree-2.65-gcc46.patch b/dev-cpp/tree/files/tree-2.65-gcc46.patch
new file mode 100644
index 000000000000..d75b516112ba
--- /dev/null
+++ b/dev-cpp/tree/files/tree-2.65-gcc46.patch
@@ -0,0 +1,15 @@
+ tree.hh |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/tree.hh b/tree.hh
+index 1429da3..d780be3 100644
+--- a/tree.hh
++++ b/tree.hh
+@@ -71,6 +71,7 @@
+ #include <set>
+ #include <queue>
+ #include <algorithm>
++#include <cstddef>
+ 
+ // HP-style construct/destroy have gone from the standard,
+ // so here is a copy.
diff --git a/dev-cpp/tree/tree-2.65-r1.ebuild b/dev-cpp/tree/tree-2.65-r1.ebuild
new file mode 100644
index 000000000000..0a819d9df7ed
--- /dev/null
+++ b/dev-cpp/tree/tree-2.65-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tree/tree-2.65-r1.ebuild,v 1.1 2011/04/08 13:43:01 jlec Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An STL-like tree class"
+HOMEPAGE="http://www.aei.mpg.de/~peekas/tree/"
+SRC_URI="http://www.aei.mpg.de/~peekas/tree/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# test was buggy, reported upstream
+	epatch \
+		"${FILESDIR}"/${PN}-2.62-test.patch \
+		"${FILESDIR}"/${P}-gcc46.patch
+}
+
+src_test() {
+	$(tc-getCXX) ${CXXFLAGS} test_tree.cc -o test_tree \
+		|| die "compile test failed"
+	./test_tree > mytest.output || die "running test failed"
+	diff -Nu test_tree.output mytest.output || die "test dist failed"
+}
+
+src_install() {
+	insinto /usr/include
+	doins tree.hh tree_util.hh || die
+	insinto /usr/share/doc/${PF}
+	doins tree_example.cc || die
+	if use doc; then
+		doins tree.pdf || die
+	fi
+}