commit: 8033e10463d6df37e1605c9eef8ee6af45e9c2f8 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sat Mar 12 15:05:13 2016 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sat Mar 19 21:39:38 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8033e104
dev-libs/liborcus: Drop 0.7.0 and obsolete patches Package-Manager: portage-2.2.27 dev-libs/liborcus/Manifest | 1 - .../liborcus/files/liborcus-0.5.1-linking.patch | 13 ------ dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch | 12 ------ .../files/liborcus-0.5.1-oldnamespace.patch | 11 ----- .../liborcus/files/liborcus-0.7.0-boost-1.56.patch | 25 ----------- dev-libs/liborcus/liborcus-0.7.0.ebuild | 48 ---------------------- 6 files changed, 110 deletions(-) diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest index 1936012..1d9a4c9 100644 --- a/dev-libs/liborcus/Manifest +++ b/dev-libs/liborcus/Manifest @@ -1,4 +1,3 @@ DIST liborcus-0.11.1.tar.xz 1627332 SHA256 02a6251a9b732c2c555c1be083411a2d0383dfd2ebc79f60ac282875b1ada49b SHA512 2a818a8888115281ea9c34d8911df99a2af131991b43de77ddf1182592becc9f77ca0df23aac5f2f92e1bcd732a0f704d15b98c66b308eaa1715f66d78a8ab76 WHIRLPOOL 67c616d3509ec18994dae6e4b718014adc3dd385aa9fa4ed5bf8b099c659f1390b15a7d6307b2a409f66abd2a5041942ee5e17e3cb7843fad49129575a829951 -DIST liborcus-0.7.0.tar.bz2 1665988 SHA256 7773a8f5f0b810e0f146dbcf3dbb42e89dd8af0868235e01d9f0cdefde41a8a9 SHA512 63aad5154e25d7d7bfd10f07e614e4c1ed2691a31c61c2b1e7ec029fa4d9168eba5b4303f5164ab29ef92843ce8f8afa9682772515c8b5e8ae65f4561b331db8 WHIRLPOOL b555b005b41fb41571ac7dbc63e32541decd0b79d61435a6730de9438761afe363d063905b671e1b724c02f2846e65e2af7fffca40282d08d35e1c4ff787fc63 DIST liborcus-0.7.1.tar.xz 1472804 SHA256 04846b64262210a0d4e18d72779c901633e45dc9cca2108235b38d4715266a43 SHA512 30461311b084f3c91ef8cc504ca7adfd212f95d49c0a320958ca203606901ddf84e37d5c95073437bad21af4c6ce71fa606dd7cdb7cc7bd58b2699d8863a318c WHIRLPOOL af6f4ff639851b94298f847437c25962412f37617f82c143b1bf71aa4f27b26003ffb2dad61fdbe9718f9b42a0f11c1dda71825da8b2ee8bf9e9fd727f309134 DIST liborcus-0.9.2.tar.xz 1558072 SHA256 dd49f9f1b8ff8a648434dd5c8b4fe1081d1118d61d0a71d4effee8f32553199c SHA512 1dd847012cf78df962c28408e0b56412a89e1d978d532a17fa92352f6788bbc1a0fe806c2d886ff148a8ee2db54620ce039b1809f347a976dca0078f248fd8ea WHIRLPOOL fe74951704b4cfbdfeeb894be459c4f7046fc23f813c50e43816943d064cbfc4a4f7feebf6a6737cf94d50826ac23796031b7626b89264ee21f42356ffbb44e8 diff --git a/dev-libs/liborcus/files/liborcus-0.5.1-linking.patch b/dev-libs/liborcus/files/liborcus-0.5.1-linking.patch deleted file mode 100644 index f9cb64d..0000000 --- a/dev-libs/liborcus/files/liborcus-0.5.1-linking.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN liborcus-0.5.1/src/parser/Makefile.am liborcus-0.5.1.new/src/parser/Makefile.am ---- liborcus-0.5.1/src/parser/Makefile.am 2013-04-12 16:25:03.000000000 +0200 -+++ liborcus-0.5.1.new/src/parser/Makefile.am 2013-04-23 19:45:47.794480191 +0200 -@@ -20,7 +20,8 @@ - - liborcus_parser_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined - liborcus_parser_@ORCUS_API_VERSION@_la_LIBADD = \ -- $(ZLIB_LIBS) -+ $(BOOST_SYSTEM_LIB) \ -+ $(ZLIB_LIBS) - - EXTRA_PROGRAMS = \ - parser-test-string-pool \ diff --git a/dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch b/dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch deleted file mode 100644 index 740376b..0000000 --- a/dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN liborcus-0.5.1.old/src/spreadsheet/sheet.cpp liborcus-0.5.1/src/spreadsheet/sheet.cpp ---- liborcus-0.5.1.old/src/spreadsheet/sheet.cpp 2013-05-27 19:07:41.712302036 +0200 -+++ liborcus-0.5.1/src/spreadsheet/sheet.cpp 2013-05-27 19:08:51.432302028 +0200 -@@ -734,7 +734,7 @@ - con.build_tree(); - - size_t index; -- if (!con.search_tree(col, index)) -+ if (!con.search_tree(col, index).second) - return 0; - - return index; diff --git a/dev-libs/liborcus/files/liborcus-0.5.1-oldnamespace.patch b/dev-libs/liborcus/files/liborcus-0.5.1-oldnamespace.patch deleted file mode 100644 index c8a669e..0000000 --- a/dev-libs/liborcus/files/liborcus-0.5.1-oldnamespace.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN liborcus-0.5.1.old/src/orcus_xml_main.cpp liborcus-0.5.1/src/orcus_xml_main.cpp ---- liborcus-0.5.1.old/src/orcus_xml_main.cpp 2013-05-27 19:07:41.713302036 +0200 -+++ liborcus-0.5.1/src/orcus_xml_main.cpp 2013-05-27 20:01:44.007301649 +0200 -@@ -36,6 +36,7 @@ - - #include <cstdlib> - #include <cstring> -+#include <iostream> - #include <fstream> - - using namespace orcus; diff --git a/dev-libs/liborcus/files/liborcus-0.7.0-boost-1.56.patch b/dev-libs/liborcus/files/liborcus-0.7.0-boost-1.56.patch deleted file mode 100644 index f72d66b..0000000 --- a/dev-libs/liborcus/files/liborcus-0.7.0-boost-1.56.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c01874c7770f4f56c031d7463156e03f2945e015 Mon Sep 17 00:00:00 2001 -From: Dmitry Roshchin <[email protected]> -Date: Mon, 27 Oct 2014 16:19:32 +0300 -Subject: [PATCH] Fix build with boost 1.56 - ---- - src/parser/string_pool_test.cpp | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/parser/string_pool_test.cpp b/src/parser/string_pool_test.cpp -index ad7d7c8..0d32c62 100644 ---- a/src/parser/string_pool_test.cpp -+++ b/src/parser/string_pool_test.cpp -@@ -5,6 +5,8 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -+#include <iostream> -+ - #include "orcus/string_pool.hpp" - #include "orcus/pstring.hpp" - --- -1.7.1 - diff --git a/dev-libs/liborcus/liborcus-0.7.0.ebuild b/dev-libs/liborcus/liborcus-0.7.0.ebuild deleted file mode 100644 index 5e300e8..0000000 --- a/dev-libs/liborcus/liborcus-0.7.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_REPO_URI="git://gitorious.org/orcus/orcus.git" - -[[ ${PV} == 9999 ]] && GITECLASS="git-2 autotools" -inherit eutils ${GITECLASS} -unset GITECLASS - -DESCRIPTION="Standalone file import filter library for spreadsheet documents" -HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"; -[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.bz2"; - -LICENSE="MIT" -SLOT="0" -[[ ${PV} == 9999 ]] || \ -KEYWORDS="amd64 ~arm ~ppc x86" -IUSE="static-libs" - -RDEPEND=" - >=dev-libs/boost-1.51.0:= - =dev-libs/libixion-0.7* - sys-libs/zlib:= -" -DEPEND="${RDEPEND} - >=dev-util/mdds-0.8.1 -" - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.7.0-boost-1.56.patch" # bug 527242 - - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - econf \ - --disable-werror \ - $(use_enable static-libs static) -} - -src_install() { - default - - prune_libtool_files --all -}
