gentoo resync : 08.01.2018

17 files changed, 131 insertions, 426 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5c8936d231bb..235569a79b53 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index d5920c8f3da4..bff601ea3d21 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -3,5 +3,4 @@ DIST asciidoc-8.6.9.tar.gz 907253 BLAKE2B 45db42abd9ec73f6d3b20fc755bdd501eab150
 EBUILD asciidoc-8.6.10.ebuild 2443 BLAKE2B c1f925ca60568c87634616d4dd1ff8c15cf06b2d6b97bf67a63f2eaa9c0ec46d8444535f802c08522ccfcfc29a90f221da4ff32896c47ae2ab18e38446eb0a67 SHA512 71a9b339b30ab19254b9cef30c6f85062c0cfc258a8eac8a58ea59532b6c4a822911f1f35c28464b2a15fded950988c8576f0d95c4fc601598e1fc1ef96c68a0
 EBUILD asciidoc-8.6.9-r2.ebuild 2194 BLAKE2B 2220da9b448de8c9682bcc73513c43f713dc6f329860a5ebb62017f5fcddb6d33274cad6e47d6592bb58b914811c93bf18f873ac7d5c15a676af55913b0610c8 SHA512 8800a9c0a0ffc8105315d468194b8c6aa0a23d2345b1a5aa4ba5950c3d2daca94f28ffd81f40e52c10d8de94d9f67306d69a3c00acf4008821ffb4c21625f190
 EBUILD asciidoc-8.6.9-r6.ebuild 2393 BLAKE2B b3894e1bfefce30f5d75a843b2065f3bfae89c8e78d4d30c886d50082b078468d1b2676ca3b08f30761d2adbdb65137dae81ebdd01d3755f47e71edac7bb807c SHA512 ef5cd7559f8c7a1a3de05a6ec2b81647b8b2bdb22efe6112d5136a36f83e32071a09febfe9a4310e437fdfa92b1e752bf0744010218653758fff5d39677a7e66
-EBUILD asciidoc-9999.ebuild 3024 BLAKE2B 9b70f5b4b66dbdbe75f4947d23d7ff32630134c5cc970abda7265891fffa85afbcf09ed3065641e0d98b80c0f1d5e432fd3c575b8194f338c58819e8a89e423b SHA512 a4f71cee5bdd91630d0e3be403666c0bd250f3425a15cdd863da3a429d8cab36304f07b463b2353c1296f8e89ddc28f5ce1e9e6aa0922577659c158f168e805d
 MISC metadata.xml 583 BLAKE2B d9e73f6edfe77114e18617c0ae65a812fec9967b9f129bc8f5d5c5a761c3c93f2bce420153f33de6d11feea2e93d844e84ad50690e2183462e38015edf781d3a SHA512 cf654b12cae851d762b538926912ed626a5681033f9c579ca9e62d442345c8efe5a5373784c702994c2b97a0acf7f251d257da29dc3960a2dc8c1b84327f11af
diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
deleted file mode 100644
index 8577a4a0e1a5..000000000000
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-[ "$PV" == "9999" ] && inherit git-r3 autotools
-inherit python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/"
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="https://github.com/asciidoc/asciidoc.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	graphviz? ( media-gfx/graphviz )
-	highlight? (
-		|| (
-			dev-util/source-highlight
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/highlight
-		)
-	)"
-DEPEND="
-	test? (
-		app-text/dvipng
-		dev-texlive/texlive-latex
-		dev-util/source-highlight
-		media-gfx/graphviz
-		media-gfx/imagemagick
-		media-sound/lilypond
-		${PYTHON_DEPS}
-	)"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-if [ "$PV" == "9999" ]; then
-	DEPEND="${DEPEND}
-		dev-util/source-highlight
-		www-client/lynx"
-fi
-
-src_prepare() {
-	default
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		"${S}/asciidoc.py" || die
-
-	[ "$PV" == "9999" ] && eautoconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_compile() {
-	default
-
-	if [ "$PV" == "9999" ]; then
-		# replicate build rules from doc/main.aap; this avoids a dependency on
-		# the A-A-P build tool
-		for f in CHANGELOG.txt BUGS.txt README.asciidoc; do
-			${PYTHON} asciidoc.py -f text.conf -n -b html4 -o - "$f" | \
-				lynx -dump -stdin > "${f%.*}" || die
-		done
-	fi
-}
-
-src_test() {
-	local -x ASCIIDOC_PY=asciidoc.py
-	"${EPYTHON}" tests/test${PN}.py update || die
-	"${EPYTHON}" tests/test${PN}.py run || die
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED%/}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
-		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-
-	# Below results in some files being installed twice in different locations, but they are
-	# in the right place, uncompressed, and there won't be any broken links. See bug #483336
-	if use examples; then
-		# examples/website is full of relative symlinks,
-		# deref them for copying, which dodoc doesn't do
-		cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index ea226e5d5341..c6dbc3b3aa32 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -7,10 +7,8 @@ AUX calibre-server.conf 523 BLAKE2B a9fb65a327656f9b2f54eab27dcaf2cdfbcbe5f0d637
 AUX calibre-server.init 1811 BLAKE2B fe22257128896d4299c5d5edab6ac63cdcf79da483f4afc49b0d1649b17599389dd4b9f88c35a964e289cbe6d961136f1e5760a2244137c404e573510899bd60 SHA512 760aa7a8f51b23b116ba07749855737869ff2313f0528d67e5a46bc362e5c0a04a7e1f46c32dd6e82add4fa5dc41d397db32dbd1a09c912008e0890d1a133eeb
 DIST calibre-2.78.0.tar.xz 38739404 BLAKE2B a563883407b8c5cdbc8080ef94d7325eca76f938d0238d0ffd7a6836453a6aa1f5dc06a602eb255cfe99e083734f352bc1e18e6ab1834dd6e003b357ca03b42e SHA512 0779ac385dde45ac4baee7cecb0916e245f3e1cf20662bad9d9a4278265390b1aa89c2b478601b57113e7de08a69343288488ee299e8b43332f0129e650aa0ca
 DIST calibre-3.15.0.tar.xz 38177684 BLAKE2B 7d3892f81db61f8d4a08589a42ccd71183d9dc7fa401480d4426d1205a9a633216a79865140481f63e1e3a741d34f604ea9d7f98c490949d0d4452cb9123fb9b SHA512 93a9f3b7122d8f4cd1d847727f6d1ccd1f9d828651e9ee77a34544742884b3e925552ca61ec1d0a1196b04a0874e97fc877e679dd8a69ba8b754b7688b730697
-DIST calibre-3.3.0.tar.xz 36308116 BLAKE2B fe331df77ed256fb509028e777bd628cb7b316ae99d594c7335216c08e509de32df03ebe3c1393e2cdf6618b4a3820458d2bf9045380c43f979218544cb7757d SHA512 bb63f83d5e35079daba9ec6e7849e6a65c51cf0b2da9fc45b86a2b64cc147f862f08413730f3d2710793de7b045fc73913534dfca11b128ad0ea72e92033f977
 DIST calibre-3.8.0.tar.xz 37922608 BLAKE2B 6ae465da15a50f45621753b4f8fdcb978fa3b3cf170575cca0a9e4ae3cd324fbb4b194861180961539f8057ce3650066d7113368dee404d899ed8ca1a58f80e6 SHA512 db7ff5cb0ee82b3237090cbf6a13d13bfa5e27139dd067290ed59d407d2dbbae2ecd3dab338a0beed845079387a051b092233350091ef6ec82623d3a16b1d48d
-EBUILD calibre-2.78.0.ebuild 8033 BLAKE2B aa37993a33ea21f966b27673b972187c6fc0270ccd8db61af32114e7fe99cb39386399e55be7960196c2c419f87bb987a3f4e9ed335cdf5a4fcc8b6848f93c87 SHA512 c65f281218b26c1f77c6e226ab86bce7dab3089c99e5a8be39b52cf6f77c643520cfb5a1026d303a09964044bfe6c9ff2f5dc1fef1a625a61354a9d950d43487
-EBUILD calibre-3.15.0.ebuild 8880 BLAKE2B 13ea9ab57da2e5fce9e71707dc8711b6a95c642a12929e7144050f3b3aad01304fb9b00bfff6dac410dfb46cb4da47fb0cd94afcf3cd9b418fe130c2c54453d1 SHA512 6dace15dc9be284ad89113c8c6b9387b6bf30a4c3e2500dfc635c921d3a3d4cf8213e5731989bdb18fa2b8c7b1bff07c889f220cd799f07b076c7ebef85ac415
-EBUILD calibre-3.3.0.ebuild 8800 BLAKE2B be17c2dfa92c94084805d2c8dd736f8f8369b79bf2af8b78ce5a0cc0288162f97856a0c792e441b94635eb22ea4493785db72d02ce337beaecab199aafaa9833 SHA512 581cb6b0331a058b013cf32de5b7d87b7ddf35482f91c62dbb947d392c90d46cf58690780534a1bb2c243dca2cee1b015b0ef361ed9763fe3cddd20ef2faafb8
-EBUILD calibre-3.8.0.ebuild 8843 BLAKE2B 5bc3d0722e890fed9a95292f8fe6e27dcc5d502a4850335bf221f1cd6a9c6ec0c703819a199d79b0ab01b72ffbd0134d48b4435a6ed30c91272843b0b4a5193a SHA512 41a12022df5a61a6b7308a65c34cb04eb25187d6da72691bfe6d60f39b7fe6e33ce48fe4fd03d576193df41e246bfc61c0086266f1584093739a0709602b949a
+EBUILD calibre-2.78.0.ebuild 8460 BLAKE2B e32c092ef390d34c3b277363ce65c58f546d1f3e9cab484a24d3cbb6278e80d7fb5c398fd39f82c697743f48b2b1ad663c3f92d4521b8bbaaa2df60c31da11dd SHA512 4b8c53480d7d3c26c8b63c0c127624de6869b24786c04ac37cf9aa5b61460a90636cfcf7115d018750bbacef2a4ea8c725804b2458b2c92095eed31be58e788a
+EBUILD calibre-3.15.0.ebuild 9288 BLAKE2B 1bab29936ccb88344000c7fa443b6a903593c2bc3502f0a771b1b0e8f91464c4c6072a50aca328312babfa7d7a2b978577fe03b797e5771e58ebfc8d21fcec0d SHA512 d62e341100904bf95324210db5b6890c23ab13b0960188de50f611b3fd515f148d9744504925ed1244def801b8e8dc23d7738bb9c4fd53939ea2942671d2961d
+EBUILD calibre-3.8.0.ebuild 9251 BLAKE2B 4fa3716b67c82a6d874b6aba0ad657dcd7ba9f3c4833204c8d9466b828ca847010240d04cc3e3343131b9952427e9bce96c739162e9fa4921127b18f57abe1bd SHA512 da3a7fabc0cec91cc431484a014f31b25303c369e26bf5c9a65bc4bb444ede18922e004b27296d9813797340a8a17a824d00c84d8c9581eecbdc116d23769844
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-2.78.0.ebuild b/app-text/calibre/calibre-2.78.0.ebuild
index b2d45db79e7c..4925b5e794f0 100644
--- a/app-text/calibre/calibre-2.78.0.ebuild
+++ b/app-text/calibre/calibre-2.78.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,ssl"
 
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
+inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="http://calibre-ebook.com/"
@@ -60,6 +60,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
 	media-fonts/liberation-fonts
 	>=media-gfx/imagemagick-6.5.9[jpeg,png]
 	media-libs/fontconfig
@@ -72,6 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
+	x11-misc/shared-mime-info
 	>=x11-misc/xdg-utils-1.0.2-r2
 	udisks? ( virtual/libudev )"
 RDEPEND="${COMMON_DEPEND}
@@ -81,6 +84,14 @@ DEPEND="${COMMON_DEPEND}
 	>=virtual/podofo-build-0.8.2
 	virtual/pkgconfig"
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
 src_prepare() {
 	# no_updates: do not annoy user with "new version is availible all the time
 	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
@@ -240,12 +251,18 @@ src_install() {
 
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
 }
diff --git a/app-text/calibre/calibre-3.15.0.ebuild b/app-text/calibre/calibre-3.15.0.ebuild
index ec7d26d14536..685494d3112a 100644
--- a/app-text/calibre/calibre-3.15.0.ebuild
+++ b/app-text/calibre/calibre-3.15.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,ssl"
 
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
+inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="http://calibre-ebook.com/"
@@ -68,6 +68,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-qt/qtdbus:5=
 	dev-qt/qtgui:5=
 	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
 	media-fonts/liberation-fonts
 	media-libs/fontconfig:=
 	>=media-libs/freetype-2:=
@@ -81,6 +83,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libX11:=
 	x11-libs/libXext:=
 	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
 	>=x11-misc/xdg-utils-1.0.2-r2
 	ios? (
 		>=app-pda/usbmuxd-1.0.8
@@ -94,6 +97,14 @@ DEPEND="${COMMON_DEPEND}
 	>=virtual/podofo-build-0.9.4
 	virtual/pkgconfig"
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
 src_prepare() {
 	# no_updates: do not annoy user with "new version is availible all the time
 	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
@@ -253,6 +264,7 @@ src_install() {
 }
 
 pkg_preinst() {
+	gnome2_icon_savelist
 	# Indentify stray directories from upstream's "Binary install"
 	# method (see bug 622728).
 	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
@@ -269,11 +281,13 @@ pkg_postinst() {
 			rm -rf "${x}"
 		fi
 	done
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
 }
diff --git a/app-text/calibre/calibre-3.3.0.ebuild b/app-text/calibre/calibre-3.3.0.ebuild
deleted file mode 100644
index 46710a8a8454..000000000000
--- a/app-text/calibre/calibre-3.3.0.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-	unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2
-	>=dev-libs/icu-57.1:=
-	>=dev-python/apsw-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.2.5[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	media-libs/fontconfig
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	sys-libs/zlib
-	virtual/libusb:1=
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.4
-	virtual/pkgconfig"
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# don't create/install uninstaller
-	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
-
-	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	#dodir $(python_get_sitedir)
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED%/}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED%/}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/calibre/calibre-3.8.0.ebuild b/app-text/calibre/calibre-3.8.0.ebuild
index e18eb11846bc..9c035ba93869 100644
--- a/app-text/calibre/calibre-3.8.0.ebuild
+++ b/app-text/calibre/calibre-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,ssl"
 
-inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
+inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="http://calibre-ebook.com/"
@@ -66,6 +66,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
 	media-fonts/liberation-fonts
 	>=media-gfx/imagemagick-6.5.9[jpeg,png]
 	media-libs/fontconfig
@@ -79,6 +81,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
+	x11-misc/shared-mime-info
 	>=x11-misc/xdg-utils-1.0.2-r2
 	ios? (
 		>=app-pda/usbmuxd-1.0.8
@@ -92,6 +95,14 @@ DEPEND="${COMMON_DEPEND}
 	>=virtual/podofo-build-0.9.4
 	virtual/pkgconfig"
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
 src_prepare() {
 	# no_updates: do not annoy user with "new version is availible all the time
 	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
@@ -251,6 +262,7 @@ src_install() {
 }
 
 pkg_preinst() {
+	gnome2_icon_savelist
 	# Indentify stray directories from upstream's "Binary install"
 	# method (see bug 622728).
 	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
@@ -267,11 +279,13 @@ pkg_postinst() {
 			rm -rf "${x}"
 		fi
 	done
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
 }
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 0f1b350a920c..03ca1bbb4da7 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,3 +1,3 @@
 DIST gspell-1.4.2.tar.xz 407356 BLAKE2B f2ee6ae43be55e8ad7253e10893868a8d7857bbe41e14d71103b27a0faf40b0ed247e9fa38ed7bc75039fe0f1f600fe739f538d50f69fb063d0932df6c0b1c27 SHA512 00f53d3ca47a4ba1af1e8b4983a41dc6df8a9788898b45ffdd161a3fc8de28024cc985f49fbb872912c0a94addbca3b28ce2edda70eeb206a794e2bcf65e4a5e
-EBUILD gspell-1.4.2.ebuild 965 BLAKE2B 2d62a6702dc433e7e1245d076241ce29a35bfd90d4d35569806fedfd36ed472cb4c0e80680f0179c0fcec2c83f057b3bfbd5d67d4875121c898dadf0ac15637c SHA512 39edef053f5c18205d0893b7227d9c7f14a3e52f01e4bccb6944ad594f9abfcd1d605327f03deb2cecb8c830cf90dbafe9085fd6a210c1bd87d11a3f1771a9bd
+EBUILD gspell-1.4.2.ebuild 972 BLAKE2B e05dbbc9d503b7d6ee25058ccc16d4bf17093efbbaba116d21ed68c103e38bf080b88baef1f1c458a28ed6196f376937ca3264443e5e03d2d62296788fe9ce46 SHA512 d755e215eea2a3b1e1ad59467cdd80b113c0a97c03288369bf744c9e5a369700e995183efc693b452557e651c9d329bf7e3f67e9551fd3f1371a20a44b2d5908
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.4.2.ebuild b/app-text/gspell/gspell-1.4.2.ebuild
index 590073750b1c..c6f0105cc171 100644
--- a/app-text/gspell/gspell-1.4.2.ebuild
+++ b/app-text/gspell/gspell-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm ~ppc x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~sparc x86"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index 25aace313d2b..5e5635782a3d 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,4 +1,6 @@
+DIST 1.23.tar.gz 83337 BLAKE2B d73cd6987bf7929c57e8acf0a24278272ea199bf980756ddb5da9a5eddf7760a8c05f0e48a287ee760d4bf4d2594fb08b43a77cef46d371a746629bf76955e91 SHA512 b94724e130cdf58b911634496c52361d008ebfafab3ac40a76612c4891737d4145596a6badc15fe4228c90c1cd7261e5a892e3e462070ebb55f71332b36345d7
 DIST nfoview-1.15.1.tar.xz 88400 BLAKE2B 4e0f2d6df179a25f7fbf9b762dab70f1331d31fc1fed018e71101171d6bbcce9b67f9c4f4a3c35fbf22ed3123e90934b035290d3fae5a4d396ddc6fdc04ce133 SHA512 e4cf86003b03ae57b8a4e76990df77c7e9e441abd8ab0440385405b0f600a85539a152de5893ebe75797bd96ecb811086c48b1439b9f8719050eb12315f67426
 EBUILD nfoview-1.15.1.ebuild 842 BLAKE2B 7730db4262045788d0528425650fd3ea113616dce208e4432e4d9e8e1b371caf526bead621f6b2832598b5c70d93c125700f123cb4f1c377b65ea9503b7c6bbf SHA512 c84c7011845bcb522c33de62c70d1d02ef8709ed9902dd2d8dd1d13b9af9e559d974c090d7abbeda3672a76feb1948f06d78b3c688b2731631a134b7df40e841
-EBUILD nfoview-9999.ebuild 844 BLAKE2B b220d73669cf6149e399c65de520b1bcf4792bda60ca327bff958d9d05ef3816fc2c071e032a68bb459a65ce2a53f25e29275b878fe228deb35e5067dc1f0215 SHA512 73c9386c20e3609e2193c1ee015ec0fdc6a8749da2a61b6300065360bff821d9f042cae7bbbca577aa088db212c2c2ddc659441d86f8fc15a969309522d21302
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD nfoview-1.23.ebuild 847 BLAKE2B e2cdaef14346aa42d3acf3976c0bc1b0799f5146587b3468897d2c2191f124f900d58f515c4ebabf1ac67b376413e5d94e30fdbff97fb9e99ebec257341780e5 SHA512 52c39e59104f72e71515940d926184aef5afefdc05b336cffa19a01ba0deccc09ce153183b1986eb17a2f14b0b8df50b6acf2516de61c6f02e79c2574126ecad
+EBUILD nfoview-9999.ebuild 847 BLAKE2B e2cdaef14346aa42d3acf3976c0bc1b0799f5146587b3468897d2c2191f124f900d58f515c4ebabf1ac67b376413e5d94e30fdbff97fb9e99ebec257341780e5 SHA512 52c39e59104f72e71515940d926184aef5afefdc05b336cffa19a01ba0deccc09ce153183b1986eb17a2f14b0b8df50b6acf2516de61c6f02e79c2574126ecad
+MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
diff --git a/app-text/nfoview/metadata.xml b/app-text/nfoview/metadata.xml
index 6f49eba8f496..f49632fab59f 100644
--- a/app-text/nfoview/metadata.xml
+++ b/app-text/nfoview/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>till2.schaefer@uni-dortmund.de</email>
+		<name>Till Schäfer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">otsaloma/nfoview</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/nfoview/nfoview-1.23.ebuild b/app-text/nfoview/nfoview-1.23.ebuild
new file mode 100644
index 000000000000..860d9eb9b041
--- /dev/null
+++ b/app-text/nfoview/nfoview-1.23.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
+HOMEPAGE="https://otsaloma.io/nfoview/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	media-fonts/terminus-font"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/nfoview/nfoview-9999.ebuild b/app-text/nfoview/nfoview-9999.ebuild
index f8030006af37..860d9eb9b041 100644
--- a/app-text/nfoview/nfoview-9999.ebuild
+++ b/app-text/nfoview/nfoview-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,12 +11,12 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
 	inherit git-r3
 else
-	SRC_URI="http://download.gna.org/nfoview/${PV:0:4}/${P}.tar.xz"
+	SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="http://home.gna.org/nfoview/"
+HOMEPAGE="https://otsaloma.io/nfoview/"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index c4bc3799f3a8..290db3c7aedc 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -786,7 +786,7 @@ EBUILD texlive-core-2013-r3.ebuild 11429 BLAKE2B 4acb2e48b6400c1fda6ded3b4e098f2
 EBUILD texlive-core-2014-r4.ebuild 10720 BLAKE2B 2887ea23e06a64622722b5857fd68355decfc87ebc2a272991653b690b337368f69106354739f8137620126db522795b016926e220d2bd2cad8d34387a9f5060 SHA512 efa6656f4242526b174c43eb4349ae2339c9f2f59e68190ac87dba6337b4750fc0404140e5c6df3f61a1cd96ee4a6b48279d3c8e8ae7fbd828264b191d7115f3
 EBUILD texlive-core-2015-r1.ebuild 10925 BLAKE2B 85715b6526c34cb996854834f70687c8602212e6adf6f8b88c040ffea1f667355b6249c624fadfcbd5f2d63691d9e97bc140f347997b618bad10ed39ee02aa13 SHA512 409576c65f51cc4b824c3a98d2b34273c4163b8aee3de426b0b38bde573b4dc4e08c36225aaab15b550842d86778d63780ece0d55fed0fb7070dc1d28d3026ad
 EBUILD texlive-core-2016-r5.ebuild 11555 BLAKE2B a518636f0d5ab05d7e76a5200e2ba94bb8a0c8d76c37193b31789c8176b32bb2142cf5616c5a278732c110914be82636f0598e3e4c9234187d38f049f4cc68e6 SHA512 8d17485bea8ed2f0da0b5a3443c38f8e1d78daba639033042464c609432f42a574264920b673e732193efc6a9522c015c8ca9a1529577b5c6a01551a39864237
-EBUILD texlive-core-2016-r6.ebuild 11566 BLAKE2B 6ee8433c05ac9d7175df9c255a1b2d5deda4338e36cc5464a9ec229ec277ee8f4ae375eb669af0991b7f814b57d878443f365a74f598b80b344405fc51c87d4b SHA512 2549c0716d265749e2e64e822d88cc05cf52680170e7155acdc7d3653bbbe734dbcef7d44391986ec61129d7fe224a480d2df01aabde8d232534cad05e5e9d23
+EBUILD texlive-core-2016-r6.ebuild 11563 BLAKE2B db9394c886d4f12b9ec4c58b3b5c3f3ea5d0a10171d09f1d3c49d34b935af6a84c9dd31c69c4f89096826d41b6be11e26ddeedb8ad5bde019a8b574e10f8bb29 SHA512 241c91ff0989ebf7d7c83e7c3b7458078aab9048eac9b16c0dd92595cfa6f25ce54b3a445060e3125cee9bbeddc7cd6f4c395c34e413206af594cc16d6e2a566
 EBUILD texlive-core-2017-r2.ebuild 11637 BLAKE2B d2b7e0b062a14232492e21e7a7c2d747e054888091da79786d03898d7ab0eda2410ffe9fc9533c79b844c1ec4dd96cc8ac8610ad3428a9e16d1bcaff8421ac15 SHA512 2298ae898b67362cc5bb3c56bec13f105f0124980e26da8aaaca2ffc21edc04eac6cf7a755f1867f85835a98c00865656f9b97e741bea8dec22aac841e2e727c
-EBUILD texlive-core-2017-r3.ebuild 11611 BLAKE2B d948e66e0e764a6378fea7a36f861379c139b2ef911786f52cc21655eeb2d83ae713a1e4e9fe3d455a9ad16115388269e901b932f4c60fce40319f2baab6da4a SHA512 d6c41eb28d8c26cd0290477c1b4e6b23a35f34bc3bfdb1f1f4db90000d0acd26e29fb0c627a7b6244ecc1f4852ba4eb4104948e92cfc3311ccfcf8826680ce21
+EBUILD texlive-core-2017-r3.ebuild 11608 BLAKE2B ba80ebe28ecc87e3eca40399bfbd77f1b48eaa07ffc43b69e660e2644873b61dd282f26569149692ae84b8015e057c278bb679ca50b594b10d1dca4ae09367d7 SHA512 7ff3d1fae91de0ff2c7bdff8368eb310b9746fca80142ef89149669f98d355946a8b9ad96b13732576c8251f7c6e6cdd302df127507ca272880e408006660a14
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2016-r6.ebuild b/app-text/texlive-core/texlive-core-2016-r6.ebuild
index c9a538691161..a6af8964aca9 100644
--- a/app-text/texlive-core/texlive-core-2016-r6.ebuild
+++ b/app-text/texlive-core/texlive-core-2016-r6.ebuild
@@ -100,7 +100,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	!app-text/xdvipdfmx
 	sys-libs/zlib
 	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.12.3-r3:=
+	>=app-text/poppler-0.58.0:=
 	>=x11-libs/cairo-1.12
 	>=x11-libs/pixman-0.18
 	dev-libs/zziplib
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index c903c3f605d2..b1cf92be455a 100644
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -100,7 +100,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	!app-text/xdvipdfmx
 	sys-libs/zlib
 	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.12.3-r3:=
+	>=app-text/poppler-0.58.0:=
 	>=x11-libs/cairo-1.12
 	>=x11-libs/pixman-0.18
 	dev-libs/zziplib