gentoo resync : 17.05.2018

15 files changed, 16 insertions, 193 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 44946557072b..7ad3c7316e2b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index a1b53d7976ed..ab54894504a0 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,4 @@
 DIST ghostscript-9.21.tar.xz 29164532 BLAKE2B 275e81e44585e186cdfd9f517d1ac77ec840c62ef01f107f6ec0131546c4a2b526000cbc4ba6a91b55eedb8f3783fbf831059d791ea441a484ce29dd5dd6af0e SHA512 cfea089b92fb01e3f7c18a9ce05e7165fc8b356e2914bf53b7f2fd9de672279c8b97ced07e983e619f0d4334ce16018b100cfbf0cc872c215a8cf2aff4c78731
 DIST ghostscript-gpl-9.21-patchset-1.tar.xz 6196 BLAKE2B d2bccba582873d29c1724469af66a5aa72755d6ff73bbdadbf33e5eb4a2027c2cf14415319c3c3c6d03a9fbd9bad43e3bf7ef57eb7a3361305f6efb7fa550675 SHA512 58fef7080ca17a238231fb528be48f52bcfa771b1e496d7fede6df45fb927f1bb1c755cb77e02aa739295b0ccf0b3d3959f9a05a1628d32ffd11e134c0e0d355
-EBUILD ghostscript-gpl-9.21.ebuild 5548 BLAKE2B 6fa7437e34da5af133b9759ed03cd0cb919433bd76db129d02bc44ac33688899cdc736d701e13163e6aac4c4173c6427f0404a692f03360bd13671d1217ea2f8 SHA512 edc91b4b05a74d589102fb2db7a49de210c9c309adee656cf506d0fa961717095cbc73f63e7b34b533070be67ac7630d1bbc684b4309f7ffeb7d30f91b4ce9d4
+EBUILD ghostscript-gpl-9.21.ebuild 5550 BLAKE2B f7af81cc6a38408faeccb9dd87321708d09639c05725ea97beda1da43b9c4847bc8d2131582fd2eff6d4e9fc30b9b3ca535d7fc07a27dc9be603f53bab6ced02 SHA512 2108fdfa94749954f86eb0e303c2da07f6feca991c2e13d95b90ad90e5172b84de6ed9ffe6a722b67f2da5f801e51ebdd4a4e31cb44a8cb2293392ce75056861
 MISC metadata.xml 516 BLAKE2B 6afad0e1422537a40a445465a9ae3b974d40e45b177cced532a8b1cee0163cc8af68e1d0f8c79212876e8439a0c3826892d6d639fdcfdf4fcf7d4e22116e837b SHA512 2f20a51f4716d8581748520da0c353f3b9846182ab77ac459abe178f6fd68942c9fc15614ac5a01ae183ff94f3db318037038f48fae54620d6aa7a25de9834d6
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
index 89941fe85f32..b0391f26d812 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-1.3.8 )
 	dbus? ( sys-apps/dbus )
 	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
-	unicode? ( net-dns/libidn )
+	unicode? ( net-dns/libidn:= )
 	tiff? ( >=media-libs/tiff-4.0.1:0= )
 	X? ( x11-libs/libXt x11-libs/libXext )
 "
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 71bcafba18b2..3f57fb454ab6 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,4 +1,4 @@
 AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
-EBUILD po4a-0.47-r1.ebuild 1662 BLAKE2B 17b708bc9d3273f52f83bd4fe9d8907b1acc057b538592e35a9c2a833b9b395518834790099b18fe4cf55925ae099a09fc35788824511a5d5fe988d87b680a9e SHA512 46f6631a4ee4a081fb6526516713e801366da5e0bdd5c957fac9d3eb862f00a8d780a4de90fecc9af40349ab5f27bbc3991800e782c5174e4beb3d0e4d01a2dd
+EBUILD po4a-0.47-r1.ebuild 1650 BLAKE2B cd8722f1395fa346d5caeea4d93f589c52ac3f2090cd0aa7d8793fb859cb7527108daef206d4e9220cd41a0a3a44c59d606fd5f2a918e7b96ce42c52aef31b5b SHA512 28763203b7bd298066eeb6a5ce4d26b740a4a4012a22e3558c5d24896afc3ed001208dcfecc00e82417a55aa6b2827df695365b847cfc361f4d4722cbe2f3748
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
index f5c19f7c5d9c..94311ba3d578 100644
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ b/app-text/po4a/po4a-0.47-r1.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
@@ -9,7 +9,7 @@ PLOCALES_BACKUP="en"
 inherit perl-module l10n
 
 DESCRIPTION="Tools for helping translation of documentation"
-HOMEPAGE="http://po4a.alioth.debian.org"
+HOMEPAGE="https://po4a.org/"
 SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 54211f848bab..1570db6f37b0 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,13 +1,7 @@
-DIST qpdf-5.1.1.tar.gz 7662701 BLAKE2B b60c37227cf18c1f1787de3e7428f370d50a115327b742f3c16ba1fc056bde4a9ad3a9578790c42cb4a5bbc4ed746fe6400cad934cd740cc8173bc6689d86ac1 SHA512 236132290694730d7de08635560435d34ae44f4edbc1b887e494f2ee183271331827226e7e29e539d25d5a2ca1dd5815a387c46edc0b6fd898436bbb674d9993
-DIST qpdf-5.1.3.tar.gz 7681578 BLAKE2B f49762e7a92d0a638c998ab002bd3f83057fada59631e58e291e3548393419ff9b2050080d66028e2e14c59a2978e7a95045f144c8a61975c38784cacd04b635 SHA512 676cc6db27dcbcdece21cb427c6aae14646389f4000ff111feee8fdbbb03fe715035e5236a08db4137f275a09ed0dda5c80afbdc5093fe7f56b69a0e335ab73a
-DIST qpdf-6.0.0.tar.gz 8344860 BLAKE2B c041fd0a89dcce6275ccd51db62cc4fe37c2ee797d2d19c8924dc12f2a9166d7a918f220ed539045c81284544f061241f1783d6c25a0f63bed534fcef82370bc SHA512 303e3cc77ddb87b9494e26c35e0b45b42f73692054c56a00f2e4f1922633c6ebb45c8684992cd9bf32f03366fcc4cd7e7ec6fb9432d2dbba6e0b24395909b5bf
 DIST qpdf-7.0.0.tar.gz 7053781 BLAKE2B 1abd54a3cdc24c3e56ac81cabaa56be8d2217961abfc026cbd0c0141aea3efb6c75b9daf2fe9f6fc0f09efd224d241fa859bd37bcd972df4e4837318497d774e SHA512 7b52d67b4d2c428a7b0c1cd03b03a23f05d38d7e3c81041079a137919019ea5158f12bf95fdcfcff6b43ffdefe93a85127ced2a363a6b4b380cbaa02a3840256
 DIST qpdf-7.1.1.tar.gz 7099282 BLAKE2B 9658dd1cc6f8d0e3dd13137db147e0f954f747b5bb6b1577f70a236b1f67c5513713889dca77181a9b25f1a2054a8ec5cbfda60866e97b2d43e60b494752c9fd SHA512 a75f988c7dd7ac174bdc981cd3696ca8b539ac6c581e3afecf601dc67277014cb4fe3f0e5cb75a67412cafa4eb645b2fc2d8a0ec203834464baf0c7e80baa0b4
 DIST qpdf-8.0.1.tar.gz 7948901 BLAKE2B 90eed8fcb34be16e1648236468c3f78ab16d2b9debe2c06f9a68af77cab2aa524eeeba1f6beb354d201c77d308e5ebd7dacfab1c79d24612af44f9109e407c38 SHA512 cabcfeee760bcdf19696c7dda81c9cc4f3cf1e0f44f68b25070d6e33fad8ad746a5dc992a9792972c9cce7192db82cc49f1a1b94a327d41b49284ac3620b2982
 DIST qpdf-8.0.2.tar.gz 7952979 BLAKE2B a9c81f41d6b5e3e9f80dab8325fffbedb8740ae500efbf4f4d2c27aca1778b1e2c438b7aba7846bd62874e2ff4265bb50b3b3d3d32302fb3e4583ba0251bf8f4 SHA512 f6d062f011d87f3f1df44e96e5dec0cd4b1b5f800dc6c088bf1313b2c96922d2f3c1b6eb1109a6ef00c558144b85dc20aeb85f937b73a3b594633aa67104f5e3
-EBUILD qpdf-5.1.1-r1.ebuild 1316 BLAKE2B 843ad7e84eebd53fc18232207cc1701d928a69393a701b2fe5ecdade82942403d38146aab292ca96c2ec7873b604c37981c17bb8fe4e6dd6d4e982ad5d2bf259 SHA512 f8803fd52e6f7ee42f364cbde11465b95181350b3e1ab0f7378db844eb9f183723805350347d27a12071c4da6c3f4ab0a604430e5894a6ed0028b1794835a234
-EBUILD qpdf-5.1.3-r1.ebuild 1330 BLAKE2B e331790df4c0ec8e2491e77b1d304c064e23b222aff0a01c15dd06963e8071bf8d03a260773ad27307bf1c3dc84ddf217d5ca28a280b67ab1769500a0d0dcafe SHA512 8ba17da0d59e2fd3219d5edb02d778accd75a6588fda5d218d62755a5e54488c80f513566fec0091a85a19ea55c0e49f74ad17454d9128104f9724d343b27ff3
-EBUILD qpdf-6.0.0-r2.ebuild 1223 BLAKE2B 683ad52c39451760bf7a916c061710161488fbc25ee4e568901ea6e01d65938c39b0802f3859c4d5b8929dcb2df2be5143ebec5c4704d4f94ec11b90b637e9b7 SHA512 9d11d2921dc5a579e9099c33a1b6fb9b3dfc30f38e5c928e91758fb96be0a478f68abb9ed8d41878fca9e34e989c60a92429bdaa9da293fcd3f7f6bc291f1819
 EBUILD qpdf-7.0.0.ebuild 1234 BLAKE2B 303e3943f8429ab560cfef1d62b1c35f2dbec6c2e27fd6436fd8cba9eec5d8247bf4df27b2093f5a5936295452c171b81a7e07f3b888b98fff428ad7b566d109 SHA512 bc0f824517bf3d7837243162e11cd7a1b973fc27f984f2486cfea23047a7df185f5d4adcdbc82fa7c7b39a9aa6a31c80624e76fb5bda9d92aa2bff4dc457efb1
 EBUILD qpdf-7.1.1.ebuild 1243 BLAKE2B 99023977c552d4fb2b6d2177f60664d01867a5f5309a79c9e192ac4b8f6c6394649f2bc58717114bcbce15c91031ad00dac38364353c1121901722b7f4240b6a SHA512 5f9e78903502e37430b8b2dda10507fb5527b47dd76aaa1afd56dbf3453ed5a209720c0bed72e0f5c2a8aa055b27403c340b1eeb8c870274e450b9bb055e347c
 EBUILD qpdf-8.0.1.ebuild 1247 BLAKE2B 764bccbf564caebf07f28c24bdc84fc9b14dd8a494aa529d27c32ad473443cfce21ef062cc74a2b5e0a44c6e61f40f123611140298cfe9051fd7e68604a555e9 SHA512 7370df6aa8c3ac1609488169d6aed641fbcdcf7130ccee68a1f24ddaf153cf9564fa02b2476851c4141d81b0dad39481f5db77ac836aa1a950744a6961a1e447
diff --git a/app-text/qpdf/qpdf-5.1.1-r1.ebuild b/app-text/qpdf/qpdf-5.1.1-r1.ebuild
deleted file mode 100644
index 350b27088603..000000000000
--- a/app-text/qpdf/qpdf-5.1.1-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="5"
-
-inherit eutils
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0/13" # subslot = libqpdf soname version
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-RDEPEND="dev-libs/libpcre
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff]
-	)"
-# Only need perl for the installed tools.
-RDEPEND+=" perl? ( >=dev-lang/perl-5.8 )"
-
-DOCS=( ChangeLog README TODO )
-
-src_prepare() {
-	# manually install docs
-	sed -i "/docdir/d" make/libtool.mk || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test test-compare-images)
-}
-
-src_install() {
-	default
-
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/fix-qdf || die
-		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
-	fi
-
-	if use doc ; then
-		dodoc doc/qpdf-manual.pdf
-		dohtml doc/*
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	prune_libtool_files
-}
diff --git a/app-text/qpdf/qpdf-5.1.3-r1.ebuild b/app-text/qpdf/qpdf-5.1.3-r1.ebuild
deleted file mode 100644
index 9d94e855b41f..000000000000
--- a/app-text/qpdf/qpdf-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0/13" # subslot = libqpdf soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-RDEPEND="dev-libs/libpcre
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff]
-	)"
-# Only need perl for the installed tools.
-RDEPEND+=" perl? ( >=dev-lang/perl-5.8 )"
-
-DOCS=( ChangeLog README TODO )
-
-src_prepare() {
-	# manually install docs
-	sed -i "/docdir/d" make/libtool.mk || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test test-compare-images)
-}
-
-src_install() {
-	default
-
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/fix-qdf || die
-		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
-	fi
-
-	if use doc ; then
-		dodoc doc/qpdf-manual.pdf
-		dohtml doc/*
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	prune_libtool_files
-}
diff --git a/app-text/qpdf/qpdf-6.0.0-r2.ebuild b/app-text/qpdf/qpdf-6.0.0-r2.ebuild
deleted file mode 100644
index f00413270dcc..000000000000
--- a/app-text/qpdf/qpdf-6.0.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-
-# subslot = libqpdf soname version
-SLOT="0/17"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
-	dev-libs/libpcre
-	sys-libs/zlib
-"
-DEPEND="${CDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff]
-	)
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
-	perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README TODO )
-
-src_configure() {
-	CONFIG_SHELL=/bin/bash econf \
-		$(use_enable static-libs static) \
-		$(use_enable test test-compare-images)
-}
-
-src_install() {
-	default
-
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/fix-qdf || die
-		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 427dc6a40b9c..4a07350a15aa 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,3 +1,3 @@
-DIST scdoc-1.2.3.tar.xz 6920 BLAKE2B 7cafe512016dc7dcfa56216cac3f3fd99ef05dfefb67ce8dba9726c8d60b49829f444f66c62c4ee9a0d2464749510ba60ac0b72996c656e3d66aef80e5ef0546 SHA512 1d5170d2a73ebccdb83ffffbec5ec431aab54b02eea5b062d0210c98636d059dc1fa57bfc1573a0e510cc8849759f6bb6462e3f5a78f22273a10bf47f2e0a2c6
-EBUILD scdoc-1.2.3.ebuild 991 BLAKE2B a8c1a483f72ab72fe6b0b63d6baf54471ad39a4450bbf6e68f076b565f8d3f4d136c58cb4b4516cb101b9cc400d852a54faf850bf65b303738cd3b49414883dd SHA512 bbd1f6948ba80bdda6c12c60c7563d5e8266c6f51db33de40902719917951c686924f4f971e8781453cde571fa6ccc41749495dece88b5669c015281175718ee
+DIST scdoc-1.3.1.tar.xz 8776 BLAKE2B 1d11423abde7ec3e7b03ddc4f9698b7b78cac6972066c57886160974bd885225dc42793d19942c11ffd215f5dddd6453f66cbd083be03132b437b6f6f8a93c8a SHA512 a404df2e2eef76cc02c69f32eb131eaa4d4ed51e96dc6ea39400662f767648538fc27c618cf34c064004918a92940ae5400e91b7b628e431132cb9619d3e94eb
+EBUILD scdoc-1.3.1.ebuild 986 BLAKE2B 109e6dba273fe028e2965a23b995acaa3fa20ef3d528add4f0149d83f6ca18e2bf9c2b9f2686b34b6cdc056a8dea34ebfe616592d7513bbb7e7bdf3a43b24c86 SHA512 4d4b3162fec5e7b07adbd2fc712e3c8c324c771cf4bd7a9d78d064477e39ef64a71f56b4ab2253bc4c186aa50ad8563e7c91228b5970398df86e69308819691c
 MISC metadata.xml 444 BLAKE2B fe48dd13d534bacc09205bd073b4052e2f5afca50eedea53236f7d2d2f31f4f876fe0b4dcb57eb8a87b4090fffb5f924ed57b9a636453be7c2bb586cc4d1a142 SHA512 3a172b03f1768baf0bb940bd842f7e6c05762e79bb1d8632bdbf86276e79cda7f1b334750a3650cc86106154a8b2e2e426c7ab99d41cc5bf5119ac1e81e7b5fc
diff --git a/app-text/scdoc/scdoc-1.2.3.ebuild b/app-text/scdoc/scdoc-1.3.1.ebuild
index fb88bae39fea..b1e8b927020a 100644
--- a/app-text/scdoc/scdoc-1.2.3.ebuild
+++ b/app-text/scdoc/scdoc-1.3.1.ebuild
@@ -16,8 +16,10 @@ KEYWORDS="~amd64 ~x86"
 src_prepare() {
 	default
 
-	sed -i 's/-Werror//' Makefile || die 'Failed to remove -Werror'
-	sed -i 's/CFLAGS=/CFLAGS+=/' Makefile || die 'Failed to patch makefile'
+	sed -e 's/-Werror//' \
+		-e 's/CFLAGS=/CFLAGS+=/' \
+		-e '/^PREFIX/s@=.*$@=/usr@' \
+		-i Makefile || die 'Failed to patch Makefile'
 }
 
 src_compile() {
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 18abf5fba92b..b885bf983024 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -317,5 +317,5 @@ DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f3522
 DIST texlive-module-web.doc-2016.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 EBUILD texlive-core-2016-r6.ebuild 11520 BLAKE2B 2899191b740ab54cc36f171bfc89e3b9084ac1c67c8c23d5cff7d9ed7c909ddc924872f026d0fc4290851146fa1c65dfc2732865f3c41c62b4a7252ca87381c4 SHA512 684240a46ac764bf5a567ea1fdce38db2e43589b8764afcb793c16f87fad5151163efcb6043ad704aef34b66beccd35afc0f8500252fc5cf70917280c6b23fd4
-EBUILD texlive-core-2017-r3.ebuild 11613 BLAKE2B c3faa57e795a21bdb6f552183d354e93476120da5e0c785bb71f77867bdc5112caf2027d0e3f45fa13d8893a7bb020810f989abd50eb1963d9f24fda3eb9cea9 SHA512 f754342529fff4f6b521a0b021044e1c1c1f2bcaf5a930930d10233b783b8de7d5b376fd6384ec362605e9f506fc19a3f6105c995d3fa554cf19a7aa89522923
+EBUILD texlive-core-2017-r3.ebuild 11616 BLAKE2B f8b4714c8c31990b79fdb5af2ee82abada4053d49bbaa19260518bbc0e1f7f793e6d98090aa628bd33d87ea0382e86850f2e6a398041d9fd1e409bf87622c04d SHA512 2601aac905a30b54f49afa470b1d8d081ecf0598a7487899e24a4644a738b57730b51dcc3f5c8efc0eead4bb53a9bd0e5aaaf5e85bc199f72eb8176a4b7db824
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index ea0bec2af8ff..c303fed4a32e 100644
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -118,7 +118,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	cjk? ( >=dev-libs/ptexenc-1.3.5 )"
 
 DEPEND="${COMMON_DEPEND}
-	<media-libs/freetype-2.9.1
+	<media-libs/freetype-2.9.1-r2
 	virtual/pkgconfig
 	sys-apps/ed
 	sys-devel/flex
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index fd9b56c993d6..22dd79de3f09 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,4 +1,4 @@
 AUX 51txt2tags-gentoo.el 214 BLAKE2B f5c5aad466fbc7eaf1ec36dcd4a52a914f1710f10fdce35640391ea4d9599903574967c1a7ab63c66f84ade4443f256d1bc197ec8179a6c3af75f1ec79cdd404 SHA512 e2a76d355c2fb163fc5c9b8013e04240206c8301fe2351fbdbc53d711625121e22cdeb2336488e6bffc355258a6d5dacbd48a2cec2d618dc4db17eebf0496feb
 DIST txt2tags-2.6.tgz 544724 BLAKE2B 9c8c37c6e003c7252276b32bacd373fe9143fdd93fdbc2bf0c23a83e2123c2a9636be5f106d248f2f0ecccd71eb9bc68cf8343557f10a7e6f8deacd8ade975ee SHA512 716e975f45dd304b6fd7d4e5aa8bd12e57c54120d892ae9abe11f1f3b5aeb747d8df0a9ffd34b8b5e6c8d422aac8830477f9a332c9e94040e1aa9946ebfe051e
-EBUILD txt2tags-2.6-r1.ebuild 1674 BLAKE2B 9bab7db5703109ea16d86f8c3a590b6f1b97549cc0e25df417f6499cc3229b76dc414b470710559e9e3f4f0a13d2f66e472fd7a56a1489ca5fd41e36ef51dee6 SHA512 4d2c3fc1323653f3b8764ce2d5fdbb4841d6ab110fae500a67f58f13e4181eef4d3c6390b021ae18fd48ff73602c997ba399466cf5d8a97e96f5739fbf31d6cb
+EBUILD txt2tags-2.6-r1.ebuild 1674 BLAKE2B 1fd20e256fe9de78c6b5c22e4a29687f7d22d80d25fa528a8f8bd75963144ccf82cf17ecc297e9e56b4f1053ba05b0ca3b6e4c56275694e3e9036a501e7abcea SHA512 a7d13cc9c8ea534b6c1b805051cfa937a379c9f916207be3dad7d86e508afbccf881cf2e5f464652e86d73d59aae3f1150b73fa7f9531c34f6912b3d5694fd69
 MISC metadata.xml 335 BLAKE2B 1852f3f02279c2d959ef2b886fa75f51c98771cf190057de977b730aae4c23941efa4b409b15ff3b859892484bcc559d8467e2b53a815b346b1165ac8af8621c SHA512 257cc7e9d2137e94fdc9d133133ca92b688ac2475a59dd30e1e0b4d548ce399cbf73cbe986f0f816c4be1f84668104e4e90f1257914512987aebb06697282b87
diff --git a/app-text/txt2tags/txt2tags-2.6-r1.ebuild b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
index 06bd030e0bd8..701f24a7853a 100644
--- a/app-text/txt2tags/txt2tags-2.6-r1.ebuild
+++ b/app-text/txt2tags/txt2tags-2.6-r1.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=5
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="tk?"
 inherit eutils elisp-common python-single-r1
 
 DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
-HOMEPAGE="http://txt2tags.org/"
+HOMEPAGE="https://txt2tags.org"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
 
 LICENSE="GPL-2"