Fix for gcc46, Some cleanup QA of the ebuilds

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

6 files changed, 51 insertions, 24 deletions

diff --git a/dev-cpp/sparsehash/ChangeLog b/dev-cpp/sparsehash/ChangeLog
index 58a4246042d8..472c49b95c88 100644
--- a/dev-cpp/sparsehash/ChangeLog
+++ b/dev-cpp/sparsehash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/sparsehash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sparsehash/ChangeLog,v 1.6 2011/02/16 18:25:58 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sparsehash/ChangeLog,v 1.7 2011/04/28 13:33:14 jlec Exp $
+
+  28 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/1.10-gcc46.patch,
+  sparsehash-1.1.ebuild, sparsehash-1.5.2.ebuild, sparsehash-1.10.ebuild:
+  Fix for gcc46, Some cleanup QA of the ebuilds
 
 *sparsehash-1.10 (16 Feb 2011)
 
diff --git a/dev-cpp/sparsehash/Manifest b/dev-cpp/sparsehash/Manifest
index 214fbef19c40..ade2971feed5 100644
--- a/dev-cpp/sparsehash/Manifest
+++ b/dev-cpp/sparsehash/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.10-gcc46.patch 344 RMD160 0edf5db834cb3fb9de2b3d15d733914cce64472b SHA1 263a13ab29a718219b55238bb3e3a73dffed96be SHA256 a3766ac53eeee9b7c72118b46af6429c5dc40faa7c21b1d43090b41815f1eceb
 DIST sparsehash-1.1.tar.gz 270585 RMD160 d849b9be8b202bc42295996c6dcea4513f2168ba SHA1 4353e71f7fe85ddca0b8decc45cb0fca23604d95 SHA256 1d84e4a7adebcbf75b7c628c3b7eaadf9c2b5dcb68557fc64cf01d3ef2fb3a05
 DIST sparsehash-1.10.tar.gz 289819 RMD160 7c3dd4310cae69364cb46f4827b403309f539f29 SHA1 47be68232edb4175bde7e1eeda0f0e453a932be8 SHA256 5a57b77633aab1e59827e51cf6247c4ac521713d45f1764ddba60353cbc9677a
 DIST sparsehash-1.5.2.tar.gz 292715 RMD160 d6872c855919666dde4c0c1429db976ae378be90 SHA1 b37924241479b926440f77e61fd782157eb25852 SHA256 a885133a2bc2fef50a2393d494972645e0324a1ec4c8c0332deafcbef9a52dcc
-EBUILD sparsehash-1.1.ebuild 688 RMD160 c731275a581c916d7c3463ec8973219580c955da SHA1 61327b8a981c3584730dd78e99eb0a9651de5882 SHA256 79015eda27bc54279bc92f7406d7b75f25d84562dcaffe87566146d69761e6e5
-EBUILD sparsehash-1.10.ebuild 697 RMD160 071d8f4e6e7c0526eda441f4bd29eb27b5bdd330 SHA1 d51be9a353e60086bd64e45cab5f367d169f1044 SHA256 ff44ef58cef4c2d8c9477d15d379cb8007acd61b35afffbe336c27163ed27294
-EBUILD sparsehash-1.5.2.ebuild 688 RMD160 0ff4e25a480685fb18c793e02be32b2879a65be3 SHA1 fcd000a6744a602438f95401a44c5bd4dc5b5481 SHA256 cc233da0c385f1352d1da6fcafc2dbcc2583d0b475edf23bc5f600f219f8abe9
-MISC ChangeLog 1043 RMD160 74b863a3ce95dfe6779e6ccd2f0037dbbb29add0 SHA1 f72e25d67290bda0eb7734c10f83a8332387ab20 SHA256 1cd7121a5d14560cca37c2234f939ca41928e7d8be6d0961fc8f54bd2fda3c3b
+EBUILD sparsehash-1.1.ebuild 661 RMD160 1dbcb5d25fec315f01a8b6e97185759d4ba2aec3 SHA1 6ce6958cc71ea39d9e0e1fcdbfefd81c3841665e SHA256 09672e5eda2e10fcbab13cfac7f99828711a1ea5754fc045d460c2d13dff1f63
+EBUILD sparsehash-1.10.ebuild 654 RMD160 30a51332c00804014a991a5373dc4250a93ebaa4 SHA1 add1e353d779ed1e903503f74c2a32ff29090189 SHA256 ffc92a75848ba6b796ba005f91993261c6a7c15037779e636c71d8d671d4c902
+EBUILD sparsehash-1.5.2.ebuild 661 RMD160 da38288520f0d0a78552e73013f96955f63cd214 SHA1 e8e096917f2c101350258aecc6318914f7cee174 SHA256 169b3a761f7da115738492fe901ed27fd3b76adbbcfdd46547497eb4f79fd14c
+MISC ChangeLog 1236 RMD160 ebcf72bc0e603fcbb7d614fe998412ae6b154c43 SHA1 8f2d28df3fa8637e5a5d650ce2231983fc918ef9 SHA256 b7455b44a5c0b80fd79b079ceabf4629f6e020938d2752cf0786b15053386bb7
 MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk25bKAACgkQgAnW8HDreRacZQCgzSSNn0rodYAd1YVnvu25RHw9
+GX8An3Aw7n2e5Vef3kSlIOpctzJuRl5V
+=DmNd
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/sparsehash/files/1.10-gcc46.patch b/dev-cpp/sparsehash/files/1.10-gcc46.patch
new file mode 100644
index 000000000000..4339b487eca0
--- /dev/null
+++ b/dev-cpp/sparsehash/files/1.10-gcc46.patch
@@ -0,0 +1,16 @@
+ src/google/sparsetable |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/google/sparsetable b/src/google/sparsetable
+index 0eeb22e..e8580b9 100644
+--- a/src/google/sparsetable
++++ b/src/google/sparsetable
+@@ -83,6 +83,8 @@
+ #endif
+ #endif
+ 
++#include <cstddef>
++
+ _START_GOOGLE_NAMESPACE_
+ 
+ #ifndef HAVE_U_INT16_T
diff --git a/dev-cpp/sparsehash/sparsehash-1.1.ebuild b/dev-cpp/sparsehash/sparsehash-1.1.ebuild
index f8ffc609bdbb..03955a62d4f8 100644
--- a/dev-cpp/sparsehash/sparsehash-1.1.ebuild
+++ b/dev-cpp/sparsehash/sparsehash-1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sparsehash/sparsehash-1.1.ebuild,v 1.1 2008/03/07 19:02:16 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sparsehash/sparsehash-1.1.ebuild,v 1.2 2011/04/28 13:33:14 jlec Exp $
 
-DESCRIPTION="An extremely memory-efficient hash_map implementation."
+DESCRIPTION="An extremely memory-efficient hash_map implementation"
 HOMEPAGE="http://code.google.com/p/google-sparsehash/"
 SRC_URI="http://google-sparsehash.googlecode.com/files/${P}.tar.gz"
 LICENSE="BSD"
@@ -10,9 +10,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
diff --git a/dev-cpp/sparsehash/sparsehash-1.10.ebuild b/dev-cpp/sparsehash/sparsehash-1.10.ebuild
index 49b176e7ee77..28aac64e6fdb 100644
--- a/dev-cpp/sparsehash/sparsehash-1.10.ebuild
+++ b/dev-cpp/sparsehash/sparsehash-1.10.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sparsehash/sparsehash-1.10.ebuild,v 1.1 2011/02/16 18:25:59 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sparsehash/sparsehash-1.10.ebuild,v 1.2 2011/04/28 13:33:14 jlec Exp $
 
-EAPI="3"
+EAPI="4"
 
-DESCRIPTION="An extremely memory-efficient hash_map implementation."
+inherit eutils
+
+DESCRIPTION="An extremely memory-efficient hash_map implementation"
 HOMEPAGE="http://code.google.com/p/google-sparsehash/"
 SRC_URI="http://google-sparsehash.googlecode.com/files/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gcc46.patch
+}
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	# Installs just every piece
 	rm -rf "${D}/usr/share/doc"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
 	dohtml doc/*
 }
diff --git a/dev-cpp/sparsehash/sparsehash-1.5.2.ebuild b/dev-cpp/sparsehash/sparsehash-1.5.2.ebuild
index 7e83799c9864..f1c9cdd2f3a5 100644
--- a/dev-cpp/sparsehash/sparsehash-1.5.2.ebuild
+++ b/dev-cpp/sparsehash/sparsehash-1.5.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sparsehash/sparsehash-1.5.2.ebuild,v 1.3 2011/02/11 13:04:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sparsehash/sparsehash-1.5.2.ebuild,v 1.4 2011/04/28 13:33:14 jlec Exp $
 
-DESCRIPTION="An extremely memory-efficient hash_map implementation."
+DESCRIPTION="An extremely memory-efficient hash_map implementation"
 HOMEPAGE="http://code.google.com/p/google-sparsehash/"
 SRC_URI="http://google-sparsehash.googlecode.com/files/${P}.tar.gz"
 LICENSE="BSD"
@@ -10,9 +10,6 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"