Stable on amd64 x86 ppc and ppc64 wrt bug#441186. Remove older.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

8 files changed, 26 insertions, 186 deletions

diff --git a/dev-util/mdds/ChangeLog b/dev-util/mdds/ChangeLog
index a8cf6863cff6..0fab68d3425e 100644
--- a/dev-util/mdds/ChangeLog
+++ b/dev-util/mdds/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/mdds
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mdds/ChangeLog,v 1.18 2012/09/17 17:30:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mdds/ChangeLog,v 1.19 2012/11/03 08:59:16 scarabeus Exp $
+
+  03 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/0.6.0-fix-boost-1.50-linking.patch,
+  -files/0.6.0-fix-missing-includes.patch,
+  -files/0.6.0-multi-vector-build.patch,
+  -files/0.6.0-right-overload-of-vector.patch, -mdds-0.6.0-r2.ebuild,
+  mdds-0.6.1.ebuild:
+  Stable on amd64 x86 ppc and ppc64 wrt bug#441186. Remove older.
 
 *mdds-0.6.1 (17 Sep 2012)
 
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 2cb7d6cf963c..3347ba4958f5 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,30 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0.6.0-fix-boost-1.50-linking.patch 899 SHA256 0ec4e744d4224a12868c3de825192d7eb6bc625b3f5c5961fe658c2de73f21ba SHA512 0fc01620ca64911701d46e5c4020626943d75ec9baa7e8deabc0e46317fec7a6aa3ca825877cb75d63dcfb206a6201a1133cdfd1ae85ad1c737521ab9c697d04 WHIRLPOOL 036910f8646b33f1c5b315efbd44c7a64430c8756fef969ef0eee669eb68ecca7c70c6bc7a3f7858c0d58dc02b3383943e8238ae207cbde037f6c87d558b7cc5
-AUX 0.6.0-fix-missing-includes.patch 1044 SHA256 c0a278140b68532a9cb7f4817622b3940ea3e5abc02335570e55596afcaf61da SHA512 00f34798088a90812b5ea76c506af8a3c1bcb5091fd534093ba583cdeb9ebc0b8973c53ece5ee28624cb87c5f8016b9b0800b92239ac90a16309ae6bb851e278 WHIRLPOOL 6aefb38060662bfd2da628f7a529b3e660c8627ec747b75bfdaf86a7d5cdd1a122e9fa6f7d85659146f2a5cb1b36ead3aeda7d741a20f16b3cd2e64382bd0f5d
-AUX 0.6.0-multi-vector-build.patch 828 SHA256 70e3e1ca1aa84feac94a89a977cd9d0920078baaa45f5b5ca4ba5357fbb119e9 SHA512 9577708dc103364a878b714edf5865669e8aa8708340160dea28a6ac6e7cffda161eb4aab87f7a5231080121f9a98edf629cd183b470c8556d6454047db4d92d WHIRLPOOL 949e9e35b9b2546179556fd3509a73839fb2b3fd89555b1fe15b727ef0fcb53ab43a1f98b9dcb69e743131dd8bca1e0c83b1b84fb907ef9ef15724c6088eacb7
-AUX 0.6.0-right-overload-of-vector.patch 2401 SHA256 d9fad2c118cf0f30c4f8ec5144c781285efcd9fe5b6282d9733b09f6c3d8260d SHA512 9a53e67e84e884f1e3c385ddba316a177d641765508744fe9fc48498e06bcd80022ace3e2dfd1a05d63fcfc321f1de343aed9865866f50dfe3fce58a50179403 WHIRLPOOL a373c10642e71ca716c2196cb488a4f4d830f5b5d3f5c86cd7e225814819389afbf962f4f45952f816000d5917b479f7886b316c9ac30ebc97122d361bf66880
-DIST mdds_0.6.0.tar.bz2 123325 SHA256 846200f5c8ddf34f86747fd4dc5feb5fea90e753639a7d5dbd3ccdce4467a67b SHA512 288054875e86d5715395d8884bff7a76fc1b091af1ba4fd00f7bd6f3b79f158297d8ececd5bf406c61ab372f8a128713379f89fc801a807dc369645ef3eca572 WHIRLPOOL 44842f8bc191d6d460848723daccb2dc5dd2faa66ef1fcf45769dc44ecd0220f5fcc926f745d27bfcb25abbe15a4bc4821988192aef9f29d1f2f7641821fc5c4
 DIST mdds_0.6.1.tar.bz2 128115 SHA256 4381b38db6ee807090c6f352d62575ea8ce9768701ad95f01afbcda497e69960 SHA512 9b53ddfe5330f276a3e3d9febf6e6749957915f2997cd81059f060221f2dcb6ba53576f9b3b01d10289143e98a0f80bcee29654bebc3c96ddf9b0a32c411dfd2 WHIRLPOOL 51b60a028b1f75f9167903aa0395876e7a8c7c96d21d619aca280ac485197b387dca55f55c61c98f7203b16ad1989c6d2c4eab8f8eb113cbec8af929ddafbb63
-EBUILD mdds-0.6.0-r2.ebuild 949 SHA256 982b1b66676ffd8f1c37ac2df2e1106a4f6565b849ae362ee559f524d8bbfeeb SHA512 c59bbf5bfa071ef2483e98b15ed4879263a2b4f07ff0b64767aad0ea555b6cb56301acf72bd9e72d946d8a7ab6f52dd3ce71548987dd34a9ee3e86367d8cb085 WHIRLPOOL 046ca8bdcf5dbcdc1158b14dbfa9d3be2c194104d364a6ace6d3b3c3660b68a1bca68375c340eca0f9161d7798bbb42a1b8c4695facc975d05db882dc277f1df
-EBUILD mdds-0.6.1.ebuild 740 SHA256 0cd81e167a581c0158c53a3c9114f1ae68db4a92964454c7b0a2e1ab358816cd SHA512 20bbd5f141be36ec5d3eaa4755ad0ff9a0b5411cc4dd88a02a7b72512fdd14f53991a1a1f31446350507d7c99bc9d26c8d6408f598dfeb062f7f88cc9ccc372a WHIRLPOOL 404e60422d5c96674eca0feede1c97f2fcbb97fa4143e107b38440d399874ab6a9507a408110655b66c5800480adea7140d12e03f52ea36f9f30eec6f5078dfb
-MISC ChangeLog 2986 SHA256 a42397be40ae9460ea885ca33ebc946df804ca061f5a67e4d2d6c6534d288e09 SHA512 dc29baee8a6f5839642135c56e70a42f35f5da5603bf67f697a8a53f60f0d156d9b6c63582a5fa9319000cfa9e06bb3df465196a8c6a5c10cf8f894491b07aa7 WHIRLPOOL bbd5f31d836e7fcc649f4dc08dccfa8fa6a3bbe0b1fad8ded2c237448cb381b4d1a59d6f1ebdf352469dc2f73bdbb81ceddb69fb22e4046790ef08adcc41f9c2
+EBUILD mdds-0.6.1.ebuild 737 SHA256 8888a15da8cb73fa95562082328eb3fdddbca10fa0538c123441ab73b003a642 SHA512 e7d36236a9b918de4393a2d6f164f37edae5d5c0e40f4d424ee1fb36666b99a759a4a900d7c702041ff7fd513e61857dcdcf0d016e15bb1b4b5d77264ef166f5 WHIRLPOOL 6fc317b2b05bf6c81c48e2ae0c4be1de9c48148a07cf22e6844130a36230666eb78e8571579f9f49772e8fa9a359465a83a418aa9b86852f2ab3e612bb8cf03b
+MISC ChangeLog 3328 SHA256 24e36e923631a8264ee4670f042c273ec4739c64b2b4a878757582c0850ca044 SHA512 3c60054a4f434c0fb37473963a3c5b314ea7e4374e2b9042e4e39171575ed26c3e3716f4af6e539632e2a704c065d9a7b27f5255b13eba0a0d98934facc7eba9 WHIRLPOOL 6297541722c03210125203715a7482a66578193c71ada16b979abd0c459ec4525fcf85bfd80338d0bb85d306dfa5816dd8069161f80da5db011d43bff5087e2c
 MISC metadata.xml 251 SHA256 8f8d59131be6b51bcaf5bf314f2cec234aaa146976f7171edf3eb314987b8e56 SHA512 a20b28b7707689db60329baef0192d5015dfcf4e2915cc3b21067f87fe1b43fbf4d968d0ced3d6552facd81f42cb11f290d36e2f661777224ab5277e16fb17de WHIRLPOOL a57ae476b3038a7d8b9c13c97ac0e4a8b4c86c820ec910d1cd58999b6309a2a36e11195a4f89f9f5d1e525921d4fb000c66e49268706c411bd7e7cb72b647154
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQV141AAoJEOSiRoyO7jvonooP/2ppn5Btz6eyhWzt58XVcFmN
-cB+v+bDgFZyuZ0/dnJWQCxxdH88ZzWuCt/GCaxd7SPOO4k3nZGu6olFRdGeIgS0R
-GpFWi+kONqo7ChbfxJUUba1xdzLf7pmDCXdcbIJO4X+j20Xnpf32vWyi6XHTBYLg
-5nrdw6D+ZsDX9FA0BLwvtixeNd0IGgUTKjQjnSygs4iUk/eq2c2U8MZFgiZMAW/i
-4PDAgpzZfxkMITLvCh518RrdsK5G2ixOlhdp0jyc4UnWf2uIjWdfUAgFmLOinS0Z
-Lr4SiYqV1Ml9KbmlRlMzNiht1H084t8aP16rfL4Y3UTBtUjgUnmIfsWUwKy6c0fG
-oZ2S9kaHqNFBi+UAaUCfEotwNShiKVu5iYDUaYt7SjpgCm94vWpPVpWDQNf8Qo0N
-M1BoaJFXtt0JnKOYp6JFz+vucU8+/gJl1WHsMRKKfLUdomu4h9Ml6OnVbI8Qa7d9
-MaQVnzhSmiM9NJnj/DFYvg18ROK5WmAODq9mld0DD37B9qhJx81TKkC9mPolYJkV
-YKDlfLG4XQK8ENDrE9eSBQcZvegkGv7aTWLFTGNodAEdbI92e8yrbwpgkHKs7l2s
-RW1M63kMgbbeaJHRezUhwIXId2d9bNhCMXhK/sI7RApYlSS55W4y13NXevvFwg4X
-EXUkjbUXKILGrQjdADaU
-=6dNl
+iQIcBAEBCAAGBQJQlNzlAAoJEOSiRoyO7jvogm0P/ReTZPLJAjZ1TFVJptOeSnyW
+P08jfto4cas3VZIWWL61IGKdClyqCEw5mD4/Bkpm7Kh8CycnzGG+YxcF65GeI1kt
+gO0+cveenDegVrgskeqBaHJZ8kDGPYVTBjGLBVAALxkvKpt3LbcQluV+G+BwoL8A
+jn+8BGiHuJV+NsKA/ONu13SC9VvwOV25h8t7aA6koRyG/eJRYToWzK8zuDmC5n5M
+8EUCV8xYLRVhDnbDRy7nqo7TD2KkWl3+WTvVNwUa/hu1c2z376+R0liYky9n1ohH
+rJCr4dsVGZDVIbsZ39AdAVsR0s2TmKL8EC67IfLapmeTOgtfVESz6qQJqfV54PI8
+wTzCzZL9/tBVXiWs00t2nzqSV9h/2m50b9pcI8CFx3EuL/T2j+/IfSIptNwx7ck8
+jsXo4XxFJtxRI3m85Og8TLdFK3sIFlvsT2o7RPePYUUtxbjM7cSFH6e9pk7HDWnu
+OogG3NrRjdOdw2DiSdId8iRvGiB7OfAIApBv+d6vYFOouzodo06hcuF9PHDUuoGb
+/5oCf4DxiRasUlTG3wkZqutk3volTVcJQ+E+WrBhIu44Est6NOxWudI4hYOjIsFS
+rrjA5FkcHPFq52F/cpUR9WkUfB8XWdLv064Oy5+VCTGxyElweQvMno+PvRiiNCV+
+z+vkDY6gQukuLUWWh8io
+=1Z6K
 -----END PGP SIGNATURE-----
diff --git a/dev-util/mdds/files/0.6.0-fix-boost-1.50-linking.patch b/dev-util/mdds/files/0.6.0-fix-boost-1.50-linking.patch
deleted file mode 100644
index 68c4cfb21880..000000000000
--- a/dev-util/mdds/files/0.6.0-fix-boost-1.50-linking.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 09937e5d6b4b82efbff40da2aa50fb02f2250bb2 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 28 Jul 2012 14:32:47 +0200
-Subject: [PATCH] fix linking error with boost 1.50
-
----
- include/mdds/mixed_type_matrix_storage.hpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/mdds/mixed_type_matrix_storage.hpp b/include/mdds/mixed_type_matrix_storage.hpp
-index fa0bf25..bb4e354 100644
---- a/include/mdds/mixed_type_matrix_storage.hpp
-+++ b/include/mdds/mixed_type_matrix_storage.hpp
-@@ -32,6 +32,10 @@
- 
- #include <boost/ptr_container/ptr_vector.hpp>
- #include <boost/ptr_container/ptr_map.hpp>
-+// Boost.Pool indirectly pulls in Boost.System, causing linking error
-+// with Boost 1.50, because some (deprecated) symbols from System are
-+// not found.
-+#define BOOST_SYSTEM_NO_DEPRECATED
- #include <boost/pool/object_pool.hpp>
- 
- namespace mdds {
--- 
-1.7.11.2
-
diff --git a/dev-util/mdds/files/0.6.0-fix-missing-includes.patch b/dev-util/mdds/files/0.6.0-fix-missing-includes.patch
deleted file mode 100644
index a218bb4d8a1e..000000000000
--- a/dev-util/mdds/files/0.6.0-fix-missing-includes.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN mdds_0.6.0/Makefile.in mdds_0.6.0.new//Makefile.in
---- mdds_0.6.0/Makefile.in	2012-07-19 05:09:49.000000000 +0200
-+++ mdds_0.6.0.new//Makefile.in	2012-08-01 11:11:25.193466139 +0200
-@@ -21,6 +21,7 @@
- 	multi_type_vector_test_custom
- 
- HEADERS= \
-+	$(INCDIR)/mdds/compat/unique_ptr.hpp \
- 	$(INCDIR)/mdds/flat_segment_tree_def.inl \
- 	$(INCDIR)/mdds/flat_segment_tree.hpp \
- 	$(INCDIR)/mdds/flat_segment_tree_itr.hpp \
-@@ -200,9 +201,11 @@
- install: $(HEADERS)
- 	install -d $(DESTDIR)@includedir@/mdds
- 	install -d $(DESTDIR)@includedir@/mdds/hash_container
-+	install -d $(DESTDIR)@includedir@/mdds/compat
- 	install -d $(DESTDIR)@docdir@
- 	install -m 644 -t $(DESTDIR)@includedir@/mdds $(INCDIR)/mdds/*.hpp
- 	install -m 644 -t $(DESTDIR)@includedir@/mdds $(INCDIR)/mdds/*.inl
-+	install -m 644 -t $(DESTDIR)@includedir@/mdds/compat $(INCDIR)/mdds/compat/*.hpp
- 	install -m 644 -t $(DESTDIR)@includedir@/mdds/hash_container $(INCDIR)/mdds/hash_container/*.hpp
- 	install -m 644 -t $(DESTDIR)@docdir@ AUTHORS COPYING NEWS README VERSION
- 
diff --git a/dev-util/mdds/files/0.6.0-multi-vector-build.patch b/dev-util/mdds/files/0.6.0-multi-vector-build.patch
deleted file mode 100644
index fd2d58290514..000000000000
--- a/dev-util/mdds/files/0.6.0-multi-vector-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 770ff91820f8ed95f7ecc40b72b78ae57ee5d277 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Thu, 19 Jul 2012 15:05:47 -0400
-Subject: [PATCH] Fixes build breakage on Debian.
-
----
- include/mdds/multi_type_vector_types.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/mdds/multi_type_vector_types.hpp b/include/mdds/multi_type_vector_types.hpp
-index f27ac88..ac2b0ef 100644
---- a/include/mdds/multi_type_vector_types.hpp
-+++ b/include/mdds/multi_type_vector_types.hpp
-@@ -355,6 +355,7 @@ struct managed_element_block : public copyable_element_block<managed_element_blo
-     typedef managed_element_block<_TypeId,_Data> self_type;
- 
-     using base_type::get;
-+    using base_type::set_value;
-     using base_type::m_array;
- 
-     managed_element_block() : base_type() {}
--- 
-1.7.11.2
-
diff --git a/dev-util/mdds/files/0.6.0-right-overload-of-vector.patch b/dev-util/mdds/files/0.6.0-right-overload-of-vector.patch
deleted file mode 100644
index 03cf1c3231f0..000000000000
--- a/dev-util/mdds/files/0.6.0-right-overload-of-vector.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 900cbea3ec067833b4284584f6dfa5502dc36de8 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Fri, 20 Jul 2012 10:30:38 +0200
-Subject: [PATCH] help compiler select the right overload of vector::insert
-
----
- include/mdds/multi_type_vector_def.inl | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
-index 252a260..fb72070 100644
---- a/include/mdds/multi_type_vector_def.inl
-+++ b/include/mdds/multi_type_vector_def.inl
-@@ -1148,7 +1148,7 @@ void multi_type_vector<_CellBlockFunc>::insert_empty_impl(size_type row, size_ty
- 
-     // Insert two new block below the current; one for the empty block being
-     // inserted, and one for the lower part of the current non-empty block.
--    m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL);
-+    m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL);
- 
-     m_blocks[block_index+1] = new block(length);
-     m_blocks[block_index+2] = new block(size_blk_next);
-@@ -1302,7 +1302,7 @@ void multi_type_vector<_CellBlockFunc>::insert_cells_to_middle(
-     // Insert two new blocks.
-     size_type n1 = row - start_row;
-     size_type n2 = blk->m_size - n1;
--    m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL);
-+    m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL);
-     blk->m_size = n1;
- 
-     m_blocks[block_index+1] = new block(length);
-@@ -1467,7 +1467,7 @@ void multi_type_vector<_CellBlockFunc>::set_cells_to_single_block(
-     assert(start_row_in_block < start_row && end_row < end_row_in_block);
- 
-     // Insert two new blocks below the current one.
--    m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL);
-+    m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL);
- 
-     // first new block is for the data array being inserted.
-     size_type new_size = end_row - start_row + 1;
-@@ -1985,7 +1985,7 @@ void multi_type_vector<_CellBlockFunc>::set_empty_in_single_block(
- 
-     // First, insert two new blocks at position past the current block.
-     size_type lower_block_size = end_row_in_block - end_row;
--    m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL);
-+    m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL);
-     m_blocks[block_index+1] = new block(empty_block_size); // empty block.
-     m_blocks[block_index+2] = new block(lower_block_size);
- 
--- 
-1.7.11.2
-
diff --git a/dev-util/mdds/mdds-0.6.0-r2.ebuild b/dev-util/mdds/mdds-0.6.0-r2.ebuild
deleted file mode 100644
index efb98892b2b6..000000000000
--- a/dev-util/mdds/mdds-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mdds/mdds-0.6.0-r2.ebuild,v 1.2 2012/09/02 16:49:08 scarabeus Exp $
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
-HOMEPAGE="http://code.google.com/p/multidimalgorithm/"
-SRC_URI="http://multidimalgorithm.googlecode.com/files/${P/-/_}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-libs/boost"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/-/_}
-
-PATCHES=(
-	"${FILESDIR}/${PV}-fix-boost-1.50-linking.patch"
-	"${FILESDIR}/${PV}-fix-missing-includes.patch"
-	"${FILESDIR}/${PV}-multi-vector-build.patch"
-	"${FILESDIR}/${PV}-right-overload-of-vector.patch"
-)
-
-src_configure() {
-	econf \
-		--with-hash-container=boost \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-
-src_compile() { :; }
diff --git a/dev-util/mdds/mdds-0.6.1.ebuild b/dev-util/mdds/mdds-0.6.1.ebuild
index ce1b2ae60a3a..e7d9832d33e6 100644
--- a/dev-util/mdds/mdds-0.6.1.ebuild
+++ b/dev-util/mdds/mdds-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mdds/mdds-0.6.1.ebuild,v 1.1 2012/09/17 17:30:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mdds/mdds-0.6.1.ebuild,v 1.2 2012/11/03 08:59:16 scarabeus Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://multidimalgorithm.googlecode.com/files/${P/-/_}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-libs/boost"