[gentoo-commits] repo/gentoo:master commit in: app-text/libwpd/files/, app-text/libwpd/

[Andreas Sturmlechner]

commit:     3799aea08fcf7cec0a4ff5b3a2f5a2173c4566dc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 23:21:55 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 23:49:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3799aea0

app-text/libwpd: Drop old

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 app-text/libwpd/Manifest                           |  1 -
 .../files/libwpd-0.10.1-CVE-2017-14226.patch       | 50 --------------------
 app-text/libwpd/libwpd-0.10.1-r1.ebuild            | 53 ----------------------
 3 files changed, 104 deletions(-)

diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index 96e519055c8..2a5e51c4922 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -1,2 +1 @@
-DIST libwpd-0.10.1.tar.xz 524004 SHA256 09d3410bc770f9d9eedc8544b5c211771ea3322de3fee19b58ad7d40fb2984f6 SHA512 976694b5e02fd9eb0b3769d5071e9ae88505f491d8fa34473e5b99cd350060a85ddfad9b3c38e9b37a280e695e4571d353fd69fe7b69a627097587912b58ad2c WHIRLPOOL c6c1124a7124edda4dad6788794c46067ad21c8fde0765ff1b1ca6305c08139e86ac0667d6fd6ca53e4bed41ad0b7aa6b4803fad5f7f72c529cf0c3b22bc7b43
 DIST libwpd-0.10.2.tar.xz 536400 SHA256 323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610 SHA512 821dbc0535ebd4fa41bcf984e344e11176862676c66abebe45cf4284f8de6e6cc7629f8a605b169d034a5c2f3e2461513d61e11e549ca73b8328eb66ac3bdd79 WHIRLPOOL 9ac29bab74f6131966212b932601e397fb5f291aed78e5e1e9da1bafc3ac21329bf1f3b39fde4ed8e8b84918903bb5142624a44293631c515c96b8f9d3511cd6

diff --git a/app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch b/app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch
deleted file mode 100644
index 4a5c0df922f..00000000000
--- a/app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Gentoo-bug: 630682 (CVE-2017-14226)
-
-Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1
-Reviewed-on: https://gerrit.libreoffice.org/42054
-Tested-by: Jenkins <ci@×××××××××××.org>
-Reviewed-by: Caolán McNamara <caolanm@××××××.com>
-Tested-by: Caolán McNamara <caolanm@××××××.com>
-
---- a/src/lib/WP5StylesListener.cpp
-+++ b/src/lib/WP5StylesListener.cpp
-@@ -85,8 +85,9 @@
- 		m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
- 		m_currentPage.setPageSpan(1);
- 
--		for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
--		        HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
-+		std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
-+		for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
-+		        HFiter != headerFooterList.end(); ++HFiter)
- 		{
- 			if ((*HFiter).getOccurrence() != NEVER)
- 			{
---- a/src/lib/WP42StylesListener.cpp
-+++ b/src/lib/WP42StylesListener.cpp
-@@ -84,8 +84,9 @@
- 			m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
- 			m_currentPage.setPageSpan(1);
- 
--			for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
--			        HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
-+			std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
-+			for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
-+			        HFiter != headerFooterList.end(); ++HFiter)
- 			{
- 				if ((*HFiter).getOccurrence() != NEVER)
- 				{
---- a/src/lib/WP1StylesListener.cpp
-+++ b/src/lib/WP1StylesListener.cpp
-@@ -83,8 +83,9 @@
- 			m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
- 			m_currentPage.setPageSpan(1);
- 
--			for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
--			        HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
-+			std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
-+			for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
-+			        HFiter != headerFooterList.end(); ++HFiter)
- 			{
- 				if ((*HFiter).getOccurrence() != NEVER)
- 				{

diff --git a/app-text/libwpd/libwpd-0.10.1-r1.ebuild b/app-text/libwpd/libwpd-0.10.1-r1.ebuild
deleted file mode 100644
index dbd2ea12c0e..00000000000
--- a/app-text/libwpd/libwpd-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit alternatives
-
-DESCRIPTION="WordPerfect Document import/export library"
-HOMEPAGE="http://libwpd.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips x86 ~x86-fbsd"
-IUSE="doc +tools"
-
-RDEPEND="dev-libs/librevenge"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2017-14226.patch" )
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable tools) \
-		--program-suffix=-${SLOT}
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if use tools; then
-		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]"
-	fi
-}
-
-pkg_postrm() {
-	if use tools; then
-		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]"
-	fi
-}