gentoo resync : 30.12.2017

6 files changed, 2 insertions, 165 deletions

diff --git a/media-libs/libvisio/Manifest b/media-libs/libvisio/Manifest
index a7ba99e80b86..03f6c921bf75 100644
--- a/media-libs/libvisio/Manifest
+++ b/media-libs/libvisio/Manifest
@@ -1,9 +1,4 @@
-AUX libvisio-0.1.3-tests-without-tools.patch 364 BLAKE2B 65dd63c94ad521a3c073ffb741f9956d9c08608de4f04a1080d7de408b3723580ceedc4de14a70a963ffec174a364c4d5ca176b0dd2b931bdb71ff216874e29d SHA512 4f14e27b6630e42a2a76d487731f3c8608e40d897fcf2227bc4129962802a6d75ddd6dd1cfae70f12f62f4e6ab2152dd70552d941c08c802897c6aade60610ea
-AUX libvisio-0.1.5-fix-test.patch 1675 BLAKE2B f704e6a543a27eb89e9716928b89c73f26fd592e391aac4992b269a8253494fffe80b30b9076efc51b65798d25566ff25a3537a4c4ae27227720bf3e08f597ba SHA512 bc2a101008feb46d76f25482fb3bbe2f086029c9e6be555d32826996d6f1404d433615d8f1c1daeca8f22f439bac4cb406c73c9a59ad6d1faf01794a599348bb
-AUX libvisio-0.1.5-no-zlib.patch 1420 BLAKE2B 312a1a91c9103e2855bc26f3ec39bb4a4da5755c4fc4dbe0a62c41bca802176c439c6566d2bc7c7e011fa8520d441e9a3c44137c70f8c7fef266c51a9e0c62ad SHA512 caa991438cc172b8bb9046220187263ed5e7d7edb93f3f9ed54ecf2d4eb530d0fba6283a521e9a9604e755098a24d83c1420dc8a1484e8f4b228db38fb2fe289
-DIST libvisio-0.1.5.tar.xz 504196 BLAKE2B d5b02b9724e17e1a5b48eee750f6e1a50f8d0a5e74ac6cfd90ad5ae6ab4bc79d40718486c6164faa192ac0ce26c13d55918ff1c6f3c03a09b61399754c5920d0 SHA512 094ab546f650840d52fc34c1b105eff139d2f6e4d5cab7c9c99f8387ece0d0c6b02ec1376b3281d56a901bac016c2a024bb708c065b8b5d9404104e6494b5fab
 DIST libvisio-0.1.6.tar.xz 676396 BLAKE2B dbd96b64a3789e275a47fe59cd939620787937e31ee11b7af7977575c183ade233afdb952d4c2e362312ae400d23726cbd01e3ccb644c9a413abc84ddbe0f161 SHA512 58cee8cfe4205b2cad2f11dbe17882e57ebf0d10500116ca9d8d120e138f8eb0c65a5fea3bd7d2746bf8140377ee9deb34258597e028f9fdc8d21f270606cce1
-EBUILD libvisio-0.1.5-r1.ebuild 1283 BLAKE2B c63d91f770d9775ca50de4f2d3f72a5d9d3e3c85d8054d5222c3294d137567db3df0fe7e23b5c895b00793939a897b83a20923c81f6c443cfee7890a115cb325 SHA512 8da42252872dd328c49436ffeafc566b157cef3d5c991e76c8179c7b0025576d73d2265f3db73e087bf7b332e8bc153fa24d54b6b63a3edb8656e884384dbdc0
-EBUILD libvisio-0.1.6.ebuild 1143 BLAKE2B e28caf89942893ee83e1e02621fd26930e011c44439b32e9fba91b5e566ee8fb5fdd77e9a664ec3a0b06b2d47de192e51a9454017cf4f50caacb144e94100131 SHA512 463fbb16a85a03c3653c963802a06b248bea4e746b90cc85382ddf69e7b9e0d9980a53a8250e513e09dd4c37e396e92ec6b7020b346d2b9a351d6872513fca0f
+EBUILD libvisio-0.1.6.ebuild 1142 BLAKE2B 13b027d3b10d9fd48ebfb7a4e1820e4a18e41941051e9f90f6585fabf5e655b052dcf6a2a566683fdae980390a3cae494ca39bc9d88e9c837ceee7cc21dbfba0 SHA512 8ddc6c0e89452731b98c1477c126f606794445b343134b418264a064e11af901209de8de8191ccbac75fab90457afb37756726f96317d95ea19e092cd74f57ba
 EBUILD libvisio-9999.ebuild 1146 BLAKE2B 3c13cdc85db0149721f3669241d536e0b641cf3be42ac1b0578a223ed63b6dbc2de4bad92f587ed95523cd99af54b77e715933f1243e4fec28083aa3834b56d1 SHA512 52d9fd56bc9ab3b37a87ada2b490133ae02932af8bc26c6570a6ca35d40bcd389011059fb24ae9f8f4ee2ec289d65f81fbb1d85d52ac512e6a8f0258edc391b1
 MISC metadata.xml 321 BLAKE2B 845e098f8136b178e62b70bb06d8ce26ed7e2b9aec93358180d36cc8de5d4436501fa13521dcc7b4a7f8e311603b25c9d30d23db216008d3d96af5e462611a9a SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch b/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch
deleted file mode 100644
index 78eb9fe66bc9..000000000000
--- a/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2015-07-25 09:29:53.000000000 +0200
-+++ b/configure.ac	2016-02-07 00:19:30.534383076 +0100
-@@ -317,6 +317,9 @@
- )
- AS_IF([test "x$enable_tests" = "xyes"], [
-     PKG_CHECK_MODULES([CPPUNIT], [cppunit])
-+    PKG_CHECK_MODULES([REVENGE_STREAM],[
-+        librevenge-stream-0.0
-+    ])
- ], [])
- AC_SUBST([CPPUNIT_CFLAGS])
- AC_SUBST([CPPUNIT_LIBS])
diff --git a/media-libs/libvisio/files/libvisio-0.1.5-fix-test.patch b/media-libs/libvisio/files/libvisio-0.1.5-fix-test.patch
deleted file mode 100644
index 801421a689c0..000000000000
--- a/media-libs/libvisio/files/libvisio-0.1.5-fix-test.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a97d30ad693374deab404ec31fe00665882cc949 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Mon, 18 Jan 2016 13:53:19 +0100
-Subject: [PATCH] tdf#92396 test must be run in specific time zone
-
-Change-Id: Idc9d85ae8c5c1a6eccca7e830baa05a867ac4402
-Change-Id: I03b40e2746ad90f2c7cf09560c218aab2a18090d
----
- src/test/Makefile.am | 3 +++
- src/test/importtest.cpp | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/Makefile.am b/src/test/Makefile.am
-index 59d3419..23049b5 100644
---- a/src/test/Makefile.am
-+++ b/src/test/Makefile.am
-@@ -29,4 +29,7 @@ EXTRA_DIST = \
- 	     data/dwg.vsdx \
- 	     $(test_SOURCES)
- 
-+# ImportTest::testVsdMetadataTitleUtf8 checks formatted date string
-+AM_TESTS_ENVIRONMENT = TZ=UTC; export TZ;
-+
- TESTS = test
-diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
-index e05b3c1..32fb185 100644
---- a/src/test/importtest.cpp
-+++ b/src/test/importtest.cpp
-@@ -242,8 +242,8 @@ void ImportTest::testVsdMetadataTitleUtf8()
-   // Test the case when the string is UTF-8 encoded already in the file.
-   assertXPath(m_doc, "/document/setDocumentMetaData", "title", "mytitle\xC3\xA9\xC3\xA1\xC5\x91\xC5\xB1");
-   // Test <dcterms:created> and <dcterms:modified>.
--  assertXPath(m_doc, "/document/setDocumentMetaData", "creation-date", "2014-11-26T09:24:56Z");
--  assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-26T09:24:56Z");
-+  assertXPath(m_doc, "/document/setDocumentMetaData", "creation-date", "2014-11-26T08:24:56Z");
-+  assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-26T08:24:56Z");
- }
- 
- void ImportTest::testVsdUserDefinedMetadata()
--- 
-2.1.4
diff --git a/media-libs/libvisio/files/libvisio-0.1.5-no-zlib.patch b/media-libs/libvisio/files/libvisio-0.1.5-no-zlib.patch
deleted file mode 100644
index c119ce619da5..000000000000
--- a/media-libs/libvisio/files/libvisio-0.1.5-no-zlib.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 8bfb5e3c19ab4e8aea09132881963facb76cfcda Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Thu, 23 Feb 2017 14:30:15 +0100
-Subject: [PATCH] zlib is not needed since the move to librevenge
-
-Change-Id: Ib83663e9cc7a808db966cd8dfb3fbcd1ee195da6
----
- configure.ac   | 12 ------------
- libvisio.pc.in |  2 +-
- 2 files changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a11115b..2aa8ece 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,18 +76,6 @@ PKG_CHECK_MODULES([ICU],[icu-i18n],[
- AC_SUBST(ICU_CFLAGS)
- AC_SUBST(ICU_LIBS)
- 
--# =========
--# Find zlib
--# =========
--PKG_CHECK_MODULES([ZLIB],[zlib],[],[
--    AC_CHECK_HEADER(zlib.h, [ZLIB_CFLAGS=],
--        [AC_MSG_ERROR(zlib.h not found. install zlib)], [])
--    AC_CHECK_LIB(z, inflate, [ ZLIB_LIBS=-lz ],
--        [AC_MSG_ERROR(zlib not found or functional)], [])
--])
--AC_SUBST(ZLIB_CFLAGS)
--AC_SUBST(ZLIB_LIBS)
--
- # ===========================
- # Find required boost headers
- # ===========================
-diff --git a/libvisio.pc.in b/libvisio.pc.in
-index ce68e6f..638930b 100644
---- a/libvisio.pc.in
-+++ b/libvisio.pc.in
-@@ -10,4 +10,4 @@ Requires: librevenge-0.0
- Libs: -L${libdir} -lvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
- Cflags: -I${includedir}/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
- 
--Requires.private: icu-i18n libxml-2.0 zlib
-+Requires.private: icu-i18n libxml-2.0
--- 
-2.1.4
diff --git a/media-libs/libvisio/libvisio-0.1.5-r1.ebuild b/media-libs/libvisio/libvisio-0.1.5-r1.ebuild
deleted file mode 100644
index 549bc409b174..000000000000
--- a/media-libs/libvisio/libvisio-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libvisio.git"
-inherit autotools
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-DESCRIPTION="Library parsing the visio documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libvisio/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
-IUSE="doc static-libs test tools"
-
-RDEPEND="
-	dev-libs/icu:=
-	dev-libs/librevenge
-	dev-libs/libxml2
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-libs/boost
-	dev-util/gperf
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.1.3-tests-without-tools.patch"
-	"${FILESDIR}/${P}-fix-test.patch"
-	"${FILESDIR}/${P}-no-zlib.patch"
-)
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		$(use_enable tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libvisio/libvisio-0.1.6.ebuild b/media-libs/libvisio/libvisio-0.1.6.ebuild
index f0539aa338e9..404db3604d3a 100644
--- a/media-libs/libvisio/libvisio-0.1.6.ebuild
+++ b/media-libs/libvisio/libvisio-0.1.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE="doc static-libs test tools"
 
 RDEPEND="