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

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

7 files changed, 11 insertions, 165 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/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"