gentoo resync : 20.11.2017

3 files changed, 0 insertions, 106 deletions

diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index f64f3185577c..1d516b08c14c 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -1,7 +1,4 @@
-AUX libwpd-0.10.1-CVE-2017-14226.patch 2247 SHA256 de7ecfd890a8d71aa9a944963b17d0aae65aef554bb2ea8412e7013b4399f50f SHA512 f817c9f962b8caf3919eea8faf8c9222515b909934f49efc9f3d0fdb406e680ce05d1407cdd74d4befbfee8d2db41520f0c6c756c6d050720cff7f5d16aae073 WHIRLPOOL be826095c13e44d10a13c5a4355f3a3de61f4042a5389283f414cf95fe3e99bbf74afa5f89818d4418e41d5c84cda2938e5a010dba8886cd9d16f81c70b55697
-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
-EBUILD libwpd-0.10.1-r1.ebuild 1357 SHA256 a01a046ab4f4bf3ec628026f38853a3fe8d81760ec1ea10a4b6be49c1e742172 SHA512 88614a13745eb1b594944ba6c4b68620fa4cf9c96f0d040e7e1a9b2e8f07733b6a93919086fd943818eedc0e29a877a682d19c3032a12c14aade9c96972f66b1 WHIRLPOOL a6937a87472fcf1e574f56ecfc15ec2c28f7a0bb81410928b5d3d75e97a6f6c90545d38cda4fe707380d05c6da752f77c5247e5a8c623db9374de7e3119f3b99
 EBUILD libwpd-0.10.2.ebuild 1304 SHA256 32efccc15b5e79e7efafa92a5e0b4c5e94e73995925495acc609481f87101d73 SHA512 3c2aef394fc4ddaeb66a437697c4cd5cc37f04d989f4e2a7d654b602b2c9ee13e2f3ce413ad61cac53567f8983326ae209323e989421977ae60b035182a0f48e WHIRLPOOL 0e3ad940238f9b43f108d038091f7252200990ebbf0e514206cca2b50c30ee29958820deb92ecea90dee66fd7fe9f7f8844dcb664d79d3fd1417fdbfa5c2c800
 MISC ChangeLog 3491 SHA256 9602eef0338576e65bcb7f493e9c270c2cb8a4081cfec334a667439cb27ac932 SHA512 115ff2b61759e6ab96d55acac00183b1f28108fddef5205ffa4db59b260b856ccbc8ff47b1e314a29ace1f39e70bd2c8597aa7c614893303a16b7a545775e292 WHIRLPOOL de14db0e27d620e6d3f3881daff03e2eefda3349251b274526c34af0efb4cfacf516b335ba7dfd7b94e1c48d43251161892917940f289da9ffe2ca41360a5efe
 MISC ChangeLog-2015 16613 SHA256 f97236f0af538975fa7a4271120f88560e7f39c1fadf6e070255642c995dcddc SHA512 e0004d6a76aaa241f534f71c542671b6ce278f8859d79a36f68d4a0a04c7cd5632b4c112ccc3f0a1f76403311c8961c0297559df7015910cf3fa0f33cf6911b6 WHIRLPOOL ceec052621b8c713fc0d14eeff309f1b6304db6172427cb1df14c6ea736a9fc3a9320fa6b9618956f0efbe811336e8cd78db474a7e86689578e786f3b4e3011a
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 4a5c0df922fa..000000000000
--- 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@libreoffice.org>
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@redhat.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 dbd2ea12c0ef..000000000000
--- 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
-}