diff --git a/Manifest.files.gz b/Manifest.files.gz
index ea1203a90e54..23201aa74825 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index cde1150e4b99..d52bf4cae9d9 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 5d0686d12026..a2013161b93e 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -2,3 +2,4 @@ DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e
DIST ansible-2.4.3.0.tar.gz 6511115 BLAKE2B d43679c651f6aa5fd86c797a204645a8ee98efbcde9abaa25385aeb6f1d7c8b4ad74185434bfd159dbf673fe9339ef8f915f78238f8b8a5caf924b54cb9bdd52 SHA512 a7cda358c67c519c7e5ba248bf47070f21a27203fb29d70d9d75ecf027ba1275d71c0f96493e047281211d172a3be8273d7e08144446284695fb0bc8b94daa82
DIST ansible-2.4.4.0.tar.gz 6512938 BLAKE2B 51e397d2242209271a8aef211c3bdeb34a15e2061a202415749ecb4232e0521aff304d5585d536b1805f14ff476b0733d559eeabe6e44de7b273b8606b11b805 SHA512 f0dcf92f2c69931fa06e6dd3845c11592d5a7e44f19a99c4d6c361022708560170f2b74ad20eded61fa5812c90eed281b78396aa92e0b33717970afb5966dd72
DIST ansible-2.5.1.tar.gz 10100358 BLAKE2B 39831c6ed49360e905ac8fb8d9ad7520c0bc16b5dbe19103c5349cb5d6fe30c2c3212f08f15a7877692b2a9a2ca3e1ab8e5580bc9919f7c2d96f7b07ae45f1e2 SHA512 d5ed9ba4bb514b79254a79a89d1572e80c5cfb1db2a67a980184aa3c26ff407f5c5c9bd0efa24f0e00af451d955f3b0d8d9ad3026be71ba7ad12487a1631ad9a
+DIST ansible-2.5.2.tar.gz 10105800 BLAKE2B 0d9080b666164c96c2a237f9a5f4b271a2fe9933d1999df85cd973df0cf85d850343bc33b8afb18c1bf0a7eecb2ab193e91c7a02c3e56e8a5e41338ce7a90081 SHA512 25568665b96ee9d7ca0888dadd90de178a9cc1da7dba07acb682ca4455ef91622344958ec2000eafbb4cfda87aec325be77d3d5b395aa4bbc2d180fad1a90a34
diff --git a/app-admin/ansible/ansible-2.5.2.ebuild b/app-admin/ansible/ansible-2.5.2.ebuild
new file mode 100644
index 000000000000..573d04b35802
--- /dev/null
+++ b/app-admin/ansible/ansible-2.5.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doman docs/man/man1/*.1
+ dodoc -r examples
+}
diff --git a/app-admin/certmgr/Manifest b/app-admin/certmgr/Manifest
new file mode 100644
index 000000000000..11f6a3f2d340
--- /dev/null
+++ b/app-admin/certmgr/Manifest
@@ -0,0 +1 @@
+DIST certmgr-1.6.0.tar.gz 31187831 BLAKE2B a1269aac2817f077fa2aae3d14f692aa5c83b0f53ffe041b9436754a93c7970dcc24bed94259e05b99105de5400b3b8c5e22bde087fe365a1c21b8eaf4b3e4a3 SHA512 65b0cb8d5b7a3b76698b3b3aa8c2b9db88d08fed209044668cb19f13eca69714a7a4bc8a20bbf60af05f5c9e39b221801a36e90c8b1c647dbf07952ac385e6ea
diff --git a/app-admin/certmgr/certmgr-1.6.0.ebuild b/app-admin/certmgr/certmgr-1.6.0.ebuild
new file mode 100644
index 000000000000..6951be522070
--- /dev/null
+++ b/app-admin/certmgr/certmgr-1.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/cloudflare/${PN}"
+inherit golang-build golang-vcs-snapshot
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Automated certificate management using a CFSSL CA"
+HOMEPAGE="https://github.com/cloudflare/certmgr"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+ pushd src || die
+ GOPATH="${S}" go install -v ${EGO_PN}/cmd/... || die
+ popd || die
+}
+
+src_install() {
+ dobin bin/*
+ pushd src/${EGO_PN} || die
+ dodoc README.md
+ popd || die
+}
diff --git a/app-admin/certmgr/metadata.xml b/app-admin/certmgr/metadata.xml
new file mode 100644
index 000000000000..303da7fa2e48
--- /dev/null
+++ b/app-admin/certmgr/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ mrueg@gentoo.org
+ Manuel RĂ¼ger
+
+
+ cloudflare/certmgr
+
+
diff --git a/app-admin/conky/conky-1.10.8-r1.ebuild b/app-admin/conky/conky-1.10.8-r1.ebuild
new file mode 100644
index 000000000000..5aa7a6543f2b
--- /dev/null
+++ b/app-admin/conky/conky-1.10.8-r1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils linux-info readme.gentoo-r1
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 sparc ~x86"
+IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+ lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+ nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+ weather-metar weather-xoap webserver wifi X xmms2"
+
+DEPEND_COMMON="
+ X? (
+ imlib? ( media-libs/imlib2[X] )
+ lua-cairo? (
+ >=dev-lua/toluapp-1.0.93
+ x11-libs/cairo[X] )
+ lua-imlib? (
+ >=dev-lua/toluapp-1.0.93
+ media-libs/imlib2[X] )
+ lua-rsvg? (
+ >=dev-lua/toluapp-1.0.93
+ gnome-base/librsvg )
+ nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ x11-libs/libXfixes
+ x11-libs/libXext
+ audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
+ xmms2? ( media-sound/xmms2 )
+ )
+ cmus? ( media-sound/cmus )
+ curl? ( net-misc/curl )
+ eve? ( net-misc/curl dev-libs/libxml2 )
+ ical? ( dev-libs/libical )
+ iconv? ( virtual/libiconv )
+ irc? ( net-libs/libircclient )
+ mysql? ( >=virtual/mysql-5.0 )
+ ncurses? ( sys-libs/ncurses:= )
+ pulseaudio? ( media-sound/pulseaudio )
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+ systemd? ( sys-apps/systemd )
+ wifi? ( net-wireless/wireless-tools )
+ weather-metar? ( net-misc/curl )
+ weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+ webserver? ( net-libs/libmicrohttpd )
+ >=dev-lang/lua-5.1.4-r8:0
+ "
+RDEPEND="
+ ${DEPEND_COMMON}
+ apcupsd? ( sys-power/apcupsd )
+ hddtemp? ( app-admin/hddtemp )
+ moc? ( media-sound/moc )
+ nano-syntax? ( app-editors/nano )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+ "
+DEPEND="
+ ${DEPEND_COMMON}
+ app-text/docbook2X
+ "
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=( "${FILESDIR}"/${P}-use-pkgconfig.patch )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT%/}/usr/share/doc/${PF}/html.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+ use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+ cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs
+
+ if use X; then
+ mycmakeargs=(
+ -DBUILD_X11=ON
+ -DOWN_WINDOW=ON
+ -DBUILD_XDAMAGE=ON
+ -DBUILD_XINERAMA=ON
+ -DBUILD_XDBE=ON
+ -DBUILD_XFT=$(usex truetype)
+ -DBUILD_IMLIB2=$(usex imlib)
+ -DBUILD_XSHAPE=ON
+ -DBUILD_ARGB=ON
+ -DBUILD_LUA_CAIRO=$(usex lua-cairo)
+ -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+ -DBUILD_LUA_RSVG=$(usex lua-rsvg)
+ -DBUILD_NVIDIA=$(usex nvidia)
+ -DBUILD_AUDACIOUS=$(usex audacious)
+ -DBUILD_XMMS2=$(usex xmms2)
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=OFF
+ -DBUILD_NVIDIA=OFF
+ -DBUILD_LUA_CAIRO=OFF
+ -DBUILD_LUA_IMLIB2=OFF
+ -DBUILD_LUA_RSVG=OFF
+ -DBUILD_AUDACIOUS=OFF
+ -DBUILD_XMMS2=OFF
+ )
+ fi
+
+ if use weather-xoap; then
+ mycmakeargs+=(
+ -DBUILD_WEATHER_XOAP=ON
+ -DBUILD_WEATHER_METAR=ON
+ )
+ elif use weather-metar; then
+ mycmakeargs+=(
+ -DBUILD_WEATHER_METAR=ON
+ -DBUILD_WEATHER_XOAP=$(usex weather-xoap)
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_WEATHER_XOAP=OFF
+ -DBUILD_WEATHER_METAR=OFF
+ )
+ fi
+
+ mycmakeargs+=(
+ -DBUILD_APCUPSD=$(usex apcupsd)
+ -DBUILD_CMUS=$(usex cmus)
+ -DBUILD_CURL=$(usex curl)
+ -DBUILD_EVE=$(usex eve)
+ -DBUILD_HDDTEMP=$(usex hddtemp)
+ -DBUILD_IOSTATS=$(usex iostats)
+ -DBUILD_ICAL=$(usex ical)
+ -DBUILD_ICONV=$(usex iconv)
+ -DBUILD_IPV6=$(usex ipv6)
+ -DBUILD_IRC=$(usex irc)
+ -DBUILD_MATH=$(usex math)
+ -DBUILD_MOC=$(usex moc)
+ -DBUILD_MPD=$(usex mpd)
+ -DBUILD_MYSQL=$(usex mysql)
+ -DBUILD_NCURSES=$(usex ncurses)
+ -DBUILD_PORT_MONITORS=$(usex portmon)
+ -DBUILD_PULSEAUDIO=$(usex pulseaudio)
+ -DBUILD_RSS=$(usex rss)
+ -DBUILD_JOURNAL=$(usex systemd)
+ -DBUILD_IBM=$(usex thinkpad)
+ -DBUILD_HTTP=$(usex webserver)
+ -DBUILD_WLAN=$(usex wifi)
+ -DBUILD_BUILTIN_CONFIG=ON
+ -DBUILD_OLD_CONFIG=OFF
+ -DBUILD_I18N=ON
+ -DMAINTAINER_MODE=ON
+ -DRELEASE=ON
+ -DBUILD_BMPX=OFF
+ -DDOC_PATH=/usr/share/doc/${PF}
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins "${S}"/extras/vim/syntax/conkyrc.vim
+ fi
+
+ if use nano-syntax; then
+ insinto /usr/share/nano/
+ doins "${S}"/extras/nano/conky.nanorc
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-admin/conky/conky-1.10.8.ebuild b/app-admin/conky/conky-1.10.8.ebuild
index e46eaaa3096c..096674aaf925 100644
--- a/app-admin/conky/conky-1.10.8.ebuild
+++ b/app-admin/conky/conky-1.10.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3 BSD LGPL-2.1 MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 1b0246c7ae6f..0ab9102d365a 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -6,8 +6,8 @@ EAPI="5"
inherit ssl-cert eutils pam autotools
DESCRIPTION="Serial Console Manager"
-HOMEPAGE="http://www.conserver.com/"
-SRC_URI="http://www.conserver.com/${P}.tar.gz"
+HOMEPAGE="https://www.conserver.com/"
+SRC_URI="https://www.conserver.com/${P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0"
diff --git a/app-admin/conserver/conserver-8.1.18.ebuild b/app-admin/conserver/conserver-8.1.18.ebuild
index cb1fea8dbe92..008ee1e31768 100644
--- a/app-admin/conserver/conserver-8.1.18.ebuild
+++ b/app-admin/conserver/conserver-8.1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -6,8 +6,8 @@ EAPI="4"
inherit ssl-cert eutils pam autotools
DESCRIPTION="Serial Console Manager"
-HOMEPAGE="http://www.conserver.com/"
-SRC_URI="http://www.conserver.com/${P}.tar.gz"
+HOMEPAGE="https://www.conserver.com/"
+SRC_URI="https://www.conserver.com/${P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0"
diff --git a/app-admin/eselect/eselect-1.4.12.ebuild b/app-admin/eselect/eselect-1.4.12.ebuild
index cb5617bd46f9..09f28f29d913 100644
--- a/app-admin/eselect/eselect-1.4.12.ebuild
+++ b/app-admin/eselect/eselect-1.4.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
RDEPEND="sys-apps/sed
diff --git a/app-admin/go-updater/Manifest b/app-admin/go-updater/Manifest
index 059e45bf446c..67640a0a4854 100644
--- a/app-admin/go-updater/Manifest
+++ b/app-admin/go-updater/Manifest
@@ -1 +1,2 @@
DIST go-updater-0.1.0.tar.gz 1754 BLAKE2B 720a328e8f28d2f0b28400053776ff8dbe52e24be7b20812d01b148bde72eda948acb5867b8ca16af7b40d20e36d36d3ffbd846c4992bb1dbe2af6db0069e765 SHA512 321f7faaec62b653c2b01f6f2e2c0104b536e63dfeb6aacd72c493d3fdc7b3bc5b96d6eff02ec1603adde1879dacbd51f4ced37c3cd94361120cc482432cb8a5
+DIST go-updater-0.2.0.tar.gz 2183 BLAKE2B 0afdd1442916a1def1de4d45eb3cb89c5634b275912b7c8c451ecd6b911e82ad5e8a9715e39404c4d3eb006e7b1822c9f23d02e871379f66536bc5eff15c2f05 SHA512 9c81ded9cdbb825872e0224634f7876a598086870a101e8c2f70fbebcfff964d4ff2f0778607c2110dad1a08160628a8943e9ac902df0b6cd70a58d5ca9e6dca
diff --git a/app-admin/go-updater/go-updater-0.2.0.ebuild b/app-admin/go-updater/go-updater-0.2.0.ebuild
new file mode 100644
index 000000000000..78dc6698a598
--- /dev/null
+++ b/app-admin/go-updater/go-updater-0.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Checks if Gentoo go packages are compiled with the system's golang version"
+HOMEPAGE="https://github.com/mrueg/go-updater"
+SRC_URI="https://github.com/mrueg/go-updater/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-go/goversion"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc README.md
+}
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index aab9d819f1e1..1210888b1592 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1,10 +1,12 @@
DIST github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz 20757 BLAKE2B fb024665eb8d49579b9ae67f706e524dfedab3b0f212f18516ba720e5f5d991609fb3a37eb6c960881d4dfeb83a001c8a345de222978222f276232a742a55224 SHA512 a70922a199719936c0d7801a5750bd6893f5e119bd7c592af096d9d82a3f4aab859649126eae60faf70a908e8a28c0cb7b54e8288365276eecf7ce8c6dabdbf4
DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
+DIST github.com-Azure-go-autorest-d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz 105565 BLAKE2B a6db0d05102de0ff49470de5c8936d6f327ccd65c92bea6e7e7ddc0b4f15fc8b2baccc0aa929ccd8b4ec0b07e42f15ffbcd49e22e88eb2e334c193daf78e2256 SHA512 2e6992dbdf57f9d87d3e0525b29b0423e0678caeb699cc3b332b0942d8efb9ad79140b1b72ffcf649ed5d40d44210314e70dbf65484f456933bd12dc0e07ec52
DIST github.com-Azure-go-autorest-e14a70c556c8e0db173358d1a903dca345a8e75e.tar.gz 96018 BLAKE2B d81bd726a352a62936fe838cffec3fd6a27e08938124621d5bf1b449822c2c9bf7887265d89b4dee307e724c8fdadecac72e651cf491abc796fec2f84fcb384c SHA512 6409b24e4b5aed51184c493d1f1e4daaa21427b0a623d6c4497697a6e498591706b0a80fa990b18d2682aa2fd542286669f3e680f5195bff5523ac317806690f
DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
DIST github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz 3384 BLAKE2B 5eb9bb3c88a3bee70cd64f30afcc039f2f43b68be23f39c72f9091765388229a8f5bdbfba8d11d1916d18e9c785e15959c000337461e44940df0ea40ecce40db SHA512 b877b8b0e67f300ed9773b32593a1edec2fb6df3b0d5026cc7b67490ec9a4cb0d9630fb30dc3dee6b7081f81c3fbf1399809c4bb171a5afab665ff93a9f3a034
DIST github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz 15744 BLAKE2B c5ebbc22c9d995a9bea44742bdc513dea977276d43306f1c9edd2c59eb9844c1e6f304ba4fa5f340b6052abea5294314049bd9055154af2d6f3e2ddac3d6cdaa SHA512 321734efb1dc3d7c6e5795c991511340330c0ecd44571f84fe6d5f6e36945c68b3fe2c47c8bceb4c80d0eaeb21b7a2e45f856b65e942a74434e1f28892120460
+DIST github.com-Masterminds-sprig-6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz 39054 BLAKE2B f730fe75f18e1706e9c15db3ff37ca63e8c66276595b6b6dc253b1f0d23859944e2b4d633ba2e4c64def17454e4dd2535984c4f39c786393318a829f9769b2ec SHA512 04f6d5e969b9c4dcc9f2ca40c3f475c09ecb0f7f196736d4e5fde384fe8f79227334b9b3299449024b639fd740c65c08b8b0c63427def6ccf7462e5844f3dfde
DIST github.com-Masterminds-sprig-b217b9c388de2cacde4354c536e520c52c055563.tar.gz 37580 BLAKE2B 8df1660308b0be42e76511842c092caa1222e92698a64875dec24240f8d66515b056af2181c950fd3d05c82645086b2b66afd5a61afed706d69964b52177a72c SHA512 9decb828c62865f09c0efac5eae8a536ad1a7e33aa6389be2af0c58017a20b08714a77b5bdde6e69ae1fa0c21e67d251fd2718d564195be7f058a286e1c6f2c4
DIST github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz 27278 BLAKE2B 072014886aba809af343bd5b5a2cf21ef95a5712ed80662f62591fb58dde6e71f075d74d93b755845cab571f510ce1e59b0cdcbf61fd8a485738acab14345c29 SHA512 77a2d594f7da607c9c1502e9ad64414c177450a40853d6928c690df2ff6adce0fa79627ea437e07e7459b1956b00db9d1fb8b0e08bff2c0e2c1f98420b36ee53
DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
@@ -34,6 +36,7 @@ DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080
DIST github.com-go-ini-ini-300e940a926eb277d3901b20bdfcc54928ad3642.tar.gz 37301 BLAKE2B 64c2452aa01d14ed39ecdd49f631bd9dbe180f3d0b1fafa171189a3258aff2de6d3902c11cb011dff360d0b4780ab17c14ff6de5e3810c654c2c1cf16428b43a SHA512 fb16c6fb95e1fbe20a2c41576bf029d8ac51d93c4f52dbb084f14c8ba431e30df43f3bdd54a8f4586e193ee15732edbb32261b56ced64f86878a0b722eb3c45f
DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
+DIST github.com-go-openapi-spec-1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz 83793 BLAKE2B 48404746fb453ca8b2da12a14c89c2ca96f326be17c023bd5c7f9a53b4fc20ab4e68affc7896aff7fcf213ce788a8ca8500f4588a3288f301d50194dd0c52d1c SHA512 8798188e5037d1b28c4376c05776c107ffca09a4932ce5936306fc7a87d3121aaaf810c3dbabbba8ff20e52ed665e00df30061199b5ef1021e2fc974455830aa
DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe
DIST github.com-go-openapi-spec-7abd5745472fff5eb3685386d5fb8bf38683154d.tar.gz 80785 BLAKE2B 7e04562f81de7facdb8571d69d981e2d0eae873d18dd63312fbfbe4f261720c306129813b2715cecd7e4011e1b9c4039f94e44fb3925bfd370c81e32aed78b8d SHA512 fcf94473b0e37c249f0d9d8d5de568fef02b6a11a88ffbd625d73fba7c06687cf4ad78346c46fa87917248dac034aa84845a66a602f2605ddbfe1d7ec564ff63
DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab
@@ -53,11 +56,14 @@ DIST github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz
DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
DIST github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz 771129 BLAKE2B 592e1af8d74e77807a65901b576bebacfca5b2331c6943031720a873bc7782ef35cf3300e5307c79164ded89394df97e7342f73168f4e2354b13cca9260785a8 SHA512 96d1b7254d16c107a5496766ddfc2e56b56a31fe9c4bd34c23ee814911036145d8327203302fbdcb6bcb9af1022073608ea123c6df661132392ecb611e427c96
DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d
+DIST github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz 9005 BLAKE2B 5ad1988c9bd3a632ea4b248e32f6223a79d54b68b1c95bddcace042c22c20d3aee6192bf3d72def729292ed50e4d423935c3ec7004398e03037f91b7f401fd77 SHA512 65a69bfc6044de4ecacfad1c9c8add6312745bd2ba3dc46f522f1e7a424aac49b5e18aca60f8daabc340d50d73675cd5c06de9441060d86009a092feb4f5c9f7
DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4
DIST github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557
+DIST github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz 12733 BLAKE2B fb29066f37f5f7d6aa5c7e0cf4a90b9b16de012d809034aaaf10ed4a43b5941e68c8925fe991ce5b25fde56995e8e66317fcab2caf97a722b12cc03825190488 SHA512 d3c2b411793681cf5b55438e3ba23512b6edbc48677c2efdbaea02d226519690525aba848cfde45205dafa39fda9f2868960b39f744aec80222b61dc42b77da7
DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136
DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc
+DIST github.com-gophercloud-gophercloud-6da026c32e2d622cc242d32984259c77237aefe1.tar.gz 514142 BLAKE2B 6ed841cc143be653a75af99b6d68f10410c957752a7f2fd315b744df5d492da0e1ad4083620b155a374fdf647739685d31b1fa9c8940dd6c692abb89127ad684 SHA512 0341f076ef430d544a15302269d16a788a1e47a8f2e35c01cf9c8fb9f710b58d3a3e5554429f5e747406484d7d7682e46590e5575bfa3b90f44b7a89ebf78f9c
DIST github.com-gophercloud-gophercloud-8183543f90d1aef267a5ecc209f2e0715b355acb.tar.gz 440513 BLAKE2B e9fd84ee14ce760241669760e5e709b150e3e90f6e5b48aab39717324a64379146b26ac4b419e0015ab217112432df37117da2aba9815d0449b25d14677657fe SHA512 ba51702bc44fa362128d764628793448d52561f28682fe30740a0b31e5bf0f3e7869efe14e349d174a2a63f4535d8e76875e765f1c5b48f968addc8ce8e0e3c4
DIST github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz 6864 BLAKE2B 71816efd7996458a90b192780fb720b9a0f7ee8bb01df6d1fa0e079ee56a426310f632839e921ffb89403145e63a34e90e985099221c4253bdc1c316f1aed37c SHA512 7cc647e6347258b9fc455cda220da8f59c3ea92f975369ce5901289102d5db8c45ea6fe24a587cc4dc95a502c4fc203c3503f9db0c427cca702418478eb25f25
DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
@@ -69,18 +75,26 @@ DIST github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz
DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
DIST github.com-jmespath-go-jmespath-0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74.tar.gz 48285 BLAKE2B 3dd3d6729fef9fa3f5f7aa09fb9114267202a90d5beb44f996406f9a45c02a281d8a1eae3f5125d03ff267b9eee874b6415891fad21bfaf4e3d7e09125d90419 SHA512 e5c1e322b1f9506edcc1f1bb4efc2d3a6fa440abff16fa3557f4ecb3e82b0be1cb9511712d3ece32e7c247c58ea3aa07197bab0ae2e7aef262aa97adf83dc253
+DIST github.com-json-iterator-go-13f86432b882000a51c6e610c620974462691a97.tar.gz 101395 BLAKE2B 336dd30f7906023e87f835df12becacd8e3e4c0a57b4897b277b4bb04272440257ad150268d5cfb4ed69665f1a168d919d7a746b1da00691afe9e7669f6f3a45 SHA512 8497d6578a78ef575834350c2eba15d11ef6273c472cda9016181c044e034ea002d4039b99852a9837425c791f199d121b19edd701b9a9c47c19a155a19baa81
DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958
DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
+DIST github.com-kubernetes-api-c699ec51538f0cfd4afa8bfcfe1e0779cafbe666.tar.gz 681854 BLAKE2B 036aec7004f00fa62b9e330d52a427b945b9455a55049f6c6620110374e1928aee66d31d82dee97d264d231f8c83b52e91f6ed5ed9953e57ab86f31d586b85e8 SHA512 66dd666c5cd0eef845eb1c31ee051cacb7b260f68804b5b58482bc5565693b4072dba7aae6fea9e58ba3729428eae2d03bf89b8a8b6b624f67ecd43f561d045b
+DIST github.com-kubernetes-apiextensions-apiserver-898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz 6322992 BLAKE2B 18d636098012e2fac47bbed778d4b1e2c6b6c996044aa46d429e9297a8cf6504ddf6126098dd879bead50dfc22cdb3a46af062234b486a4574f10b841ed04f59 SHA512 a8a0ec14df38cb25c09b2800da1ed6cec66ebf38e42cd883e2c0852181a7ad7fe5ac4b8e618fc5a6adb168f2fb822db80e0fbd14ba008e041182394599c41ff0
DIST github.com-kubernetes-apiextensions-apiserver-a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz 4570659 BLAKE2B 50d421caaf529c12e1e4ce07493ffa0c92daea64b68d63992dd85bc5025f928df454a8af6701cbaa9bc065b61868b079d04dedb50f6696a267a4c5d790a28750 SHA512 cf74085a3bdfb6303243d42e438d7291300f1cff01c64aa854c444be52c6ad81ffbb868ef3eb3850225c62d25337d0eec7f7d1044709f1b5860121bec44b703c
DIST github.com-kubernetes-apimachinery-3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz 1485046 BLAKE2B 51a95498e0ba00b19e0731604feb001779d2798d73a3c64a7193c07fde01ec71a6a9e4a3605bcd50be33ec55c92be71c15039ac70b0f9cd88a566c908acdb11a SHA512 12f63a76fce8465d2c294e65c2b16a30fc5c2ede65d63e75f3a7b143e6c5acfa2abe673508a9b792b0b5819ae534ae1018edfece1431f573e731e33d5e244807
+DIST github.com-kubernetes-apimachinery-54101a56dda9a0962bc48751c058eb4c546dcbb9.tar.gz 446533 BLAKE2B 709ecdba91821a3533d85ab73a6392ebaaa549e4fe78b9d0510bb987e275a174e621ec92c4ec38cd137f60922b8f2a81fc093e18cab9fe050bffdf5d9deb576f SHA512 97ba85121dcf5b7effce14d2c5e2d67597afeb1d438ed450396ca94d46dfcd5be772af300d37d339e5ef39408fead8b8f77731a0823a270d0ee44dfb7b88e671
DIST github.com-kubernetes-apimachinery-68f9c3a1feb3140df59c67ced62d3a5df8e6c9c2.tar.gz 459010 BLAKE2B 161369e558beaf2af9dd79510448cb5039486dea3bcd453f4dc11e50aaaaac401779d9db8166d8a86276c2aa977a1d8e45f81ef561523ca5766f5994066ca0ef SHA512 26223507c411ce1502cfd6f66c560eee5dac632620f4425566f4762f1a556a1ae92ed2ab16d7e6734e41871846792f1328de0fa6082373dbbae6296b577bd6eb
DIST github.com-kubernetes-apiserver-2a1092aaa7202e8f9b188281ff9424a014ce61c2.tar.gz 1144199 BLAKE2B 6fe4e3e8629f33ba81e611bee420f9375b157b66c41fa23a73689c4cfc1038f7a8a35357115699274f87ca69010c476020593faec59d8fff6f3108ae58192e36 SHA512 9fa3ab96ee1c878c5db401fbde3505fffb42227fc986798240aea76f425589e00b3e9e80b263913106cb223e3831ac7d67638388c1fd11553b0f4bb138143a2c
DIST github.com-kubernetes-apiserver-c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz 3869160 BLAKE2B 7e3fcafce1ee62a7e95b1c09814a3e5efb7efb20642214e0f2b093e11e797d8ddc312c18f7369b0745d344470cf1fc9d3ce9e582a6998f2df8f139cdad812427 SHA512 8f5cef4f90fa6ef9d64fb3ae21c68f3b7785e758bbc4f85dd2b7f2ec07f281a3df66ac1705f291b834513341f8a2c20ae1601ab65e337f313c156f5c4e9b481d
+DIST github.com-kubernetes-apiserver-ea53f8588c655568158b4ff53f5ec6fa4ebfc332.tar.gz 1128422 BLAKE2B 21897cc3baa81ff35fe04fe8e13a652e9f308d04043d49756e2a144bafc61063758fff7c51dbd795f8c395824df51656d5e58626aa52d3c7bb1c66ec18287139 SHA512 6ba081a066ec9e31623345a91df4dc85216576b9c945f4e514790a944451d082d72ce5c5599beb6a3bdb55114cdc118f283a35276de85e78190698dbb560be98
+DIST github.com-kubernetes-client-go-23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz 487299 BLAKE2B 3f40b7173a62414dddb7ada2d21b9cbc541e4bdeff9ad8cb501cde47af49859540a1c2af1992ff2dea2bea7fd93f02f9e932b7f6ca5a2078d68807cb46496040 SHA512 b1482dee5a512aca81c901a031db9d7e26875560ebacfd8b5a70ab78ae7b7941bd39e7b0cdbdff2d759e5c8f15909ed16f8bf993d2623d849198e271d27ea139
DIST github.com-kubernetes-client-go-78700dec6369ba22221b72770783300f143df150.tar.gz 471136 BLAKE2B b8b1e5dd7078fae146ebffd92f0e6adb48241073bc5d4261d62bee7637cf86fb8a11a5782abad91db37170a9b716d3eb17472e06e546a8aec207df85726d8e8a SHA512 19e5ae8906429227896c25a692aef3d64689de444fc5ffa5e846d53a986e9cfed921d0dc02b3e36400923176bf340145c7a04f568f49a060e5ba68451a227b5b
DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
DIST github.com-kubernetes-kube-openapi-39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1.tar.gz 84447 BLAKE2B fa2ad0affd97fd0874b9bc4723f522d78c0ede1c6d43ed22ac151aaa3423f3dc180dd5578378bf95f747ef5eb18140414787349ab062c3974f71901c58fc00a2 SHA512 45867a30bc4877b4376d69787c4d20943fe21dfda20d6eefeda729b808668bc37b12e5a7c0869d13bb6b3481b798ef990d66d6b4e733331651d8a4db323c4cb5
+DIST github.com-kubernetes-kube-openapi-50ae88d24ede7b8bad68e23c805b5d3da5c8abaf.tar.gz 88141 BLAKE2B e96d61f9c784e4428723d1dc28315f2400cdc2102b10178c8a93cbb4fa56e1b07f5a34671bc75e17d5d028ecb0b0661abec6edb86ab33e385b72388ba593cd24 SHA512 37aa7397a8ff203ba53931f19b676c996e3712145f1729ba8a1b7981295049783912d49ce83bb932ccd0ffadd4d1ebe727a1b7118f4d411b44148ef649d26ad6
DIST github.com-kubernetes-kubernetes-3a1c9449a956b6026f075fa3134ff92f7d55f812.tar.gz 23382404 BLAKE2B f6d6b9a67d90470d8c30a17c60cd24bfa075d36a580a3ab6f985d96f53d08b0971569c33c0c508e542148022ca3be0cf5fdc60707070da6e9b71c8ba3605e8fc SHA512 05f046d3a4ad5844b05b4b579bbdf2448bfac05197c8fb3a47ca19ff91bd5482972e763c32af84f99e66ccbbcb9c9102d4a5968981f9fd183ecc68c718183af7
DIST github.com-kubernetes-kubernetes-5fa2db2bd46ac79e5e00a4e6ed24191080aa463b.tar.gz 23391805 BLAKE2B 2aaf2b048cbc9b94b1edb1176e7ea7488a593841e831162157c38d426591a4349f99f4c9a918f157510e0e666afcece34f00923f76831f290f91e4d12f9dd499 SHA512 2670395fc356dad41520dfbaaa42c17f837c536cf22e6dc6db7ec29b2db23b04583efe8231264475737d854c2f188453e3f13b1133df4052dbecfda9cbae9967
+DIST github.com-kubernetes-kubernetes-a22f9fd34871d9dc9e5db2c02c713821d18ab2cd.tar.gz 24697736 BLAKE2B 8d735570cdb30bb3d833fabb6a6f5c7d5d458ddbfc5d3b5b6f40748129aca13878ad3cfccc70d6e601f62233b88be2f5b040ac535e0971e1c2a3ba1b87f69f4f SHA512 06d05f214c5d6a839f04eef655f66b225af8fb32d514e7b81d75d5f7656de418e8ce3d91a3acb860f1aaa6b64570843f516be9f59d0a5cd4ed955b340debe6af
DIST github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz 13650 BLAKE2B 7ef52334585300d4faf98a02324380ba5dcdaf708b8027ca9fdae43d0b0a43c5d495162f1e69d4f9f9b8dbc2e22dfaefd66eb479bace78bbbfcf84145613c174 SHA512 91f525cc68ec01f394da926eb3fcd7bd95b62609721c86f22c02d852b42913eba659a97bb9ceb19f4b6aab5a967e5f385d732b81284871c82c740fb102a09368
DIST github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz 70478 BLAKE2B 19c135401f34f8a8285c8bc315e6197c156de85fe9f4e65de7b71fbb73e37d57031915c2632930d5e76bf01e9038ba380150bdc78ec2cdac959e2cdb9571bc11 SHA512 319a7bd61ae490353a939a412dd00ffed9b6acd55bb739e8c259caed7904ec3407493888798addf89a15474053e125abe8818618240a55402b4351270cebfbdb
DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
@@ -103,6 +117,8 @@ DIST github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f63
DIST github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz 28245 BLAKE2B 2f37d14ee529db80301ffcc2c9c88e18cb21b0398333e5528494d143006ec9adc1ceac31d0de3ad30c30c442354220393fccf13fec251ff2cb27994435242f87 SHA512 85023d0442b05ac280d67f43443cbbd40cd4e21da10a6fc9f6f9395fc53e730c73591c9f5a74b910f4190fd8f52843836049ab62fc388bfd8e60338cdb1297a5
DIST github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz 71311 BLAKE2B f908877fb77bbc63a213647f068966f771cc2d299fad21da2b7b096b3253102c9f334f8709960a33841a2b441fee2b9ddb23bccd1fb745268fa41303b25b50f2 SHA512 69ed1d5202af46c685821b914f8ca8bc77b9bfbcfb68a2f388f141d35fc2e673f27bf99d5f9dff285f974a363aa0f3fed1eaacb19910dca080c6e1fa388dcb38
DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
+DIST github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz 278276 BLAKE2B dfb467b318f0a6661c5ae910f32bc5337d9677ff60b55dea4706193b4acb815f7e087debc92cf9347ae54db13f512c4a2dc1cc05ea031201bf119caaffa6c6e7 SHA512 4230ba34fe8f45ed7e4a0f7ffc60781b1b4fbaa6877212a8d5ab5a8b088d0d3151f76868929e270c5ca71769ae366976a25de65716e8c0e6289a4f720055f02f
DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4
DIST helm-2.8.1.tar.gz 1125082 BLAKE2B cb513c34127f1fedf759b94710fc22efea0b76a25189b87fe2e169252265b57b04cdc006d1c8bf0bf6b63e80f4e544716298865aef236874b337610153f3e45b SHA512 5867d192b2a401cf93ea8b1d4e1dddffab992b55931cebd10c53324270288fefb10fa2dc12277dd361b3e4b95ad0258c755459276ce044af1ae9e70266ba6ae1
DIST helm-2.8.2.tar.gz 1129864 BLAKE2B 2f066d3c106942f230cea43c8ea10aeca3dc928de128cf9e0baec94681c1421f9cb882a566b22d0e569f6ffc70966bcae9830d9e947b7ba758f297bdeababbd7 SHA512 ae1b6f8f32a87e705f83633eddb37ebc32e2089e9576f9e99f31d260d7451d765607f36b18c3d364eb1c5d82e78f27e18e761f94b9a1d1eab2f38fc3876c4fdd
+DIST helm-2.9.0.tar.gz 1137069 BLAKE2B dd9bd5e4e0456d894722d07529090b5b7d4bd511b367c02d4cbeaa35cb10cfc9bb584c2575ec774b82ec02a762e415154235b88ab429931a41bcabb661325280 SHA512 c70d3ee929d02cae0930b8d1045db9750755fd0f4abd3672685f7427cd0b1dbe1bd99a54278de0859625c602d53c14c0467d87802d34809c2b4688f0fd31e5ca
diff --git a/app-admin/helm/helm-2.9.0.ebuild b/app-admin/helm/helm-2.9.0.ebuild
new file mode 100644
index 000000000000..cf07d222471c
--- /dev/null
+++ b/app-admin/helm/helm-2.9.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e"
+"github.com/Azure/go-autorest d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756"
+"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/evanphx/json-patch 944e07253867aacae43c04b2e6a239005443f33a"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
+"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 6da026c32e2d622cc242d32984259c77237aefe1"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
+"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/json-iterator/go 13f86432b882000a51c6e610c620974462691a97"
+"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
+"github.com/Masterminds/sprig 6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
+"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
+"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/technosophos/moniker ab470f5e105a44d0c87ea21bacd6a335c4816d83"
+"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto"
+"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 f8f38de21b4dcd69d0413faf231983f5fd6634b1 github.com/square/go-jose"
+"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
+"k8s.io/api c699ec51538f0cfd4afa8bfcfe1e0779cafbe666 github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 898b0eda132e1aeac43a459785144ee4bf9b0a2e github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery 54101a56dda9a0962bc48751c058eb4c546dcbb9 github.com/kubernetes/apimachinery"
+"k8s.io/apiserver ea53f8588c655568158b4ff53f5ec6fa4ebfc332 github.com/kubernetes/apiserver"
+"k8s.io/client-go 23781f4d6632d88e869066eaebb743857aa1ef9b github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 50ae88d24ede7b8bad68e23c805b5d3da5c8abaf github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes a22f9fd34871d9dc9e5db2c02c713821d18ab2cd github.com/kubernetes/kubernetes"
+"k8s.io/utils aedf551cdb8b0119df3a19c65fde413a13b34997 github.com/kubernetes/utils"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="f6025bb9ee7daf9fee0026541c90a6f557a3e0bc"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+ -e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+ -e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+ -e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+ rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor || die
+}
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+ GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+ go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+ popd || die
+ bin/${PN} completion bash > ${PN}.bash || die
+ bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+ newbashcomp ${PN}.bash ${PN}
+ insinto /usr/share/zsh/site-functions
+ newins ${PN}.zsh _${PN}
+
+ dobin bin/${PN} bin/tiller
+ dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index a87d86565278..0c072d6392bd 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,4 +1,4 @@
DIST sudo-1.8.20p2.tar.gz 2930769 BLAKE2B 90338e7d436683f94a9e13e9f0da668f2bbbf2184530feb63166186309881b737b783d2be80f935e5d64fd2a4264928423d2b754121be5caf07acbacbe2a6d42 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda
DIST sudo-1.8.21p2.tar.gz 2976081 BLAKE2B c0b555879ddb6832c6396b557793f5d4783481fca5d721901c7ef81c1856c1cf7630fddd09bbb42207c27d51892a79c2bf5c653b5b5091ebc84f2d59981207b7 SHA512 f04bbff54ad74ba73c078e15c75d2f41332d4912078ed66157ba7346b7fff914bd0747460cb4cd0c472af2d3b344fa72f5c62c95169df68a9cac74d7245c720c
DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
-DIST sudo-1.8.23rc1.tar.gz 3137550 BLAKE2B 4ed50b54db643a04c77332f052e109045782cae34c60a53b1d4e29f64cb02561cb3a6ef70eeafeedbcfefd91e5e6a04ce9a9302c291babe8328ea33bfcc5081c SHA512 7d88e0a29c222fb759d951fc770434af217f3b56b90a196553882e9b6e680134da2a4b0e323a4cf6d38d71cc1ed6797ebcd8e5230e74fcc88d19d98a4d1438e2
+DIST sudo-1.8.23rc2.tar.gz 3149442 BLAKE2B dcf80e26f501cd1e22956e940a97ada7efb68158c995d9719d9c3cdf9f2979a99643e03717c316595875931c783e242bc8e1c809c65b028e93331efcecace0c7 SHA512 0ca1fb8cddb003304999b6e41c05678621e370eb25bc1cd7f3ca8d54f07c8c914b9f05da128208a9225b4e7c83ff6b736bc3a618fdee46fa8f81b70e3c3b0f31
diff --git a/app-admin/sudo/sudo-1.8.23_rc1.ebuild b/app-admin/sudo/sudo-1.8.23_rc2.ebuild
similarity index 100%
rename from app-admin/sudo/sudo-1.8.23_rc1.ebuild
rename to app-admin/sudo/sudo-1.8.23_rc2.ebuild
diff --git a/app-admin/supervisor/supervisor-3.1.4.ebuild b/app-admin/supervisor/supervisor-3.1.4.ebuild
index 78725722c4b3..f7356ad7d5c8 100644
--- a/app-admin/supervisor/supervisor-3.1.4.ebuild
+++ b/app-admin/supervisor/supervisor-3.1.4.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1
MY_PV="${PV/_beta/b}"
DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
LICENSE="repoze ZPL BSD HPND GPL-2"
diff --git a/app-admin/supervisor/supervisor-3.3.3.ebuild b/app-admin/supervisor/supervisor-3.3.3.ebuild
index 7b8ea8a006c4..7dba0e2b7cd7 100644
--- a/app-admin/supervisor/supervisor-3.3.3.ebuild
+++ b/app-admin/supervisor/supervisor-3.3.3.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1
MY_PV="${PV/_beta/b}"
DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
LICENSE="repoze ZPL BSD HPND GPL-2"
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 5a9d30a35294..2a977ec6d5e6 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,2 +1 @@
-DIST testdisk-7.0.tar.bz2 676990 BLAKE2B deeeee290f05d4a992ff69c990cca8480c74e67ba2df0b523640833b968ed98dc9f44e5f33b2666daf07286dd8349b98171d6c65f7f3baae3d5cca159a5c9584 SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2
DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc
diff --git a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch
deleted file mode 100644
index cb99e503829d..000000000000
--- a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/configure.ac 2015-04-18 11:04:47.000000000 +0200
-+++ b/configure.ac 2017-12-04 20:34:51.804861863 +0100
-@@ -854,17 +854,14 @@
-
- if test "$use_qt" = "true";
- then
-- PKG_CHECK_MODULES(QTGUI, [QtGui >= 4.0.1],,use_qt=false)
-- AC_CHECK_TOOLS(MOC,[moc-qt4 moc],)
-- if test x$MOC = x ; then
-- AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.)
-+ PKG_CHECK_MODULES([QTGUI], [QtCore >= 4.8.0 QtGui], [
-+ QT_PATH="$( eval $PKG_CONFIG --variable=libdir QtCore )/bin"
-+ AC_PATH_PROGS([MOC], [moc-qt4 moc], [moc], [$QT_PATH])
-+ AC_PATH_PROGS([RCC], [rcc-qt4 rcc], [rcc], [$QT_PATH])
-+ ], [
-+ AC_MSG_ERROR([Qt4 not found])
- use_qt=false
-- fi
-- AC_CHECK_TOOLS(RCC,[rcc-qt4 rcc],)
-- if test x$RCC = x ; then
-- AC_MSG_WARN(Could not find a rcc-qt4 or rcc tool in your PATH.)
-- use_qt=false
-- fi
-+ ])
- qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS"
- qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS"
- fi
diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild
deleted file mode 100644
index 01eab5bb4960..000000000000
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils flag-o-matic
-
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
-SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc x86"
-IUSE="ewf jpeg ntfs reiserfs static qt4"
-
-REQUIRED_USE="static? ( !qt4 )"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-DEPEND="
- static? (
- sys-apps/util-linux[static-libs]
- >=sys-libs/ncurses-5.2:0[static-libs]
- jpeg? ( virtual/jpeg:0[static-libs] )
- ntfs? ( sys-fs/ntfs3g[static-libs] )
- reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
- >=sys-fs/e2fsprogs-1.35[static-libs]
- sys-libs/zlib[static-libs]
- !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) )
- )
- !static? (
- sys-apps/util-linux
- >=sys-libs/ncurses-5.2:0=
- jpeg? ( virtual/jpeg:0 )
- ntfs? ( sys-fs/ntfs3g )
- reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
- >=sys-fs/e2fsprogs-1.35
- sys-libs/zlib
- !arm? ( ewf? ( app-forensics/libewf:= ) )
- qt4? ( dev-qt/qtgui:4 )
- )"
-RDEPEND="!static? ( ${DEPEND} )"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DOCS=( )
-
-PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
-
-src_configure() {
- local myconf
-
- # this is static method is the same used by upstream for their 'static' make
- # target, but better, as it doesn't break.
- use static && append-ldflags -static
-
- # --with-foo are broken, any use of --with/--without disable the
- # functionality.
- # The following variation must be used.
- use reiserfs || myconf+=" --without-reiserfs"
- use ntfs || myconf+=" --without-ntfs --without-ntfs3g"
- use jpeg || myconf+=" --without-jpeg"
- use ewf || myconf+=" --without-ewf"
- myconf+=$(usex qt4 " --enable-qt" " --disable-qt")
-
- econf \
- --docdir "${ROOT}/usr/share/doc/${P}" \
- --enable-sudo \
- ${myconf}
-
- # perform safety checks for NTFS, REISERFS and JPEG
- if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
- die "Failed to find either NTFS or NTFS-3G library."
- fi
- if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
- die "Failed to find reiserfs library."
- fi
- if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
- die "Failed to find jpeg library."
- fi
-}
diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
index 01b29321c4ff..5cebad4ea172 100644
--- a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
+++ b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${COMMIT}.tar.gz -
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
REQUIRED_USE="static? ( !qt5 )"
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 7efcc6428cf6..d9dbbdfc47d3 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -1,3 +1,4 @@
DIST vault-0.10.0.tar.gz 12533158 BLAKE2B a2341a9a13719d1a68c363b83e1e09f5ba7a6bd2cd7c2cd274a26f2cff9f3dd851498eed361d7bb84cee3242dc8d841d89002dab64fb726343e8364077f891d1 SHA512 204f6f7b36802befc6749a064f217817cdd1bbe634517dc6146a9a4a32bf70ea341634a7a4399f901bb2a63a1b096982f258e365244b01ab4ace833a799fa5bd
+DIST vault-0.10.1.tar.gz 13001413 BLAKE2B d4dd663062062c55d110b165c1369a8a6f44c91002d564680ed008fcea2ce1e26ac24773deb951a46a7d9bcce2234e3b1dc250a957605f3ec82c781ac2e46b4a SHA512 dfa2d81e0e51cf41694ad40ad9bcc6847a9261ee06b2787d59915b941a63bfe58e649271e1ff5a963b892af5c13043057f29a1a8412efe51b3cf54157c54a060
DIST vault-0.9.3.tar.gz 8694430 BLAKE2B 2ac99f5723b9ecf65382f10b795e51d29659b2d218732c6e9d8cc5a3a788a5dfbdc58926399a98ef27bae05454c74dec028a4ed631417788843c7ca7102263e8 SHA512 3939c952c12497f5fb9d4ba0fa4ca94acfd8ee8bb2f3636364dad680a54be4256d52018521573a0c1499a3cf573ff9daa27a52dee3ff7216181436b9aadea574
DIST vault-0.9.6.tar.gz 10464094 BLAKE2B 6e776b000ba6e0e209fd6c89dceedc7925cf41a151816c08a3d96627dd3f2d747be10da70c9c87fcda7870dc1540887fe194c101b275f9cdf12073ad70191f3d SHA512 31c6a39f2a5ebce79660f9ba7b673f95042ab283681de016a9540da17b6a938a45762cf4b4625cf35545fe80716e212a9ee362abe5c6fca52eafd5322b6b0de4
diff --git a/app-admin/vault/vault-0.10.1.ebuild b/app-admin/vault/vault-0.10.1.ebuild
new file mode 100644
index 000000000000..2e6d92497501
--- /dev/null
+++ b/app-admin/vault/vault-0.10.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.10:=
+ dev-go/gox"
+
+FILECAPS=(
+ -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_prepare() {
+ default
+ # Avoid the need to have a git checkout
+ sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+ -i src/${EGO_PN}/scripts/build.sh || die
+ sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
+}
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+ mkdir bin || die
+ export GOPATH=${S}
+ cd src/${EGO_PN} || die
+ XC_ARCH=$(go env GOARCH) \
+ XC_OS=$(go env GOOS) \
+ XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+ emake
+}
+
+src_install() {
+ dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ keepdir /etc/${PN}.d
+ insinto /etc/${PN}.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+
+ dobin bin/${PN}
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 8732cc49b2c5..765447e54e06 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/gcab/gcab-0.8.ebuild b/app-arch/gcab/gcab-0.8.ebuild
index 5de14060ae19..bf1cc83268ca 100644
--- a/app-arch/gcab/gcab-0.8.ebuild
+++ b/app-arch/gcab/gcab-0.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 5bab27117856..a7baf225d11c 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,3 +1,4 @@
DIST unrar-5.5.8.tar.gz 222285 BLAKE2B ec6317fc95674a3f282f92762ee89d2fd21d162a96b7b1ea29de9f4ab0ebf0bdb9c3e7141c7146d4bd2e570620db7d7850bc9a8c45a42ef745af1d75d4df5a71 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa
DIST unrar-5.6.1.tar.gz 225408 BLAKE2B 1b4cef7b55dec0658d4eca09e9dc933ed1ad10d87dabe3626a01974bddb51dabf89c39f2db200cbe4388a682c0a756c720d116b9654e4539bfca1658396d0768 SHA512 62f37f9e3deb86651c92832190fa27a8e4490084c6a95f42e8a5f5668fbc7aafd9c273a2c60683c3534b614e0ca44b20d18598296f67edb0812850a50b807e77
DIST unrar-5.6.2.tar.gz 225677 BLAKE2B a8eaf1ca3262caedb1f1a44109d26e688208d62c2424b476e40b90406be8d6274073bae4f1963b0f7eec4e978a25347b36be8561e74143c6a6ce84e2c4956130 SHA512 67f958330bc58fecc2fde3a16073bb44b61b5fd4a0ff19c5e345ce830a1ff3f00f3fb2507455912b7b3252804b9d27a92c4469f31513337569fed298d6af7655
+DIST unrar-5.6.3.tar.gz 225788 BLAKE2B 8baf99ef85052a395fe0f2daed41803587e7d839949488eb3430e3d3a3dbca30ef894530d5ef40757f7ea2ffdfb2d493e8e13d7322e65885cf03f8fa0859b804 SHA512 cd3c97d357242a91917cdd9ee6898527829bff73dd187e58d7490d0d0ed5ffd8f8db651ce63d4bd8307c6a085fa95d72faa7b0cf1348bba191086136232a98fc
diff --git a/app-arch/unrar/unrar-5.6.3.ebuild b/app-arch/unrar/unrar-5.6.3.ebuild
new file mode 100644
index 000000000000..78288603ed4f
--- /dev/null
+++ b/app-arch/unrar/unrar-5.6.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/5"
+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 ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.5.5-build.patch
+ "${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+ default
+
+ local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+ else
+ sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+ fi
+ sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+ mkdir -p build-{lib,bin}
+ printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+ cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+ unrar_make() {
+ emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+ }
+
+ unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+ ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+ ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+ unrar_make -C build-bin
+}
+
+src_install() {
+ dobin build-bin/unrar
+ dodoc readme.txt
+
+ dolib.so build-lib/libunrar*
+
+ insinto /usr/include/libunrar${PV%.*.*}
+ doins *.hpp
+ dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 7f7ce2dcc2df..4dcc1841fcc3 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index 40a964014786..3936cd8d65ec 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,2 +1 @@
-DIST backintime-1.1.24.tar.gz 658961 BLAKE2B 88255ea138f31c4540f54d2053616d4c8ce35f7c969b15a9c46422bfed4f0fd2cabb01e0cd4d1505fb84eee31daacb9da36c6bf71225f5b9a1d47d6941e571b2 SHA512 d16b6d3a710154ca8bddf80a8f06835efe84dd2f2435102e06a732f7e6e291b1954864298542658bab2b7bc42d5a6bf1d9338a98c66fd3f888c450b9685cc011
DIST backintime-1.2.0_pre20180221.tar.gz 712330 BLAKE2B 9ba40c5f89b9fbdf0b1c381bf2e3edce13553b2c301792627fc037bd2de181804b2dc6cad6e78a02844f8835dcd6415a35590125e832d55187fa2ed1a5fa864b SHA512 ad1bb11ea411904027952809c577de1a5317f40430af9b91b16a2c157d560c72b65c879bb880b557e9b5e333e76a44977a26486f4ed4f45281a5e8b0d4583c2a
diff --git a/app-backup/backintime/backintime-1.1.24.ebuild b/app-backup/backintime/backintime-1.1.24.ebuild
deleted file mode 100644
index e06ed0d26293..000000000000
--- a/app-backup/backintime/backintime-1.1.24.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit eutils python-single-r1 gnome2-utils
-
-DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
-HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/"
-SRC_URI="https://github.com/bit-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt4"
-
-DEPEND="${PYTHON_DEPS}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/keyring[${PYTHON_USEDEP}]
- net-misc/openssh
- net-misc/rsync[xattr,acl]"
-RDEPEND="${DEPEND}
- qt4? ( dev-python/PyQt4 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
- #fix doc install location
- sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \
- -i common/configure || die
- sed -e "s:/doc/${PN}-qt4:/doc/${PF}:g" \
- -i qt4/configure || die
- sed -e "/addInstallFile \"..\/VERSION/d" \
- -e "/addInstallFile \"..\/LICENSE/d" \
- -e "/addInstallFile \"..\/debian\/copyright/d" \
- -i {qt4,common}/configure || die
-
- if [ -n ${LINGUAS+x} ] ; then
- cd common/po || die
- for po in *.po ; do
- if ! has ${po/.po} ${LINGUAS} ; then
- rm ${po} || die
- fi
- done
- fi
-
- default
-}
-
-src_configure() {
- cd "${S}"/common || die
- ./configure --python3 --no-fuse-group || die
- if use qt4 ; then
- cd "${S}"/qt4 || die
- ./configure --python3 || die
- fi
-}
-
-src_compile() {
- cd "${S}"/common || die
- emake
- if use qt4 ; then
- cd "${S}"/qt4 || die
- emake
- fi
-}
-
-src_install() {
- cd "${S}"/common || die
- emake DESTDIR="${D}" install
- if use qt4 ; then
- cd "${S}"/qt4 || die
- emake DESTDIR="${D}" install
- fi
-
- python_optimize "${D}"
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
index 0df305389205..1b1e607dc857 100644
--- a/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
+++ b/app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/bit-team/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="qt5"
DEPEND="${PYTHON_DEPS}
diff --git a/app-backup/bacula/bacula-9.0.6-r3.ebuild b/app-backup/bacula/bacula-9.0.6-r3.ebuild
new file mode 100644
index 000000000000..f30acaa0b53f
--- /dev/null
+++ b/app-backup/bacula/bacula-9.0.6-r3.ebuild
@@ -0,0 +1,430 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit qmake-utils desktop systemd user libtool
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+ dev-libs/gmp:0
+ !bacula-clientonly? (
+ postgres? ( dev-db/postgresql:=[threads] )
+ mysql? ( virtual/mysql )
+ sqlite? ( dev-db/sqlite:3 )
+ !bacula-nodir? ( virtual/mta )
+ )
+ qt5? (
+ dev-qt/qtsvg:5
+ x11-libs/qwt:6
+ )
+ logwatch? ( sys-apps/logwatch )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ readline? ( sys-libs/readline:0 )
+ static? (
+ acl? ( virtual/acl[static-libs] )
+ sys-libs/zlib[static-libs]
+ dev-libs/lzo[static-libs]
+ sys-libs/ncurses:=[static-libs]
+ ssl? (
+ !libressl? ( dev-libs/openssl:0=[static-libs] )
+ libressl? ( dev-libs/libressl:0=[static-libs] )
+ )
+ )
+ !static? (
+ acl? ( virtual/acl )
+ sys-libs/zlib
+ dev-libs/lzo
+ sys-libs/ncurses:=
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )"
+RDEPEND="${DEPEND}
+ !bacula-clientonly? (
+ !bacula-nosd? (
+ sys-block/mtx
+ app-arch/mt-st
+ )
+ )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
+ static? ( bacula-clientonly )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ #XOR and !bacula-clientonly controlled by REQUIRED_USE
+ use mysql && export mydbtype="mysql"
+ use postgres && export mydbtype="postgresql"
+ use sqlite && export mydbtype="sqlite3"
+
+ # create the daemon group and user
+ if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
+ enewgroup bacula
+ einfo
+ einfo "The group 'bacula' has been created. Any users you add to this"
+ einfo "group have access to files created by the daemons."
+ einfo
+ fi
+
+ if use bacula-clientonly && use static && use qt5; then
+ ewarn
+ ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag."
+ ewarn
+ fi
+
+ if ! use bacula-clientonly; then
+ if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
+ enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
+ einfo
+ einfo "The user 'bacula' has been created. Please see the bacula manual"
+ einfo "for information about running bacula as a non-root user."
+ einfo
+ fi
+ fi
+}
+
+src_prepare() {
+ # adjusts default configuration files for several binaries
+ # to /etc/bacula/ instead of ./
+ pushd src >&/dev/null || die
+ for f in console/console.c dird/dird.c filed/filed.c \
+ stored/bcopy.c stored/bextract.c stored/bls.c \
+ stored/bscan.c stored/btape.c stored/stored.c \
+ qt-console/main.cpp; do
+ sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+ || die "sed on ${f} failed"
+ done
+ popd >&/dev/null || die
+
+ # bug 466688 drop deprecated categories from Desktop file
+ sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+ # bug 466690 Use CXXFLAGS instead of CFLAGS
+ sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+ # drop automatic install of unneeded documentation (for bug 356499)
+ eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+ # bug #310087
+ eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+ # bug #311161
+ eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
+
+ # bat needs to respect LDFLAGS and CFLAGS
+ eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+
+ # bug #328701
+ eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+ eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-fix-static.patch
+
+ # fix soname in libbaccat.so bug #602952
+ eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch"
+
+ # do not strip binaries
+ sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+ sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+ # fix file not found error during make depend
+ eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+ # fix missing QtGlobal include in src/qt-console/pages.h for Qt5
+ eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-fix-pages-h-qt-includes.patch
+ eapply_user
+
+ # Fix systemd unit files:
+ # bug 497748
+ sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+ sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+ # bug 504370
+ sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+ # bug 584442 and 504368
+ sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+ # build 'bat' for Qt5
+ export QMAKE="$(qt5_get_bindir)"/qmake
+
+ # adapt to >=Qt-5.9 (see bug #644566)
+ # qmake needs an existing target file to generate install instructions
+ sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \
+ src/qt-console/bat.pro.in || die
+ mkdir src/qt-console/.libs || die
+ touch src/qt-console/.libs/bat || die
+ chmod 755 src/qt-console/.libs/bat || die
+
+ # fix wrong handling of libressl version
+ eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl.patch
+
+ # fix bundled libtool (bug 466696)
+ # But first move directory with M4 macros out of the way.
+ # It is only needed by autoconf and gives errors during elibtoolize.
+ mv autoconf/libtool autoconf/libtool1 || die
+ elibtoolize
+}
+
+src_configure() {
+ local myconf=''
+
+ if use bacula-clientonly; then
+ myconf="${myconf} \
+ $(use_enable bacula-clientonly client-only) \
+ $(use_enable !static libtool) \
+ $(use_enable static static-cons) \
+ $(use_enable static static-fd)"
+ else
+ myconf="${myconf} \
+ $(use_enable !bacula-nodir build-dird) \
+ $(use_enable !bacula-nosd build-stored)"
+ # bug #311099
+ # database support needed by dir-only *and* sd-only
+ # build as well (for building bscan, btape, etc.)
+ myconf="${myconf}
+ --with-${mydbtype}"
+ if use mysql; then
+ myconf="${myconf} \
+ --disable-batch-insert"
+ else
+ myconf="${myconf} \
+ --enable-batch-insert"
+ fi
+ fi
+
+ # do not build bat if 'static' clientonly
+ if ! use bacula-clientonly || ! use static; then
+ myconf="${myconf} \
+ $(use_enable qt5 bat)"
+ fi
+
+ myconf="${myconf} \
+ $(use_with X x) \
+ $(use_enable !readline conio) \
+ $(use_enable readline) \
+ $(use_with readline readline /usr) \
+ $(use_with ssl openssl) \
+ $(use_enable ipv6) \
+ $(use_enable acl) \
+ $(use_with tcpd tcp-wrappers)"
+
+ econf \
+ --libdir=/usr/$(get_libdir) \
+ --docdir=/usr/share/doc/${PF} \
+ --htmldir=/usr/share/doc/${PF}/html \
+ --with-pid-dir=/var/run \
+ --sysconfdir=/etc/bacula \
+ --with-subsys-dir=/var/lock/subsys \
+ --with-working-dir=/var/lib/bacula \
+ --with-logdir=/var/lib/bacula \
+ --with-scriptdir=/usr/libexec/bacula \
+ --with-systemd=$(systemd_get_systemunitdir) \
+ --with-dir-user=bacula \
+ --with-dir-group=bacula \
+ --with-sd-user=root \
+ --with-sd-group=bacula \
+ --with-fd-user=root \
+ --with-fd-group=bacula \
+ --enable-smartalloc \
+ --disable-afs \
+ --host=${CHOST} \
+ ${myconf}
+}
+
+src_compile() {
+ # Make build log verbose (bug #447806)
+ emake NO_ECHO=""
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ doicon scripts/bacula.png
+
+ # install bat icon and desktop file when enabled
+ # (for some reason ./configure doesn't pick this up)
+ if use qt5 && ! use static ; then
+ doicon src/qt-console/images/bat_icon.png
+ domenu scripts/bat.desktop
+ fi
+
+ # remove some scripts we don't need at all
+ rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+ # rename statically linked apps
+ if use bacula-clientonly && use static ; then
+ pushd "${D}"/usr/sbin || die
+ mv static-bacula-fd bacula-fd || die
+ mv static-bconsole bconsole || die
+ popd || die
+ fi
+
+ # extra files which 'make install' doesn't cover
+ if ! use bacula-clientonly; then
+ # the database update scripts
+ diropts -m0750
+ insinto /usr/libexec/bacula/updatedb
+ insopts -m0754
+ doins "${S}"/updatedb/*
+ fperms 0640 /usr/libexec/bacula/updatedb/README
+
+ # the logrotate configuration
+ # (now unconditional wrt bug #258187)
+ diropts -m0755
+ insinto /etc/logrotate.d
+ insopts -m0644
+ newins "${S}"/scripts/logrotate bacula
+
+ # the logwatch scripts
+ if use logwatch; then
+ diropts -m0750
+ dodir /usr/share/logwatch/scripts/services
+ dodir /usr/share/logwatch/scripts/shared
+ dodir /etc/logwatch/conf/logfiles
+ dodir /etc/logwatch/conf/services
+ pushd "${S}"/scripts/logwatch >&/dev/null || die
+ emake DESTDIR="${D}" install
+ popd >&/dev/null || die
+ fi
+ fi
+
+ if ! use qt5; then
+ rm -vf "${D}"/usr/share/man/man1/bat.1*
+ fi
+ rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+ if use bacula-clientonly || use bacula-nodir; then
+ rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
+ rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
+ rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+ rm -vf "${D}"/usr/libexec/bacula/create_*_database
+ rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+ rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+ rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+ rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+ rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+ rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+ fi
+ if use bacula-clientonly || use bacula-nosd; then
+ rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
+ rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+ rm -vf "${D}"/usr/share/man/man8/bextract.8*
+ rm -vf "${D}"/usr/share/man/man8/bls.8*
+ rm -vf "${D}"/usr/share/man/man8/bscan.8*
+ rm -vf "${D}"/usr/share/man/man8/btape.8*
+ rm -vf "${D}"/usr/libexec/bacula/disk-changer
+ rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+ rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+ fi
+
+ # documentation
+ dodoc ChangeLog ReleaseNotes SUPPORT
+
+ # install examples (bug #457504)
+ if use examples; then
+ docinto examples/
+ dodoc -r examples/*
+ fi
+
+ # vim-files
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins scripts/bacula.vim
+ insinto /usr/share/vim/vimfiles/ftdetect
+ newins scripts/filetype.vim bacula_ft.vim
+ fi
+
+ # setup init scripts
+ myscripts="bacula-fd"
+ if ! use bacula-clientonly; then
+ if ! use bacula-nodir; then
+ myscripts="${myscripts} bacula-dir"
+ fi
+ if ! use bacula-nosd; then
+ myscripts="${myscripts} bacula-sd"
+ fi
+ fi
+ for script in ${myscripts}; do
+ # copy over init script and config to a temporary location
+ # so we can modify them as needed
+ cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+ cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+ # now set the database dependancy for the director init script
+ case "${script}" in
+ bacula-dir)
+ case "${mydbtype}" in
+ sqlite3)
+ # sqlite databases don't have a daemon
+ sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+ ;;
+ *)
+ # all other databases have daemons
+ sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+ ;;
+ esac
+ ;;
+ *)
+ ;;
+ esac
+
+ # install init script and config
+ newinitd "${T}/${script}".initd "${script}"
+ newconfd "${T}/${script}".confd "${script}"
+ done
+
+ systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+ # make sure the working directory exists
+ diropts -m0750
+ keepdir /var/lib/bacula
+
+ # make sure bacula group can execute bacula libexec scripts
+ fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+ if use bacula-clientonly; then
+ fowners root:bacula /var/lib/bacula
+ else
+ fowners bacula:bacula /var/lib/bacula
+ fi
+
+ if ! use bacula-clientonly && ! use bacula-nodir; then
+ einfo
+ einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+ einfo " /usr/libexec/bacula/create_${mydbtype}_database"
+ einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
+ einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
+ einfo
+
+ ewarn "ATTENTION!"
+ ewarn "The format of the database may have changed."
+ ewarn "If you just upgraded from a version below 9.0.0 you must run"
+ ewarn "'update_bacula_tables' now."
+ ewarn "Make sure to have a backup of your catalog before."
+ ewarn
+ fi
+
+ if use sqlite; then
+ einfo
+ einfo "Be aware that Bacula does not officially support SQLite database anymore."
+ einfo "Best use it only for a client-only installation. See Bug #445540."
+ einfo
+ fi
+
+ einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+ einfo "you have to enable 'USE=qt5'."
+ einfo
+}
diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch
new file mode 100644
index 000000000000..3df4285c2e2e
--- /dev/null
+++ b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl.patch
@@ -0,0 +1,62 @@
+--- src/lib/crypto.c.orig 2018-02-02 15:34:39.420489000 -0600
++++ src/lib/crypto.c 2018-02-02 15:35:44.000524000 -0600
+@@ -195,7 +195,7 @@
+ IMPLEMENT_ASN1_FUNCTIONS(SignatureData)
+ IMPLEMENT_ASN1_FUNCTIONS(CryptoData)
+
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) )
+ DEFINE_STACK_OF(SignerInfo);
+ DEFINE_STACK_OF(RecipientInfo);
+ #else
+--- src/lib/openssl-compat.h.orig 2018-02-02 15:26:04.182557000 -0600
++++ src/lib/openssl-compat.h 2018-02-02 15:27:50.229100000 -0600
+@@ -1,7 +1,7 @@
+ #ifndef __OPENSSL_COPMAT__H__
+ #define __OPENSSL_COPMAT__H__
+
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
+ static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey)
+ {
+ CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
+--- src/lib/openssl.c.orig 2018-02-16 08:36:24.092583000 -0600
++++ src/lib/openssl.c 2018-02-16 08:37:23.795454000 -0600
+@@ -69,7 +69,7 @@
+ }
+ }
+
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
+ /* Array of mutexes for use with OpenSSL static locking */
+ static pthread_mutex_t *mutexes;
+
+@@ -263,7 +263,7 @@
+ {
+ int stat = 0;
+
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
+ if ((stat = openssl_init_threads()) != 0) {
+ berrno be;
+ Jmsg1(NULL, M_ABORT, 0,
+@@ -310,7 +310,7 @@
+ Jmsg0(NULL, M_ERROR, 0, _("Failed to save OpenSSL PRNG\n"));
+ }
+
+-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
+ openssl_cleanup_threads();
+
+ /* Free libssl and libcrypto error strings */
+--- src/lib/tls.c.orig 2017-11-21 18:37:16.000000000 +0100
++++ src/lib/tls.c 2018-04-16 20:00:54.082000000 +0200
+@@ -116,7 +116,7 @@
+ ctx = (TLS_CONTEXT *)malloc(sizeof(TLS_CONTEXT));
+
+ /* Allocate our OpenSSL TLS Context */
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) )
+ /* Allows SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols */
+ ctx->openssl = SSL_CTX_new(TLS_method());
+
diff --git a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
index 33f9eadc3f0f..c63ce9708275 100644
--- a/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
+++ b/app-backup/borgweb/borgweb-0.2.0-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Browser-based user interface for BorgBackup"
-HOMEPAGE="https://pypi.org/project/borgweb"
+HOMEPAGE="https://pypi.org/project/borgweb/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/app-backup/zbackup/zbackup-1.4.4.ebuild b/app-backup/zbackup/zbackup-1.4.4.ebuild
deleted file mode 100644
index 75f7cf5fca25..000000000000
--- a/app-backup/zbackup/zbackup-1.4.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A versatile deduplicating backup tool"
-HOMEPAGE="http://zbackup.org/ https://github.com/zbackup/zbackup"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="libressl tartool"
-
-DEPEND="app-arch/lzma
- dev-libs/lzo:2
- .
- If you intend to use more than one display, then it is strongly
- recommended that you compile Emacs with the Athena/Lucid or the
- Motif toolkit instead.
- EOF
- #if use xwidgets; then
- # myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
- #else
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
- myconf+=" --without-xwidgets"
- #fi
- for f in motif Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"gtk\" is set."
- done
- elif use motif; then
- einfo "Configuring to build with Motif toolkit"
- myconf+=" --with-x-toolkit=motif"
- for f in Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"motif\" is set."
- done
- elif use athena || use Xaw3d; then
- einfo "Configuring to build with Athena/Lucid toolkit"
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
- else
- einfo "Configuring to build with no toolkit"
- myconf+=" --with-x-toolkit=no"
- fi
- #! use gtk && use xwidgets && ewarn \
- # "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
- fi
-
- # Save version information in the Emacs binary. It will be available
- # in variable "system-configuration-options".
- myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
- econf \
- --program-suffix="-${EMACS_SUFFIX}" \
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --localstatedir="${EPREFIX}"/var \
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --with-gameuser=":gamestat" \
- --without-compress-install \
- --without-hesiod \
- --with-file-notification=$(usev inotify || usev gfile || echo no) \
- $(use_enable acl) \
- $(use_with dbus) \
- $(use_with dynamic-loading modules) \
- $(use_with gpm) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with libxml2 xml2) \
- $(use_with selinux) \
- $(use_with ssl gnutls) \
- $(use_with wide-int) \
- $(use_with zlib) \
- ${myconf}
-}
-
-src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- emake
-}
-
-src_install () {
- emake DESTDIR="${D}" NO_BIN_LINK=t install
-
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
- || die "moving emacs executable failed"
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
- || die "moving emacs man page failed"
-
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
- || die "moving info dir failed"
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
- # avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}"/var
-
- # remove unused /site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
- # remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
- if use gzip-el; then
- # compress .el files when a corresponding .elc exists
- find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
- -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
- assert "gzip .el failed"
- fi
-
- local cdir
- if use source; then
- cdir="/usr/share/emacs/${FULL_VERSION}/src"
- insinto "${cdir}"
- # This is not meant to install all the source -- just the
- # C source you might find via find-function
- doins src/*.{c,h,m}
- elif has installsources ${FEATURES}; then
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
- fi
-
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- Y (setq find-function-C-source-directory
- Y "${EPREFIX}${cdir}")
- X (let ((path (getenv "INFOPATH"))
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
- X (and path
- X ;; move Emacs Info dir before anything else in /usr/share/info
- X (let* ((p (cons nil (split-string path ":" t))) (q p))
- X (while (and (cdr q) (not (string-match re (cadr q))))
- X (setq q (cdr q)))
- X (setcdr q (cons dir (delete dir (cdr q))))
- X (setq Info-directory-list (prune-directory-list (cdr p)))))))
- EOF
- elisp-site-file-install "${T}/${SITEFILE}" || die
-
- dodoc README BUGS CONTRIBUTE
-
- if use aqua; then
- dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
- mv nextstep/Emacs.app \
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
- fi
-
- DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
- through the Emacs eselect module, which also redirects man and info
- pages. Therefore, several Emacs versions can be installed at the
- same time. \"man emacs.eselect\" for details.
- \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
- strongly recommended that you use app-admin/emacs-updater to rebuild
- all byte-compiled elisp files of the installed Emacs packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's
- machine would satisfy basic Emacs requirements under X11.
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
- for how to enable anti-aliased fonts."
- use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
- \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
- it into /Applications by yourself."
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- elif [[ -d "${ED}"${infodir} ]]; then
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" \
- || die "install-info failed"
- fi
- done
- fi
-}
-
-pkg_postinst() {
- elisp-site-regen
- readme.gentoo_print_elog
-
- if use livecd; then
- # force an update of the emacs symlink for the livecd/dvd,
- # because some microemacs packages set it with USE=livecd
- eselect emacs update
- elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
- # refresh symlinks in case any installed files have changed
- eselect emacs set ${EMACS_SUFFIX}
- else
- eselect emacs update ifunset
- fi
-}
-
-pkg_postrm() {
- elisp-site-regen
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-25.3-r4.ebuild b/app-editors/emacs/emacs-25.3-r4.ebuild
index f1345d3b9fed..fa65731efdb0 100644
--- a/app-editors/emacs/emacs-25.3-r4.ebuild
+++ b/app-editors/emacs/emacs-25.3-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="25"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index afec8cebd2ea..7ed552aba66d 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -40,7 +40,6 @@
of the internal Lisp implementations
Retrieve e-mail using net-mail/mailutils
instead of the internal movemail substitute
- Enable building under a PaX enabled kernel
Install C source files and make them available for
find-function
Use the selected toolkit's scrollbars in
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index d8af1a132206..c3ec35a035ab 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,4 +1 @@
DIST focuswriter-1.6.10-src.tar.bz2 10202594 BLAKE2B d7b59dc2c37d87ed0d1e58358906a9fef6f14a339e12a50980d17cdbed043f604bb355edca956af61b5fcaa78f68eb35b54ef85fc08dfa00dfa747893d6c1200 SHA512 8c12481af77fa4353840f22a6aa54c5264041afc141d9746e097e42171a9f274663940fc0c5e5e2c91ef677190c682a195cb775199d4b8cc2b1ad040542e2e61
-DIST focuswriter-1.6.7-src.tar.bz2 10196583 BLAKE2B 99c749271c785e69f07601575343669ed5be619e646be4ee38cc82242d353a84577842c1ff98f62b0adbbff1a733a0dce82593ac4ffa2eb61e611cea1b2657b5 SHA512 d33c66881b1065aa9812dae14a5fe2a2850ce1c50f4b38e028bcd3f5a4bb1fd489705b0272e3233f3db468b262daefbd906025126f792d04af41722cde2c7bf5
-DIST focuswriter-1.6.8-src.tar.bz2 10196595 BLAKE2B 1c726b948469960e1cc35dcf592acf48693035d2792449fdc336ac4bb03029d6d9eaac77c674347ac5e7a1a7ba7cd386de0d4034e7390dd80067b9522d85a08d SHA512 d10a559448f075110d9ba7fec487b9f125a4fcdce7dc1fcd2b21b94613a7d1126baa49623273bf0f56b1b7c2ef026a30c019653ba73e39b6fa78687c862e3402
-DIST focuswriter-1.6.9-src.tar.bz2 10202664 BLAKE2B 68525ca548513b9b88ca032c0f629681a592149672611891a1ddfe6a8574a233dfc7bcee64dfcae2255b3dce2cbd15907428f25a7ad27a4ebc5c535d3fb34d7b SHA512 dcebd2e1c16a9eb1d135befef58ba0a276dac8d84385d90db3a8c192f3ff05eb5b6ac11cef239c1c4b4998b396da908ad99d5c89c0eb1438d9eb654f2cc7afec
diff --git a/app-editors/focuswriter/focuswriter-1.6.10.ebuild b/app-editors/focuswriter/focuswriter-1.6.10.ebuild
index e9ad01952042..9aa7b84840d7 100644
--- a/app-editors/focuswriter/focuswriter-1.6.10.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
LICENSE="LGPL-3 GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# drop qtcore subslot when minimal Qt is 5.10
diff --git a/app-editors/focuswriter/focuswriter-1.6.7.ebuild b/app-editors/focuswriter/focuswriter-1.6.7.ebuild
deleted file mode 100644
index aee21c9571a5..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="A fullscreen and distraction-free word processor"
-HOMEPAGE="https://gottcode.org/focuswriter/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- app-text/hunspell:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsingleapplication[qt5,X]
- dev-qt/qtwidgets:5
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qtconcurrent:5
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog CREDITS NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
-
-src_configure() {
- eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-editors/focuswriter/focuswriter-1.6.8.ebuild b/app-editors/focuswriter/focuswriter-1.6.8.ebuild
deleted file mode 100644
index 67fc1801283b..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.8.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="A fullscreen and distraction-free word processor"
-HOMEPAGE="https://gottcode.org/focuswriter/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# drop qtcore subslot when minimal Qt is 5.10
-RDEPEND="
- app-text/hunspell:=
- dev-qt/qtcore:5=
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsingleapplication[qt5,X]
- dev-qt/qtwidgets:5
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qtconcurrent:5
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog CREDITS NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
-
-src_configure() {
- eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-editors/focuswriter/focuswriter-1.6.9-r1.ebuild b/app-editors/focuswriter/focuswriter-1.6.9-r1.ebuild
deleted file mode 100644
index f61c59e9ba31..000000000000
--- a/app-editors/focuswriter/focuswriter-1.6.9-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="A fullscreen and distraction-free word processor"
-HOMEPAGE="https://gottcode.org/focuswriter/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# drop qtcore subslot when minimal Qt is 5.10
-RDEPEND="
- app-text/hunspell:=
- dev-qt/qtcore:5=
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsingleapplication[qt5(+),X]
- dev-qt/qtwidgets:5
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qtconcurrent:5
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog CREDITS NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" )
-
-src_configure() {
- eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 3555fbd43889..02aff899c51a 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,3 +1,3 @@
DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79
-DIST nano-2.9.4.tar.gz 2874037 BLAKE2B 493005cd3635fa7ad9508d6a24076e3a23b9038e5e4fbecf2a9ea51e03c861eaaf0fbe3e566075394523669350b1e396140f0bc6504953bb7c99690d47ef502f SHA512 dec4259668716a49d6dc403aabf4e2c0c0148247f9161e6a88c29c573026fcec00a15147b2e6d2c8c1d52fac227ab4d7b3f3552389af97b485da0b875976f0fd
DIST nano-2.9.5.tar.gz 2889382 BLAKE2B fa9a020b133f0b1c669689e0831d2700d7509a01e7355ab7ee613a38b1c6c65e35e9572ad5c4ea4aae427c52ba841d7b5da826bb0afddf25f3d8add8ffa15302 SHA512 623a1d142f5aff62186314d84ea8461e10ab7eb2e11c8a57497736bc5ad432e39d48086d17eb80bdbf9b33adc41e9d77db5416281138993dbea795afd96dbfc0
+DIST nano-2.9.6.tar.gz 2892819 BLAKE2B 572fcd30b3640e1819d2d573c6aa755141b3990ab05fdf4928a8ade4dedd77ee4d8b81644a75d2c698fbc5512b1bffb7e7d449beac57700a77a1f7687ece4d58 SHA512 360802c3d772e8159e729803d5307575b348f779623e49401752984201b6b874df1582fe79ed6552a524db64ae6d8a1bfb449b525f7354cbd5cd9941432a2dff
diff --git a/app-editors/nano/nano-2.9.4.ebuild b/app-editors/nano/nano-2.9.6.ebuild
similarity index 97%
rename from app-editors/nano/nano-2.9.4.ebuild
rename to app-editors/nano/nano-2.9.6.ebuild
index 74791e406856..2b29359919a7 100644
--- a/app-editors/nano/nano-2.9.4.ebuild
+++ b/app-editors/nano/nano-2.9.6.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
inherit git-r3 autotools
else
- MY_P=${PN}-${PV/_}
+ MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
@@ -64,7 +64,7 @@ src_configure() {
src_install() {
default
- rm -rf "${D}"/trash
+ rm -rf "${ED%/}"/trash
dodoc doc/sample.nanorc
docinto html
@@ -78,6 +78,5 @@ src_install() {
"${ED%/}"/etc/nanorc || die
fi
- dodir /usr/bin
dosym ../../bin/nano /usr/bin/nano
}
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 0aed36a7b0ee..2b29359919a7 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
inherit git-r3 autotools
else
- MY_P=${PN}-${PV/_}
+ MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
@@ -32,10 +32,10 @@ DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
src_prepare() {
+ default
if [[ ${PV} == "9999" ]] ; then
eautoreconf
fi
- default
}
src_configure() {
@@ -64,7 +64,7 @@ src_configure() {
src_install() {
default
- rm -rf "${D}"/trash
+ rm -rf "${ED%/}"/trash
dodoc doc/sample.nanorc
docinto html
@@ -78,6 +78,5 @@ src_install() {
"${ED%/}"/etc/nanorc || die
fi
- dodir /usr/bin
dosym ../../bin/nano /usr/bin/nano
}
diff --git a/app-editors/xvile/xvile-9.8r.ebuild b/app-editors/xvile/xvile-9.8r-r1.ebuild
similarity index 89%
rename from app-editors/xvile/xvile-9.8r.ebuild
rename to app-editors/xvile/xvile-9.8r-r1.ebuild
index 8748bca62a91..d2cd7608324f 100644
--- a/app-editors/xvile/xvile-9.8r.ebuild
+++ b/app-editors/xvile/xvile-9.8r-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
@@ -20,9 +20,9 @@ RDEPEND="perl? ( dev-lang/perl )
>=x11-libs/libICE-1.0.0
>=x11-libs/libSM-1.0.0
>=x11-libs/libXaw-1.0.1
- >=x11-libs/libXpm-3.5.4.2
- >=x11-proto/xproto-7.0.4"
+ >=x11-libs/libXpm-3.5.4.2"
DEPEND="${RDEPEND}
+ x11-base/xorg-proto
sys-devel/flex"
S=${WORKDIR}/${MY_P}
diff --git a/app-editors/xvile/xvile-9.8s.ebuild b/app-editors/xvile/xvile-9.8s-r1.ebuild
similarity index 89%
rename from app-editors/xvile/xvile-9.8s.ebuild
rename to app-editors/xvile/xvile-9.8s-r1.ebuild
index 360881561dd8..8ea94b51724e 100644
--- a/app-editors/xvile/xvile-9.8s.ebuild
+++ b/app-editors/xvile/xvile-9.8s-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
@@ -20,9 +20,9 @@ RDEPEND="perl? ( dev-lang/perl )
>=x11-libs/libICE-1.0.0
>=x11-libs/libSM-1.0.0
>=x11-libs/libXaw-1.0.1
- >=x11-libs/libXpm-3.5.4.2
- >=x11-proto/xproto-7.0.4"
+ >=x11-libs/libXpm-3.5.4.2"
DEPEND="${RDEPEND}
+ x11-base/xorg-proto
sys-devel/flex"
S=${WORKDIR}/${MY_P}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index e514b6471aae..50307d1ce71a 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/bochs/bochs-2.6.9.ebuild b/app-emulation/bochs/bochs-2.6.9.ebuild
index 1fbf6c61aec6..80e103e7f589 100644
--- a/app-emulation/bochs/bochs-2.6.9.ebuild
+++ b/app-emulation/bochs/bochs-2.6.9.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
@@ -30,7 +30,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
doc? ( app-text/docbook-sgml-utils )
- X? ( x11-proto/xproto )
+ X? ( x11-base/xorg-proto )
sys-apps/sed
>=app-text/opensp-1.5
"
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index be7eb609435f..ada44a642db1 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -1,2 +1,3 @@
DIST docker-proxy-0.8.0_p20170917.tar.gz 2177045 BLAKE2B 0fed1328e8216ab83b23e8e1fe1793da6e874eced7ad18d101b0b7757f1de4fa7d321fb78620a349a4ed492abb4d85c3ecbf49311698b6af156a6255dec5740e SHA512 673ea638fa5c560d8238d7c1d88f114430f9d8efe701804bfe30044d0c059a688cbf6b62922be50834e16ee055ef6cf015f6232f76f0d942768f9e84e95496cd
DIST docker-proxy-0.8.0_p20180314.tar.gz 2692292 BLAKE2B 6d09750277691313f16ff48c14e2b8f706180dad0805b4874bfc7ed228e090ad1e5a1bdfe1555970424dfde78a31de3373c76c7417c6e5cabedf4da551e49934 SHA512 c33005f0281260a3dcc9dd567680068afbdb9ea6036b2847c9cd3d77e72d32e6b7d359178acbd4a2db7cc15cc53d99079a1b544bc32912dbf19f2babc670a2bd
+DIST docker-proxy-0.8.0_p20180411.tar.gz 2695069 BLAKE2B 5205d5700ad116bb457dc7a57f2624f9efa46f1dbf3f5fe9215077655cddba8e1e1301bc555fb43a22cba4d74423123953a67994bf8974b114350e64be601299 SHA512 300e197313017536f91768ba675f2ab773eb1914f8e5908f4ff5b6fc8c4f0fa5ba1653cd9f8ca26e7c466f1623716aa45a2746f862e47ca9fe9136010085f600
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
new file mode 100644
index 000000000000..2eba51cd06ba
--- /dev/null
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20180411.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/docker/libnetwork"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit golang-vcs
+else
+ EGIT_COMMIT="c15b372ef22125880d378167dde44f4b134e1a77"
+ SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~ppc64"
+ inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RDEPEND="!
- #include
- #include
-+#include
-
- #include "lxc.h"
- #include "config.h"
-@@ -58,9 +59,6 @@
- #ifdef MAJOR_IN_MKDEV
- # include
- #endif
--#ifdef MAJOR_IN_SYSMACROS
--# include
--#endif
-
- #ifndef BLKGETSIZE64
- #define BLKGETSIZE64 _IOR(0x12,114,size_t)
-diff --git a/src/lxc/conf.c b/src/lxc/conf.c
-index 5d583d5f..d4217c27 100644
---- a/src/lxc/conf.c
-+++ b/src/lxc/conf.c
-@@ -36,14 +36,12 @@
- #include
- #include
- #include
-+#include
-
- /* makedev() */
- #ifdef MAJOR_IN_MKDEV
- # include
- #endif
--#ifdef MAJOR_IN_SYSMACROS
--# include
--#endif
-
- #ifdef HAVE_STATVFS
- #include
-diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
-index 3963a3ee..30ac6733 100644
---- a/src/lxc/lxccontainer.c
-+++ b/src/lxc/lxccontainer.c
-@@ -36,6 +36,7 @@
- #include
- #include
- #include
-+#include
-
- #include
- #include
-@@ -60,9 +61,6 @@
- #ifdef MAJOR_IN_MKDEV
- # include
- #endif
--#ifdef MAJOR_IN_SYSMACROS
--# include
--#endif
-
- #if HAVE_IFADDRS_H
- #include
diff --git a/app-emulation/lxc/files/lxc-1.0.8-bash-completion.patch b/app-emulation/lxc/files/lxc-1.0.8-bash-completion.patch
deleted file mode 100644
index e9e0e6c98dfd..000000000000
--- a/app-emulation/lxc/files/lxc-1.0.8-bash-completion.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: lxc-lxc-1.0.8/config/bash/Makefile.am
-===================================================================
---- lxc-lxc-1.0.8.orig/config/bash/Makefile.am
-+++ lxc-lxc-1.0.8/config/bash/Makefile.am
-@@ -2,12 +2,12 @@ EXTRA_DIST = lxc
-
- if ENABLE_BASH
- install-bash:
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/
-- $(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/
-+ $(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions/
-+ $(INSTALL_DATA) lxc $(DESTDIR)$(datarootdir)/bash-completion/completions/
-
- uninstall-bash:
-- rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc
-- rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || :
-+ rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc
-+ rmdir $(DESTDIR)$(datarootdir)/bash-completion// || :
-
- install-data-local: install-bash
- uninstall-local: uninstall-bash
-Index: lxc-lxc-1.0.8/config/bash/lxc.in
-===================================================================
---- lxc-lxc-1.0.8.orig/config/bash/lxc.in
-+++ lxc-lxc-1.0.8/config/bash/lxc.in
-@@ -1,4 +1,3 @@
--have lxc-start && {
- _lxc_names() {
- COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
- }
-@@ -100,4 +99,3 @@ have lxc-start && {
-
- complete -o default -F _lxc_generic_o lxc-clone
- complete -o default -F _lxc_generic_o lxc-start-ephemeral
--}
diff --git a/app-emulation/lxc/files/lxc-1.0.11-bash-completion.patch b/app-emulation/lxc/files/lxc-3.0.0-bash-completion.patch
similarity index 69%
rename from app-emulation/lxc/files/lxc-1.0.11-bash-completion.patch
rename to app-emulation/lxc/files/lxc-3.0.0-bash-completion.patch
index d8d0bac55a76..2a08eedb1c2d 100644
--- a/app-emulation/lxc/files/lxc-1.0.11-bash-completion.patch
+++ b/app-emulation/lxc/files/lxc-3.0.0-bash-completion.patch
@@ -1,5 +1,5 @@
diff --git a/config/bash/lxc.in b/config/bash/lxc.in
-index 344d5cb2..f051eaae 100644
+index 43056882..0a22d4ad 100644
--- a/config/bash/lxc.in
+++ b/config/bash/lxc.in
@@ -1,4 +1,3 @@
@@ -7,16 +7,16 @@ index 344d5cb2..f051eaae 100644
_lxc_names() {
COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
}
-@@ -100,4 +99,3 @@ _have lxc-start && {
+@@ -108,4 +107,3 @@ _have lxc-start && {
+ complete -o default -F _lxc_generic_t lxc-create
- complete -o default -F _lxc_generic_o lxc-clone
- complete -o default -F _lxc_generic_o lxc-start-ephemeral
+ complete -o default -F _lxc_generic_o lxc-copy
-}
diff --git a/configure.ac b/configure.ac
-index 2ea88c19..f52d772a 100644
+index 50c99836..0569caec 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -429,7 +429,7 @@ AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"])
+@@ -395,7 +395,7 @@ AM_CONDITIONAL([ENABLE_BASH], [test "x$enable_bash" = "xyes"])
AM_COND_IF([ENABLE_BASH],
[AC_MSG_CHECKING([bash completion directory])
PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
diff --git a/app-emulation/lxc/lxc-1.0.11.ebuild b/app-emulation/lxc/lxc-1.0.11.ebuild
deleted file mode 100644
index 2658e3a05db4..000000000000
--- a/app-emulation/lxc/lxc-1.0.11.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="doc examples lua python seccomp"
-
-RDEPEND="net-libs/gnutls
- sys-libs/libcap
- lua? ( >=dev-lang/lua-5.1:= )
- python? ( ${PYTHON_DEPS} )
- seccomp? ( sys-libs/libseccomp )"
-
-DEPEND="${RDEPEND}
- doc? ( app-text/docbook-sgml-utils )
- >=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
- sys-apps/util-linux
- app-misc/pax-utils
- virtual/awk"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
- ~CPUSETS ~CGROUP_CPUACCT
- ~CGROUP_SCHED
-
- ~NAMESPACES
- ~IPC_NS ~USER_NS ~PID_NS
-
- ~CGROUP_FREEZER
- ~UTS_NS ~NET_NS
- ~VETH ~MACVLAN
-
- ~POSIX_MQUEUE
- ~!NETPRIO_CGROUP
-
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS
- ~!GRKERNSEC_PROC
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
-
-ERROR_GRKERNSEC_CHROOT_MOUNT=":CONFIG_GRKERNSEC_CHROOT_MOUNT some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE=":CONFIG_GRKERNSEC_CHROOT_DOUBLE some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_PIVOT=":CONFIG_GRKERNSEC_CHROOT_PIVOT some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CHMOD=":CONFIG_GRKERNSEC_CHROOT_CHMOD some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CAPS=":CONFIG_GRKERNSEC_CHROOT_CAPS some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_PROC=":CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
-
-DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
- if [[ -n ${BACKPORTS} ]]; then
- epatch "${WORKDIR}"/patches/*
- fi
-
- epatch "${FILESDIR}"/${PN}-1.0.11-bash-completion.patch
- epatch "${FILESDIR}"/${PN}-1.0.11-major.patch
-
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- econf \
- --localstatedir=/var \
- --bindir=/usr/sbin \
- --docdir=/usr/share/doc/${PF} \
- --with-config-path=/etc/lxc \
- --with-rootfs-path=/usr/lib/lxc/rootfs \
- --with-distro=gentoo \
- $(use_enable doc) \
- --disable-apparmor \
- $(use_enable examples) \
- $(use_enable lua) \
- $(use_enable seccomp) \
- --disable-python
-}
-
-python_compile() {
- distutils-r1_python_compile build_ext -I ../ -L ../${PN}
-}
-
-src_compile() {
- default
-
- if use python; then
- pushd "${S}/src/python-${PN}" > /dev/null
- distutils-r1_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
- bashcomp_alias ${PN}-start \
- ${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
-
- if use python; then
- pushd "${S}/src/python-lxc" > /dev/null
- # Unset DOCS. This has been handled by the default target
- unset DOCS
- distutils-r1_src_install
- popd > /dev/null
- fi
-
- keepdir /etc/lxc /usr/lib/lxc/rootfs /var/log/lxc
-
- find "${D}" -name '*.la' -delete
-
- # Gentoo-specific additions!
- # Use initd.3 per #517144
- newinitd "${FILESDIR}/${PN}.initd.3" ${PN}
-
- # lxc-devsetup script
- exeinto /usr/libexec/${PN}
- doexe config/init/systemd/${PN}-devsetup
- # Use that script with the systemd service (Similar to upstream
- # Makefile.am
- cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service || die
- sed -i \
- "/Restart=always/a ExecStartPre=/usr/libexec/${PN}/${PN}-devsetup" \
- ${PN}_at.service \
- || die "Failed to add ${PN}-devsetup to the systemd service file"
- systemd_newunit ${PN}_at.service "lxc@.service"
-}
-
-pkg_postinst() {
- elog "There is an init script provided with the package now; no documentation"
- elog "is currently available though, so please check out /etc/init.d/lxc ."
- elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
- elog "to start the container defined into /etc/lxc/configname.conf ."
- elog "For further information about LXC development see"
- elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
- elog ""
- ewarn "With version 0.7.4, the mountpoint syntax came back to the one used by 0.7.2"
- ewarn "and previous versions. This means you'll have to use syntax like the following"
- ewarn ""
- ewarn " lxc.rootfs = /container"
- ewarn " lxc.mount.entry = /usr/portage /container/usr/portage none bind 0 0"
- ewarn ""
- ewarn "To use the Fedora, Debian and (various) Ubuntu auto-configuration scripts, you"
- ewarn "will need sys-apps/yum or dev-util/debootstrap."
- ewarn ""
- ewarn "Some GrSecurity settings in relation to chroot security will cause LXC not to"
- ewarn "work, while others will actually make it much more secure. Please refer to"
- ewarn "Diego Elio PettenĂ²'s weblog at http://blog.flameeyes.eu/tag/lxc for further"
- ewarn "details."
-}
diff --git a/app-emulation/lxc/lxc-1.0.8.ebuild b/app-emulation/lxc/lxc-1.0.8.ebuild
deleted file mode 100644
index 1c55e5916100..000000000000
--- a/app-emulation/lxc/lxc-1.0.8.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P="${P/_/-}"
-PYTHON_COMPAT=( python3_4 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools bash-completion-r1 distutils-r1 eutils linux-info versionator flag-o-matic systemd
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/"
-SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="doc examples lua python seccomp"
-
-RDEPEND="net-libs/gnutls
- sys-libs/libcap
- lua? ( >=dev-lang/lua-5.1:= )
- python? ( ${PYTHON_DEPS} )
- seccomp? ( sys-libs/libseccomp )"
-
-DEPEND="${RDEPEND}
- doc? ( app-text/docbook-sgml-utils )
- >=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
- sys-apps/util-linux
- app-misc/pax-utils
- virtual/awk"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
- ~CPUSETS ~CGROUP_CPUACCT
- ~RESOURCE_COUNTERS
- ~CGROUP_SCHED
-
- ~NAMESPACES
- ~IPC_NS ~USER_NS ~PID_NS
-
- ~DEVPTS_MULTIPLE_INSTANCES
- ~CGROUP_FREEZER
- ~UTS_NS ~NET_NS
- ~VETH ~MACVLAN
-
- ~POSIX_MQUEUE
- ~!NETPRIO_CGROUP
-
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS
- ~!GRKERNSEC_PROC
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
-
-ERROR_GRKERNSEC_CHROOT_MOUNT=":CONFIG_GRKERNSEC_CHROOT_MOUNT some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE=":CONFIG_GRKERNSEC_CHROOT_DOUBLE some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_PIVOT=":CONFIG_GRKERNSEC_CHROOT_PIVOT some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CHMOD=":CONFIG_GRKERNSEC_CHROOT_CHMOD some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CAPS=":CONFIG_GRKERNSEC_CHROOT_CAPS some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_PROC=":CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
-
-DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
- if [[ -n ${BACKPORTS} ]]; then
- epatch "${WORKDIR}"/patches/*
- fi
-
- epatch "${FILESDIR}"/${PN}-1.0.8-bash-completion.patch
-
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- econf \
- --localstatedir=/var \
- --bindir=/usr/sbin \
- --docdir=/usr/share/doc/${PF} \
- --with-config-path=/etc/lxc \
- --with-rootfs-path=/usr/lib/lxc/rootfs \
- --with-distro=gentoo \
- $(use_enable doc) \
- --disable-apparmor \
- $(use_enable examples) \
- $(use_enable lua) \
- $(use_enable seccomp) \
- --disable-python
-}
-
-python_compile() {
- distutils-r1_python_compile build_ext -I ../ -L ../${PN}
-}
-
-src_compile() {
- default
-
- if use python; then
- pushd "${S}/src/python-${PN}" > /dev/null
- distutils-r1_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
- bashcomp_alias ${PN}-start \
- ${PN}-{attach,cgroup,clone,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
-
- if use python; then
- pushd "${S}/src/python-lxc" > /dev/null
- # Unset DOCS. This has been handled by the default target
- unset DOCS
- distutils-r1_src_install
- popd > /dev/null
- fi
-
- keepdir /etc/lxc /usr/lib/lxc/rootfs /var/log/lxc
-
- find "${D}" -name '*.la' -delete
-
- # Gentoo-specific additions!
- # Use initd.3 per #517144
- newinitd "${FILESDIR}/${PN}.initd.3" ${PN}
-
- # lxc-devsetup script
- exeinto /usr/libexec/${PN}
- doexe config/init/systemd/${PN}-devsetup
- # Use that script with the systemd service (Similar to upstream
- # Makefile.am
- cp "${FILESDIR}"/${PN}_at.service ${PN}_at.service || die
- sed -i \
- "/Restart=always/a ExecStartPre=/usr/libexec/${PN}/${PN}-devsetup" \
- ${PN}_at.service \
- || die "Failed to add ${PN}-devsetup to the systemd service file"
- systemd_newunit ${PN}_at.service "lxc@.service"
-}
-
-pkg_postinst() {
- elog "There is an init script provided with the package now; no documentation"
- elog "is currently available though, so please check out /etc/init.d/lxc ."
- elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
- elog "to start the container defined into /etc/lxc/configname.conf ."
- elog "For further information about LXC development see"
- elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
- elog ""
- ewarn "With version 0.7.4, the mountpoint syntax came back to the one used by 0.7.2"
- ewarn "and previous versions. This means you'll have to use syntax like the following"
- ewarn ""
- ewarn " lxc.rootfs = /container"
- ewarn " lxc.mount.entry = /usr/portage /container/usr/portage none bind 0 0"
- ewarn ""
- ewarn "To use the Fedora, Debian and (various) Ubuntu auto-configuration scripts, you"
- ewarn "will need sys-apps/yum or dev-util/debootstrap."
- ewarn ""
- ewarn "Some GrSecurity settings in relation to chroot security will cause LXC not to"
- ewarn "work, while others will actually make it much more secure. Please refer to"
- ewarn "Diego Elio PettenĂ²'s weblog at http://blog.flameeyes.eu/tag/lxc for further"
- ewarn "details."
-}
diff --git a/app-emulation/lxc/lxc-2.0.7.ebuild b/app-emulation/lxc/lxc-2.0.7.ebuild
deleted file mode 100644
index 22003a834e98..000000000000
--- a/app-emulation/lxc/lxc-2.0.7.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${P/_/-}"
-PYTHON_COMPAT=( python{3_4,3_5} )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/"
-SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="cgmanager doc examples lua python seccomp"
-
-RDEPEND="net-libs/gnutls
- sys-libs/libcap
- cgmanager? ( app-admin/cgmanager )
- lua? ( >=dev-lang/lua-5.1:= )
- python? ( ${PYTHON_DEPS} )
- seccomp? ( sys-libs/libseccomp )"
-
-DEPEND="${RDEPEND}
- doc? ( app-text/docbook-sgml-utils )
- >=sys-kernel/linux-headers-3.2"
-
-RDEPEND="${RDEPEND}
- sys-process/criu
- sys-apps/util-linux
- app-misc/pax-utils
- virtual/awk"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
- ~CPUSETS ~CGROUP_CPUACCT
- ~CGROUP_SCHED
-
- ~NAMESPACES
- ~IPC_NS ~USER_NS ~PID_NS
-
- ~NETLINK_DIAG ~PACKET_DIAG
- ~INET_UDP_DIAG ~INET_TCP_DIAG
- ~UNIX_DIAG ~CHECKPOINT_RESTORE
-
- ~CGROUP_FREEZER
- ~UTS_NS ~NET_NS
- ~VETH ~MACVLAN
-
- ~POSIX_MQUEUE
- ~!NETPRIO_CGROUP
-
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS
- ~!GRKERNSEC_PROC
- ~!GRKERNSEC_SYSFS_RESTRICT
-"
-
-ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
-
-ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG: needed for lxc-checkpoint"
-ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG: needed for lxc-checkpoint"
-ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG: needed for lxc-checkpoint"
-ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG: needed for lxc-checkpoint"
-ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG: needed for lxc-checkpoint"
-ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE: needed for lxc-checkpoint"
-
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
-
-ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT: some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE: some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT: some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD: some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS: some GRSEC features make LXC unusable see postinst notes"
-ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC: this GRSEC feature is incompatible with unprivileged containers"
-ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC feature is incompatible with unprivileged containers"
-
-DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES"
- linux-info_pkg_setup
-}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-2.0.6-bash-completion.patch
- #558854
- eapply "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- if use python; then
- #541932
- python_setup "python3*"
- export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}"
- fi
-
- # I am not sure about the --with-rootfs-path
- # /var/lib/lxc is probably more appropriate than
- # /usr/lib/lxc.
- econf \
- --localstatedir=/var \
- --bindir=/usr/bin \
- --sbindir=/usr/bin \
- --with-config-path=/var/lib/lxc \
- --with-rootfs-path=/var/lib/lxc/rootfs \
- --with-distro=gentoo \
- --with-runtime-path=/run \
- --disable-apparmor \
- --disable-werror \
- $(use_enable cgmanager) \
- $(use_enable doc) \
- $(use_enable examples) \
- $(use_enable lua) \
- $(use_enable python) \
- $(use_enable seccomp)
-}
-
-python_compile() {
- distutils-r1_python_compile build_ext -I ../ -L ../${PN}
-}
-
-src_compile() {
- default
-
- if use python; then
- pushd "${S}/src/python-${PN}" > /dev/null
- distutils-r1_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
- # start-ephemeral is no longer a command but removing it here
- # generates QA warnings (still in upstream completion script)
- bashcomp_alias ${PN}-start \
- ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
-
- if use python; then
- pushd "${S}/src/python-lxc" > /dev/null
- # Unset DOCS. This has been handled by the default target
- unset DOCS
- distutils-r1_src_install
- popd > /dev/null
- fi
-
- keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
-
- find "${D}" -name '*.la' -delete
-
- # Gentoo-specific additions!
- newinitd "${FILESDIR}/${PN}.initd.5" ${PN}
-
- # Remember to compare our systemd unit file with the upstream one
- # config/init/systemd/lxc.service.in
- systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
-}
-
-pkg_postinst() {
- elog ""
- elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been"
- elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc"
- elog "please add the following to your /etc/lxc/default.conf"
- elog "lxc.lxcpath = /etc/lxc"
- elog ""
- elog "There is an init script provided with the package now; no documentation"
- elog "is currently available though, so please check out /etc/init.d/lxc ."
- elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
- elog "to start the container defined into /etc/lxc/configname.conf ."
- elog "For further information about LXC development see"
- elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
- elog ""
-}
diff --git a/app-emulation/lxc/lxc-2.0.9.ebuild b/app-emulation/lxc/lxc-3.0.0.ebuild
similarity index 76%
rename from app-emulation/lxc/lxc-2.0.9.ebuild
rename to app-emulation/lxc/lxc-3.0.0.ebuild
index 288b3662d1c7..c6cd017971c9 100644
--- a/app-emulation/lxc/lxc-2.0.9.ebuild
+++ b/app-emulation/lxc/lxc-3.0.0.ebuild
@@ -3,26 +3,22 @@
EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-DISTUTILS_OPTIONAL=1
+inherit autotools bash-completion-r1 linux-info flag-o-matic systemd readme.gentoo-r1 pam
-inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd readme.gentoo-r1
DESCRIPTION="LinuX Containers userspace utilities"
HOMEPAGE="https://linuxcontainers.org/"
SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
LICENSE="LGPL-3"
SLOT="0"
-IUSE="cgmanager examples lua python seccomp selinux"
+IUSE="examples pam seccomp selinux"
RDEPEND="
net-libs/gnutls
sys-libs/libcap
- cgmanager? ( app-admin/cgmanager )
- lua? ( >=dev-lang/lua-5.1:= )
- python? ( ${PYTHON_DEPS} )
+ pam? ( virtual/pam )
seccomp? ( sys-libs/libseccomp )
selinux? ( sys-libs/libselinux )"
@@ -93,15 +89,13 @@ ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT: this GRSEC fea
DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
pkg_setup() {
kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES"
linux-info_pkg_setup
}
src_prepare() {
- eapply "${FILESDIR}"/${PN}-2.0.6-bash-completion.patch
+ eapply "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
#558854
eapply "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch
eapply_user
@@ -111,12 +105,6 @@ src_prepare() {
src_configure() {
append-flags -fno-strict-aliasing
- if use python; then
- #541932
- python_setup "python3*"
- export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}"
- fi
-
# I am not sure about the --with-rootfs-path
# /var/lib/lxc is probably more appropriate than
# /usr/lib/lxc.
@@ -135,63 +123,33 @@ src_configure() {
--disable-apparmor \
--disable-werror \
--enable-doc \
- $(use_enable cgmanager) \
$(use_enable examples) \
- $(use_enable lua) \
- $(use_enable python) \
+ $(use_enable pam) \
+ $(use_with pam pamdir $(getpam_mod_dir)) \
$(use_enable seccomp) \
$(use_enable selinux)
}
-python_compile() {
- distutils-r1_python_compile build_ext -I ../ -L ../${PN}
-}
-
-src_compile() {
- default
-
- if use python; then
- pushd "${S}/src/python-${PN}" > /dev/null
- distutils-r1_src_compile
- popd > /dev/null
- fi
-}
-
src_install() {
default
mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
- # start-ephemeral is no longer a command but removing it here
- # generates QA warnings (still in upstream completion script)
bashcomp_alias ${PN}-start \
- ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
-
- if use python; then
- pushd "${S}/src/python-lxc" > /dev/null
- # Unset DOCS. This has been handled by the default target
- unset DOCS
- distutils-r1_src_install
- popd > /dev/null
- fi
+ ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+ rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
find "${D}" -name '*.la' -delete
# Gentoo-specific additions!
- newinitd "${FILESDIR}/${PN}.initd.5" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd.7" ${PN}
# Remember to compare our systemd unit file with the upstream one
# config/init/systemd/lxc.service.in
systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
DOC_CONTENTS="
- Starting from version ${PN}-1.1.0-r3, the default lxc path has been
- moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc
- please add the following to your /etc/lxc/lxc.conf
-
- lxc.lxcpath = /etc/lxc
-
For openrc, there is an init script provided with the package.
You _should_ only need to symlink /etc/init.d/lxc to
/etc/init.d/lxc.configname to start the container defined in
diff --git a/app-emulation/q4wine/Manifest b/app-emulation/q4wine/Manifest
index e76981413d69..79a90fcb6851 100644
--- a/app-emulation/q4wine/Manifest
+++ b/app-emulation/q4wine/Manifest
@@ -1,2 +1 @@
-DIST q4wine-1.3.5.tar.bz2 2862445 BLAKE2B 0de9e61f18c8dedccfa3fc1f42eb6f26b0a99534cb3ad3cc5da06ea2f2fdfcb8d164a05a591a1bc6c959cdc183d98696dee50c78eb73e430198dc901137729f4 SHA512 54fb7bce28750cb71589f6a94658f61369c7777cf7865b71d2feea4ac1221714d861a781fbd1325ee3d21f124162fd2eedc2780ab2bd0af93864eefebcde5f4c
DIST q4wine-1.3.6.tar.bz2 2867547 BLAKE2B b35a638e514108e4ee4be34b446a7d2d5ba00415d8f54cfee293988707b637d41945d3197a2132147e09d5a05153fd47a55701dcba358f3a2b3a2e6037f78aaa SHA512 1ff0ea2a4523fc5582ec67f5e305622653c4e387ac5f2cecde52289117ef879a60261fdbf9ddf421812765539124d4c5b6b37ff401530d3e061723a3c35d57f8
diff --git a/app-emulation/q4wine/q4wine-1.3.5.ebuild b/app-emulation/q4wine/q4wine-1.3.5.ebuild
deleted file mode 100644
index 576ca02429f8..000000000000
--- a/app-emulation/q4wine/q4wine-1.3.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-# Upstream names the package PV-rX. We change that to
-# PV_pX so we can use portage revisions.
-MY_P=${PN}-${PV/_p/-r}
-
-DESCRIPTION="Qt GUI configuration tool for Wine"
-HOMEPAGE="https://q4wine.brezblock.org.ua/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+dbus debug +ico +iso +wineappdb"
-
-CDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsingleapplication[qt5,X]
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dbus? ( dev-qt/qtdbus:5 )
- ico? ( >=media-gfx/icoutils-0.26.0 )
-"
-DEPEND="${CDEPEND}
- dev-qt/linguist-tools:5
-"
-RDEPEND="${CDEPEND}
- app-admin/sudo
- >=sys-apps/which-2.19
- iso? ( sys-fs/fuseiso )
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
- local mycmakeargs=(
- -DQT5=ON
- -DDEBUG=$(usex debug ON OFF)
- -DWITH_ICOUTILS=$(usex ico ON OFF)
- -DWITH_SYSTEM_SINGLEAPP=ON
- -DWITH_WINEAPPDB=$(usex wineappdb ON OFF)
- -DUSE_BZIP2=OFF
- -DUSE_GZIP=OFF
- -DWITH_DBUS=$(usex dbus ON OFF)
- )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-emulation/q4wine/q4wine-1.3.6-r1.ebuild b/app-emulation/q4wine/q4wine-1.3.6-r1.ebuild
index 2608009d072d..f5672e386af4 100644
--- a/app-emulation/q4wine/q4wine-1.3.6-r1.ebuild
+++ b/app-emulation/q4wine/q4wine-1.3.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+dbus debug +ico +iso +wineappdb"
CDEPEND="
diff --git a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
index 1052d0a334f7..478549c3d5ca 100644
--- a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
+++ b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -16,9 +16,7 @@ IUSE="readline svga +X"
REQUIRED_USE="|| ( svga X )"
-DEPEND="X? ( >=x11-proto/xf86vidmodeproto-2.2.2
- >=x11-proto/xextproto-7.0.2
- >=x11-proto/xproto-7.0.4
+DEPEND="X? ( x11-base/xorg-proto
>=x11-libs/libX11-1.0.0
>=x11-libs/libXext-1.0.0
>=x11-libs/libXxf86vm-1.0.0 )
diff --git a/app-emulation/spectemu/spectemu-0.99.3.ebuild b/app-emulation/spectemu/spectemu-0.99.3.ebuild
index 2ab41303ddcd..cbdae8d8a0e8 100644
--- a/app-emulation/spectemu/spectemu-0.99.3.ebuild
+++ b/app-emulation/spectemu/spectemu-0.99.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
### Several versions of specemu exist, xspect & vgaspect, utilising X11
@@ -17,9 +17,7 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="X readline svga"
-DEPEND="X? ( >=x11-proto/xf86vidmodeproto-2.2.2
- >=x11-proto/xextproto-7.0.2
- >=x11-proto/xproto-7.0.4
+DEPEND="X? ( x11-base/xorg-proto
>=x11-libs/libX11-1.0.0
>=x11-libs/libXext-1.0.0
>=x11-libs/libXxf86vm-1.0.0 )
diff --git a/app-emulation/spim/spim-8.0-r3.ebuild b/app-emulation/spim/spim-8.0-r3.ebuild
index 00776564c323..2717b50ee23c 100644
--- a/app-emulation/spim/spim-8.0-r3.ebuild
+++ b/app-emulation/spim/spim-8.0-r3.ebuild
@@ -19,8 +19,10 @@ RDEPEND="
x11-libs/libXaw )
"
DEPEND="${RDEPEND}
- X? ( x11-misc/imake
- x11-proto/xproto )
+ X? (
+ x11-base/xorg-proto
+ x11-misc/imake
+ )
sys-devel/bison
"
# test hangs forever, disabling it
diff --git a/app-emulation/vice/vice-3.1.ebuild b/app-emulation/vice/vice-3.1.ebuild
index cc4fb987e508..6fe9e2623e27 100644
--- a/app-emulation/vice/vice-3.1.ebuild
+++ b/app-emulation/vice/vice-3.1.ebuild
@@ -75,15 +75,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
x11-apps/bdftopcf
x11-apps/mkfontdir
- x11-proto/xproto
- x11-proto/xextproto
+ x11-base/xorg-proto
media-libs/fontconfig
- x11-proto/videoproto
nls? ( sys-devel/gettext )
!sdl? (
- fullscreen? (
- x11-proto/xf86vidmodeproto
- )
!gtk? (
x11-libs/libICE
x11-libs/libSM
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild
index 6e4ec727e56f..3c8b9c6ca161 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.32.ebuild
@@ -27,8 +27,7 @@ RDEPEND="X? ( x11-apps/xrandr
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libSM
- x11-libs/libICE
- x11-proto/glproto )
+ x11-libs/libICE )
sys-apps/dbus
!!x11-drivers/xf86-input-virtualbox"
DEPEND="${RDEPEND}
@@ -37,8 +36,7 @@ DEPEND="${RDEPEND}
sys-devel/bin86
sys-libs/pam
sys-power/iasl
- X? ( x11-proto/renderproto )
- !X? ( x11-proto/xproto )"
+ x11-base/xorg-proto"
PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
BUILD_TARGETS="all"
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild
index b85dda606c3f..97d4f9402e9b 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.34.ebuild
@@ -27,8 +27,7 @@ RDEPEND="X? ( x11-apps/xrandr
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libSM
- x11-libs/libICE
- x11-proto/glproto )
+ x11-libs/libICE )
sys-apps/dbus
!!x11-drivers/xf86-input-virtualbox"
DEPEND="${RDEPEND}
@@ -37,8 +36,7 @@ DEPEND="${RDEPEND}
sys-devel/bin86
sys-libs/pam
sys-power/iasl
- X? ( x11-proto/renderproto )
- !X? ( x11-proto/xproto )"
+ x11-base/xorg-proto"
PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
BUILD_TARGETS="all"
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild
index b85dda606c3f..97d4f9402e9b 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.36.ebuild
@@ -27,8 +27,7 @@ RDEPEND="X? ( x11-apps/xrandr
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libSM
- x11-libs/libICE
- x11-proto/glproto )
+ x11-libs/libICE )
sys-apps/dbus
!!x11-drivers/xf86-input-virtualbox"
DEPEND="${RDEPEND}
@@ -37,8 +36,7 @@ DEPEND="${RDEPEND}
sys-devel/bin86
sys-libs/pam
sys-power/iasl
- X? ( x11-proto/renderproto )
- !X? ( x11-proto/xproto )"
+ x11-base/xorg-proto"
PDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} )"
BUILD_TARGETS="all"
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild
index 13cfeb79a1d6..9a895f357c2a 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.10.ebuild
@@ -28,8 +28,7 @@ RDEPEND="
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libSM
- x11-libs/libICE
- x11-proto/glproto )
+ x11-libs/libICE )
sys-apps/dbus
!!x11-drivers/xf86-input-virtualbox
!x11-drivers/xf86-video-virtualbox
@@ -41,8 +40,7 @@ DEPEND="
sys-devel/bin86
sys-libs/pam
sys-power/iasl
- X? ( x11-proto/renderproto )
- !X? ( x11-proto/xproto )
+ x11-base/xorg-proto
"
PDEPEND="
X? ( x11-drivers/xf86-video-vboxvideo )
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild
index 13cfeb79a1d6..9a895f357c2a 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.8.ebuild
@@ -28,8 +28,7 @@ RDEPEND="
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libSM
- x11-libs/libICE
- x11-proto/glproto )
+ x11-libs/libICE )
sys-apps/dbus
!!x11-drivers/xf86-input-virtualbox
!x11-drivers/xf86-video-virtualbox
@@ -41,8 +40,7 @@ DEPEND="
sys-devel/bin86
sys-libs/pam
sys-power/iasl
- X? ( x11-proto/renderproto )
- !X? ( x11-proto/xproto )
+ x11-base/xorg-proto
"
PDEPEND="
X? ( x11-drivers/xf86-video-vboxvideo )
diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild b/app-emulation/wine-any/wine-any-2.0-r1.ebuild
index 1f394f6f13bf..52aa80d79f24 100644
--- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.0-r1.ebuild
@@ -150,17 +150,13 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-any/wine-any-2.19.ebuild b/app-emulation/wine-any/wine-any-2.19.ebuild
index 62b897aa0e7a..d0b16c47aa1e 100644
--- a/app-emulation/wine-any/wine-any-2.19.ebuild
+++ b/app-emulation/wine-any/wine-any-2.19.ebuild
@@ -151,17 +151,13 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-any/wine-any-2.20.ebuild b/app-emulation/wine-any/wine-any-2.20.ebuild
index ceb899dbb839..913e3e1528aa 100644
--- a/app-emulation/wine-any/wine-any-2.20.ebuild
+++ b/app-emulation/wine-any/wine-any-2.20.ebuild
@@ -152,17 +152,13 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-any/wine-any-2.21.ebuild b/app-emulation/wine-any/wine-any-2.21.ebuild
index ceb899dbb839..913e3e1528aa 100644
--- a/app-emulation/wine-any/wine-any-2.21.ebuild
+++ b/app-emulation/wine-any/wine-any-2.21.ebuild
@@ -152,17 +152,13 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
index 4ac2529840fe..d8688841e0a8 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -154,17 +154,13 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
index 296fe4e7b71a..0ca4d6a8699e 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
@@ -134,13 +134,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
index 94d819782d2f..45394c946984 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
@@ -135,13 +135,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
index cd620120b755..d8fd326eccbc 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
@@ -136,13 +136,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
index cd620120b755..d8fd326eccbc 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
@@ -136,13 +136,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index 7781bcbed2f8..b48cb73fb1b6 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
@@ -138,13 +138,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
index 191ee925a443..2eb9fbdb2a49 100644
--- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
@@ -140,17 +140,13 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-staging/wine-staging-2.19.ebuild b/app-emulation/wine-staging/wine-staging-2.19.ebuild
index e6caef35641a..933b53a87ffc 100644
--- a/app-emulation/wine-staging/wine-staging-2.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.19.ebuild
@@ -141,17 +141,13 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-staging/wine-staging-2.20.ebuild b/app-emulation/wine-staging/wine-staging-2.20.ebuild
index 3733269fd131..e3bcca8e5dae 100644
--- a/app-emulation/wine-staging/wine-staging-2.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.20.ebuild
@@ -142,17 +142,13 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-staging/wine-staging-2.21.ebuild b/app-emulation/wine-staging/wine-staging-2.21.ebuild
index 3733269fd131..e3bcca8e5dae 100644
--- a/app-emulation/wine-staging/wine-staging-2.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.21.ebuild
@@ -142,17 +142,13 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index a231afd2ad86..fd41d6cfdb22 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -144,17 +144,13 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
staging? (
dev-lang/perl
dev-perl/XML-Simple
)
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
index 122d7b748931..44f1a68f219e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
@@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
index c701c112800e..203ac31a11d8 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
@@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
index c701c112800e..203ac31a11d8 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
@@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
index e24402ac58f6..42ea191ef336 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
@@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
index 1897a5fe7ad6..e012559463d5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
@@ -119,13 +119,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
index 3f1778611a37..40d354c58c00 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
@@ -121,13 +121,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
index 3f1778611a37..40d354c58c00 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
@@ -121,13 +121,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
index 3f1778611a37..40d354c58c00 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
@@ -121,13 +121,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
index ad6493ebe95d..0fc721308065 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
@@ -121,13 +121,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild
index 28b84951d9b6..a7cee7750644 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild
@@ -122,13 +122,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild
index 28b84951d9b6..a7cee7750644 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild
@@ -122,13 +122,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index ddf4b23d2eec..62ef97c197eb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -123,13 +123,9 @@ DEPEND="${COMMON_DEPEND}
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
+ X? ( x11-base/xorg-proto )
prelink? ( sys-devel/prelink )
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.9.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.9.2.ebuild
index 4c330e915392..138f1da19fe5 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.9.2.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.9.2.ebuild
@@ -32,7 +32,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
HOMEPAGE="https://www.xenproject.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="custom-cflags"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-emulation/xen-tools/xen-tools-4.10.0.ebuild b/app-emulation/xen-tools/xen-tools-4.10.0.ebuild
index 03bc0dd63837..1d2b4deba3b0 100644
--- a/app-emulation/xen-tools/xen-tools-4.10.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.10.0.ebuild
@@ -110,7 +110,7 @@ DEPEND="${COMMON_DEPEND}
dev-texlive/texlive-latexextra
media-gfx/transfig
)
- hvm? ( x11-proto/xproto
+ hvm? ( x11-base/xorg-proto
!net-libs/libiscsi )
qemu? (
app-arch/snappy:=
diff --git a/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild
index 4c35903b2c5d..f18cfce1271b 100644
--- a/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild
@@ -108,7 +108,7 @@ DEPEND="${COMMON_DEPEND}
dev-texlive/texlive-latexextra
media-gfx/transfig
)
- hvm? ( x11-proto/xproto
+ hvm? ( x11-base/xorg-proto
!net-libs/libiscsi )
qemu? (
app-arch/snappy:=
diff --git a/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild
index 0ef35d660eb6..191c3222dbe1 100644
--- a/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.9.1-r2.ebuild
@@ -109,7 +109,7 @@ DEPEND="${COMMON_DEPEND}
dev-texlive/texlive-latexextra
media-gfx/transfig
)
- hvm? ( x11-proto/xproto
+ hvm? ( x11-base/xorg-proto
!net-libs/libiscsi )
qemu? (
app-arch/snappy:=
diff --git a/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild
index a66fad4f58fd..723cc4fdf1d4 100644
--- a/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.9.2-r1.ebuild
@@ -13,12 +13,12 @@ MAJOR_V="$(get_version_component_range 1-2)"
if [[ $PV == *9999 ]]; then
inherit git-r3
- KEYWORDS=""
+ KEYWORDS="amd64"
REPO="xen.git"
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}"
else
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
UPSTREAM_VER=2
SECURITY_VER=
# xen-tools's gentoo patches tarball
@@ -108,7 +108,7 @@ DEPEND="${COMMON_DEPEND}
dev-texlive/texlive-latexextra
media-gfx/transfig
)
- hvm? ( x11-proto/xproto
+ hvm? ( x11-base/xorg-proto
!net-libs/libiscsi )
qemu? (
app-arch/snappy:=
diff --git a/app-emulation/xen/xen-4.9.2.ebuild b/app-emulation/xen/xen-4.9.2.ebuild
index c6763a9657c3..ff12221cf111 100644
--- a/app-emulation/xen/xen-4.9.2.ebuild
+++ b/app-emulation/xen/xen-4.9.2.ebuild
@@ -12,11 +12,11 @@ MY_P=${PN}-${MY_PV}
if [[ $PV == *9999 ]]; then
inherit git-r3
- KEYWORDS=""
+ KEYWORDS="amd64"
EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
SRC_URI=""
else
- KEYWORDS="~amd64 ~arm -x86"
+ KEYWORDS="amd64 ~arm -x86"
UPSTREAM_VER=1
SECURITY_VER=
GENTOO_VER=
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 6f2158986478..6676b83135c5 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index 9a562ad1552c..d384593303aa 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -1,4 +1,5 @@
DIST libpinyin-2.1.0.tar.gz 246219 BLAKE2B cae5b41faeb2e0eedc2ae2c098b2db04b22e36d0bd9fd222a4516f71ab9b3e8ade7fa96e0d6d898e197bf91c1cb6a0b98a9fff97e7be31bb4f901400c87bfea7 SHA512 e6aa3998ac466cb155750b574140dd43673bfeb4f13d1b88c4892b61bb773aee84610dd67ad17871961d51a48067c535eab33a6fb6c9ac28179a9958c4e9b518
DIST libpinyin-2.1.91.tar.gz 256045 BLAKE2B 148a2617cbe335ebda5b9fb26f63f7c75f06d2dfd3fb950f60b4db37762a5bb3a91459dba0759abd33fbc01d38fe26d7cce92dfaaa2c6e45c80552f0bbeb3d27 SHA512 568b263726a022bdca52fd54c7583a36a31385a8f19bb5c5903918a6036c5499ef8c8bb91ebb2db877449ec5177d2d4e4f0a20e7bb528534361ba1405dd1fd92
+DIST libpinyin-2.2.0.tar.gz 256221 BLAKE2B 72c0dc42ca6e63852c92975b871706d24c1066cb9bb37faf9ff0ccde9773308e1a29c7587f00ab337c52a1f957c8e67d6241bdff13a50d9dbf73c3b4e530d2be SHA512 7327e6726acaf984492fdecb5ed04f81624da261aeac3cbea9a8ea5540d84f39ca8d41ec8835b509da97b9de5837534885e4ba5f4041ce9c7252c8a438480598
DIST libpinyin-model14.text.tar.gz 19361973 BLAKE2B 702f0c2cb0c8157758f8c46e7b47221475f2a96a5e4f6181b5dee605bd72002827431f017a913275b4e9cf6b4b07bccec4b9a5b7960a9b2c42ffba4631c57ed6 SHA512 792d3cf7ab7fdea701737cea66d18f697015f19d18b6d26273db2da0ae28291f38b3d8a5717f595da63fbe573921c552bdce10c4bec9a0834947dfec92265da9
DIST libpinyin-model15.text.tar.gz 19361973 BLAKE2B 3d24321db407e28c1adf49373dd9bacafe0e89409511c0656d7b9a85f1d1ac8693249088dd99beef069576f4a8d0d5db3fd47f98822b32aa3098315cf2660d22 SHA512 d3f5b42f6ea6b22570b5ba67cf23d94a3fee2d7d894191ebc11eb72edc162c72b90b2fe10b312bfd8d77d110654ee5dc00c21b25fb8b7c3f905d4088c9895ac1
diff --git a/app-i18n/libpinyin/libpinyin-2.1.0.ebuild b/app-i18n/libpinyin/libpinyin-2.1.0.ebuild
index c6e54768bc3a..949814bc8171 100644
--- a/app-i18n/libpinyin/libpinyin-2.1.0.ebuild
+++ b/app-i18n/libpinyin/libpinyin-2.1.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"
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/project
if [[ "${PV}" == "9999" ]]; then
SRC_URI=""
else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
fi
SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
@@ -29,9 +29,7 @@ IUSE=""
RDEPEND="dev-libs/glib:2
sys-libs/db:="
-
DEPEND="${RDEPEND}
- virtual/libintl
virtual/pkgconfig"
src_unpack() {
diff --git a/app-i18n/libpinyin/libpinyin-2.1.91.ebuild b/app-i18n/libpinyin/libpinyin-2.1.91.ebuild
index 528e0eee1113..0529ee397abe 100644
--- a/app-i18n/libpinyin/libpinyin-2.1.91.ebuild
+++ b/app-i18n/libpinyin/libpinyin-2.1.91.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/project
if [[ "${PV}" == "9999" ]]; then
SRC_URI=""
else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
fi
SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
@@ -29,9 +29,7 @@ IUSE=""
RDEPEND="dev-libs/glib:2
sys-libs/db:="
-
DEPEND="${RDEPEND}
- virtual/libintl
virtual/pkgconfig"
src_unpack() {
diff --git a/app-i18n/libpinyin/libpinyin-2.2.0.ebuild b/app-i18n/libpinyin/libpinyin-2.2.0.ebuild
new file mode 100644
index 000000000000..0529ee397abe
--- /dev/null
+++ b/app-i18n/libpinyin/libpinyin-2.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
+fi
+
+LIBPINYIN_MODEL_VERSION="15"
+
+DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
+HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+ sys-libs/db:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_unpack() {
+ if [[ "${PV}" == "9999" ]]; then
+ git-r3_src_unpack
+ else
+ unpack ${P}.tar.gz
+ fi
+}
+
+src_prepare() {
+ default
+
+ sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
+ ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-libzhuyin \
+ --disable-static
+}
+
+src_install() {
+ default
+ find "${D}" -name "*.la" -delete || die
+}
diff --git a/app-i18n/libpinyin/libpinyin-9999.ebuild b/app-i18n/libpinyin/libpinyin-9999.ebuild
index 4d8960cc6eda..20abcddac60e 100644
--- a/app-i18n/libpinyin/libpinyin-9999.ebuild
+++ b/app-i18n/libpinyin/libpinyin-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/project
if [[ "${PV}" == "9999" ]]; then
SRC_URI=""
else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
fi
SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
@@ -29,9 +29,7 @@ IUSE=""
RDEPEND="dev-libs/glib:2
sys-libs/db:="
-
DEPEND="${RDEPEND}
- virtual/libintl
virtual/pkgconfig"
src_unpack() {
diff --git a/app-i18n/librime/librime-1.2.9.ebuild b/app-i18n/librime/librime-1.2.9.ebuild
index 11ec817ae96d..e897af759e35 100644
--- a/app-i18n/librime/librime-1.2.9.ebuild
+++ b/app-i18n/librime/librime-1.2.9.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"
@@ -21,7 +21,7 @@ RDEPEND="app-i18n/opencc:=
dev-libs/leveldb:=
dev-libs/marisa:="
DEPEND="${RDEPEND}
- x11-proto/xproto
+ x11-base/xorg-proto
test? ( dev-cpp/gtest )"
src_configure() {
diff --git a/app-i18n/man-pages-zh_CN/Manifest b/app-i18n/man-pages-zh_CN/Manifest
index b2d34d0c87ed..272842a6bda0 100644
--- a/app-i18n/man-pages-zh_CN/Manifest
+++ b/app-i18n/man-pages-zh_CN/Manifest
@@ -1 +1,2 @@
DIST man-pages-zh_CN-1.5.tar.gz 3762338 BLAKE2B c2c740e6ae6f6e0cb26af7bca4e9d5ce75b20eb535362030565c8ed794c984ac8d1c7fe0ee354f58cbb37bc2dba1067afc33dbe4af07257938b0137156b43790 SHA512 799eac7e6c64dd9bb647bf490457bc6ece76870d261606e33f48df977762b66f778fb5afe3608443be100e516988c700ddb53de2a226e7b29d32348fa240ce91
+DIST man-pages-zh_CN-1.6.3.2.tar.gz 1845997 BLAKE2B 3af6859593e4b2a52ef3ce93f2d18fe0f102e63cee3c7035de04ab4d8b8ac491ceff284b1a2f01a5e4dcdc4869c2a9768ff7dfde48b9e89813a2e558bf7b259e SHA512 61171406482a24c3dfd1b6303af3d7fb086466d5f05d5799f50488beb78c91c5d1bcf574aab669b71fa0f027691a0be1a1d254d08f823ff4bd8bf976e0c83dff
diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
new file mode 100644
index 000000000000..571125909774
--- /dev/null
+++ b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A somewhat comprehensive collection of Chinese Linux man pages"
+HOMEPAGE="https://github.com/man-pages-zh/manpages-zh"
+MY_PN="manpages-zh"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="https://github.com/man-pages-zh/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="FDL-1.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_prepare() {
+ # remove man pages that are provided by other packages.
+ rm src/man1/groups.1 || die
+
+ eapply_user
+}
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ doman -i18n=zh_CN src/man?/*.[1-9]*
+ dodoc README.md AUTHORS ChangeLog NEWS
+}
diff --git a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild b/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
index 6b4b8db7eed2..b89dc7ed279b 100644
--- a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit cmake-utils gnome2-utils
DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool"
-HOMEPAGE="http://www.tagaini.net/"
+HOMEPAGE="https://www.tagaini.net/"
SRC_URI="https://github.com/Gnurou/tagainijisho/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-3+ public-domain"
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
index dfa2430580ed..249cf77a5630 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
inherit autotools ltprune python-single-r1 ruby-single
diff --git a/app-i18n/transifex-client/transifex-client-0.10.ebuild b/app-i18n/transifex-client/transifex-client-0.10.ebuild
index aacf51b512dc..ffa6e59029dd 100644
--- a/app-i18n/transifex-client/transifex-client-0.10.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client http://www.transifex.net/"
+HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
SRC_URI="https://github.com/transifex/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-i18n/transifex-client/transifex-client-0.12.2.ebuild b/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
index c2aa8411acd1..267aa3228929 100644
--- a/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client http://www.transifex.net/"
+HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
index 0ed9178bed17..49b915494430 100644
--- a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client http://www.transifex.net/"
+HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index 4689635b1b7f..f72b7d26bba5 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.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"
@@ -55,10 +55,7 @@ DEPEND="${RDEPEND}
dev-util/intltool
virtual/pkgconfig
>=sys-devel/gettext-0.15
- X? (
- x11-proto/xextproto
- x11-proto/xproto
- )"
+ X? ( x11-base/xorg-proto )"
RDEPEND="${RDEPEND}
X? (
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index ffe51b96501d..cac96b004b75 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.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"
@@ -58,10 +58,7 @@ DEPEND="${RDEPEND}
dev-util/intltool
virtual/pkgconfig
>=sys-devel/gettext-0.15
- X? (
- x11-proto/xextproto
- x11-proto/xproto
- )"
+ X? ( x11-base/xorg-proto )"
RDEPEND="${RDEPEND}
X? (
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index ee652420e95a..3ad332adea0e 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1 +1,2 @@
DIST unicode-cldr-common-31.0.1.zip 16370865 BLAKE2B 46e941471074116eb00ba81848b37c82e025e12841d75ef9e4e2620f887384c4dbb3f8c36febcd86d19cd17d4d84e77e11121d1ed1cf2ccf67a09260cdddc9f7 SHA512 6ef4a73b31bde5dead5af9145e5befa5969e9449b4072c94c5370c979db54e3072ec5bf15f54152045da329bf4382e54edb532c0ec77a2ce451bacc8778b73bc
+DIST unicode-cldr-common-33.0.zip 20401984 BLAKE2B 1318f8c73678f4ed2ff6a2d947171515d52825c2395e77c8149fb6a5646110876dd8e1bc30a3b918cb25c4bf106b42fe2a372a9938ff0dbf106cf0d7dc33d75a SHA512 f2f9fa5242702fd8044c9b239e175b7ead41e36da39c9e67e70b4fde7ed5d28115141ea457cda4f645b10a2d29734b35590bd0f012296bdf4986a920b87532dd
diff --git a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
new file mode 100644
index 000000000000..2b0a7f62b66a
--- /dev/null
+++ b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Unicode Common Locale Data Repository"
+HOMEPAGE="http://cldr.unicode.org/"
+if [[ "${PV}" =~ ^[[:digit:]]+\.0$ ]]; then
+ SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
+else
+ SRC_URI="https://unicode.org/Public/${PN#*-}/${PV}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
+fi
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+ insinto /usr/share/unicode/cldr
+ doins -r common
+}
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index 2ce09676503d..26b35dfd75ac 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -1,5 +1,10 @@
+DIST unicode-emoji-data-11.0.txt 59720 BLAKE2B f1416d01d384245769549cc6ea93a2fe28bbfe77d30b26c9042965e3f9aee546572ef593284f767017b3a76acbc8015987c924be3afcc06df60b31588962a455 SHA512 501847414275564c7753b7d2b8e45cdfbf9fe96a96f0f3eea81f34c480da551b317b432ca426f6441c95eea520992e8888ead749e9c60da38233afd159d9b555
DIST unicode-emoji-data-5.0.txt 35041 BLAKE2B 83e52d46495e9e657717aa2c59a6f7eb457ef0592a88b86b72558bb12edf30587c833877d23739bb245a77b946ad983c967fa6706a7482132ac793a4823da570 SHA512 3b68cb709700cf871f545f357a54864c6cf1dee2ee7046f42d895c0811a75129206edf2c0617a5f1183417066f0fdf2e74086e880a65826590aac9d1d31f568f
+DIST unicode-emoji-sequences-11.0.txt 105983 BLAKE2B 5b929faa3cfdbcfa11fa72f77386d3a7aee2dddc5ceb3d110d275a3ed523ddadc7be71b3fb857901d880970d5ab48dfc4b024d7e379b5efb0992e7424bfde80a SHA512 c9af23e0738350b6d61691498ac82cccec970bb2cd4a0c5d6fab6c86fef742c09c6a83f50124c1f98c285e706d145786bb29cbf4339ff1a01c75ad7515b159a6
DIST unicode-emoji-sequences-5.0.txt 103383 BLAKE2B 1fc122b617963090d7ce165c9bc13a0507c5c26e60c36fa320f3527bae72e7362be944aa28cc4ea29598551361c304d43c7fe276a0452c2c5fae7e584b3169da SHA512 729bbf862b8d7ff6225b7416a0a464592f89040e4c27674c0d9afb6e0d997162c0a336c2a1e9de41313dcd45b504b3b27915ee8c67e45186c942c2996076d554
+DIST unicode-emoji-test-11.0.txt 361356 BLAKE2B 0e3b035fff3a4e542b3dd1172cf1438648a273ec0490316f843009b725c04764180a3ce0581b3e9819a0a5724c95ae5b536065e80401510d0b8e174636544184 SHA512 89c5a0f2eb460234e50dcc0fc904fbb254a1c0afa54b5bb672032f01764e0bed3624d1a4cd5627c83fcf1ea1347c9e3baaca05b2c685890afa505763baf8be79
DIST unicode-emoji-test-5.0.txt 341770 BLAKE2B ab4e0900dd685172ba686c3a8e501cb3333be5594338526179a3d851970546fdde2793f9c31c501e978608bcee57d7281b4722bc6f657f0626c4a48ca2ad8490 SHA512 368483fadaa2c87e1197d0b0351c1e68b4244e73ab93542d73df7169d1dfcdf98b0fc1da8a969645f6a2d45db1f2db5f75ba919dd05f1012fbc2f3fb524f5c5d
+DIST unicode-emoji-variation-sequences-11.0.txt 36333 BLAKE2B c32b674969a102d24645d33fb000c31997c26c1e6de956fc82ae41c2fd43b244f3757e8ab217cbb03434defca16373fd33affa25c6df0b7b9393f0ab191ec65f SHA512 a0a487ef43d9cd49ff2ced654794e7190f357b00dd70ec9b84e640181dc5b2df44b2063aa4b16447d00815094155b24531f115e9121c51c95635b0af4b043643
DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc4fd7784ec9bd5869e58f934738fa1d46edc030202fb9490ddebd6f1cefb98dd78b3be2c4da7e3f2acef0ce54487a183123311efbf7205 SHA512 484509ed56c5ea5e73160e211643a938d3fa08474281d316e5ed2d2346f38f5140a147454a9cb81c9f463d6c62befd98a8b70b695ee50effdbcfc6085dcaa520
+DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d
DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
new file mode 100644
index 000000000000..8a9a211570ba
--- /dev/null
+++ b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="UTS #51 Unicode Emoji"
+HOMEPAGE="https://unicode.org/emoji/"
+BASE_URI="https://unicode.org/Public/${PN#*-}/${PV}"
+SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
+ ${BASE_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
+ ${BASE_URI}/${PN#*-}-test.txt -> ${PN}-test-${PV}.txt
+ ${BASE_URI}/${PN#*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt
+ ${BASE_URI}/${PN#*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+ :
+}
+
+src_install() {
+ insinto /usr/share/unicode/emoji
+ local file
+ for file in ${A}; do
+ newins "${DISTDIR}/${file}" "$(sed -e "s/${PN%-*}-\(.*\)-${PV}/\1/" <<< "${file}")"
+ done
+}
diff --git a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
index e16c7b2cef1c..d69068c2ea85 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit eutils
@@ -16,7 +16,7 @@ KEYWORDS="x86 ppc"
RDEPEND="x11-libs/libX11
xft? ( x11-libs/libXft )"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_unpack() {
unpack ${A}
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
index 8d9cdf902b59..e2d8f9a37aca 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit eutils multilib toolchain-funcs
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ~ppc x86"
RDEPEND="x11-libs/libX11
xft? ( x11-libs/libXft )"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_unpack() {
unpack ${A}
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index cc6cb0a03e5a..4254fa89fd60 100644
Binary files a/app-laptop/Manifest.gz and b/app-laptop/Manifest.gz differ
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild
index 9b030cf833c6..37773616daba 100644
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.72.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="+acpi apm bluetooth"
RDEPEND="sys-apps/iproute2
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 903a1f17ce53..5d9f082b1bd0 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/postgres_exporter/Manifest b/app-metrics/postgres_exporter/Manifest
index 7856a09f86a3..80fc8e152073 100644
--- a/app-metrics/postgres_exporter/Manifest
+++ b/app-metrics/postgres_exporter/Manifest
@@ -1 +1,2 @@
DIST postgres_exporter-0.4.5.tar.gz 3698713 BLAKE2B fd15605d59f2f78ad380b24018dc7d9d789af58be248d0b0492a720a368ca1802719467091f9e4cd9aec57318ed5948d1e725bff63fcd47a13447b64d71da7ca SHA512 82da737389ab0abcc336cb9bd32b4af8165e101c1b09543847d1cbf93a1465fe537985b9b24b5518898b81e3614d6986389a99e38c82f613525983543ec99cb4
+DIST postgres_exporter-0.4.6.tar.gz 3698795 BLAKE2B 5d8a370d6f5ddbe0c8570ad14d8547a5d56dbbd9d4f2d5ef604550cd0e1e97baa5c7bbd0940704f3d8f7f25da0f26d54318b4e4732a82f68e9394c5c9b044a20 SHA512 16062a372ad8048ca0bdb41e302bde9d18dfcdc519fbf387cc7ea414667d4a8ad2984b524e7a2c86132f4b37a175c6dd9d4ce67be5cc3c9d91aa9e73cb8c4e3b
diff --git a/app-metrics/postgres_exporter/postgres_exporter-0.4.6.ebuild b/app-metrics/postgres_exporter/postgres_exporter-0.4.6.ebuild
new file mode 100644
index 000000000000..8aa5a0f5e8dd
--- /dev/null
+++ b/app-metrics/postgres_exporter/postgres_exporter-0.4.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/wrouesnel/postgres_exporter"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="PostgreSQL stats exporter for Prometheus"
+HOMEPAGE="https://github.com/wrouesnel/postgres_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ VERSION_SHORT="${PV}" VERSION="${PV}" GOPATH="${S}" go run mage.go binary || die
+ popd || die
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin ${PN}
+ dodoc README.md queries.yaml
+ popd || die
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8583e4709564..770aa365b3b2 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/asciinema/asciinema-1.4.0.ebuild b/app-misc/asciinema/asciinema-1.4.0.ebuild
index 8abaa2657620..ee47c74f60ec 100644
--- a/app-misc/asciinema/asciinema-1.4.0.ebuild
+++ b/app-misc/asciinema/asciinema-1.4.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema"
+HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
diff --git a/app-misc/asciinema/asciinema-2.0.0.ebuild b/app-misc/asciinema/asciinema-2.0.0.ebuild
index 8e58e5137833..f3de7eca9d53 100644
--- a/app-misc/asciinema/asciinema-2.0.0.ebuild
+++ b/app-misc/asciinema/asciinema-2.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema"
+HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
diff --git a/app-misc/faq/Manifest b/app-misc/faq/Manifest
new file mode 100644
index 000000000000..c9ab2df40579
--- /dev/null
+++ b/app-misc/faq/Manifest
@@ -0,0 +1,16 @@
+DIST faq-0.0.1.tar.gz 9916 BLAKE2B 1a585f56e72818978f5a79e0df3d59533a422127e8eacc79a05bb8704c0321b85c85e8cc9fd6eb633a1d5c39ea0b03d546d8da39462a94f369495ca0279a516d SHA512 38d5789dcf83042cc909424864e37d7adaf49bd3f2ab3da851005d528d3deb1e13ea37f68ba9245cf05e1fd1e45d1ab80c5d6d027ed785983d279cb8de05f718
+DIST github.com-Azure-draft-53924464463d2474f410415f1310d2b95fb8965f.tar.gz 1417651 BLAKE2B 3d8743ac35e813116ca7c093878669b721a1af052e2a8e48daa48736132bbf85326a363638dc4f253f825a730e4325c6bd6f83fccb319c507cdfc82c2ba978a4 SHA512 464b6cb5250bf35b505c6c40c509c357a46b32b96cee4c06917b35fb66cb5f21841fd5c812079356565d5ca2045c5e51eec74106f0d4731e9096e8224286f68e
+DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
+DIST github.com-ashb-jqrepl-70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz 14761 BLAKE2B fe636cf5425d2b717647404a012ff297d3c792e6ac11998004c3813e30768ba9dbee7b12aefbfd8793db398c7e24dad805e54207f689399bf9ce7f5632cfa7bc SHA512 f0f6529ad9561919fe5ffecb2acb2a432560a01b24292eb3b2746ba45491455f5e7bb023ceee0de1fdc147471e9733f3946a3bde599d2bf8122177626ea54424
+DIST github.com-clbanning-mxj-eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz 1071238 BLAKE2B 34a7cfe6e46fd80ee49c05c4efa6ba615ca516af34828dc291029d3f8efc83548204930a2487ed0fc86590f1443c8ca2b5574071189872ac9578739c1ecb6445 SHA512 742f9ff55eda7785cc733189018f487c2a7debcbc2d4446f8631b1e66457aa433319d9b5e81ed405ca54581a300d6e979367422eb7729d2cd9edde36717414b9
+DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e
+DIST github.com-globalsign-mgo-baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz 409146 BLAKE2B 4fe1d3812f0f695febbb42809cfffbce50a8602ed89b58d1dca53255520b4945f30aee0a97141e28ce554f97edbaea3121020aee66db1a29cecd59c463755bc2 SHA512 7caac9d229c9cdd9a32a2f3f3117790bf67391c2b25c1ff88cd4ad6f5b0157f68affc90f86733919f961b5551e6732eab307309ddcf25f517dc8023ce6c96e0f
+DIST github.com-go-yaml-yaml-86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz 70230 BLAKE2B 0d6d56ae3ab1a46a2b8cb7cd89141825358d33b76d8bdf7a18bd42bea42321c2d294cabc1fcaee3b3761a56654da261f83cfd54db0f734b1471ab29df985197a SHA512 ab1f058e9702238b968e21d03c2d5effb606f6446e2f0a3f6fbd71dcfd90bf1a390bde6d3097f5e9b087e79645138e21a792862cc83d119ce4e0da2510be775c
+DIST github.com-golang-crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz 1455583 BLAKE2B ceb0dbb22869d4e5a43a8674138f725de7514af12131da26152bfc723d8981356f056547c63b81193da2b0b9d4587a2941b05dcd921d27ed9cb5d9db3abdd971 SHA512 2c81f213f5d934af9b449d0bcb4b6ee2078b4db842933aa84b6dcaf893029f2bba3657fd3cab14749cff8d4cca6ee64dc7478d4c790f314bb12ebb8fed88d179
+DIST github.com-golang-sys-13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz 802725 BLAKE2B f826bcb2230bbeba10b138d3fae0191ee0dda49ade37dc3462adcf16ea890dd87d86aa9793ada59b86ee427da4f2b336fee1a2cda7f079bf50a6f7b70360cc48 SHA512 d4f82bd401b6a805c7d369fac26edb5153f0f9654a6d9fc9809a545c8a3de546329a36f4fe8aa5506bd2d3b4da27dcd56cc2bd5ea18f2c5a033d7fa5f3820251
+DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
+DIST github.com-jbrukh-bayesian-bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz 9353 BLAKE2B df1e8457587b5d27f0cbfe5707da54a38c3ca4311586674d9e4bc85ad55dc222e570002a2388fbbbf239e559e4438aa063971665e436e234ffecb7888a7aff3a SHA512 e3ba5ce1e2a8e3b61e70b4c9f31c4215ec8ffb4a558e51f74efcace20b6bcf958f675ffc1125623e79da616aba2518a6e4623596e3a47abf3d841ca9d9833cf3
+DIST github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz 28758 BLAKE2B e34b383cbbddcadd99692609c9c20f94182735fc9879c0391947d0bc540df05cae7570230103a75a1e031fe8e30d1a4796eb17c80b4fba4a6d79bb999932205f SHA512 8f4f0bc4f4cd02f26f1ab39857e0e8120feab8ae3bb44b570e5d269b0c716d4028b824b04ad3923dc3e5a82b64c757e462ff74c71875677fd4fd276bd5b40926
+DIST github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz 100895 BLAKE2B a4534b0ce3689db04d2f1fc4bdd982576f62e1f4622b81f305b9651bb455b14d4b4b145cc4da49a52289b2b7f32cd9e1406e950020fc7b3f87bb0fdba98db12f SHA512 b33bc0c32d25d099f44b3c7cf653ebbcdbec00d45aade37d38e9c5e0f15bcff36ea736b13583d5ba88e7728815ffa986c4dc01b082df5ac2bfbd8db2c7f7d333
+DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
+DIST github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz 13253 BLAKE2B 043d6824c2d0aeb69403610dc64b890d77a555483e92d54d0f70f630bc1b1326202118a8d2285335dea0605b582d640962a763eb4fe9cfee257a742a6da2141e SHA512 488aa86cbb20e0c1c0f22d053dd6e793f0d1e6faaa84c3e5da299e3714d493df2284ed74009002dfe8e33d06291d06791f74c257443ee6dc3ba84b871d59fec3
diff --git a/app-misc/faq/faq-0.0.1.ebuild b/app-misc/faq/faq-0.0.1.ebuild
new file mode 100644
index 000000000000..ddd31a08b0a2
--- /dev/null
+++ b/app-misc/faq/faq-0.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jzelinskie/faq"
+
+EGO_VENDOR=(
+ "github.com/Azure/draft 53924464463d2474f410415f1310d2b95fb8965f"
+ "github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+ "github.com/ashb/jqrepl 70de3caa122cf7c7a737f28b666ab0d541560598"
+ "github.com/clbanning/mxj eb2e8a1ed220896d2b16890436447a0eae496fae"
+ "github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
+ "github.com/globalsign/mgo baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2"
+ "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+ "github.com/jbrukh/bayesian bf3f261f9a9c61145c60d47665b0518cc32c774f"
+ "github.com/sirupsen/logrus c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+ "github.com/spf13/cobra a1f051bc3eba734da4772d60e2d677f47cf93ef4"
+ "github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+ "github.com/zeebo/bencode d522839ac797fc43269dae6a04a1f8be475a915d"
+ "golang.org/x/crypto 88942b9c40a4c9d203b82b3731787b672d6e809b github.com/golang/crypto"
+ "golang.org/x/sys 13d03a9a82fba647c21a0ef8fba44a795d0f0835 github.com/golang/sys"
+ "gopkg.in/yaml.v2 86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Format agnostic jQ"
+HOMEPAGE="https://github.com/jzelinskie/faq"
+SRC_URI="https://github.com/jzelinskie/faq/archive/${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+ pushd src || die
+ GOPATH="${S}" go install github.com/jzelinskie/faq
+ popd || die
+}
+
+src_install() {
+ dobin bin/${PN}
+ pushd src/${EGO_PN} || die
+ dodoc README.md docs/examples.md
+ popd || die
+}
diff --git a/app-misc/faq/metadata.xml b/app-misc/faq/metadata.xml
new file mode 100644
index 000000000000..9003aa1128ff
--- /dev/null
+++ b/app-misc/faq/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ mrueg@gentoo.org
+ Manuel RĂ¼ger
+
+
+ jzelinksie/faq
+
+
diff --git a/app-misc/geoclue/geoclue-2.4.8.ebuild b/app-misc/geoclue/geoclue-2.4.8.ebuild
index 9990c91df100..ba3294f255e4 100644
--- a/app-misc/geoclue/geoclue-2.4.8.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.x
LICENSE="LGPL-2"
SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE="+introspection +modemmanager zeroconf"
RDEPEND="
diff --git a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
index 4660f200b5bf..2f0d75855806 100644
--- a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
+++ b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Program to extract metadata using Hachoir library"
-HOMEPAGE="https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.org/project/hachoir-metadata"
+HOMEPAGE="https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.org/project/hachoir-metadata/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild b/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
index 12fd6da2185d..b2b40be21fef 100644
--- a/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
+++ b/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Find subfile in any binary stream"
-HOMEPAGE="https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.org/project/hachoir-subfile"
+HOMEPAGE="https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.org/project/hachoir-subfile/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild b/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
index 55d30fce03b3..4ccb31219c4f 100644
--- a/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
+++ b/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="ncurses"
inherit distutils-r1
DESCRIPTION="Binary file explorer using Hachoir and urwid libraries"
-HOMEPAGE="https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.org/project/hachoir-urwid"
+HOMEPAGE="https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.org/project/hachoir-urwid/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/app-misc/icdiff/icdiff-1.7.3.ebuild b/app-misc/icdiff/icdiff-1.7.3.ebuild
index aab477b10c44..c1f6ccba26d9 100644
--- a/app-misc/icdiff/icdiff-1.7.3.ebuild
+++ b/app-misc/icdiff/icdiff-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python2_7 python3_4 python3_5)
inherit distutils-r1
DESCRIPTION="Colourized diff that supports side-by-side diffing"
-HOMEPAGE="http://www.jefftk.com/icdiff"
+HOMEPAGE="https://www.jefftk.com/icdiff"
SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild b/app-misc/icdiff/icdiff-1.9.1.ebuild
index eda476f4a614..190d11b72b67 100644
--- a/app-misc/icdiff/icdiff-1.9.1.ebuild
+++ b/app-misc/icdiff/icdiff-1.9.1.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python2_7 python3_4 python3_5)
inherit distutils-r1
DESCRIPTION="Colourized diff that supports side-by-side diffing"
-HOMEPAGE="http://www.jefftk.com/icdiff"
+HOMEPAGE="https://www.jefftk.com/icdiff"
SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/app-misc/screenfetch/screenfetch-3.8.0.ebuild b/app-misc/screenfetch/screenfetch-3.8.0.ebuild
index 0c5776358981..35f27763226d 100644
--- a/app-misc/screenfetch/screenfetch-3.8.0.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.8.0.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
inherit git-r3
else
- KEYWORDS="amd64 ~x86 ~x64-macos"
+ KEYWORDS="amd64 x86 ~x64-macos"
SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
diff --git a/app-misc/workrave/workrave-1.10.20.ebuild b/app-misc/workrave/workrave-1.10.20.ebuild
index 0d3fce130b04..eb0accfb92a4 100644
--- a/app-misc/workrave/workrave-1.10.20.ebuild
+++ b/app-misc/workrave/workrave-1.10.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
# dbus support looks to be used only for trying to use panel applets on gnome3!
IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce"
diff --git a/app-misc/yq/yq-2.1.2.ebuild b/app-misc/yq/yq-2.1.2.ebuild
index aa07895a1b25..1508219d3b3b 100644
--- a/app-misc/yq/yq-2.1.2.ebuild
+++ b/app-misc/yq/yq-2.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/app-misc/yq/yq-2.3.0.ebuild b/app-misc/yq/yq-2.3.0.ebuild
index b383dbdabe99..ab7d35d6967b 100644
--- a/app-misc/yq/yq-2.3.0.ebuild
+++ b/app-misc/yq/yq-2.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/app-misc/yq/yq-2.3.3.ebuild b/app-misc/yq/yq-2.3.3.ebuild
index b383dbdabe99..ab7d35d6967b 100644
--- a/app-misc/yq/yq-2.3.3.ebuild
+++ b/app-misc/yq/yq-2.3.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/app-misc/yq/yq-2.3.4.ebuild b/app-misc/yq/yq-2.3.4.ebuild
index aa07895a1b25..1508219d3b3b 100644
--- a/app-misc/yq/yq-2.3.4.ebuild
+++ b/app-misc/yq/yq-2.3.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index c6c2d1d11e54..45c4dd224313 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/gnumeric/gnumeric-1.12.38.ebuild b/app-office/gnumeric/gnumeric-1.12.38.ebuild
index 4c5b03f89eb7..95cec2e6148d 100644
--- a/app-office/gnumeric/gnumeric-1.12.38.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.38.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnumeric.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="+introspection libgda perl python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-office/grisbi/grisbi-1.0.2.ebuild b/app-office/grisbi/grisbi-1.0.2.ebuild
index 392f5fbf64ad..d3e60f15cf74 100644
--- a/app-office/grisbi/grisbi-1.0.2.ebuild
+++ b/app-office/grisbi/grisbi-1.0.2.ebuild
@@ -13,7 +13,7 @@ IUSE="libressl nls ofx ssl"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
RDEPEND="
dev-libs/libxml2:2
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch
new file mode 100644
index 000000000000..37a554d807da
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch
@@ -0,0 +1,71 @@
+From 106b2c96e9807af14d6eb6e8f83dcf25095a093e Mon Sep 17 00:00:00 2001
+From: Rene Engelhard
+Date: Tue, 24 Apr 2018 15:56:23 +0200
+Subject: fix build with poppler 0.64
+
+GooString became const...
+
+Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5
+Reviewed-on: https://gerrit.libreoffice.org/53422
+Tested-by: Jenkins
+Reviewed-by: Michael Stahl
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++++++++++
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 00fd56a..9618e5b 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -446,6 +446,9 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state )
+ FontAttributes aNewFont;
+ int nSize = 0;
+
++#if POPPLER_CHECK_VERSION(0, 64, 0)
++ const
++#endif
+ GooString* pFamily = gfxFont->getName();
+ if( pFamily )
+ {
+@@ -742,6 +745,9 @@ void PDFOutDev::updateFont(GfxState *state)
+ FontAttributes aFont;
+ int nEmbedSize=0;
+
++#if POPPLER_CHECK_VERSION(0, 64, 0)
++ const
++#endif
+ Ref* pID = gfxFont->getID();
+ // TODO(Q3): Portability problem
+ long long fontID = (long long)pID->gen << 32 | (long long)pID->num;
+@@ -932,7 +938,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y,
+ printf( "\n" );
+ }
+
++#if POPPLER_CHECK_VERSION(0, 64, 0)
++void PDFOutDev::drawString(GfxState*, const GooString* /*s*/)
++#else
+ void PDFOutDev::drawString(GfxState*, GooString* /*s*/)
++#endif
+ {
+ // TODO(F3): NYI
+ }
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index 922c513..2a6268c 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -223,7 +223,11 @@ namespace pdfi
+ double dx, double dy,
+ double originX, double originY,
+ CharCode code, int nBytes, Unicode *u, int uLen) override;
++#if POPPLER_CHECK_VERSION(0, 64, 0)
++ virtual void drawString(GfxState *state, const GooString *s) override;
++#else
+ virtual void drawString(GfxState *state, GooString *s) override;
++#endif
+ virtual void endTextObject(GfxState *state) override;
+
+ //----- image drawing
+--
+cgit v1.1
+
diff --git a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
index 2b32a98e6ca6..a8b1cae3566d 100644
--- a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
@@ -212,12 +212,9 @@ DEPEND="${COMMON_DEPEND}
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
+ x11-base/xorg-proto
x11-libs/libXt
x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
java? (
dev-java/ant-core
>=virtual/jdk-1.6
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index 10a786515f48..fd1f349a9f70 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -102,7 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
+ >=dev-libs/liborcus-0.13.3
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
@@ -217,12 +217,9 @@ DEPEND="${COMMON_DEPEND}
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
+ x11-base/xorg-proto
x11-libs/libXt
x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
java? (
dev-java/ant-core
>=virtual/jdk-1.6
@@ -247,6 +244,8 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ # 6.0 branch
+ "${FILESDIR}/${P}-poppler-0.64.patch"
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 10a786515f48..edf22ead40df 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -102,7 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
+ >=dev-libs/liborcus-0.13.3
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
@@ -217,12 +217,9 @@ DEPEND="${COMMON_DEPEND}
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
+ x11-base/xorg-proto
x11-libs/libXt
x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
java? (
dev-java/ant-core
>=virtual/jdk-1.6
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 271f47c5cc6c..3799a7815c0e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -102,7 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
+ >=dev-libs/liborcus-0.13.3
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
@@ -216,12 +216,9 @@ DEPEND="${COMMON_DEPEND}
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
+ x11-base/xorg-proto
x11-libs/libXt
x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
java? (
dev-java/ant-core
>=virtual/jdk-1.6
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 5f82bdf68651..0665f4ecf0a4 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,2 +1 @@
-DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B 08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095 SHA512 b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708
DIST lyx-2.3.0.tar.xz 15676680 BLAKE2B 4b09f4c3979f51a8b30825c07fe3b24f080bfc8f42d54e94809e342087b683ca24edcb835994583b28d5b9c13868736f850d6c88b229e2d7f6f6bc0fd64c722c SHA512 77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5
diff --git a/app-office/lyx/files/2.1-python.patch b/app-office/lyx/files/2.1-python.patch
deleted file mode 100644
index 5fb21655a695..000000000000
--- a/app-office/lyx/files/2.1-python.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
-index 97c4f68..8f05e62 100644
---- a/src/graphics/GraphicsConverter.cpp
-+++ b/src/graphics/GraphicsConverter.cpp
-@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file,
- LYXERR(Debug::GRAPHICS, "build_script ... ");
- typedef Graph::EdgePath EdgePath;
-
-- script << "#!/usr/bin/env python\n"
-+ script << "#!/usr/bin/env python2\n"
- "# -*- coding: utf-8 -*-\n"
- "import os, shutil, sys\n\n"
- "def unlinkNoThrow(file):\n"
-diff --git a/src/support/os.cpp b/src/support/os.cpp
-index 8f60c68..2f1cb91 100644
---- a/src/support/os.cpp
-+++ b/src/support/os.cpp
-@@ -63,9 +63,9 @@ int timeout_min()
- string const python(bool reset)
- {
- // Check whether the first python in PATH is the right one.
-- static string command = python2("python -tt");
-+ static string command = python2("python2 -tt");
- if (reset) {
-- command = python2("python -tt");
-+ command = python2("python2 -tt");
- }
-
- if (command.empty()) {
diff --git a/app-office/lyx/lyx-2.2.3-r4.ebuild b/app-office/lyx/lyx-2.2.3-r4.ebuild
deleted file mode 100644
index fcee37e04bb1..000000000000
--- a/app-office/lyx/lyx-2.2.3-r4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils xdg-utils flag-o-matic font python-single-r1 qmake-utils toolchain-funcs multilib desktop
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
- ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=
- dev-texlive/texlive-fontsextra
- sys-apps/file
- sys-libs/zlib
- virtual/imagemagick-tools[png,svg?]
- aspell? ( app-text/aspell )
- cups? ( net-print/cups )
- dia? ( app-office/dia )
- docbook? ( app-text/sgmltools-lite )
- dot? ( media-gfx/graphviz )
- enchant? ( app-text/enchant )
- gnumeric? ( app-office/gnumeric )
- html? ( dev-tex/html2latex )
- hunspell? ( app-text/hunspell )
- latex? (
- app-text/dvipng
- app-text/ghostscript-gpl
- app-text/ps2eps
- app-text/texlive
- dev-tex/chktex
- dev-tex/dvipost
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-mathscience
- dev-texlive/texlive-pictures
- || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
- || (
- dev-tex/hevea
- dev-tex/latex2html
- dev-tex/tex4ht[java]
- dev-tex/tth
- )
- )
- l10n_he? ( dev-tex/culmus-latex )
- !qt5? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- )
- rcs? ( dev-vcs/rcs )
- rtf? (
- app-text/unrtf
- dev-tex/html2latex
- dev-tex/latex2rtf
- )
- subversion? ( dev-vcs/subversion )
- svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- !qt5? ( dev-qt/qtsvg:4 )
- qt5? (
- dev-qt/qtconcurrent:5
- dev-qt/qtx11extras:5
- )
-"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-PATCHES=( "${FILESDIR}"/2.1-python.patch )
-
-pkg_setup() {
- python-single-r1_pkg_setup
- font_pkg_setup
-}
-
-src_prepare() {
- default
- sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-}
-
-src_configure() {
- tc-export CXX
- #bug 221921
- export VARTEXFONTS=${T}/fonts
-
- econf \
- $(use_with aspell) \
- $(use_enable debug) \
- $(use_with enchant) \
- $(use_with hunspell) \
- $(use_enable monolithic-build) \
- $(use_enable nls) \
- $(use_enable qt5) \
- --with-qt-dir=$(usex qt5 $(qt5_get_libdir)/qt5 $(qt4_get_libdir)) \
- --disable-stdlib-debug \
- --without-included-boost \
- --with-packaging=posix
-}
-
-src_install() {
- default
-
- if use l10n_he ; then
- echo "\bind_file cua" > "${T}"/hebrew.bind
- echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
-
- insinto /usr/share/lyx/bind
- doins "${T}"/hebrew.bind
- fi
-
- newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
- doicon -s 48 "${S}/lib/images/lyx.png"
- doicon -s scalable "${S}/lib/images/lyx.svg"
-
- # fix for bug 91108
- if use latex ; then
- dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx
- fi
-
- # fonts needed for proper math display, see also bug #15629
- font_src_install
-
- python_fix_shebang "${ED}"/usr/share/${PN}
-
- if use hunspell ; then
- dosym ../myspell /usr/share/lyx/dicts
- dosym ../myspell /usr/share/lyx/thes
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- font_pkg_postinst
- gnome2_icon_cache_update
- xdg_desktop_database_update
-
- # fix for bug 91108
- if use latex ; then
- texhash
- fi
-
- # instructions for RTL support. See also bug 168331.
- if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
- elog
- elog "Enabling RTL support in LyX:"
- elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
- elog "You must enable RTL support in LyX. To do so start LyX and go to"
- elog "Tools->Preferences->Language settings->Language"
- elog "and make sure the \"Right-to-left language support\" is checked"
- elog
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-
- if use latex ; then
- texhash
- fi
-}
diff --git a/app-office/lyx/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild
index 8ec5b1767f4e..c5452baaac77 100644
--- a/app-office/lyx/lyx-2.3.0.ebuild
+++ b/app-office/lyx/lyx-2.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos"
IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
index e249940edd06..cb200d9236b5 100644
--- a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
+++ b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -40,7 +40,7 @@ COMMON_DEPEND="x11-libs/libICE
mng? ( media-libs/libmng )"
DEPEND="${COMMON_DEPEND}
sys-devel/autoconf
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-libs/libxkbfile
app-text/rman
x11-misc/imake"
diff --git a/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild b/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild
index 3a56421cce7f..09fb8d2f78a3 100644
--- a/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild
+++ b/app-office/taskcoach/taskcoach-1.4.3-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="TaskCoach"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Simple personal tasks and todo lists manager"
-HOMEPAGE="http://www.taskcoach.org https://pypi.org/project/TaskCoach"
+HOMEPAGE="http://www.taskcoach.org https://pypi.org/project/TaskCoach/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-3"
diff --git a/app-office/texmacs/texmacs-1.99.2-r1.ebuild b/app-office/texmacs/texmacs-1.99.2-r1.ebuild
index f408b0358af2..b699dc377ee2 100644
--- a/app-office/texmacs/texmacs-1.99.2-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.99.2-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
@@ -31,7 +31,7 @@ RDEPEND="
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/app-office/texmacs/texmacs-1.99.5.ebuild b/app-office/texmacs/texmacs-1.99.5.ebuild
index 38d576fe4680..879508352d2e 100644
--- a/app-office/texmacs/texmacs-1.99.5.ebuild
+++ b/app-office/texmacs/texmacs-1.99.5.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
@@ -31,7 +31,7 @@ RDEPEND="
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/app-office/texmacs/texmacs-1.99.6-r1.ebuild b/app-office/texmacs/texmacs-1.99.6-r1.ebuild
index f30d4670bf1f..22770bc0ecc5 100644
--- a/app-office/texmacs/texmacs-1.99.6-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.99.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=6
@@ -32,7 +32,7 @@ RDEPEND="
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/app-office/texmacs/texmacs-1.99.6-r2.ebuild b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
index cdc5bdd2566b..d033045a79f5 100644
--- a/app-office/texmacs/texmacs-1.99.6-r2.ebuild
+++ b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
IUSE="jpeg netpbm sqlite svg spell"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
RDEPEND="
app-text/ghostscript-gpl
@@ -34,7 +34,7 @@ RDEPEND="
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/app-office/texmacs/texmacs-1.99.6.ebuild b/app-office/texmacs/texmacs-1.99.6.ebuild
index bd65c285bdbd..c4e5c3f4e6fe 100644
--- a/app-office/texmacs/texmacs-1.99.6.ebuild
+++ b/app-office/texmacs/texmacs-1.99.6.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
@@ -31,7 +31,7 @@ RDEPEND="
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index df727efaa2fd..864c6fbfc327 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,2 +1 @@
-DIST texmaker-4.5.tar.bz2 11287724 BLAKE2B 9138e4765e439419384573aed210b1df30890a1b8f3493e89f85c187bca56791dbdfb4805853dff6335cfeb2fc3ba7a00039927d3476c2c90aaa6d6213ba32b3 SHA512 623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11
DIST texmaker-5.0.tar.bz2 15728938 BLAKE2B 14d0ea9e7f8b5f4b4e40bfdbe706b585215d0df8546aeb5d614c73314f41b3f0d443ccf5d4ddb0d7eab00bf76a358cbd51e14ff21ac15e0f8e89b884f12719df SHA512 2473e0ad701da399f428caf8b067129c069a86d8cc5f1d0993ba53025961f7caab816195495d63788d58dafa7a208ca8fbcebbac118a49b20f3f639ee377a636
diff --git a/app-office/texmaker/files/texmaker-4.5-modern-styles.patch b/app-office/texmaker/files/texmaker-4.5-modern-styles.patch
deleted file mode 100644
index 73c3b92f761b..000000000000
--- a/app-office/texmaker/files/texmaker-4.5-modern-styles.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/texmaker.cpp 2014-11-26 09:06:56.000000000 -0300
-+++ b/texmaker.cpp 2015-06-19 20:49:58.801377000 -0300
-@@ -4451,7 +4451,12 @@
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
- if (modern_style)
- {
--qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
-+ if(desktop_env == 1){
-+ if (styles.contains("GTK+")) qApp->setStyle(new ManhattanStyle(QLatin1String("gtkstyle")));
-+ else if (styles.contains("Windows")) qApp->setStyle(new ManhattanStyle(QLatin1String("windows")));
-+ else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
-+ }
-+ else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
- }
- // else
- // {
diff --git a/app-office/texmaker/files/texmaker-4.5-unbundle.patch b/app-office/texmaker/files/texmaker-4.5-unbundle.patch
deleted file mode 100644
index 607b2c8b7e41..000000000000
--- a/app-office/texmaker/files/texmaker-4.5-unbundle.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/configdialog.cpp b/configdialog.cpp
-index dddb11e..9a1aee7 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -222,7 +222,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/texmaker.cpp b/texmaker.cpp
-index b8a2143..a8bcd46 100644
---- a/texmaker.cpp
-+++ b/texmaker.cpp
-@@ -2787,7 +2787,7 @@ if (hasDecodingError)
- QString dicDir=QCoreApplication::applicationDirPath() + "/";
- #else
- #ifdef DEBIAN_SPELLDIR
--QString dicDir=PREFIX"/share/myspell/dicts/";
-+QString dicDir=PREFIX"/share/myspell/";
- #else
- QString dicDir=PREFIX"/share/texmaker/";
- #endif
-diff --git a/texmaker.pro b/texmaker.pro
-index 7e9b706..909eb62 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -98,29 +98,6 @@ HEADERS += texmaker.h \
- unicodeview.h \
- quickbeamerdialog.h \
- svnhelper.h \
-- hunspell/affentry.hxx \
-- hunspell/affixmgr.hxx \
-- hunspell/atypes.hxx \
-- hunspell/baseaffix.hxx \
-- hunspell/csutil.hxx \
-- hunspell/dictmgr.hxx \
-- hunspell/hashmgr.hxx \
-- hunspell/htypes.hxx \
-- hunspell/hunspell.hxx \
-- hunspell/hunspell.h \
-- hunspell/langnum.hxx \
-- hunspell/license.hunspell \
-- hunspell/phonet.hxx \
-- hunspell/suggestmgr.hxx \
-- hunspell/license.myspell \
-- hunspell/filemgr.hxx \
-- hunspell/hunzip.hxx \
-- hunspell/replist.hxx \
-- hunspell/w_char.hxx \
-- singleapp/qtlocalpeer.h \
-- singleapp/qtlockedfile.h \
-- singleapp/qtsingleapplication.h \
-- singleapp/qtsinglecoreapplication.h \
- encodingprober/CharDistribution.h \
- encodingprober/ChineseGroupProber.h \
- encodingprober/ctype_test_p.h \
-@@ -210,22 +187,6 @@ SOURCES += main.cpp \
- unicodeview.cpp \
- quickbeamerdialog.cpp \
- svnhelper.cpp \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
-- singleapp/qtlocalpeer.cpp \
-- singleapp/qtlockedfile.cpp \
-- singleapp/qtsingleapplication.cpp \
-- singleapp/qtsinglecoreapplication.cpp \
- encodingprober/CharDistribution.cpp \
- encodingprober/ChineseGroupProber.cpp \
- encodingprober/JapaneseGroupProber.cpp \
-@@ -336,8 +297,7 @@ icon.path = $${ICONDIR}
-
- INSTALLS = target
- HEADERS += x11fontdialog.h
--SOURCES += x11fontdialog.cpp \
-- singleapp/qtlockedfile_unix.cpp
-+SOURCES += x11fontdialog.cpp
- FORMS += x11fontdialog.ui
-
- utilities.files = doc/doc1.png \
diff --git a/app-office/texmaker/texmaker-4.5-r2.ebuild b/app-office/texmaker/texmaker-4.5-r2.ebuild
deleted file mode 100644
index 2c65b02c9180..000000000000
--- a/app-office/texmaker/texmaker-4.5-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils readme.gentoo
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="
- app-text/hunspell
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- app-text/poppler[qt5]
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtscript:5
- dev-qt/qtsingleapplication[X,qt5]
- dev-qt/qtwebkit:5[printsupport]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/ghostscript-gpl
- app-text/psutils
- media-libs/netpbm
- virtual/latex-base"
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-unbundle.patch
- "${FILESDIR}"/${P}-modern-styles.patch
- )
-
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- find singleapp hunspell -delete || die
-
- epatch "${PATCHES[@]}"
-
- cat >> ${PN}.pro <<- EOF
- exists(texmakerx_my.pri):include(texmakerx_my.pri)
- EOF
-
- cp "${FILESDIR}"/texmakerx_my.pri . || die
-
- sed \
- -e '/^#include/s:hunspell/::g' \
- -e '/^#include/s:singleapp/::g' \
- -i *.cpp *.h || die
-
- DOC_CONTENTS="A user manual with many screenshots is available at:
- ${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
-
-src_configure() {
- local myeqmakeargs=(
- ${PN}.pro
- PREFIX="${EPREFIX}/usr"
- DESKTOPDIR="${EPREFIX}/usr/share/applications"
- ICONDIR="${EPREFIX}/usr/share/pixmaps"
- )
- eqmake5 ${myeqmakeargs[@]}
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
- readme.gentoo_create_doc
-}
diff --git a/app-office/texmaker/texmaker-4.5-r3.ebuild b/app-office/texmaker/texmaker-4.5-r3.ebuild
deleted file mode 100644
index 79f1a8da1221..000000000000
--- a/app-office/texmaker/texmaker-4.5-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils readme.gentoo-r1
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="
- app-text/hunspell
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- app-text/poppler[qt5]
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtscript:5
- dev-qt/qtsingleapplication[X,qt5]
- dev-qt/qtwebkit:5[printsupport]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/ghostscript-gpl
- app-text/psutils
- media-libs/netpbm
- virtual/latex-base"
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-unbundle.patch
- "${FILESDIR}"/${P}-modern-styles.patch
- )
-
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- find singleapp hunspell -delete || die
-
- epatch "${PATCHES[@]}"
-
- cat >> ${PN}.pro <<- EOF
- exists(texmakerx_my.pri):include(texmakerx_my.pri)
- EOF
-
- cp "${FILESDIR}"/texmakerx_my.pri . || die
-
- sed \
- -e '/^#include/s:hunspell/::g' \
- -e '/^#include/s:singleapp/::g' \
- -i *.cpp *.h || die
-
- DOC_CONTENTS="A user manual with many screenshots is available at:
- ${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
-
-src_configure() {
- local myeqmakeargs=(
- ${PN}.pro
- PREFIX="${EPREFIX}/usr"
- DESKTOPDIR="${EPREFIX}/usr/share/applications"
- ICONDIR="${EPREFIX}/usr/share/pixmaps"
- )
- eqmake5 ${myeqmakeargs[@]}
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
- readme.gentoo_create_doc
-}
diff --git a/app-office/texmaker/texmaker-5.0-r1.ebuild b/app-office/texmaker/texmaker-5.0-r1.ebuild
index 35d097ce16a7..f05efde98875 100644
--- a/app-office/texmaker/texmaker-5.0-r1.ebuild
+++ b/app-office/texmaker/texmaker-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
COMMON_DEPEND="
diff --git a/app-office/texstudio/texstudio-2.12.6-r1.ebuild b/app-office/texstudio/texstudio-2.12.6-r1.ebuild
index 8e4b50e469c0..c6915136af00 100644
--- a/app-office/texstudio/texstudio-2.12.6-r1.ebuild
+++ b/app-office/texstudio/texstudio-2.12.6-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE="video"
COMMON_DEPEND="
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 08a77a991fc4..9fbb69206fc8 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/pfl/pfl-3.0.ebuild b/app-portage/pfl/pfl-3.0.ebuild
index ea1a286fa5d2..92a794602b6a 100644
--- a/app-portage/pfl/pfl-3.0.ebuild
+++ b/app-portage/pfl/pfl-3.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_5 )
+PYTHON_COMPAT=( python{3_5,3_6} )
PYTHON_REQ_USE="xml"
inherit eutils distutils-r1
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 518d43760f0a..71ff3378c89f 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/quoter/quoter-3.0_p2-r1.ebuild b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
index a5b0ed2d6f58..4c1901dae04b 100644
--- a/app-shells/quoter/quoter-3.0_p2-r1.ebuild
+++ b/app-shells/quoter/quoter-3.0_p2-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit vcs-snapshot
+inherit toolchain-funcs vcs-snapshot
DESCRIPTION="Quote arguments or standard input for usage in POSIX shell by eval"
HOMEPAGE="https://github.com/vaeth/quoter/"
@@ -11,7 +11,10 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE=""
+
+src_configure() {
+ tc-export CC
+}
src_install() {
emake DESTDIR="${ED}" install
diff --git a/app-shells/thefuck/Manifest b/app-shells/thefuck/Manifest
index ba5e44895954..9ecc9ce95de0 100644
--- a/app-shells/thefuck/Manifest
+++ b/app-shells/thefuck/Manifest
@@ -1,2 +1,3 @@
DIST thefuck-3.24.tar.gz 1360450 BLAKE2B 38a4a0484220eb92e75d164958f7a1db9d3828268a352da7a99ea79487869a39c88cdb65a315a49f71cd70a8d3ce488b1b692c241dff7329fc27c16ba33ce81f SHA512 d4949ea723cf3b080f2fbe269d0cafe3d0266089fa8cc515b3b9376b2004c045be82716cd219741a60a0e99c20575adb92339a879467f709f7ca03dcc71a5c2d
DIST thefuck-3.25.tar.gz 1362279 BLAKE2B 52b3f1c8756b6981c0528fd77c18256957dd5d628ea37801b9c9abf6114e1cef8af53d9d1dd50fc7c88fad7bd628dc8373aa70dbc6933c07c63b7da31eb5d95a SHA512 c7b215358c09e1fa5e6aae519e7d6c3fd50027b4c72bb1c128786cd2cff707196f2b9b2a23dfed34d841874caab9463791e82c9083f6aac9c90f26d12a4d4598
+DIST thefuck-3.26.tar.gz 1365778 BLAKE2B 3266fc5a1e351df1ccd13bfb6def6254194a05a94c7bf2bdcafb9c75414fce23b479eb1ac866333e8aef7d51bc609fc00aad8508e4cf0f0d959632744330e734 SHA512 2dbcc7ba0adb24b3f7d80d0c575a4ed515508e0ab5bc2fc4eb9ba82ad36325af1784eb9c241794ce0e038ed8e99042eb21cc3b29eeaa273517aebc7205ab787f
diff --git a/app-shells/thefuck/thefuck-3.26.ebuild b/app-shells/thefuck/thefuck-3.26.ebuild
new file mode 100644
index 000000000000..09a7b70b6e7e
--- /dev/null
+++ b/app-shells/thefuck/thefuck-3.26.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
+
+DESCRIPTION="Magnificent app which corrects your previous console command"
+HOMEPAGE="https://github.com/nvbn/thefuck"
+SRC_URI="https://github.com/nvbn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/decorator[${PYTHON_USEDEP}]
+ dev-python/colorama[${PYTHON_USEDEP}]
+ dev-python/pyte[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ )"
+
+python_prepare_all() {
+ sed -i -e "/import pip/s/^/#/" -e "/pip.__version__/,+3 s/^/#/" setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ py.test || die
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8f0d099ef3f5..1f9f45d06b7b 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index d5aa3037ccac..c529440fbf62 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1 +1,2 @@
DIST nfoview-1.23.tar.gz 83337 BLAKE2B d73cd6987bf7929c57e8acf0a24278272ea199bf980756ddb5da9a5eddf7760a8c05f0e48a287ee760d4bf4d2594fb08b43a77cef46d371a746629bf76955e91 SHA512 b94724e130cdf58b911634496c52361d008ebfafab3ac40a76612c4891737d4145596a6badc15fe4228c90c1cd7261e5a892e3e462070ebb55f71332b36345d7
+DIST nfoview-1.24.tar.gz 86037 BLAKE2B 5d565680864f1a73a64d9557e69eda0771dc164f12018ac8964fb1c2225005c1bb881c7b9035c7baed2021838e3a291e52fb5af84cf9c271c046cfddd684270c SHA512 91ad1f9f972b7681655b429c0910475012bd2231e51c6db5659b19fb869779d1de10dadc1d6461fa7d577c051af9b74f1d463543a429e1dca438a4ff17ac2293
diff --git a/app-text/nfoview/nfoview-1.24.ebuild b/app-text/nfoview/nfoview-1.24.ebuild
new file mode 100644
index 000000000000..5b1cf0483c63
--- /dev/null
+++ b/app-text/nfoview/nfoview-1.24.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 -> ${P}.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/pelican/pelican-3.6.0.ebuild b/app-text/pelican/pelican-3.6.0.ebuild
index 5f59a084fd77..3db3fdbd7329 100644
--- a/app-text/pelican/pelican-3.6.0.ebuild
+++ b/app-text/pelican/pelican-3.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican/"
SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-text/pelican/pelican-3.6.3.ebuild b/app-text/pelican/pelican-3.6.3.ebuild
index 7be15bd02b48..4b0fb743507c 100644
--- a/app-text/pelican/pelican-3.6.3.ebuild
+++ b/app-text/pelican/pelican-3.6.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican/"
SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-text/pelican/pelican-3.7.0.ebuild b/app-text/pelican/pelican-3.7.0.ebuild
index e343bef922f7..7401f3d4bb99 100644
--- a/app-text/pelican/pelican-3.7.0.ebuild
+++ b/app-text/pelican/pelican-3.7.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican/"
SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-text/pelican/pelican-3.7.1.ebuild b/app-text/pelican/pelican-3.7.1.ebuild
index 8aaa1ebd965b..f45db088e2b9 100644
--- a/app-text/pelican/pelican-3.7.1.ebuild
+++ b/app-text/pelican/pelican-3.7.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican/"
SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild
index e14863151e95..1f064b0d20af 100644
--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1 git-r3
DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.org/project/pelican/"
EGIT_REPO_URI="https://github.com/getpelican/pelican.git"
EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index 06e5752b963b..0b3f27c2c364 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,2 +1,3 @@
DIST poppler-data-0.4.7.tar.gz 4182339 BLAKE2B 85a731e738cce9b6adc7c236ee5183b6494b641a20e4c823900314bfec5bc3c327ae49e35511936c0f3a6f13e25be098b24bd6a91ae04815be6a02149a636563 SHA512 9a865f077f8760a106c6b28302357253c6d63a8f4f10a9506724d1f0ba42e3481bd790ca07e7ee245c63de3650a33c12e80e20e94415a0e37b05225cfe0efce2
DIST poppler-data-0.4.8.tar.gz 4209901 BLAKE2B ed4dc809044240141db3ec483b7fb272d976eb61febf13b3f1297b27146f8597eb6d817a799da4729192f39873226f6eae6374b86bcf4dad8cde7d0bc9388b94 SHA512 c9435f557ca696fb1e94b6a0b42d401cc911a08f995e3494a7352b47bde5091226f2bb99792ff2b1ee02dfebee66f50f736daca72020a19217ce1c27bde92d54
+DIST poppler-data-0.4.9.tar.gz 4196919 BLAKE2B a986dcff2c2295eeb952adbb4bfc59ccbc53c27668ecc44fcf862bbe3d65062ccdb9302ebdd9b530d9d0ed155666922086b368c81c0772bdab284e323e6ac436 SHA512 45afd378d0bb415c5e1bc9718025328058712c0bde6d529d2c7a4813b12f600be46ecd2ed2454b3f83fb9f8cad157b75d11d8c5d1ca849f347c310b58132ff7a
diff --git a/app-text/poppler-data/poppler-data-0.4.9.ebuild b/app-text/poppler-data/poppler-data-0.4.9.ebuild
new file mode 100644
index 000000000000..ecc3bd95ac2f
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
+HOMEPAGE="https://poppler.freedesktop.org/"
+SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="BSD GPL-2 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+src_install() {
+ emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
+
+ # bug 409361
+ dodir /usr/share/poppler/cMaps
+ cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die
+ find ../cMap -type f -exec ln -s {} . \; || die
+}
diff --git a/app-text/restview/restview-2.7.0.ebuild b/app-text/restview/restview-2.7.0.ebuild
index 3197c7f674ad..72050adfa23f 100644
--- a/app-text/restview/restview-2.7.0.ebuild
+++ b/app-text/restview/restview-2.7.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="reStructuredText viewer"
-HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview"
+HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/app-text/restview/restview-2.8.0.ebuild b/app-text/restview/restview-2.8.0.ebuild
index 3197c7f674ad..72050adfa23f 100644
--- a/app-text/restview/restview-2.8.0.ebuild
+++ b/app-text/restview/restview-2.8.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="reStructuredText viewer"
-HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview"
+HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/app-text/restview/restview-2.8.1.ebuild b/app-text/restview/restview-2.8.1.ebuild
index e44024334509..4a48d1c8d80c 100644
--- a/app-text/restview/restview-2.8.1.ebuild
+++ b/app-text/restview/restview-2.8.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="reStructuredText viewer"
-HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview"
+HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 946d3bb727b0..149d00867e8c 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
index 6576f182982b..076e66a6f805 100644
--- a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=744"
LICENSE="vim"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for dhcpd.conf files."
diff --git a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
index 997553669a89..09c4e4bd5c45 100644
--- a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
+++ b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting"
HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=545"
LICENSE="vim"
-KEYWORDS="~alpha amd64 ia64 ~mips ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc ~ppc64 sparc x86"
IUSE=""
VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
index 0daf2fb271b5..5f4dcb5b3716 100644
--- a/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
+++ b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: syntax highlighting for eruby"
HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=403"
LICENSE="vim.org"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd"
VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for eruby"
diff --git a/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild b/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
index 73d18c38d02e..8ae4c68fd007 100644
--- a/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
+++ b/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2261"
SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
LICENSE="vim.org"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86"
VIM_PLUGIN_HELPTEXT=\
"This plugin provides syntax highlighting for Nagios configuration
diff --git a/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
index 09abdf64124c..2cee4cc1ecaa 100644
--- a/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
+++ b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
@@ -8,7 +8,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: syntax highlighting for perl module Template-Toolkit"
HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=830"
LICENSE="vim"
-KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd"
IUSE=""
VIM_PLUGIN_HELPTEXT=\
diff --git a/app-vim/vim-spell-cs/vim-spell-cs-20061021-r1.ebuild b/app-vim/vim-spell-cs/vim-spell-cs-20061021-r1.ebuild
index e863fbb03395..06beb4f9d9d1 100644
--- a/app-vim/vim-spell-cs/vim-spell-cs-20061021-r1.ebuild
+++ b/app-vim/vim-spell-cs/vim-spell-cs-20061021-r1.ebuild
@@ -8,5 +8,5 @@ VIM_SPELL_LANGUAGE="Czech"
inherit vim-spell
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-KEYWORDS="amd64 sparc ~x86"
+KEYWORDS="amd64 sparc x86"
LICENSE="GPL-2"
diff --git a/app-vim/vim-spell-da/vim-spell-da-20060116-r1.ebuild b/app-vim/vim-spell-da/vim-spell-da-20060116-r1.ebuild
index 9a29c6fbb5c1..3fff3c7aafb9 100644
--- a/app-vim/vim-spell-da/vim-spell-da-20060116-r1.ebuild
+++ b/app-vim/vim-spell-da/vim-spell-da-20060116-r1.ebuild
@@ -7,6 +7,6 @@ VIM_SPELL_LANGUAGE="Danish"
inherit vim-spell
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
LICENSE="GPL-2"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-el/vim-spell-el-20080402-r1.ebuild b/app-vim/vim-spell-el/vim-spell-el-20080402-r1.ebuild
index d359c508819b..9a30994df196 100644
--- a/app-vim/vim-spell-el/vim-spell-el-20080402-r1.ebuild
+++ b/app-vim/vim-spell-el/vim-spell-el-20080402-r1.ebuild
@@ -8,5 +8,5 @@ VIM_SPELL_LANGUAGE="Greek"
inherit vim-spell
LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild b/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild
index 84a3586ca448..765ba9b7bfcd 100644
--- a/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild
+++ b/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild
@@ -7,6 +7,6 @@ VIM_SPELL_LANGUAGE="English"
inherit vim-spell
-KEYWORDS="~alpha amd64 ~arm ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
LICENSE="BSD LGPL-2.1 public-domain"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-es/vim-spell-es-20060208-r1.ebuild b/app-vim/vim-spell-es/vim-spell-es-20060208-r1.ebuild
index ff5d12d3364b..ae416bcc3eb5 100644
--- a/app-vim/vim-spell-es/vim-spell-es-20060208-r1.ebuild
+++ b/app-vim/vim-spell-es/vim-spell-es-20060208-r1.ebuild
@@ -8,5 +8,5 @@ VIM_SPELL_LANGUAGE="Spanish"
inherit vim-spell
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ppc sparc x86"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-fr/vim-spell-fr-20060121-r1.ebuild b/app-vim/vim-spell-fr/vim-spell-fr-20060121-r1.ebuild
index 3b0fedfa9fbc..4bb0a44c917a 100644
--- a/app-vim/vim-spell-fr/vim-spell-fr-20060121-r1.ebuild
+++ b/app-vim/vim-spell-fr/vim-spell-fr-20060121-r1.ebuild
@@ -8,5 +8,5 @@ VIM_SPELL_LANGUAGE="French"
inherit vim-spell
LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-he/vim-spell-he-20100312-r1.ebuild b/app-vim/vim-spell-he/vim-spell-he-20100312-r1.ebuild
index b1d2899e1652..cf4ae8d5c5c8 100644
--- a/app-vim/vim-spell-he/vim-spell-he-20100312-r1.ebuild
+++ b/app-vim/vim-spell-he/vim-spell-he-20100312-r1.ebuild
@@ -8,5 +8,5 @@ VIM_SPELL_LANGUAGE="Hebrew"
inherit vim-spell
LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-hu/vim-spell-hu-20100312-r1.ebuild b/app-vim/vim-spell-hu/vim-spell-hu-20100312-r1.ebuild
index 63e6331d453e..64ddfc5c5f35 100644
--- a/app-vim/vim-spell-hu/vim-spell-hu-20100312-r1.ebuild
+++ b/app-vim/vim-spell-hu/vim-spell-hu-20100312-r1.ebuild
@@ -8,5 +8,5 @@ VIM_SPELL_LANGUAGE="Hungarian"
inherit vim-spell
LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-it/vim-spell-it-20100312-r1.ebuild b/app-vim/vim-spell-it/vim-spell-it-20100312-r1.ebuild
index 1e5f69c85126..b60a2329e26f 100644
--- a/app-vim/vim-spell-it/vim-spell-it-20100312-r1.ebuild
+++ b/app-vim/vim-spell-it/vim-spell-it-20100312-r1.ebuild
@@ -8,5 +8,5 @@ VIM_SPELL_LANGUAGE="Italian"
inherit vim-spell
LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-nl/vim-spell-nl-20051007-r1.ebuild b/app-vim/vim-spell-nl/vim-spell-nl-20051007-r1.ebuild
index 547bc298c077..f7606b3c7698 100644
--- a/app-vim/vim-spell-nl/vim-spell-nl-20051007-r1.ebuild
+++ b/app-vim/vim-spell-nl/vim-spell-nl-20051007-r1.ebuild
@@ -8,5 +8,5 @@ VIM_SPELL_LANGUAGE="Dutch"
inherit vim-spell
LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild b/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild
index bf345d5f5c8e..64a2e416337c 100644
--- a/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild
+++ b/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild
@@ -8,5 +8,5 @@ VIM_SPELL_LANGUAGE="Polish"
inherit vim-spell
LICENSE="CC-BY-SA-2.0"
-KEYWORDS="amd64 ppc sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-pt/vim-spell-pt-20100312-r1.ebuild b/app-vim/vim-spell-pt/vim-spell-pt-20100312-r1.ebuild
index bcc101de43e2..1f3bab60513f 100644
--- a/app-vim/vim-spell-pt/vim-spell-pt-20100312-r1.ebuild
+++ b/app-vim/vim-spell-pt/vim-spell-pt-20100312-r1.ebuild
@@ -8,5 +8,5 @@ VIM_SPELL_LANGUAGE="Portuguese"
inherit vim-spell
LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-ru/vim-spell-ru-20070506-r1.ebuild b/app-vim/vim-spell-ru/vim-spell-ru-20070506-r1.ebuild
index 3a4677c5d692..c0fdb3071a2a 100644
--- a/app-vim/vim-spell-ru/vim-spell-ru-20070506-r1.ebuild
+++ b/app-vim/vim-spell-ru/vim-spell-ru-20070506-r1.ebuild
@@ -8,5 +8,5 @@ VIM_SPELL_LANGUAGE="Russian"
inherit vim-spell
LICENSE="myspell-ru_RU-AlexanderLebedev"
-KEYWORDS="amd64 ppc sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index ba5bcb4821d0..82cc3f46994a 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/glog/glog-0.3.3-r1.ebuild b/dev-cpp/glog/glog-0.3.3-r1.ebuild
index 3b6207ec2075..667d65726491 100644
--- a/dev-cpp/glog/glog-0.3.3-r1.ebuild
+++ b/dev-cpp/glog/glog-0.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -16,10 +16,7 @@ IUSE="gflags static-libs unwind test"
RDEPEND="gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
unwind? ( sys-libs/libunwind )"
DEPEND="${RDEPEND}
- test? (
- >=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}]
- >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
- )"
+ test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
diff --git a/dev-cpp/glog/glog-0.3.4-r1.ebuild b/dev-cpp/glog/glog-0.3.4-r1.ebuild
index 522feb232f90..ad7b6587ddb3 100644
--- a/dev-cpp/glog/glog-0.3.4-r1.ebuild
+++ b/dev-cpp/glog/glog-0.3.4-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
@@ -18,10 +18,7 @@ RDEPEND="
gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
- test? (
- >=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}]
- >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
- )"
+ test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
PATCHES=(
"${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
diff --git a/dev-cpp/glog/glog-0.3.4.ebuild b/dev-cpp/glog/glog-0.3.4.ebuild
index a6e1d7719cb0..a6b6ee4e3fb4 100644
--- a/dev-cpp/glog/glog-0.3.4.ebuild
+++ b/dev-cpp/glog/glog-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -17,10 +17,7 @@ IUSE="gflags static-libs unwind test"
RDEPEND="gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
unwind? ( sys-libs/libunwind )"
DEPEND="${RDEPEND}
- test? (
- >=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}]
- >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
- )"
+ test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch
diff --git a/dev-cpp/mm-common/mm-common-0.9.12.ebuild b/dev-cpp/mm-common/mm-common-0.9.12.ebuild
index 0d93f4c19d26..5000f18771c2 100644
--- a/dev-cpp/mm-common/mm-common-0.9.12.ebuild
+++ b/dev-cpp/mm-common/mm-common-0.9.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
IUSE=""
RDEPEND=""
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 37d0ac20361e..7bd13b10a007 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index bde9a5cfebd8..1d790a63bd23 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -1,5 +1,3 @@
-DIST etcd-2.3.8.tar.gz 2206562 BLAKE2B 754930b4b5f0e90386b2b4765a9dbb6790ae509a81d3430c3f7c2c828d90318db3b01a2faea0c7075078096ce74302f2be7444245047534749f49d13a927851e SHA512 4268de32797cab23e9e47784d31d5abd6982068c53d3cc9735a06719740dba45b73f4e067cbc7aa8aef5ca7c56d8be067f1076685ac82f64012b760d8b7f2bfc
DIST etcd-3.2.17.tar.gz 3064774 BLAKE2B b111082f39dd428d40d8325dc5d1f3507fbd45c2fb12002f87d4a85c60e6d546042b6ae3ecda9e842e7d27b992a17b7899c1b871f25623651a455fd0758b690b SHA512 d526a1c96de04467f23ca112bcb502367f22fd8cbefe29667f097aa7fcec6fce78914c56b2e39fd0131b566803d715cb5fee5e335f9f3f4b86011d00232b5d0d
-DIST etcd-3.3.2.tar.gz 3385493 BLAKE2B e4c2e614b0b868268fbfe3db222caeab2fe65f8fe55026aadff2acc5f1a2769fe3a71f0658e90ca35ccf5b117e7ec30b1f8a62499b6156976dac63118a766b92 SHA512 6320a49dddac527312b75c113428c52c27e0516b7d7235ceddf3009c2edbdc509d2ec425859c5d57591b55109e04aa9737dbe7d1337a6c2307936fa372f8a28a
DIST etcd-3.3.3.tar.gz 3387223 BLAKE2B bf873ef764a4fa03c2c5b282129a2dc2e7574fd7d0206fb270d61c3a277342a2af145f4e00512c878a31d4102c0f8b0b7090872beb928b574aca97f5fe43915e SHA512 16597bba961d7018656dd4f73d4067218978cc41fa8fafbf9677621bdba2d5e81825d2c74820153a177df1813e5d8ac79e72967ba61be3339feb01bb2f539920
DIST etcd-3.3.4.tar.gz 3513132 BLAKE2B 92902c260150259ce5627dbf517c81bdb914c857a901a5f7d8d878a2daad8db931c2d1958a562a612ed62b5ac3080ce54661cb70eabff3430ab9ff65c258544d SHA512 971c47545059dda65d40c2db0928a01b97cf8b1e1b60a6e631e797e3cf1619245430f938f637bea3ab0d01cc2a8974586988727bc9c652b8802e184ad5ad8487
diff --git a/dev-db/etcd/etcd-2.3.8.ebuild b/dev-db/etcd/etcd-2.3.8.ebuild
deleted file mode 100644
index f20ed84c75b8..000000000000
--- a/dev-db/etcd/etcd-2.3.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user systemd
-
-KEYWORDS="~amd64"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd/"
-SRC_URI="https://github.com/coreos/etcd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.4:="
-RDEPEND="!dev-db/etcdctl"
-
-#pkg_setup() {
-# enewgroup ${PN}
-# enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-#}
-
-src_prepare() {
- sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
- -e 's|-ldflags "-s.*"|-v -x|' \
- -e 's|-ldflags "-s|-v -x "|' \
- -i build || die
- sed -e 's|go test|\0 -v|'\
- -i test || die
-}
-
-src_compile() {
- ./build || die
-}
-
-src_install() {
- insinto /etc/${PN}
- doins "${FILESDIR}/${PN}.conf"
- dobin bin/*
- dodoc README.md
- use doc && dodoc -r Documentation
- systemd_dounit "${FILESDIR}/${PN}.service"
- systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- dodir /var/lib/${PN}
- fowners ${PN}:${PN} /var/lib/${PN}
- fperms 755 /var/lib/${PN}
- dodir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
- fperms 755 /var/log/${PN}
-}
-
-src_test() {
- ./test || die
-}
diff --git a/dev-db/etcd/etcd-3.3.2.ebuild b/dev-db/etcd/etcd-3.3.2.ebuild
deleted file mode 100644
index 88b1e478fe0a..000000000000
--- a/dev-db/etcd/etcd-3.3.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/coreos/etcd"
-MY_PV="${PV/_rc/-rc.}"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc +server"
-DEPEND=">=dev-lang/go-1.9:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
- default
- sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
- -i "${S}"/src/${EGO_PN}/build || die
-}
-
-pkg_setup() {
- if use server; then
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- fi
-}
-
-src_compile() {
- export GOPATH=${S}
- pushd src/${EGO_PN} || die
- ./build || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/etcdctl
- use doc && dodoc -r Documentation
- if use server; then
- insinto /etc/${PN}
- doins "${FILESDIR}/${PN}.conf"
- dobin bin/etcd
- dodoc README.md
- systemd_dounit "${FILESDIR}/${PN}.service"
- systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- keepdir /var/lib/${PN}
- fowners ${PN}:${PN} /var/lib/${PN}
- fperms 0700 /var/lib/${PN}
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
- fperms 755 /var/log/${PN}
- fi
- popd || die
-}
-
-src_test() {
- pushd src/${EGO_PN} || die
- ./test || die
- popd || die
-}
diff --git a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch
new file mode 100644
index 000000000000..7237fbfc0f30
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch
@@ -0,0 +1,27 @@
+https://sqlite.org/src/info/893e6089c875e947
+
+--- /test/zipfile2.test
++++ /test/zipfile2.test
+@@ -52,17 +52,15 @@
+ CREATE VIRTUAL TABLE fff USING zipfile('test''zip');
+ }
+
+-if {$::tcl_platform(platform)=="windows"} {
+- set res {1 {cannot open file: testdir}}
+-} else {
+- set res {1 {error in fread()}}
+-}
+ do_test 2.0 {
+ forcedelete testdir
+ file mkdir testdir
+ execsql { CREATE VIRTUAL TABLE hhh USING zipfile('testdir') }
+- catchsql { SELECT * FROM hhh }
+-} $res
++ lindex [catchsql {
++ SELECT * FROM hhh;
++ INSERT INTO hhh(name, data) VALUES('1.txt', 'file data');
++ }] 0
++} 1
+
+
+ set archive {
diff --git a/dev-db/sqlite/sqlite-3.23.1.ebuild b/dev-db/sqlite/sqlite-3.23.1.ebuild
index 863c3cd57b6c..e9d92c71ec35 100644
--- a/dev-db/sqlite/sqlite-3.23.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.23.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
@@ -52,6 +52,7 @@ src_prepare() {
if full_archive; then
eapply "${FILESDIR}/${PN}-3.23.0-full_archive-build.patch"
eapply "${FILESDIR}/${PN}-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch"
+ eapply "${FILESDIR}/${PN}-3.23.1-full_archive-tests.patch"
eapply_user
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 086f22969b3f..13e9774856f3 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild b/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild
index ffb2b28b46c6..445816f1165a 100644
--- a/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.5.0_p20060502.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sdcc.sourceforge.net/snapshots/sdcc-src/${PN}-src-${MY_PV}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
IUSE="doc"
DEPEND=">=dev-embedded/gputils-0.13.2
diff --git a/dev-embedded/sdcc/sdcc-2.6.0.ebuild b/dev-embedded/sdcc/sdcc-2.6.0.ebuild
index d490da6133ee..6c7bae31cced 100644
--- a/dev-embedded/sdcc/sdcc-2.6.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.6.0.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="doc"
DEPEND=">=dev-embedded/gputils-0.13.2
diff --git a/dev-embedded/sdcc/sdcc-2.7.0.ebuild b/dev-embedded/sdcc/sdcc-2.7.0.ebuild
index 79185f92578c..8f20469a8deb 100644
--- a/dev-embedded/sdcc/sdcc-2.7.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.7.0.ebuild
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="doc"
DEPEND=">=dev-embedded/gputils-0.13.2
diff --git a/dev-embedded/sdcc/sdcc-2.8.0.ebuild b/dev-embedded/sdcc/sdcc-2.8.0.ebuild
index 772a0c0d2fc6..b453702c67f9 100644
--- a/dev-embedded/sdcc/sdcc-2.8.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="boehm-gc doc"
DEPEND=">=dev-embedded/gputils-0.13.2
diff --git a/dev-embedded/sdcc/sdcc-2.9.0.ebuild b/dev-embedded/sdcc/sdcc-2.9.0.ebuild
index 0c0cdc553a66..2a6ad593874e 100644
--- a/dev-embedded/sdcc/sdcc-2.9.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-2.9.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
else
SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="~amd64 ~x86"
docs_compile() { return 1; }
fi
diff --git a/dev-embedded/sdcc/sdcc-3.5.0.ebuild b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
index e3300256be1a..3379d7019c12 100644
--- a/dev-embedded/sdcc/sdcc-3.5.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
else
SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
- KEYWORDS="amd64 ~ppc x86"
+ KEYWORDS="amd64 x86"
docs_compile() { return 1; }
fi
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index fdc35714a019..e0d3b94b8ec6 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
else
SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
- KEYWORDS="~amd64 ~ppc ~x86"
+ KEYWORDS="~amd64 ~x86"
docs_compile() { return 1; }
fi
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index f63d7e2447c1..44fa4dfa16c4 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/ode/ode-0.11.1.ebuild b/dev-games/ode/ode-0.11.1.ebuild
index 710cd3dcdb97..b0af397fe523 100644
--- a/dev-games/ode/ode-0.11.1.ebuild
+++ b/dev-games/ode/ode-0.11.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/opende/${P}.tar.bz2"
LICENSE="|| ( LGPL-2.1 BSD )"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
IUSE="debug doc double-precision examples gyroscopic static-libs"
RDEPEND="examples? (
diff --git a/dev-games/ode/ode-0.12.ebuild b/dev-games/ode/ode-0.12.ebuild
index 3af95e61faeb..2a92674fd717 100644
--- a/dev-games/ode/ode-0.12.ebuild
+++ b/dev-games/ode/ode-0.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/opende/${P}.tar.bz2"
LICENSE="|| ( LGPL-2.1 BSD )"
SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="debug doc double-precision examples gyroscopic static-libs"
RDEPEND="examples? (
diff --git a/dev-games/ode/ode-0.14-r1.ebuild b/dev-games/ode/ode-0.14-r1.ebuild
index 75e9f439ec73..3f54e7ff25fc 100644
--- a/dev-games/ode/ode-0.14-r1.ebuild
+++ b/dev-games/ode/ode-0.14-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://bitbucket.org/odedevs/ode/downloads/${P}.tar.gz"
LICENSE="|| ( LGPL-2.1+ BSD )"
SLOT="0/6"
-KEYWORDS="amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="debug doc double-precision examples gyroscopic static-libs"
RDEPEND="examples? (
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f4d4c027e998..19d3f86c9783 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/ant/ant-1.9.2-r1.ebuild b/dev-java/ant/ant-1.9.2-r1.ebuild
index 8985d241e917..6f0a35eeecd3 100644
--- a/dev-java/ant/ant-1.9.2-r1.ebuild
+++ b/dev-java/ant/ant-1.9.2-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://ant.apache.org/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+jsch +log4j +oro +regexp +resolver testutil"
diff --git a/dev-java/bcpg/bcpg-1.50-r2.ebuild b/dev-java/bcpg/bcpg-1.50-r2.ebuild
new file mode 100644
index 000000000000..6a89f6e93494
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.50-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.50"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Appears to need older version of bcprov; but
+# since bcprov is not slotted, this can cause conflicts. Needs further
+# investigation; though, only a small part has tests and there are no tests for
+# bcpg itself.
+RESTRICT="test"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+
+src_unpack() {
+ default
+ cd "${S}" || die
+ unpack ./src.zip
+}
+
+src_prepare() {
+ default
+ if ! use test; then
+ local RM_TEST_FILES=(
+ org/bouncycastle/openpgp/test
+ org/bouncycastle/openpgp/examples/test
+ )
+ rm -rv "${RM_TEST_FILES[@]}" || die
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+}
+
+src_test() {
+ local cp="${PN}.jar:bcprov.jar:junit.jar"
+ local pkg="org.bouncycastle"
+ java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
+ grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+ einstalldocs
+ java-pkg-simple_src_install
+ use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcpg/bcpg-1.52-r2.ebuild b/dev-java/bcpg/bcpg-1.52-r2.ebuild
new file mode 100644
index 000000000000..a819a8dcd7e9
--- /dev/null
+++ b/dev-java/bcpg/bcpg-1.52-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15on-${PV/./}"
+
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://polydistortion.net/bc/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.52"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# Tests are currently broken. Appears to need older version of bcprov; but
+# since bcprov is not slotted, this can cause conflicts. Needs further
+# investigation; though, only a small part has tests and there are no tests for
+# bcpg itself.
+RESTRICT="test"
+
+CDEPEND="dev-java/bcprov:${SLOT}"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="bcprov-${SLOT}"
+
+src_unpack() {
+ default
+ cd "${S}" || die
+ unpack ./src.zip
+}
+
+src_prepare() {
+ default
+ if ! use test; then
+ local RM_TEST_FILES=(
+ org/bouncycastle/openpgp/test
+ org/bouncycastle/openpgp/examples/test
+ )
+ rm -rv "${RM_TEST_FILES[@]}" || die
+ fi
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+}
+
+src_test() {
+ local cp="${PN}.jar:bcprov.jar:junit.jar"
+ local pkg="org.bouncycastle"
+ java -cp ${cp} ${pkg}.openpgp.test.AllTests | tee openpgp.tests
+ grep -q FAILURES *.tests && die "Tests failed."
+}
+
+src_install() {
+ einstalldocs
+ java-pkg-simple_src_install
+ use source && java-pkg_dosrc org
+}
diff --git a/dev-java/boilerpipe/metadata.xml b/dev-java/boilerpipe/metadata.xml
index 010ffb802f85..07ba689dd861 100644
--- a/dev-java/boilerpipe/metadata.xml
+++ b/dev-java/boilerpipe/metadata.xml
@@ -1,10 +1,7 @@
-
- ercpe@gentoo.org
- Johann Schmitz (ercpe)
-
+
kohlschutter/boilerpipe
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
index 465018f8f624..9229206c5f76 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.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
@@ -39,9 +39,9 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
DEPEND="app-arch/zip
gtk? (
+ x11-base/xorg-proto
x11-libs/libXrender
>=x11-libs/libXtst-1.1.0
- x11-proto/xproto
)
>=virtual/jdk-1.5
${RDEPEND}"
diff --git a/dev-java/icedtea/icedtea-3.7.0.ebuild b/dev-java/icedtea/icedtea-3.7.0.ebuild
index be3cb438b0bc..8605d13cd9d0 100644
--- a/dev-java/icedtea/icedtea-3.7.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.7.0.ebuild
@@ -86,13 +86,10 @@ X_COMMON_DEP="
>=x11-libs/libXtst-1.0.3
x11-libs/libXcomposite"
X_DEPEND="
+ x11-base/xorg-proto
>=x11-libs/libXau-1.0.3
>=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXinerama-1.0.2
- x11-proto/inputproto
- >=x11-proto/xextproto-7.1.1
- x11-proto/xineramaproto
- x11-proto/xproto"
+ >=x11-libs/libXinerama-1.0.2"
# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
COMMON_DEP="
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index 38277ec68fdc..69caaa7038e5 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1 +1,2 @@
+DIST json-simple-1.1.tar.gz 22154 BLAKE2B 594717df45d56b4e70cee9aadca661a9da7e19c2a77e5ab2176396c48bdf061f25db0e4cbf5b93b12dc862dfca593a71dcd154f24c914a4d2ff510e3f4b11570 SHA512 f09cb298254a8f35b534670d6a1801eeaf58385529f459f413aed556df1ac577bea6e678a32065077abc851dc310b3af38b818f1737bd255f05e756d7e2da066
DIST json_simple-1.1-all.zip 44814 BLAKE2B 09a1bf3213c6724d167a514c47e9a4084c217687633f075d0a1019be253d3b37e1a26c7e291570f73a5942c5d7e586d4a8ce78e938e755cb3d8150f82dd0306d SHA512 02a5300456dbe2a1b5331b247ad964237d11d2281b35351f1f7bed6867eaf5bb6fb07ca1a50f87e30cd93221c5119e8b5f6f273357ab5fcfeda164ec119c0404
diff --git a/dev-java/json-simple/json-simple-1.1-r1.ebuild b/dev-java/json-simple/json-simple-1.1-r1.ebuild
new file mode 100644
index 000000000000..a91c4fbc828d
--- /dev/null
+++ b/dev-java/json-simple/json-simple-1.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="tag_release_1_1_1"
+
+DESCRIPTION="Simple Java toolkit for JSON"
+HOMEPAGE="http://www.json.org"
+SRC_URI="https://github.com/fangyidong/json-simple/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+JAVA_SRC_DIR="src/main"
+
+src_prepare() {
+ default
+ rm -rv src/test || die
+}
diff --git a/dev-java/lucene/lucene-3.5.0-r2.ebuild b/dev-java/lucene/lucene-3.5.0-r2.ebuild
index a5b2c1d755bf..6d0031e124b3 100644
--- a/dev-java/lucene/lucene-3.5.0-r2.ebuild
+++ b/dev-java/lucene/lucene-3.5.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
LICENSE="Apache-2.0"
SLOT="3.5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
CDEPEND="
dev-java/junit:4
diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
index 00ad0d23efec..091821750c1b 100644
--- a/dev-java/lucene/lucene-3.6.2-r2.ebuild
+++ b/dev-java/lucene/lucene-3.6.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
LICENSE="Apache-2.0"
SLOT="3.6"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
CDEPEND="
dev-java/ant-ivy:2
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 5efd9b3e0b91..b000a981e8e7 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,17 +1,3 @@
-DIST jdk-8u162-linux-arm32-vfp-hflt-demos.tar.gz 10432598 BLAKE2B 49e8ac44c52b41851ccc96d41f77eddc92304e0ebb7b62da6bf393d73aadbd94e67d92b87bd13f7a2ccdedfbc0fc7c6ef7dd5cd2595860ee8d1776dad308e341 SHA512 00576347ec158f4f996db1aface6067b7df99a9e125bb2c22980b11ab84660cd2a3997d9519db3302fa31cbaaf98c01c5b3967b51daa5469926ca48037ef60e0
-DIST jdk-8u162-linux-arm32-vfp-hflt.tar.gz 81719419 BLAKE2B be6bd2ec7114e313e6abbd040aa9b29fe415cc15ce93b5c6fa350b0964faa7a1a3c0882c303596156065f9ea79a08bf8542757c5a8a16170d31f9cee5d7dd426 SHA512 86b835c388010f2bafd05114813ab84b4cd13334244891e9a65ae140fb65c9ad4436380043255fab36d44a91df9210ffe0858d89e48fc4efe2e460ae62928134
-DIST jdk-8u162-linux-arm64-vfp-hflt-demos.tar.gz 10434399 BLAKE2B 528476df75ec63acbe66dc58aad87e21633f34407e147352d048e76cc48c34afccf3d407229dd95ebd51bf2b5864d5b2626ddbd4a6b0d07142ce290fad58e786 SHA512 4ac7f4485c7290321221874fcac695cc47199e7ef76a0270a2d4b381bf42311a2d3dc0d325c1a50cbc0e79a82f9b876f5481a717425a7919d53e97b11d3f0a29
-DIST jdk-8u162-linux-arm64-vfp-hflt.tar.gz 78519170 BLAKE2B f8c083aba14ed5a7d70ab5c7eaaba7854a55c467608f38eec389489cbfae0a3abca3a2c9297a100eef7328c5e1d78f751dbbb11947a191fde94a428ca9e7737b SHA512 f713b174193abcf5a7cdbef2ff75a77c953f3369cdd9dd80a3633e9024c1386bed10d3889bb1ea0617ae5764fee7e70cf487c6a1a4c8c46dc92c2e27704b0d9d
-DIST jdk-8u162-linux-i586-demos.tar.gz 55100252 BLAKE2B 437dcb25306fedfda9fbda12533790d4df6b3be999ee5dafc2012e5277abc2736856f0ca028827420ff4b9aba920d8bc3f6933ead0e80e03c055e43fb7f1db71 SHA512 a867c08716874646e8073a1850f40d46f2d7b8bb1fa37ced7e95c11852ae169011fa8364055d07437cc1750974a984150eed8171b13d3bff03460cdea4b1567f
-DIST jdk-8u162-linux-i586.tar.gz 192733880 BLAKE2B e4e00ff4ca48c9de65ba7493fbd9f9ba04304d03dfb67f0130db977d2a3f244b22b6092115345e701ed60fa56e3cfc3787a6292ba29d46a082ff8205809793ad SHA512 f6b84e3fbfe741851e109908b394dd65e68e1214a049f47754dc88f4c223d217e597f7c6a6f34c94fb8fa9d78be59861475612289269b34789223519badb0a2f
-DIST jdk-8u162-linux-x64-demos.tar.gz 55164558 BLAKE2B a442bb0b9e75a61952ac8f588eef3d66f5bfe987cef982a621e12dc65e487cd49c95b9a92a5595d2d03337a07fb9d2cc4e0afbd0a041614a15a87751be525966 SHA512 a24668b4e2acb493e73ab4e0e1c8c2b60650675fe424c113514771e7ab6464bb40e839ff5b37c8e0019624160d7d3aacfc30c0049b851f34be816e13ea861db9
-DIST jdk-8u162-linux-x64.tar.gz 189815615 BLAKE2B ae4f9cac86aab3dfd528f9e8930bfecdb42fbeea8a6394c9589303766d47127083cff13567927125756c4ea174d7ee338da115266d01a3613380333022a65101 SHA512 55349e0400f2fa77144af1977b7487f38631a404b23411a294f3ab55c2190fd3db1447fe788490834a03c2093421e06ed3e2db8434f8c4f417f58763881402f6
-DIST jdk-8u162-macosx-x64.dmg 259123815 BLAKE2B 6c41876e7b9e54bbb7c14563f98825d6f41ea0cf30fbd914b4e75622f772c554a62d97b5e13f441de92428d945e985d3c32cbb285a85d5ae2ca15ff3883c97d9 SHA512 2c03129c5334ae7471a15722e70b872a3d8450d400b56333e42a663de71409b30161cd86764c8b9af7f0d49ef613ceac7d1507d821a84fb8544e53695ae6ea29
-DIST jdk-8u162-macosx-x86_64-demos.zip 55705634 BLAKE2B 088884279396ff53b69721ba8f3870a67b6d846c94d7a21e713e270f31a6366d5b1b00f371d334da264824c33ad33a1b146890888074e09af31060e8e3cac011 SHA512 939da23bc935a7c089dce9f7fcf87f4df8be911282a4a7fca6cb8b9325cdbc85632721ee596dc2f4014c81ab5d9e18a56369b46bf7ed2547dfac553a6962c1fd
-DIST jdk-8u162-solaris-sparcv9-demos.tar.gz 9799694 BLAKE2B e6812e0771cfde50ccb2623e645a114d668812656d4dc151a14f952a93f70dcbd7325c691637979eda95f2cc7892dd0e4ad75605eb72b2bdda4e1ea2bb2f9011 SHA512 b4d1a410b68b48eab66cab179274cf03f8dda1c49f155eb31bf6a91640f5ae4a9f750591d3d7327221c47d27e9fc6adc793414d1b63e404d5eb08cad2fac424b
-DIST jdk-8u162-solaris-sparcv9.tar.gz 104118900 BLAKE2B 8aa9e54e1cc189517caab4b799d2a0cb2ad8f5a5796058cb18bcdca0dd03b1dbfe927a88cb7bc257c79412a0a2594762e083e1979ee4fd21662f152c79b6b445 SHA512 10249be011c526ee707dfc1f293351d60892b64f1b9160b70583d94b17989e6705a69d6502b477a960b7826cadbb214e52aae3ce36aa4bcb3b6ddf8d06fb90eb
-DIST jdk-8u162-solaris-x64-demos.tar.gz 9752263 BLAKE2B 50e28f56df39b355587fc5894edb065eca115ef6f71c9afcef0c2640b9cd2dc8df9bb315a85219dbce96a59ab24304b429f0c756548b7a9fe26155f50916a11a SHA512 173c887650fa92f5c515fe5f7973c488301253344161ede7b1003a7fae0b5404c81fe450235c485846cb262ae82684500e249ac134f248889bea9ad05048cc1c
-DIST jdk-8u162-solaris-x64.tar.gz 101741152 BLAKE2B 9e01659aa83b11b20e47842b7ef5c23b3e376540023d92a1e2350083037d45872cb15138fcd37ad62ea05ed5d47a716b0c8dc792f415ecd18ada6ed9b075aea4 SHA512 9755a4b9af4b5aa7e904748e5d627ebffb2ff290748d28aac9b494b372815a6ca3ee219c140ed43698a341f495ccffe5f9cae3bea0ad94e1e14fefa84d287783
DIST jdk-8u172-linux-arm32-vfp-hflt-demos.tar.gz 10423820 BLAKE2B af3c7edab4e0bd3c785914292ac227138af25a948fa580ab466937f169806254bc12476dd1b4b320ce4997f52d41ab4851a7c82c47f33bbd3080cc49c1f8d091 SHA512 8b18204d5bfb8545db71e7b3f5f6fd6d67077116a32c6cf33cbe192a88c768a97082dbd62a436b2c75f45b3d5aac8974f8bf653dd3902121f4881193dff226cb
DIST jdk-8u172-linux-arm32-vfp-hflt.tar.gz 81781271 BLAKE2B cf69c1964126e6f79324ac5aaca552f6984925a5e2cd1dce8417a6c61792dba908e0cd92127405f8f10fafd2b7b6a33e76d5a4f766e72fe8bc928ffa9612c9e7 SHA512 451b1b4875775ee40c8b9260f1d6437d8f5d14ba12b578eb4bc855a04d061c5dc7a320b9ab962c8f26d9a73c8975122cd31c412b44654dd07e47de8a024f88fd
DIST jdk-8u172-linux-arm64-vfp-hflt-demos.tar.gz 10438462 BLAKE2B f72f2360b75d35443b5845669cb48d517591ad870253c6ae2a7fc341bcf12f86351125691f973f6cebb6a286d1f1763a93f38e238a00eb3562676cfcdff8b026 SHA512 91cfc64aed933c6760dd32b07609fe27edf13c7974e9ed6e5e9c3eddf47416ed97caec525a028ecdd8cf70d20d8fc2655c250befff9c37f38cba9e338d4c56d8
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
deleted file mode 100644
index f71907bd1d48..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162-r1.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils java-vm-2 prefix versionator
-
-KEYWORDS="-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
- S_PV="$(get_version_component_range 1-3)"
-else
- MY_PV_EXT="u$(get_version_component_range 4)"
- S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-declare -A ARCH_FILES
-ARCH_FILES[amd64]="jdk-${MY_PV}-linux-x64.tar.gz"
-ARCH_FILES[arm]="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
-ARCH_FILES[arm64]="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
-ARCH_FILES[x86]="jdk-${MY_PV}-linux-i586.tar.gz"
-ARCH_FILES[x64-macos]="jdk-${MY_PV}-macosx-x64.dmg"
-ARCH_FILES[sparc64-solaris]="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-ARCH_FILES[x64-solaris]="jdk-${MY_PV}-solaris-x64.tar.gz"
-
-for keyword in ${KEYWORDS//-\*} ; do
- case "${keyword#\~}" in
- *-linux) continue ;;
- x64-macos) demo="jdk-${MY_PV}-macosx-x86_64-demos.zip" ;;
- *) demo=${ARCH_FILES[${keyword#\~}]/./-demos.} ;;
- esac
-
- SRC_URI+="
- ${keyword#\~}? (
- ${ARCH_FILES[${keyword#\~}]}
- examples? ( ${demo} )
- )"
-done
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.8"
-IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
-REQUIRED_USE="javafx? ( alsa fontconfig )"
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-# important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-# under MacOS. It doesn't appear to use many, if any, of the
-# dependencies below.
-#
-RDEPEND="!x64-macos? (
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )
- javafx? (
- dev-libs/glib:2
- dev-libs/libxml2:2
- dev-libs/libxslt
- media-libs/freetype:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/libXxf86vm
- x11-libs/pango
- virtual/opengl
- )
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- doc? ( dev-java/java-sdk-docs:${SLOT} )
- fontconfig? ( media-libs/fontconfig:1.0 )
- !prefix? ( sys-libs/glibc:* )
- selinux? ( sec-policy/selinux-java )"
-
-DEPEND="app-arch/zip
- examples? ( x64-macos? ( app-arch/unzip ) )"
-
-S="${WORKDIR}/jdk$(replace_version_separator 3 _ ${S_PV})"
-
-pkg_nofetch() {
- local a
- einfo "Please download these files and move them to your distfiles directory:"
- einfo
- for a in ${A} ; do
- [[ ! -f ${DISTDIR}/${a} ]] && einfo " ${a}"
- done
- einfo
- einfo " http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
- einfo
- einfo "If the above mentioned URL does not point to the correct version anymore,"
- einfo "please download the file from Oracle's Java download archive:"
- einfo
- einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
- einfo
-}
-
-src_unpack() {
- if use x64-macos ; then
- mkdir -p "${T}"/dmgmount || die
- hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
- -mountpoint "${T}"/dmgmount || die
- local jdkgen=$(get_version_component_range 2)
- local uver=$(get_version_component_range 4)
- ( cd "${T}" &&
- xar -xf "${T}/dmgmount/JDK ${jdkgen} Update ${uver}.pkg" \
- jdk${PV//.}.pkg/Payload ) || die
- zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
- hdiutil detach "${T}"/dmgmount || die
- mv Contents/Home "${S}" || die
- fi
-
- default
-}
-
-src_prepare() {
- default
-
- if [[ -n ${JAVA_PKG_STRICT} ]] ; then
- # Mark this binary early to run it now.
- pax-mark m ./bin/javap
-
- eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
- eqawarn
- eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
- fi
-
- # Remove the hook that calls Oracle's evil usage tracker. Not just
- # because it's evil but because it breaks the sandbox during builds
- # and we can't find any other feasible way to disable it or make it
- # write somewhere else. See bug #559936 for details.
- zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}${dest#/}"
-
- # Create files used as storage for system preferences.
- mkdir jre/.systemPrefs || die
- touch jre/.systemPrefs/.system.lock || die
- touch jre/.systemPrefs/.systemRootModFile || die
-
- if ! use alsa ; then
- rm -vf jre/lib/*/libjsoundalsa.* || die
- fi
-
- if ! use commercial ; then
- rm -vfr lib/missioncontrol jre/lib/jfr* || die
- fi
-
- if use headless-awt ; then
- rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
- {,jre/}bin/{javaws,policytool} \
- bin/appletviewer || die
- fi
-
- if ! use javafx ; then
- rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
- jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
- bin/*javafx* bin/javapackager || die
- fi
-
- if ! use nsplugin ; then
- rm -vf jre/lib/*/libnpjp2.* || die
- else
- local nsplugin=$(echo jre/lib/*/libnpjp2.*)
- local nsplugin_link=${nsplugin##*/}
- nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
- dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
- fi
-
- # Even though plugins linked against multiple ffmpeg versions are
- # provided, they generally lag behind what Gentoo has available.
- rm -vf jre/lib/*/libavplugin* || die
-
- # Prune all fontconfig files so that libfontconfig will be used.
- rm -v jre/lib/fontconfig.* || die
-
- # Packaged as dev-util/visualvm but some users prefer this version.
- use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
-
- # Install desktop file for the Java Control Panel. Using
- # ${PN}-${SLOT} to prevent file collision with JRE and other slots.
- if [[ -d jre/lib/desktop/icons ]] ; then
- local icon
- pushd jre/lib/desktop/icons >/dev/null || die
- for icon in */*/apps/sun-jcontrol.png ; do
- insinto /usr/share/icons/"${icon%/*}"
- newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
- done
- popd >/dev/null || die
- make_desktop_entry \
- "${dest}"/bin/jcontrol \
- "Java Control Panel for Oracle JDK ${SLOT}" \
- sun-jcontrol-${PN}-${SLOT} \
- "Settings;Java;"
- fi
-
- dodoc COPYRIGHT
- dodir "${dest}"
- cp -pPR bin include jre lib man "${ddest}" || die
-
- if use derby ; then
- cp -pPR db "${ddest}" || die
- fi
-
- if use examples && [[ ${A} = *-demos.* ]] ; then
- cp -pPR demo sample "${ddest}" || die
- fi
-
- ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
- "${ddest}"/jre/lib/security/ || die
-
- if use source ; then
- cp -v src.zip "${ddest}" || die
-
- if use javafx ; then
- cp -v javafx-src.zip "${ddest}" || die
- fi
- fi
-
- # Only install Gentoo-specific fontconfig if flag is disabled.
- # https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
- if ! use fontconfig ; then
- insinto "${dest}"/jre/lib/
- doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
- fi
-
- # Needs to be done before CDS, bug #215225.
- java-vm_set-pax-markings "${ddest}"
-
- # See bug #207282.
- einfo "Creating the Class Data Sharing archives"
- case ${ARCH} in
- arm|ia64)
- ${ddest}/bin/java -client -Xshare:dump || die
- ;;
- x86)
- ${ddest}/bin/java -client -Xshare:dump || die
- # limit heap size for large memory on x86 #467518
- # this is a workaround and shouldn't be needed.
- ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
- ;;
- *)
- ${ddest}/bin/java -server -Xshare:dump || die
- ;;
- esac
-
- # Remove empty dirs we might have copied.
- find "${D}" -type d -empty -exec rmdir -v {} + || die
-
- if use x64-macos ; then
- local lib
- for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
- ebegin "Fixing self-reference of ${lib}"
- install_name_tool \
- -id "${EPREFIX}${dest}"/jre/lib/${lib} \
- "${ddest}"/jre/lib/${lib} || die
- eend $?
- done
- fi
-
- java-vm_install-env "${FILESDIR}"/${PN}.env.sh
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- java-vm-2_pkg_postinst
-
- if ! use headless-awt && ! use javafx ; then
- ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
- ewarn "require this and they may fail with a confusing error message."
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- java-vm-2_pkg_postrm
-}
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index fd6d01b978d0..662c931f0b1c 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,5 +1,3 @@
-DIST jre-8u162-linux-i586.tar.gz 83185844 BLAKE2B 0739e0e272e19560554976d993d229e0bfd6df11389f6dc8e8292717620fdb8e2786128890667375b5399f96d696ec7fb2ac2369d1edea82753d8c6e659c0aeb SHA512 154af4397163c68266e963280bdc4794ca088e207f9426213035e06bbfc4f024ec5c20c89d8d58323e56ace6af4e89d2f08a80fd436c70fc712ed0401772d213
-DIST jre-8u162-linux-x64.tar.gz 80107578 BLAKE2B 28b86729414cfd58290b01990a57b7a87cba1b4ff6361df45988433b90b6c29878abe120c6b90e6c31cbd306960bb75139ea054544f109d863cdad723fd4f0fb SHA512 dbda4346d76925f47ffd288fe9ad21cb2235f55da380945d6cfed8d94322ba97cf8832d3d328f0622c6175620f1682b93e9e380403db3f2d4804062fb7832e66
DIST jre-8u172-linux-i586.tar.gz 84306480 BLAKE2B c5763bf5631a5ac246e5bbb6eaec98bac59ece15a9779c2861b474584bc86caafa333575d03fe875c3fcd3c47cbb506b905c274bf2b621f810846411b7619d5d SHA512 a4773fe39b69f22e6a646cd6b8ebdf189252e5b686f4000e43fc418ef133ac1b3e24374693c41eed5b3063849f33bbbf70a3ffe04c52ef9b1b8ac1b8d1d0dd22
DIST jre-8u172-linux-x64.tar.gz 81182269 BLAKE2B f9c7afc534cc9e8c60458a58a768692ee95cb9401c238974daeb4ada5aa26b45f7a0de2b1785de77fb85ceaefc717b49cf08238f31032437bb620343cd468c30 SHA512 e113138946eb95fb2c9ea8bdc5ca4b8d0c3e9ae35baaf12a04c0f5a0c9af390f181d2e39fa1c71eb8c91d734a944c9239fdc10dcfc9b8a19829dad24dd35447f
DIST jre-9.0.4_linux-x64_bin.tar.gz 87045353 BLAKE2B ccf3c0d725ca1431261a0b38cc06851fc10651415982fa2d97f512972c088c2c158ee51710b59e04f89326dd4cbb4c1ef8ecf514af190fbdc2be07cd222fd5d8 SHA512 20310fe68c89d26a89523eb1fe583eb5706fe2458342f5be0dfb4badd1d9df6ba25b00463f080fceb7c22781ff1555a61b29d187d8b02e1f9e165120b8140c3b
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162-r1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162-r1.ebuild
deleted file mode 100644
index ca2117f3c69b..000000000000
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.162-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils java-vm-2 prefix versionator
-
-KEYWORDS="-* amd64 x86"
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
- S_PV="$(get_version_component_range 1-3)"
-else
- MY_PV_EXT="u$(get_version_component_range 4)"
- S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-declare -A ARCH_FILES
-ARCH_FILES[amd64]="jre-${MY_PV}-linux-x64.tar.gz"
-ARCH_FILES[x86]="jre-${MY_PV}-linux-i586.tar.gz"
-
-for keyword in ${KEYWORDS//-\*} ; do
- SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
-done
-
-DESCRIPTION="Oracle's Java SE Runtime Environment"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-LICENSE="Oracle-BCLA-JavaSE"
-SLOT="1.8"
-IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-# important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-# under MacOS. It doesn't appear to use many, if any, of the
-# dependencies below.
-#
-RDEPEND="!x64-macos? (
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )
- javafx? (
- dev-libs/glib:2
- dev-libs/libxml2:2
- dev-libs/libxslt
- media-libs/freetype:2
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/libXxf86vm
- x11-libs/pango
- virtual/opengl
- )
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- fontconfig? ( media-libs/fontconfig:1.0 )
- !prefix? ( sys-libs/glibc:* )
- selinux? ( sec-policy/selinux-java )"
-
-DEPEND="app-arch/zip"
-
-S="${WORKDIR}/jre$(replace_version_separator 3 _ ${S_PV})"
-
-pkg_nofetch() {
- einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
- einfo "your distfiles directory:"
- einfo
- einfo " http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
- einfo
- einfo "If the above mentioned URL does not point to the correct version anymore,"
- einfo "please download the file from Oracle's Java download archive:"
- einfo
- einfo " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html"
- einfo
-}
-
-src_prepare() {
- default
-
- # Remove the hook that calls Oracle's evil usage tracker. Not just
- # because it's evil but because it breaks the sandbox during builds
- # and we can't find any other feasible way to disable it or make it
- # write somewhere else. See bug #559936 for details.
- zip -d lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}${dest#/}"
-
- # Create files used as storage for system preferences.
- mkdir .systemPrefs || die
- touch .systemPrefs/.system.lock || die
- touch .systemPrefs/.systemRootModFile || die
-
- if ! use alsa ; then
- rm -vf lib/*/libjsoundalsa.* || die
- fi
-
- if ! use commercial ; then
- rm -vfr lib/jfr* || die
- fi
-
- if use headless-awt ; then
- rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
- bin/{javaws,policytool} || die
- fi
-
- if ! use javafx ; then
- rm -vf lib/*/lib*{decora,fx,glass,prism}* \
- lib/*/libgstreamer-lite.* lib/{,ext/}*fx* || die
- fi
-
- if ! use nsplugin ; then
- rm -vf lib/*/libnpjp2.* || die
- else
- local nsplugin=$(echo lib/*/libnpjp2.*)
- local nsplugin_link=${nsplugin##*/}
- nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
- dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
- fi
-
- # Even though plugins linked against multiple ffmpeg versions are
- # provided, they generally lag behind what Gentoo has available.
- rm -vf lib/*/libavplugin* || die
-
- # Prune all fontconfig files so that libfontconfig will be used.
- rm -v lib/fontconfig.* || die
-
- # Install desktop file for the Java Control Panel. Using
- # ${PN}-${SLOT} to prevent file collision with JDK and other slots.
- if [[ -d lib/desktop/icons ]] ; then
- local icon
- pushd lib/desktop/icons >/dev/null || die
- for icon in */*/apps/sun-jcontrol.png ; do
- insinto /usr/share/icons/"${icon%/*}"
- newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
- done
- popd >/dev/null || die
- make_desktop_entry \
- "${dest}"/bin/jcontrol \
- "Java Control Panel for Oracle JRE ${SLOT}" \
- sun-jcontrol-${PN}-${SLOT} \
- "Settings;Java;"
- fi
-
- dodoc COPYRIGHT
- dodir "${dest}"
- cp -pPR bin lib man "${ddest}" || die
-
- ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
- "${ddest}"/lib/security/ || die
-
- # Only install Gentoo-specific fontconfig if flag is disabled.
- # https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
- if ! use fontconfig ; then
- insinto "${dest}"/lib/
- doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
- fi
-
- # Needs to be done before CDS, bug #215225.
- java-vm_set-pax-markings "${ddest}"
-
- # See bug #207282.
- einfo "Creating the Class Data Sharing archives"
- case ${ARCH} in
- arm|ia64)
- ${ddest}/bin/java -client -Xshare:dump || die
- ;;
- x86)
- ${ddest}/bin/java -client -Xshare:dump || die
- # limit heap size for large memory on x86 #467518
- # this is a workaround and shouldn't be needed.
- ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
- ;;
- *)
- ${ddest}/bin/java -server -Xshare:dump || die
- ;;
- esac
-
- # Remove empty dirs we might have copied.
- find "${D}" -type d -empty -exec rmdir -v {} + || die
-
- java-vm_install-env "${FILESDIR}"/${PN}.env.sh
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- java-vm-2_pkg_postinst
-
- if ! use headless-awt && ! use javafx ; then
- ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
- ewarn "require this and they may fail with a confusing error message."
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- java-vm-2_pkg_postrm
-}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 60c0da17d4af..aa6d99043ce0 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,7 +1,3 @@
-DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 BLAKE2B 44c6d0e42e92a822230b41fa732b58816d18e92e8466a59bb21de98cbb6cb3bcf6db29a7c5842ff8c754231c44626a95fd768f514f49bbb2ffc098618c7a50a2 SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b
-DIST protobuf-3.0.2.tar.gz 3917853 BLAKE2B 542beb7b16de0da2cdc6f7981381b6de1ff2c01f229005727a74b4e5ff16db3f44e91c026eed323ccb1a2a2b3f834afa3686df80ff5f90d54f5f030cbaf601cf SHA512 28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2
-DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f62b01a694d37c0b069956ef5d658df1beef68514b00a22005a36293b4a8a18654b5656f8c614309f0a744039c2fb SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a
-DIST protobuf-3.3.0.tar.gz 4336596 BLAKE2B 381b2961fe1de8a86225903d0cfe4c98c238336b8782e5191c57c6fcf60cf321f39163d50864bf9c119a90bd7796269dc7e34168a158f7affa7fa295ce5deae0 SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636
DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
diff --git a/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild b/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
deleted file mode 100644
index 605460511993..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-pkg-simple
-
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10b3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="nano"
-
-# Protobuf is only a build-time dep, but depend on the exact same version
-# (excluding revision), since we are using the same tarball.
-# But probably same subslot is sufficient.
-DEPEND=">=virtual/jdk-1.7
- >=dev-libs/protobuf-3"
-RDEPEND=">=virtual/jre-1.7
- !/dev/null || die
- einfo "Compiling Java library ..."
- /usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- JAVA_JAR_FILENAME="protobuf.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- if use nano; then
- einfo "Compiling Java Nano library ..."
- pushd "${S}/javanano" >/dev/null || die
- /usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/javanano/src/main/java"
- JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
- JAVA_JAR_FILENAME="protobuf-nano.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- fi
-}
-
-src_install() {
- JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- if use nano; then
- JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
- JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
- fi
- mv "${S}/java/target" . || die
- if use nano; then
- cp -Rvf "${S}/javanano/target" . || die
- fi
- java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
deleted file mode 100644
index f774a37f4ff3..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="nano"
-
-# Protobuf is only a build-time dep, but depends on the exact same version
-# (excluding revision), since we are using the same tarball.
-# But probably same subslot is sufficient.
-DEPEND=">=virtual/jdk-1.7
- >=dev-libs/protobuf-3"
-
-RDEPEND=">=virtual/jre-1.7
- !/dev/null || die
- einfo "Compiling Java library ..."
- "${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- JAVA_JAR_FILENAME="protobuf.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- if use nano; then
- einfo "Compiling Java Nano library ..."
- pushd "${S}/javanano" >/dev/null || die
- "${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/javanano/src/main/java"
- JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
- JAVA_JAR_FILENAME="protobuf-nano.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- fi
-}
-
-src_install() {
- JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- if use nano; then
- JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
- JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
- fi
- mv "${S}/java/target" . || die
- if use nano; then
- cp -Rvf "${S}/javanano/target" . || die
- fi
- java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
deleted file mode 100644
index 567e5a226588..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/11"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="nano"
-
-# Protobuf is only a build-time dep, but depends on the exact same version
-# (excluding revision), since we are using the same tarball.
-# But probably same subslot is sufficient.
-DEPEND=">=virtual/jdk-1.7
- >=dev-libs/protobuf-3"
-
-RDEPEND=">=virtual/jre-1.7
- !/dev/null || die
- einfo "Compiling Java library ..."
- "${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- JAVA_JAR_FILENAME="protobuf.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- if use nano; then
- einfo "Compiling Java Nano library ..."
- pushd "${S}/javanano" >/dev/null || die
- "${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/javanano/src/main/java"
- JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
- JAVA_JAR_FILENAME="protobuf-nano.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- fi
-}
-
-src_install() {
- JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- if use nano; then
- JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
- JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
- fi
- mv "${S}/java/target" . || die
- if use nano; then
- cp -Rvf "${S}/javanano/target" . || die
- fi
- java-pkg-simple_src_install
-}
diff --git a/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild b/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild
deleted file mode 100644
index 31b8a5d0896a..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.3.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/13"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="nano"
-
-# Protobuf is only a build-time dep, but depends on the exact same version
-# (excluding revision), since we are using the same tarball.
-# But probably same subslot is sufficient.
-DEPEND=">=virtual/jdk-1.7
- ~dev-libs/protobuf-${PV}"
-
-RDEPEND=">=virtual/jre-1.7
- !/dev/null || die
- einfo "Compiling Java library ..."
- "${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- JAVA_JAR_FILENAME="protobuf.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- if use nano; then
- einfo "Compiling Java Nano library ..."
- pushd "${S}/javanano" >/dev/null || die
- "${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
- JAVA_SRC_DIR="${S}/javanano/src/main/java"
- JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
- JAVA_JAR_FILENAME="protobuf-nano.jar"
- java-pkg-simple_src_compile
- popd >/dev/null || die
- fi
-}
-
-src_install() {
- JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
- JAVA_SRC_DIR="${S}/java/core/src/main/java"
- if use nano; then
- JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
- JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
- fi
- mv "${S}/java/target" . || die
- if use nano; then
- cp -Rvf "${S}/javanano/target" . || die
- fi
- java-pkg-simple_src_install
-}
diff --git a/dev-java/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r2.ebuild
index 63f3c11299f2..aa38b1de0654 100644
--- a/dev-java/swt/swt-3.7.2-r2.ebuild
+++ b/dev-java/swt/swt-3.7.2-r2.ebuild
@@ -40,11 +40,11 @@ COMMON=">=dev-libs/glib-2.6
DEPEND=">=virtual/jdk-1.4
app-arch/unzip
+ x11-base/xorg-proto
x11-libs/libX11
x11-libs/libXrender
x11-libs/libXt
>=x11-libs/libXtst-1.1.0
- x11-proto/inputproto
virtual/pkgconfig
${COMMON}"
diff --git a/dev-java/swt/swt-3.8.2-r2.ebuild b/dev-java/swt/swt-3.8.2-r2.ebuild
index 72289d111711..64b28cc018f3 100644
--- a/dev-java/swt/swt-3.8.2-r2.ebuild
+++ b/dev-java/swt/swt-3.8.2-r2.ebuild
@@ -40,11 +40,11 @@ COMMON=">=dev-libs/glib-2.6
DEPEND=">=virtual/jdk-1.4
app-arch/unzip
+ x11-base/xorg-proto
x11-libs/libX11
x11-libs/libXrender
x11-libs/libXt
>=x11-libs/libXtst-1.1.0
- x11-proto/inputproto
virtual/pkgconfig
${COMMON}"
diff --git a/dev-java/swt/swt-4.2-r3.ebuild b/dev-java/swt/swt-4.2-r3.ebuild
index 40625a0c8c8b..fdfce91451a6 100644
--- a/dev-java/swt/swt-4.2-r3.ebuild
+++ b/dev-java/swt/swt-4.2-r3.ebuild
@@ -42,11 +42,11 @@ DEPEND="${COMMON_DEP}
>=virtual/jdk-1.4
app-arch/unzip
virtual/pkgconfig
+ x11-base/xorg-proto
x11-libs/libX11
x11-libs/libXrender
x11-libs/libXt
- >=x11-libs/libXtst-1.1.0
- x11-proto/inputproto"
+ >=x11-libs/libXtst-1.1.0"
RDEPEND="${COMMON_DEP}
>=virtual/jre-1.4"
diff --git a/dev-java/tapestry/tapestry-3.0.4-r3.ebuild b/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
index 2c4e880bfbce..19824e4645a7 100644
--- a/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
+++ b/dev-java/tapestry/tapestry-3.0.4-r3.ebuild
@@ -14,7 +14,7 @@ IUSE="${JAVA_PKG_IUSE}"
LICENSE="Apache-2.0"
SLOT="3.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
CDEPEND="
dev-java/bsf:2.3
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 8214ab5fa423..62bf8a7df818 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/R/R-3.4.1.ebuild b/dev-lang/R/R-3.4.1.ebuild
index 3334adcbe8dc..45c84fd36498 100644
--- a/dev-lang/R/R-3.4.1.ebuild
+++ b/dev-lang/R/R-3.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
diff --git a/dev-lang/mono/mono-4.8.0.524.ebuild b/dev-lang/mono/mono-4.8.0.524.ebuild
index af3e5bdb24b8..5eb4e3535b14 100644
--- a/dev-lang/mono/mono-4.8.0.524.ebuild
+++ b/dev-lang/mono/mono-4.8.0.524.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
IUSE="nls minimal pax_kernel xen doc"
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 2606ae4b12b2..3db50e33cae2 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,11 +1,13 @@
DIST php-5.6.33.tar.xz 12465256 BLAKE2B a33ce429c1565e6304031304168aa63ce82fa6c0968fc5ef09f5955e43c04ebe112db92475a999f39d997e2a3c9724ece60902ef0db84e2599d97d0e42ce57d2 SHA512 c494721594511f79a103ea3c73c5035aa0fcbca626710a0b85d2395693caf6762edefa3347cd0f8567b186f98c0df7f83cd4c698b158f0f72aa62aabbbb4e297
DIST php-5.6.34.tar.xz 12465748 BLAKE2B 6b12f52a04d6b645d78f3d00617386a72fafffda24850e10f545464c9d0ca55321e91a292c3eb83409d0a303c4e37c2a686f547d86227c280ec78b428e73a92e SHA512 9aa02f943d6949a28ad96df5e75eec3ecab3731824400d0a0a8ccba9dee95b7af6421b38b86f352a45c778019ebfb1e6161a03256e4ef712341a9e0bad596ae7
DIST php-5.6.35.tar.xz 12466396 BLAKE2B 96757fc064c139f238329c51741538fdbdefd04abad59c37565e1882a5a7df7d3755cf496561336b25748a968fb18dbf9d542a54a672f553f4be5ead292141cc SHA512 dd7d891954aa7f8e83eecb265e1bb01dfd357092dad0cfc5a3f441bea069f7181cd79330653b178d4953ac1ee8570d7f4c21acc8fc67975dd7dc1413eaebf0af
+DIST php-5.6.36.tar.xz 12467560 BLAKE2B 8badaabc668ff3a4b1129f03605a1570729f8196d2e2539fe85bc42a628f2b24ea76c298b194e8466d9218ae98218243430c8d36d73fbd32b042dd6453510361 SHA512 807c68ab85b6685b19707bd18cfd46f3695b2dc67f9f17f85476634e4a80a036cb413ccae05ed5ba529eafe8df57ebf758dd664ed2942ec44f90a6e8b0172e5e
DIST php-7.0.27.tar.xz 11916824 BLAKE2B 9d2881a611435b3f9607e04d1f271ca497b8543792608f3690f00aa767fe8cc1f442822ae702076d21df0b56005d7b4e8e88b11ec6dd50d0bc198197b48cafda SHA512 1987ad5573fdcbd5c8d92fdbf5ba8dca6e9621d89d30f66a003338467e31f09f9e8ceb5cdcb2ddf24ec7aa5acf0c8e33c3774e586e7682667eb3ed148237d1bb
DIST php-7.0.28.tar.xz 11917836 BLAKE2B 8110b0486b0556abf2249d7cbdbd245249f32e230d8197e493edfdf8df38d8eac61b79b90983fa8a2918f67a5d80fefd9a213adff4c3eb760b3844e555614650 SHA512 054c765011d2ad5bb1ef2fd2d66df05f374032015869e69112b309a13b79f437de25e9692719110efbd79f33c677add36430dab21ae12231a7730207c9e877aa
DIST php-7.0.29.tar.xz 12400192 BLAKE2B 0bd1bd9450b87437e539ec5131cb4f7e4dbf76d5fd5212bdf34c4f022dd8f2d357e9a845d83b485d89469e20675c031bcf382a8ca348161dfd082d7a389ffcb2 SHA512 ea5a2fbcfc875dd2621e3f67038c1e00f43b53bc7079ae2127fcefbf116db0f32e34d4435f8211305402a4eccdaa5dfd6b96cf9416e68700f2c1f438d74a0af8
+DIST php-7.0.30.tar.xz 12030228 BLAKE2B cc4c50d108fca68ee98b70a3007893d912d2343dd255faf52e41c1de04f590f427d9edad7b637177ccf1d9c62212ee6060baca13931c0aa14532df548ef159aa SHA512 1f0914ebda79247aa65ace63f6c8c4fcd850b21a82704f7b6482760259239cc5fee4cfd5aa2ed590b56822b4d69330ac472f46537e7f25d59e73ba63a48827c5
DIST php-7.1.13.tar.xz 12194780 BLAKE2B 0bac1cb3ec46cd4206d71b0d8ec3058fff455bc7e3febb33dcb8e14d5a8b16918d3e4679e0691b8ba29b95ab90be2a3dc3a73bade45c1ca4eaf692d6d3c2db3d SHA512 f5357ffcbcaab1ba03d70edc0f1329b530f9f9c7779ac57d6fd2bd0bb730162f8d107025e5ff66592077d1bf504ee6816ec0379f50ceb1fac36cea90b0fc4fa2
-DIST php-7.1.14.tar.xz 12198612 BLAKE2B 6ceb307423f07dafb75992b021d94259452fa4f08a9122c6d5e0da95dca1bcd88c7795effabefa7bddd06b398eca8093881a5ddb6d66fa91fc63a56c3a0fa4cc SHA512 7604e490aef95ae9c87bc4230491328c4cbcce42653234906885f9aa323f867ea941a7dbe80424aa4c4872392559ff5fa2acf1605c402055b6e428e6fe79ece6
DIST php-7.1.15.tar.xz 12201380 BLAKE2B 4387382daf3883962eb0e47d86c983a65c293e89aa71239977bb1c6fdaa99b3a76eacb71a30f134fcc47f4ca6fea95687f3e405c1ecc7a737c8cf40489e8e7a3 SHA512 2b23795ffcb9d741adafe8a1e01e6988bb86ce7c6380bdbe822f8f6485e217ed2e95a27daf5ba11f0bf10317f1e1f4e37068e40d0bf322de5625d38b430d37c2
DIST php-7.1.16.tar.xz 12211512 BLAKE2B bf242e2438b2dc363368a9ef4478349a291f483477ccedf988abd0fbb78a6f1b31e3b86dcb39ed9a9a8151674a8373ae77d8420e77efd6a2e05d5cfc778ed40f SHA512 98e96f06a4912cfa6926be2f292ce7120ca893c9b779b2efef4120c1df3580fa427cd58f5e4977edb01a0ae3b85660d6ca79b2bd79b6cd830cd77f6c6588b5ea
-DIST php-7.2.4.tar.xz 12031892 BLAKE2B f76b3ccbfed4d309639ac5e35a12aa70a194f8cecde98634d7bff9123eb45ff3a4f0b3297149a44357bbc3287a9a3c1393d86b12bd53f38ff844db9498ee3452 SHA512 d1d0720f0d4bb28f7ce0ec7c859b14c1e74e9d0e7c73de6988d5ce737d7ccb7308c0a7a2651ee012c630be2cd53e6531505df0a03f0efbb6359176b446982244
+DIST php-7.1.17.tar.xz 12213536 BLAKE2B bf358bc4920d38f74e4bdbc53f4744274071b4cea057452bfafbbc5760eb1ae0878f8cc92cf5337b883e17769cc6a490d0e64d3969aa1769cec92bf14f9101ea SHA512 2ac81b5ec898d366dc60f2dae4b07094457c6b8b110615e0fcc3af1e680708ed0e9c89728b95e453110eec41198cb8a0416b4aeadc017d4a2b6bf25ce624cac1
+DIST php-7.2.5.tar.xz 12034928 BLAKE2B 36c9ec413b5332a1ef138a5724fd1718f5a8ffa8873dbe27ae7b6ca9a55ecfa0de7f7504a20581edb48605c2afcc799784eb3d94e08236222f6de2094d1921d0 SHA512 1d49fc6e47d2e86d4fd62396e558965502f44cc8f72459bb0d406e157298cac67703b219837952da11122722d9fa8cb4cda8ef66ddf063cb063859db34110f58
diff --git a/dev-lang/php/files/5.6-mbstring-oniguruma-6.8.patch b/dev-lang/php/files/5.6-mbstring-oniguruma-6.8.patch
new file mode 100644
index 000000000000..642b261950fb
--- /dev/null
+++ b/dev-lang/php/files/5.6-mbstring-oniguruma-6.8.patch
@@ -0,0 +1,12 @@
+diff -aurN a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
+--- a/ext/mbstring/php_mbregex.c 2018-03-28 17:28:58.000000000 -0400
++++ b/ext/mbstring/php_mbregex.c 2018-04-04 12:53:23.268296387 -0400
+@@ -454,7 +454,7 @@
+ OnigUChar err_str[ONIG_MAX_ERROR_MESSAGE_LEN];
+
+ found = zend_hash_find(&MBREX(ht_rc), (char *)pattern, patlen+1, (void **) &rc);
+- if (found == FAILURE || (*rc)->options != options || (*rc)->enc != enc || (*rc)->syntax != syntax) {
++ if (found == FAILURE || onig_get_options(*rc) != options || onig_get_encoding(*rc) != enc || onig_get_syntax(*rc) != syntax) {
+ if ((err_code = onig_new(&retval, (OnigUChar *)pattern, (OnigUChar *)(pattern + patlen), options, enc, syntax, &err_info)) != ONIG_NORMAL) {
+ onig_error_code_to_str(err_str, err_code, &err_info);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "mbregex compile err: %s", err_str);
diff --git a/dev-lang/php/php-5.6.36.ebuild b/dev-lang/php/php-5.6.36.ebuild
new file mode 100644
index 000000000000..97094f855af9
--- /dev/null
+++ b/dev-lang/php/php-5.6.36.ebuild
@@ -0,0 +1,776 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic versionator systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+ coverage crypt +ctype curl debug
+ enchant exif +fileinfo +filter firebird
+ flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+ mhash mssql mysql libmysqlclient mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline recode selinux +session sharedmem
+ +simplexml snmp soap sockets spell sqlite ssl
+ sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre-8.32[unicode]
+ fpm? ( acl? ( sys-apps/acl ) )
+ apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+ =dev-libs/libmcrypt-2.4 )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( app-text/enchant )
+ exif? ( !gd? (
+ virtual/jpeg:0
+ media-libs/libpng:0=
+ sys-libs/zlib:0=
+ ) )
+ firebird? ( dev-db/firebird )
+ gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+ gmp? ( dev-libs/gmp:0= )
+ iconv? ( virtual/libiconv )
+ imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ iodbc? ( dev-db/libiodbc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+ libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+ mssql? ( dev-db/freetds[mssql] )
+ libmysqlclient? (
+ mysql? ( virtual/libmysqlclient:= )
+ mysqli? ( virtual/libmysqlclient:= )
+ )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( >=dev-db/unixODBC-1.8.13 )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ recode? ( app-text/recode )
+ sharedmem? ( dev-libs/mm )
+ simplexml? ( >=dev-libs/libxml2-2.6.8 )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ soap? ( >=dev-libs/libxml2-2.6.8 )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ sybase-ct? ( dev-db/freetds )
+ tidy? ( app-text/htmltidy )
+ truetype? (
+ =media-libs/freetype-2*
+ >=media-libs/t1lib-5.0.0
+ !gd? (
+ virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+ )
+ unicode? ( dev-libs/oniguruma:= )
+ vpx? ( media-libs/libvpx:0= )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
+ xml? ( >=dev-libs/libxml2-2.6.8 )
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+ xpm? (
+ x11-libs/libXpm
+ virtual/jpeg:0
+ media-libs/libpng:0= sys-libs/zlib:0=
+ )
+ xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+ zip? ( sys-libs/zlib:0= )
+ zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1
+ sys-devel/flex
+ >=sys-devel/m4-1.4.3
+ >=sys-devel/libtool-1.5.18"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed )
+ cli? ( ^^ ( readline libedit ) )
+ truetype? ( gd )
+ vpx? ( gd )
+ cjk? ( gd )
+ exif? ( gd )
+ xpm? ( gd )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ wddx? ( xml )
+ xmlrpc? ( || ( xml iconv ) )
+ xmlreader? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ mhash? ( hash )
+ phar? ( hash )
+ recode? ( !imap !mysql !mysqli !libmysqlclient )
+ libmysqlclient? ( || (
+ mysql
+ mysqli
+ pdo
+ ) )
+
+ qdbm? ( !gdbm )
+ readline? ( !libedit )
+ sharedmem? ( !threads )
+"
+
+PHP_MV="$(get_major_version)"
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ dodir "${PHP_INI_DIR#${EPREFIX}}"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config file php-fpm.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch"
+ eapply "${FILESDIR}/5.6-mbstring-oniguruma-6.8.patch"
+
+ # Change PHP branding
+ # Get the alpha/beta/rc version
+ sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+ -i configure.in || die "Unable to change PHP branding"
+
+ # Patch PHP to show Gentoo as the server platform
+ sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+ -i configure.in || die "Failed to fix server platform name"
+
+ # Prevent PHP from activating the Apache config,
+ # as we will do that ourselves
+ sed -i \
+ -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+ -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+ configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
+ || die
+
+ # Patch PHP to support heimdal instead of mit-krb5
+ if has_version "app-crypt/heimdal" ; then
+ sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+ || die "Failed to fix heimdal libname"
+ sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+ || die "Failed to fix heimdal crypt library reference"
+ fi
+
+ eapply_user
+
+ # Force rebuilding aclocal.m4
+ rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+ eautoreconf
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # http://bugs.php.net/bug.php?id=48795, bug #343481
+ sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+ fi
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_enable bcmath bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype ctype)
+ $(use_with curl curl "${EPREFIX}/usr")
+ $(use_enable xml dom)
+ $(use_with enchant enchant "${EPREFIX}/usr")
+ $(use_enable exif exif)
+ $(use_enable fileinfo fileinfo)
+ $(use_enable filter filter)
+ $(use_enable ftp ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_enable hash hash)
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+ $(use_enable intl intl)
+ $(use_enable ipv6 ipv6)
+ $(use_enable json json)
+ $(use_with kerberos kerberos "${EPREFIX}/usr")
+ $(use_enable xml libxml)
+ $(use_with xml libxml-dir "${EPREFIX}/usr")
+ $(use_enable unicode mbstring)
+ $(use_with crypt mcrypt "${EPREFIX}/usr")
+ $(use_with mssql mssql "${EPREFIX}/usr")
+ $(use_with unicode onig "${EPREFIX}/usr")
+ $(use_with ssl openssl "${EPREFIX}/usr")
+ $(use_with ssl openssl-dir "${EPREFIX}/usr")
+ $(use_enable pcntl pcntl)
+ $(use_enable phar phar)
+ $(use_enable pdo pdo)
+ $(use_enable opcache opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_with recode recode "${EPREFIX}/usr")
+ $(use_enable simplexml simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap soap)
+ $(use_enable sockets sockets)
+ $(use_with sqlite sqlite3 "${EPREFIX}/usr")
+ $(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer tokenizer)
+ $(use_enable wddx wddx)
+ $(use_enable xml xml)
+ $(use_enable xmlreader xmlreader)
+ $(use_enable xmlwriter xmlwriter)
+ $(use_with xmlrpc xmlrpc)
+ $(use_with xslt xsl "${EPREFIX}/usr")
+ $(use_enable zip zip)
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm ; then
+ our_conf+=( "--enable-dba${shared}" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype-dir "${EPREFIX}/usr")
+ $(use_with truetype t1lib "${EPREFIX}/usr")
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg-dir "${EPREFIX}/usr")
+ $(use_with gd png-dir "${EPREFIX}/usr")
+ $(use_with xpm xpm-dir "${EPREFIX}/usr")
+ $(use_with vpx vpx-dir "${EPREFIX}/usr")
+ )
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_with gd gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # Interbase/firebird support
+ our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+ use libmysqlclient && mysqllib="${EPREFIX}/usr"
+ use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+ our_conf+=( $(use_with mysql mysql "${mysqllib}") )
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ our_conf+=(
+ $(use_with odbc unixODBC "${EPREFIX}/usr")
+ $(use_with iodbc iodbc "${EPREFIX}/usr")
+ )
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib)
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit libedit "${EPREFIX}/usr")
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-pcre-regex affects ext/pcre
+ # --with-pcre-dir affects ext/filter and ext/zip
+ our_conf+=(
+ --with-pcre-regex="${EPREFIX}/usr"
+ --with-pcre-dir="${EPREFIX}/usr"
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ if [[ "fpm" == "${sapi}" ]] ; then
+ sapi_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_with systemd fpm-systemd)
+ )
+ fi
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local sapi="", file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp5$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.0.30.ebuild b/dev-lang/php/php-7.0.30.ebuild
new file mode 100644
index 000000000000..ec866bd84bad
--- /dev/null
+++ b/dev-lang/php/php-7.0.30.ebuild
@@ -0,0 +1,745 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic versionator systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://secure.php.net/"
+SRC_URI="https://secure.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
+ coverage crypt +ctype curl debug
+ enchant exif +fileinfo +filter firebird
+ flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline recode selinux +session sharedmem
+ +simplexml snmp soap sockets spell sqlite ssl
+ sysvipc systemd tidy +tokenizer truetype unicode wddx webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre-8.32[unicode]
+ fpm? ( acl? ( sys-apps/acl ) )
+ apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+ =dev-libs/libmcrypt-2.4 )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( app-text/enchant )
+ exif? ( !gd? (
+ virtual/jpeg:0
+ media-libs/libpng:0=
+ sys-libs/zlib:0=
+ ) )
+ firebird? ( dev-db/firebird )
+ gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+ gmp? ( dev-libs/gmp:0= )
+ iconv? ( virtual/libiconv )
+ imap? ( virtual/imap-c-client[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ iodbc? ( dev-db/libiodbc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+ libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( >=dev-db/unixODBC-1.8.13 )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ recode? ( app-text/recode )
+ sharedmem? ( dev-libs/mm )
+ simplexml? ( >=dev-libs/libxml2-2.6.8 )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ soap? ( >=dev-libs/libxml2-2.6.8 )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tidy? ( app-text/htmltidy )
+ truetype? (
+ =media-libs/freetype-2*
+ !gd? (
+ virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= )
+ )
+ unicode? ( dev-libs/oniguruma:= )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
+ webp? ( media-libs/libwebp:0= )
+ xml? ( >=dev-libs/libxml2-2.6.8 )
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+ xpm? (
+ x11-libs/libXpm
+ virtual/jpeg:0
+ media-libs/libpng:0= sys-libs/zlib:0=
+ )
+ xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+ zip? ( sys-libs/zlib:0= )
+ zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1
+ sys-devel/flex
+ >=sys-devel/m4-1.4.3
+ >=sys-devel/libtool-1.5.18"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ truetype? ( gd )
+ webp? ( gd )
+ cjk? ( gd )
+ exif? ( gd )
+ xpm? ( gd )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ wddx? ( xml )
+ xmlrpc? ( || ( xml iconv ) )
+ xmlreader? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ mhash? ( hash )
+ phar? ( hash )
+ qdbm? ( !gdbm )
+ readline? ( !libedit )
+ recode? ( !imap !mysqli !mysql )
+ sharedmem? ( !threads )
+ mysql? ( || ( mysqli pdo ) )
+"
+
+PATCHES=( "${FILESDIR}/mbstring-oniguruma-6.8.patch" )
+
+PHP_MV="$(get_major_version)"
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ dodir "${PHP_INI_DIR#${EPREFIX}}"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_enable bcmath bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype ctype)
+ $(use_with curl curl "${EPREFIX}/usr")
+ $(use_enable xml dom)
+ $(use_with enchant enchant "${EPREFIX}/usr")
+ $(use_enable exif exif)
+ $(use_enable fileinfo fileinfo)
+ $(use_enable filter filter)
+ $(use_enable ftp ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_enable hash hash)
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+ $(use_enable intl intl)
+ $(use_enable ipv6 ipv6)
+ $(use_enable json json)
+ $(use_with kerberos kerberos "${EPREFIX}/usr")
+ $(use_enable xml libxml)
+ $(use_with xml libxml-dir "${EPREFIX}/usr")
+ $(use_enable unicode mbstring)
+ $(use_with crypt mcrypt "${EPREFIX}/usr")
+ $(use_with unicode onig "${EPREFIX}/usr")
+ $(use_with ssl openssl "${EPREFIX}/usr")
+ $(use_with ssl openssl-dir "${EPREFIX}/usr")
+ $(use_enable pcntl pcntl)
+ $(use_enable phar phar)
+ $(use_enable pdo pdo)
+ $(use_enable opcache opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_with recode recode "${EPREFIX}/usr")
+ $(use_enable simplexml simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap soap)
+ $(use_enable sockets sockets)
+ $(use_with sqlite sqlite3 "${EPREFIX}/usr")
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer tokenizer)
+ $(use_enable wddx wddx)
+ $(use_enable xml xml)
+ $(use_enable xmlreader xmlreader)
+ $(use_enable xmlwriter xmlwriter)
+ $(use_with xmlrpc xmlrpc)
+ $(use_with xslt xsl "${EPREFIX}/usr")
+ $(use_enable zip zip)
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm ; then
+ our_conf+=( "--enable-dba${shared}" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype-dir "${EPREFIX}/usr")
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg-dir "${EPREFIX}/usr")
+ $(use_with gd png-dir "${EPREFIX}/usr")
+ $(use_with xpm xpm-dir "${EPREFIX}/usr")
+ )
+ if use webp; then
+ our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+ fi
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_with gd gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # Interbase/firebird support
+ our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ our_conf+=(
+ $(use_with odbc unixODBC "${EPREFIX}/usr")
+ $(use_with iodbc iodbc "${EPREFIX}/usr")
+ )
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit libedit "${EPREFIX}/usr")
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-pcre-regex affects ext/pcre
+ # --with-pcre-dir affects ext/filter and ext/zip
+ our_conf+=(
+ --with-pcre-regex="${EPREFIX}/usr"
+ --with-pcre-dir="${EPREFIX}/usr"
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ if [[ "fpm" == "${sapi}" ]] ; then
+ sapi_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_with systemd fpm-systemd)
+ )
+ fi
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/mib_indexes
+
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local sapi="", file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.1.14.ebuild b/dev-lang/php/php-7.1.17.ebuild
similarity index 99%
rename from dev-lang/php/php-7.1.14.ebuild
rename to dev-lang/php/php-7.1.17.ebuild
index ee42a9c8acb7..34ff2d2648dc 100644
--- a/dev-lang/php/php-7.1.14.ebuild
+++ b/dev-lang/php/php-7.1.17.ebuild
@@ -46,7 +46,7 @@ IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk
COMMON_DEPEND="
>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
>=dev-libs/libpcre-8.32[unicode]
- acl? ( sys-apps/acl )
+ fpm? ( acl? ( sys-apps/acl ) )
apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
/dev/null || die
- ./allTests.py --script | sh
- ret=${?}
- popd >/dev/null || die
-
- return ${ret}
-}
-
-src_test() {
- run_tests cpp || die "emake cpp test failed"
-
- if use python ; then
- testing() {
- # tests require that the directory is named 'py'
- ln -f -s ../"${BUILD_DIR}"/python py/python || die
- run_tests py || die "emake py-${EPYTHON} test failed"
- }
- BUILD_DIR=py python_foreach_impl testing
- fi
-
- if use ruby ; then
- run_tests rb || die "emake rb test failed"
- fi
-
- if use mono ; then
- # skip mono tests, bug #498484
- ewarn "Tests for C# are currently disabled."
-# run_tests cs || die "emake cs test failed"
- fi
-}
diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
index 538503b9d2a6..4955f0858ef8 100644
--- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
@@ -28,8 +28,9 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
LICENSE="GPL-2"
SLOT="0/36"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="doc examples libressl +ncurses mono php python ruby test debug"
+RESTRICT="test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND=">=dev-libs/expat-2.0.1
@@ -114,12 +115,14 @@ src_prepare() {
-e '/SUBDIRS/s|\ test||' \
csharp/Makefile || die "sed failed"
- # IceUtil/stacktrace fails with USE=debug
# skip udp test due to multicast
+ # skip IceGrid/admin bug #649850
# skip IceSSL tests due to requirement of internet connection
+ # skip IceStorm/single bug #636834
# IceStorm/stress fails without USE=debug
+ # IceUtil/stacktrace fails with USE=debug
sed -i \
- -e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \
+ -e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress|' \
cpp/Makefile || die "sed failed"
# mainly broken .ice files
@@ -131,6 +134,11 @@ src_prepare() {
sed -i \
-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
ruby/Makefile || die "sed failed"
+
+ # fix for x86 IceBox test
+ sed -i \
+ -e 's|"32"|""|' \
+ scripts/TestUtil.py || die "sed failed"
}
src_configure() {
@@ -182,16 +190,16 @@ src_configure() {
# make it use ruby23 only
sed -i \
- -e 's|RUBY = ruby|\022|' \
+ -e 's|RUBY = ruby|\023|' \
ruby/config/Make.rules || die "sed failed"
sed -i \
- -e 's|env ruby|\022|' \
+ -e 's|env ruby|\023|' \
ruby/config/s2rb.rb || die "sed failed"
sed -i \
- -e 's|env ruby|\022|' \
+ -e 's|env ruby|\023|' \
ruby/scripts/slice2rb || die "sed failed"
sed -i \
- -e 's|output.write("ruby|\022|' \
+ -e 's|output.write("ruby|\023|' \
scripts/TestUtil.py || die "sed failed"
fi
diff --git a/dev-libs/Ice/Ice-3.6.3.ebuild b/dev-libs/Ice/Ice-3.6.3.ebuild
deleted file mode 100644
index a873c8bd3be3..000000000000
--- a/dev-libs/Ice/Ice-3.6.3.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby23"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php7-0"
-
-# This variable does not belong to any eclass. It is solely used in this ebuild
-# db:6.2 breaks the build process
-BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
-
-inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="https://zeroc.com/products/ice"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
- doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
-LICENSE="GPL-2"
-SLOT="0/36"
-KEYWORDS="amd64 x86"
-IUSE="doc examples libressl +ncurses mono php python ruby test debug"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/expat-2.0.1
- >=app-arch/bzip2-1.0.5
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- || (
- $(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
- )
- dev-cpp/libmcpp
- python? ( ${PYTHON_DEPS} )
- ruby? ( $(ruby_implementation_depend ruby23) )
- mono? ( dev-lang/mono )
- php? ( dev-lang/php:7.0 )
- !dev-python/IcePy
- !dev-ruby/IceRuby"
-DEPEND="${RDEPEND}
- ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= )
- test? (
- ${PYTHON_DEPS}
- dev-python/passlib[${PYTHON_USEDEP}]
- )"
-
-# Maintainer notes:
-# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3})
-
-S="${WORKDIR}/${P/I/i}"
-PHP_EXT_S="${S}/php"
-
-PATCHES=(
- "${FILESDIR}/${P}-no-arch-opts.patch"
- "${FILESDIR}/${P}-csharp.patch"
-)
-
-pkg_setup() {
- # prevent ruby-ng.eclass from messing with pkg_setup
- return
-}
-
-src_unpack() {
- # prevent ruby-ng.eclass from messing with src_unpack
- default
-}
-
-src_prepare() {
- epatch -p1 "${PATCHES[@]}"
-
- sed -i \
- -e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
- -e 's|-L\$\(libdir\)||' \
- cpp/config/Make.rules || die "sed failed"
-
- sed -i \
- -e 's|\(install_phpdir[[:space:]]*\):=|\1?=|' \
- -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
- php/config/Make.rules.php || die "sed failed"
-
- sed -i \
- -e 's|\(install_pythondir[[:space:]]*\)=|\1?=|' \
- -e 's|\(install_rubydir[[:space:]]*\)=|\1?=|' \
- -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
- {python,ruby}/config/Make.rules || die "sed failed"
-
- sed -i \
- -e 's|-O2 ||g' \
- -e 's|-Werror ||g' \
- cpp/config/Make.rules.Linux || die "sed failed"
-
- sed -i \
- -e 's|install-common||' \
- {cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
-
- sed -i \
- -e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
- -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
- -e 's|\(install_pkgconfigdir[[:space:]]*\):=|\1?=|' \
- csharp/config/Make.rules.cs || die "sed failed"
-
- # skip mono tests, bug #498484
- sed -i \
- -e '/SUBDIRS/s|\ test||' \
- csharp/Makefile || die "sed failed"
-
- # IceUtil/stacktrace fails with USE=debug
- # skip udp test due to multicast
- # skip IceSSL tests due to requirement of internet connection
- # IceStorm/stress fails without USE=debug
- sed -i \
- -e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \
- cpp/Makefile || die "sed failed"
-
- # mainly broken .ice files
- sed -i \
- -e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
- python/Makefile || die "sed failed"
-
- # fails even on unicode locale
- sed -i \
- -e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
- ruby/Makefile || die "sed failed"
-}
-
-src_configure() {
- suitable_db_version() {
- local ver
- for ver in "${BERKDB_SLOTS[@]}"; do
- if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
- echo "${ver}"
- return 0
- fi
- done
- die "No suitable BerkDB versions found, aborting"
- }
-
- MAKE_RULES=(
- "prefix=\"${ED%/}/usr\""
- "install_docdir=\"${ED%/}/usr/share/doc/${PF}\""
- "install_configdir=\"${ED%/}/usr/share/${P}/config\""
- "install_mandir=\"${ED%/}/usr/share/man\""
- "embedded_runpath_prefix=\"${EPREFIX}/usr\""
- "LP64=yes"
- "new_dtags=yes"
- "NOTEST=$(usex !test)"
- "USE_READLINE=$(usex ncurses)"
- "OPTIMIZE=$(usex !debug)"
- )
-
- local BERKDB_VERSION="$(suitable_db_version)"
- MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
- sed -i \
- -e "s|g++|$(tc-getCXX)|" \
- -e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
- -e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
- -e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
- -e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
- cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
-
- if use python; then
- local S="${S}/python"
- python_copy_sources
- fi
-
- if use ruby; then
- SITERUBY="$(ruby23 -r rbconfig -e 'print RbConfig::CONFIG[\"sitelibdir\"]')"
- MAKE_RULES_RUBY=(
- "install_rubydir=\"${ED%/}/${SITERUBY}\""
- "install_libdir=\"${ED%/}/${SITERUBY}\""
- )
-
- # make it use ruby23 only
- sed -i \
- -e 's|RUBY = ruby|\022|' \
- ruby/config/Make.rules || die "sed failed"
- sed -i \
- -e 's|env ruby|\022|' \
- ruby/config/s2rb.rb || die "sed failed"
- sed -i \
- -e 's|env ruby|\022|' \
- ruby/scripts/slice2rb || die "sed failed"
- sed -i \
- -e 's|output.write("ruby|\022|' \
- scripts/TestUtil.py || die "sed failed"
- fi
-
- MAKE_RULES_MONO=(
- "GACINSTALL=yes"
- "GAC_ROOT=\"${ED%/}/usr/$(get_libdir)\""
- "GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\""
- "install_libdir=\"${ED%/}/usr/$(get_libdir)\""
- "install_pkgconfigdir=\"${ED%/}/usr/$(get_libdir)/pkgconfig\""
- )
-
- if has_version ">dev-lang/mono-4"; then
- MAKE_RULES_MONO+=("MCS=mcs")
- fi
-
- use test && python_setup
-}
-
-src_compile() {
- # Do not remove this export or build will break!
- tc-export CXX
-
- emake -C cpp "${MAKE_RULES[@]}"
-
- if use php; then
- local i
- for i in $(php_get_slots); do
- mkdir -p "${WORKDIR}/${i}" || die
- cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
-
- pushd "${WORKDIR}/${i}" >/dev/null || die
- ln -s "${S}/cpp" || die
- ln -s "${S}/config" || die
- ln -s "${S}/slice" || die
- ln -s "${S}/Makefile" || die
-
- emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
- popd >/dev/null || die
- done
- fi
-
- if use python; then
- building() {
- emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
- }
- local S="${S}/python"
- python_foreach_impl building
- fi
-
- if use ruby; then
- emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
- fi
-
- if use mono; then
- emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
- fi
-}
-
-src_test() {
- local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- emake -C cpp "${MAKE_RULES[@]}" test
-
- # php tests require the extension loaded and are therefore skipped
-
- if use python; then
- testing() {
- emake -C "${BUILD_DIR}" \
- "${MAKE_RULES[@]}" \
- PYTHON="${EPYTHON}" \
- install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
- install_libdir="\"${D%/}/$(python_get_sitedir)\"" test
- }
- local S="${S}/python"
- python_foreach_impl testing
- fi
-
- if use ruby; then
- emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
- fi
-
- if use mono; then
- # skip mono tests, bug #498484
- ewarn "Tests for C# are currently disabled."
- #emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
- fi
-}
-
-src_install() {
- local DOCS=( CHANGELOG*.md README.md )
- use doc && DOCS+=( "${DISTDIR}/${P}.pdf" )
- einstalldocs
-
- insinto /usr/share/${P}
- doins -r slice
-
- emake -C cpp "${MAKE_RULES[@]}" install
-
- if use examples; then
- docinto examples-cpp
- dodoc cpp/config/*.cfg
- docompress -x /usr/share/doc/${PF}/examples-cpp
- fi
-
- if use php; then
- insinto "/usr/share/php/${PN}"
-
- local i
- while IFS="" read -d $'\0' -r i; do
- doins "${i}"
- done < <(find "${S}/php/lib/" -name '*.php' -print0)
-
- pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
-
- local -x LD_LIBRARY_PATH="${ED%/}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
- for i in *; do
- mkdir -p "${ED%/}/usr/share/php/${i}" || die
- "${ED%/}"/usr/bin/slice2php \
- -I"${ED%/}/usr/share/${P}/slice/" --all \
- --output-dir "${ED%/}/usr/share/php/${i}" \
- --ice "${ED%/}/usr/share/${P}/slice/${i}"/*
- done
-
- for i in $(php_get_slots); do
- php_init_slot_env "${i}"
- insinto "${EXT_DIR}"
- newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
- done
- php-ext-source-r2_createinifiles
-
- popd >/dev/null || die
- fi
-
- if use python; then
- installation() {
- mkdir -p "${D%/}/$(python_get_sitedir)" || die
-
- emake -C "${BUILD_DIR}" \
- "${MAKE_RULES[@]}" \
- install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
- install_libdir="\"${D%/}/$(python_get_sitedir)\"" \
- install
- }
- local S="${S}/python"
- python_foreach_impl installation
- fi
-
- if use ruby; then
- dodir "${SITERUBY}"
- emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
- fi
-
- if use mono; then
- emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
- fi
-}
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index aa42decdf1c1..10bdff65b811 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -1,4 +1,2 @@
-DIST Ice-3.5.1.pdf 8279548 BLAKE2B 154c013ef5429ce27bc54805fdab6959e363731499e17be6d1b09bc0273fdd55dfc387f80852138d10dec337fe7f2f34efe522561fdf75903a82cb01535f0c14 SHA512 6fe78ed629de330c56cf260a0a78d650ad9e1507d737a8e58c616f1c61897487dae2f9fb942f1e878706dbc645cb9c672377eeef905f8764b57dd7e6f8d1c7f2
-DIST Ice-3.5.1.tar.gz 4799296 BLAKE2B 815f6fc40635b85eef85b7b3f1fcf0f7622bb1d3bc40e685f6a6a0de64e2a201bb3a92590231a4f278eac455c02d1f3943bf52bc69a8dbfd91c33ecb3f502ee7 SHA512 610fa317bd75e64802d1b5216db4747f86157d3246a2022397bafaefdd9b1b78d131733762003ee779065401c8a83120db65cf9b86fbf1914266309571baf58f
DIST Ice-3.6.3.pdf 8844957 BLAKE2B 137e3ce85885305931cbbb2c838ccc52175dffb7ad51264837b2db77eea05987ebecc5e3678e2f589bef1cc94c133f0f298ecce23031fcf2654621921c2bd541 SHA512 44638a315b0da9c26519c053c48ab8ee216c43410f53844465535a972ae01031f1603769e9b3169fdf9358de67e0d0c7e238b2918b5d5b1c4cb95cb922fa922a
DIST Ice-3.6.3.tar.gz 5512741 BLAKE2B 7219cd263ccf6207c0d1e788358004744bd53717bba79a53be468b5e38ddbc81895ef078ba31c98d90ac9ccdd9e17123f4a7ab590fa354c28f6d82f09bf0301d SHA512 6e17d21f55a8504af87a64c498a0c4d2084ed96a85c7a66d00319324774f671ace6afa03108d8d4e9bedf5fcfc2f3dba247949a27deecacdd0d298bd0bfe0a45
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index bdedc536a2f9..57328aba1996 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild b/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
index 0dfe7f58ee0b..d4ec021376d3 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="boehm-gc"
# SONAME: libgc.so.1 libgccpp.so.1
# We've been using subslot 0 for these instead of "1.1".
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cxx static-libs +threads"
DEPEND="
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
index 410db4fea02a..cd733f879a32 100644
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.t
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs subunit"
RDEPEND="
diff --git a/dev-libs/g-wrap/g-wrap-1.9.11.ebuild b/dev-libs/g-wrap/g-wrap-1.9.11.ebuild
index e14bd4cad68a..571b1a538804 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.11.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -8,7 +8,7 @@ inherit eutils
DESCRIPTION="A tool for exporting C libraries into Scheme"
HOMEPAGE="http://www.nongnu.org/g-wrap/"
SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
SLOT="0"
LICENSE="GPL-2"
IUSE=""
diff --git a/dev-libs/g-wrap/g-wrap-1.9.13.ebuild b/dev-libs/g-wrap/g-wrap-1.9.13.ebuild
index 6f052b20b626..c843ccce7a30 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.13.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -8,7 +8,7 @@ inherit eutils
DESCRIPTION="A tool for exporting C libraries into Scheme"
HOMEPAGE="http://www.nongnu.org/g-wrap/"
SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
SLOT="0"
LICENSE="GPL-2"
IUSE=""
diff --git a/dev-libs/gmime/gmime-3.2.0.ebuild b/dev-libs/gmime/gmime-3.2.0.ebuild
index 3075f18979d7..418fab9362eb 100644
--- a/dev-libs/gmime/gmime-3.2.0.ebuild
+++ b/dev-libs/gmime/gmime-3.2.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
SLOT="3.0"
LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="crypt doc idn static-libs test vala"
RDEPEND="
diff --git a/dev-libs/grok/metadata.xml b/dev-libs/grok/metadata.xml
index 3384e9108b86..d1adf07cb2da 100644
--- a/dev-libs/grok/metadata.xml
+++ b/dev-libs/grok/metadata.xml
@@ -1,10 +1,7 @@
-
- ercpe@gentoo.org
- Johann Schmitz (ercpe)
-
+
jordansissel/grok
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
index 2bf01e687ac2..f706c9127fb4 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="MIT boehm-gc GPL-2+"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
index 5eaff80fbe2b..038308e1dc4c 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
@@ -54,7 +54,7 @@ multilib_src_configure() {
$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
- GPG_ERROR_CONFIG="${EPREFIX}/usr/bin/${CHOST}-gpg-error-config"
+ GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
diff --git a/dev-libs/libgee/libgee-0.20.1.ebuild b/dev-libs/libgee/libgee-0.20.1.ebuild
index 45ae74459244..4d809c7a80e0 100644
--- a/dev-libs/libgee/libgee-0.20.1.ebuild
+++ b/dev-libs/libgee/libgee-0.20.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
LICENSE="LGPL-2.1+"
SLOT="0.8/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-linux"
IUSE="+introspection"
# FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgit2/libgit2-0.26.3.ebuild b/dev-libs/libgit2/libgit2-0.26.3.ebuild
index 549b491f6136..c94b6bca4718 100644
--- a/dev-libs/libgit2/libgit2-0.26.3.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
fi
DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libinput/libinput-1.10.5.ebuild b/dev-libs/libinput/libinput-1.10.5.ebuild
index 5364b191c2fc..445bf25b19bb 100644
--- a/dev-libs/libinput/libinput-1.10.5.ebuild
+++ b/dev-libs/libinput/libinput-1.10.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
IUSE="doc input_devices_wacom test"
# Tests require write access to udev rules directory which is a no-no for live system.
# Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index 51941a2ca57a..af8a577bee12 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -4,3 +4,4 @@ DIST liblognorm-2.0.1.tar.gz 657390 BLAKE2B afdec1d1afbf0cfae7a317a4bdfd109457f3
DIST liblognorm-2.0.2.tar.gz 658976 BLAKE2B 44a928ca4d8934f9b6f0b81610315a7de1f0968d2d62fddf9e919699c2fa10d1bce94f0a46a40ff9bf6521ae7dc7a88440febd1b770af9dc3983d13e5a10e188 SHA512 7cb1e20c895859072b9d6f0b3c2dd89874192dce6d11878a4c3eb0b0d9f1691d97205a61290e9cd07deeaa71c58f5fb6a4c1f14bd206119d690cf84c107ccbe4
DIST liblognorm-2.0.3.tar.gz 660680 BLAKE2B d5da4386026faae43dbcbe36aacc47687ef8636be2223a596a9915adee731535083016e5d680c9169cb8d4262a7f3d2342a9e6af566108a635f9d49fcf2cfec5 SHA512 8f343f3029c506a9c060b1b55e478da9ceedc1fbf27ca53a991ffbddb397383adfee2d79beb174a6c997599ee3c0fa4bbc9925fa850e5bf4f4d7b181ddae7cdb
DIST liblognorm-2.0.4.tar.gz 665898 BLAKE2B 80bcd114d2be81f8eea847e699b7e8ade9ca37d4376f64af81bfaba1a440e1efbab579235aba775c46a9d011e930453d2c001de525577b7775784e7152b3e700 SHA512 3c7cbf0c8c320708615218009354d198ba0893632ca464a07270f59d137753dfc7ad6dae66b565660f14e9285f9c8964824d36070b1872b6c633589b4996ba02
+DIST liblognorm-2.0.5.tar.gz 667709 BLAKE2B 9f2a774c2378caa460a1f11e21570e719f83e782c5731a35921099b1b31397495ea2a4baebd489d186526eb2d011f2ab30d971713a8083c1ae02168d3f632ce8 SHA512 2b36fabfa8b751127d47f307833414d339ae43bad5b687ce6ac42a961021f9a515703ca0c4808e098ef49be3a943abdbf307f90995a2331c6e266167ef041d00
diff --git a/dev-libs/liblognorm/liblognorm-2.0.5.ebuild b/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
new file mode 100644
index 000000000000..53b1689f8f12
--- /dev/null
+++ b/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="Fast samples-based log normalization library"
+HOMEPAGE="http://www.liblognorm.com"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+ inherit git-r3
+else
+ SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+fi
+
+LICENSE="LGPL-2.1 Apache-2.0"
+SLOT="0/5.1.0"
+IUSE="debug doc static-libs test"
+
+RDEPEND="
+ >=dev-libs/libestr-0.1.3
+ >=dev-libs/libfastjson-0.99.2:=
+"
+
+DEPEND="
+ ${RDEPEND}
+ >=sys-devel/autoconf-archive-2015.02.04
+ virtual/pkgconfig
+ doc? ( >=dev-python/sphinx-1.2.2 )
+"
+
+DOCS=( ChangeLog )
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # regexp disabled due to https://github.com/rsyslog/liblognorm/issues/143
+ local myeconfargs=(
+ --enable-compile-warnings=yes
+ --disable-Werror
+ $(use_enable doc docs)
+ $(use_enable test testbench)
+ $(use_enable debug)
+ $(use_enable static-libs static)
+ --disable-regexp
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ # When adding new tests via patches we have to make them executable
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ emake --jobs 1 check
+}
+
+src_install() {
+ default
+
+ find "${ED}"usr/lib* -name '*.la' -delete || die
+}
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index 2d280304ea59..e567241773e4 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,2 +1 @@
-DIST libpthread-stubs-0.3.tar.bz2 203468 BLAKE2B 4985b18766e93ab42fd3d9b345194c384e527f5a85f7eb8397b7794d2875fd951bf9c8e7c6c3f9a1d75575bec90ead8f5be09a8e8a0daedead5c95fcb415e6ea SHA512 c7cf63fa82ce9e8c37c6dc3b8cc30f8883655f95683c4466c54b617b086dd26a43bfa36363e47dc5730af6d59ac70443d211eb01b07d276edd144030a3580b15
DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.3-r1.ebuild
deleted file mode 100644
index 712a9d0fe14c..000000000000
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.3-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Pthread functions stubs for platforms missing them"
-SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
index 79e9d06be25a..4aa8714ea11e 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
@@ -4,6 +4,7 @@
EAPI=5
XORG_MULTILIB=yes
+XORG_STATIC=no
inherit xorg-2
DESCRIPTION="Pthread functions stubs for platforms missing them"
diff --git a/dev-libs/libxml2/libxml2-2.9.8.ebuild b/dev-libs/libxml2/libxml2-2.9.8.ebuild
index 34db503af33e..85ab79a58b3d 100644
--- a/dev-libs/libxml2/libxml2-2.9.8.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug examples icu ipv6 lzma python readline static-libs test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libxslt/libxslt-1.1.32.ebuild b/dev-libs/libxslt/libxslt-1.1.32.ebuild
index 205e0210335a..0adc2bae5ced 100644
--- a/dev-libs/libxslt/libxslt-1.1.32.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="crypt debug examples python static-libs elibc_Darwin"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/nettle/nettle-3.4.ebuild b/dev-libs/nettle/nettle-3.4.ebuild
index 02c792570bbc..f8cf3580ca0f 100644
--- a/dev-libs/nettle/nettle-3.4.ebuild
+++ b/dev-libs/nettle/nettle-3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-3 LGPL-2.1 )"
SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 4d8619f4e9b9..f1f35cc37021 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -2,3 +2,4 @@ DIST onig-6.6.1.tar.gz 943490 BLAKE2B 75771b5da78ac31e382ba964b9e881cb153b0ded89
DIST onig-6.7.0.tar.gz 952950 BLAKE2B 7ff45b04abe28caabf8c54e3dea4fb801c50fec9795bb39089a5be282d703c794c1eaa14433fe96b09ecd653275e8450e16ce410f0f53de63acd79cef36d3844 SHA512 21b10ff7cca8bdf057110927755cecf444415e308a8580427a4f661d58e678ef808a9e238066c54e664878739449fcf3de9e8348568e9dad2bfdda8d39b46a30
DIST onig-6.7.1.tar.gz 951650 BLAKE2B 475f6de4dca5579071777de9805a7676f8bf0ba0fff360a8231895882ce5535c80ee8f12bede3d1db17497efcc904c4653f4d15d559cf5ac180039563f0c14cd SHA512 36ce29b639e8a15bacc3fcce835eea3ae5516fbefc250d0152493b86166f8f3b74ae4c807c609f6374cd8c401b434dd1682747be14b70da64386150d4e82badc
DIST onig-6.8.1.tar.gz 973837 BLAKE2B 5ccbd8b428dcb0775e745857cb1ee678cb2e42c1b9044ac807444403ea0ca602aeaa7ab86f70b9835c2042a2b48a65531c355d1f32ba22294403dc5a3f3ce895 SHA512 50005d7bccdfd5090181781c942e7814eb82ef1652453ce4bdf7f4e763344c87af84fb06c5240494d3774568913cbfc3b158e0a69edfbc1283eaeb7842dc0631
+DIST onig-6.8.2.tar.gz 979775 BLAKE2B c055e943d5b38e10a32f2a30094089d7ca7f72b8fcb58e8d1b4a4674285e208bdc6b5c8694e2a8415f19ae1515d13810c7fd96d27c18e360a69159cbcf0004be SHA512 1bfa6688c67b684afd558ce9f0654f484acbb733972382fccc0b3d1a05a2c2075e349d9d9c8f86371ee07221b45e5ef28ed238b5807be6fbc49d1f53b14e1596
diff --git a/dev-libs/oniguruma/oniguruma-6.8.2.ebuild b/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
new file mode 100644
index 000000000000..977725c6e82b
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal
+
+MY_P="onig-${PV}"
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="crnl-as-line-terminator static-libs"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/UNICODE_PROPERTIES)
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable crnl-as-line-terminator) \
+ $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index e0219b43b79c..e624d9636955 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -10,3 +10,4 @@ DIST openssl-1.1.0h.tar.gz 5422717 BLAKE2B 11de1468855c0bb1836fb346c8efdfedd0613
DIST openssl-1.1.0h_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879
DIST openssl-1.1.0h_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae
DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
+DIST openssl-1.1.1-pre5.tar.gz 8288689 BLAKE2B f65c797a8cce6e2240008ed842d9bc7667ef4bb792a141a0832f475b51b1e499786fa2bab87977aa58f8edaba7c35be1a67563bc8a6d0e41fcf1a3c95961b877 SHA512 dfdf4ee2e0f05ff9af5ecd7305bad4ff8d587c08ea675055048d7eae2a8e38fe74c2e63b13facd95ccbcb586be2d6e388088c567380af64f0ccc88095a881173
diff --git a/dev-libs/openssl/openssl-1.1.1_pre5.ebuild b/dev-libs/openssl/openssl-1.1.1_pre5.ebuild
new file mode 100644
index 000000000000..e022bf39b778
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1_pre5.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+
+MY_P=${P/_/-}
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="https://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0/1.1" # .so version of libssl/libcrypto
+[[ "${PV}" = *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ >=dev-lang/perl-5
+ sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+ test? (
+ sys-apps/diffutils
+ sys-devel/bc
+ )"
+PDEPEND="app-misc/ca-certificates"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_WRAPPED_HEADERS=(
+ usr/include/openssl/opensslconf.h
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
+)
+
+src_prepare() {
+ # keep this in sync with app-misc/c_rehash
+ SSL_CNF_DIR="/etc/ssl"
+
+ # Make sure we only ever touch Makefile.org and avoid patching a file
+ # that gets blown away anyways by the Configure script in src_configure
+ rm -f Makefile
+
+ if ! use vanilla ; then
+ eapply "${PATCHES[@]}"
+ fi
+
+ eapply_user #332661
+
+ # make sure the man pages are suffixed #302165
+ # don't bother building man pages if they're disabled
+ # Make DOCDIR Gentoo compliant
+ sed -i \
+ -e '/^MANSUFFIX/s:=.*:=ssl:' \
+ -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+ -e $(has noman FEATURES \
+ && echo '/^install:/s:install_docs::' \
+ || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+ -e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \
+ Configurations/unix-Makefile.tmpl \
+ || die
+
+ # quiet out unknown driver argument warnings since openssl
+ # doesn't have well-split CFLAGS and we're making it even worse
+ # and 'make depend' uses -Werror for added fun (#417795 again)
+ [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
+
+ # allow openssl to be cross-compiled
+ cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+ chmod a+rx gentoo.config || die
+
+ append-flags -fno-strict-aliasing
+ append-flags $(test-flags-CC -Wa,--noexecstack)
+ append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+ # Prefixify Configure shebang (#141906)
+ sed \
+ -e "1s,/usr/bin/env,${EPREFIX}&," \
+ -i Configure || die
+ # Remove test target when FEATURES=test isn't set
+ if ! use test ; then
+ sed \
+ -e '/^$config{dirs}/s@ "test",@@' \
+ -i Configure || die
+ fi
+ # The config script does stupid stuff to prompt the user. Kill it.
+ sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+ ./config --test-sanity || die "I AM NOT SANE"
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ unset APPS #197996
+ unset SCRIPTS #312551
+ unset CROSS_COMPILE #311473
+
+ tc-export CC AR RANLIB RC
+
+ # Clean out patent-or-otherwise-encumbered code
+ # Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher)
+ # IDEA: Expired https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+ # EC: ????????? ??/??/2015 https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+ # MDC2: Expired https://en.wikipedia.org/wiki/MDC-2
+ # RC5: Expired https://en.wikipedia.org/wiki/RC5
+
+ use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+ echoit() { echo "$@" ; "$@" ; }
+
+ local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+ # See if our toolchain supports __uint128_t. If so, it's 64bit
+ # friendly and can use the nicely optimized code paths. #460790
+ local ec_nistp_64_gcc_128
+ # Disable it for now though #469976
+ #if ! use bindist ; then
+ # echo "__uint128_t i;" > "${T}"/128.c
+ # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+ # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+ # fi
+ #fi
+
+ local sslout=$(./gentoo.config)
+ einfo "Use configuration ${sslout:-(openssl knows best)}"
+ local config="Configure"
+ [[ -z ${sslout} ]] && config="config"
+
+ # 'srp' was restricted until early 2017 as well.
+ # "disable-deprecated" option breaks too many consumers.
+ # Don't set it without thorough revdeps testing.
+ echoit \
+ ./${config} \
+ ${sslout} \
+ $(use cpu_flags_x86_sse2 || echo "no-sse2") \
+ enable-camellia \
+ $(use_ssl !bindist ec) \
+ $(use_ssl !bindist srp) \
+ $(use elibc_musl && echo "no-async") \
+ ${ec_nistp_64_gcc_128} \
+ enable-idea \
+ enable-mdc2 \
+ enable-rc5 \
+ $(use_ssl asm) \
+ $(use_ssl rfc3779) \
+ $(use_ssl sctp) \
+ $(use_ssl tls-heartbeat heartbeats) \
+ $(use_ssl zlib) \
+ --prefix="${EPREFIX}"/usr \
+ --openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+ --libdir=$(get_libdir) \
+ shared threads \
+ || die
+
+ # Clean out hardcoded flags that openssl uses
+ # Fix quoting for sed
+ local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
+ -e 's:^CFLAGS=::' \
+ -e 's:-fomit-frame-pointer ::g' \
+ -e 's:-O[0-9] ::g' \
+ -e 's:-march=[-a-z0-9]* ::g' \
+ -e 's:-mcpu=[-a-z0-9]* ::g' \
+ -e 's:-m[a-z0-9]* ::g' \
+ -e 's:\\:\\\\:g' \
+ )
+ sed -i \
+ -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
+ -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+ Makefile || die
+}
+
+multilib_src_compile() {
+ # depend is needed to use $confopts; it also doesn't matter
+ # that it's -j1 as the code itself serializes subdirs
+ emake -j1 depend
+ emake all
+}
+
+multilib_src_test() {
+ emake -j1 test
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ # openssl installs perl version of c_rehash by default, but
+ # we provide a shell version via app-misc/c_rehash
+ rm "${ED%/}"/usr/bin/c_rehash || die
+
+ dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+ # This is crappy in that the static archives are still built even
+ # when USE=static-libs. But this is due to a failing in the openssl
+ # build system: the static archives are built as PIC all the time.
+ # Only way around this would be to manually configure+compile openssl
+ # twice; once with shared lib support enabled and once without.
+ use static-libs || rm -f "${ED%/}"/usr/lib*/lib*.a
+
+ # create the certs directory
+ keepdir ${SSL_CNF_DIR}/certs
+
+ # Namespace openssl programs to prevent conflicts with other man pages
+ cd "${ED%/}"/usr/share/man || die
+ local m d s
+ for m in $(find . -type f | xargs grep -L '#include') ; do
+ d=${m%/*} ; d=${d#./} ; m=${m##*/}
+ [[ ${m} == openssl.1* ]] && continue
+ [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+ mv ${d}/{,ssl-}${m}
+ # fix up references to renamed man pages
+ sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+ ln -s ssl-${m} ${d}/openssl-${m}
+ # locate any symlinks that point to this man page ... we assume
+ # that any broken links are due to the above renaming
+ for s in $(find -L ${d} -type l) ; do
+ s=${s##*/}
+ rm -f ${d}/${s}
+ # We don't want to "|| die" here
+ ln -s ssl-${m} ${d}/ssl-${s}
+ ln -s ssl-${s} ${d}/openssl-${s}
+ done
+ done
+ [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+ dodir /etc/sandbox.d #254521
+ echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED%/}"/etc/sandbox.d/10openssl
+
+ diropts -m0700
+ keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+ ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+ c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+ eend $?
+}
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 82200c1d0abf..07df6d6f4adb 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1,4 +1 @@
-DIST protobuf-c-1.0.2.tar.gz 449923 BLAKE2B 25db29683bc5129b0aaf015eee8ceea2aa16cf83318f2abc882bcdc51674a5e4ec9499be559cd9f8abaab5f4829d8346104fd4d957f5abca7de9b22f29e1e449 SHA512 d748712f4216015802ffeff1072266da98ba9d9a4dfdaecd1c1b9d76f15403112b5cc2563a54390653c5eb82d7b51caf4c1f595cf1287bcbb123efb646e12f33
-DIST protobuf-c-1.1.1.tar.gz 454913 BLAKE2B a8ac4df0880f3598eee01db2647a1701b47abbff479e311cbe48ea8b47da94a5770ceae6d290c086a21a8f42d77b7b48cc4af470ef43f6e176f3d487f03b0fc3 SHA512 9eeb3165ca53c57091503866e2600d675e03d79c22dbd41bd3c4ebf8e569ed147f0b832e8b68dcdaece2f151798e7e0589fdf975e9a04fae9904991e89ea0465
-DIST protobuf-c-1.2.1.tar.gz 458614 BLAKE2B f0fcb9e43729e6b95e9062f2e2ed86b10e3ba9b03f059d3cd4084787ffca383dbb7d495995ce47193cb3f10635932f015bcf8dbb3e874a04fe2d6ec8ff4a8018 SHA512 032b82dde333e286a3aff1a621be9e497122d38ce8f337275842a55be083232605387a516cfd4b9a09f8f7caf8817c14e596570352bc6ae495c3a3f15ac00959
DIST protobuf-c-1.3.0.tar.gz 488443 BLAKE2B 8eca559ad06aaa5cb09984b3d2e7c5767cd341c2e439b94c2d219226c612992808da091d01f5e0ad5f14e47292d4a621037953b58a5bea827e7c22837234ffe6 SHA512 ba49bf45a9ae93d41f200f4f18c4f9469c63fcc2a2392b3b45f083c378a6876891890448ceba216083ad351aa35f4669cd920973f53e5780de9ec4c8f61279bb
diff --git a/dev-libs/protobuf-c/files/protobuf-c-1.1.0-no-build-tests.patch b/dev-libs/protobuf-c/files/protobuf-c-1.1.0-no-build-tests.patch
deleted file mode 100644
index 4e611d710705..000000000000
--- a/dev-libs/protobuf-c/files/protobuf-c-1.1.0-no-build-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/518440
-
-avoid compiling tests when we aren't actually testing, especially since it
-requires a compiler to execute which fails when cross-compiling
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -135,7 +135,7 @@ t_generated_code2_test_generated_code2_SOURCES = \
- t_generated_code2_test_generated_code2_LDADD = \
- protobuf-c/libprotobuf-c.la
-
--noinst_PROGRAMS += \
-+check_PROGRAMS += \
- t/generated-code2/cxx-generate-packed-data
-
- t_generated_code2_cxx_generate_packed_data_SOURCES = \
-@@ -160,12 +160,6 @@ t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto
- t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT)
- $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc
-
--BUILT_SOURCES += \
-- t/test.pb-c.c t/test.pb-c.h \
-- t/test-full.pb-c.c t/test-full.pb-c.h \
-- t/test-full.pb.cc t/test-full.pb.h \
-- t/generated-code2/test-full-cxx-output.inc
--
- t_version_version_SOURCES = \
- t/version/version.c
- t_version_version_LDADD = \
diff --git a/dev-libs/protobuf-c/files/protobuf-c-1.2.0-no-build-tests.patch b/dev-libs/protobuf-c/files/protobuf-c-1.2.0-no-build-tests.patch
deleted file mode 100644
index c11e98df5784..000000000000
--- a/dev-libs/protobuf-c/files/protobuf-c-1.2.0-no-build-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/518440
-
-avoid compiling tests when we aren't actually testing, especially since it
-requires a compiler to execute which fails when cross-compiling
-
---- protobuf-c-1.2.0/Makefile.am
-+++ protobuf-c-1.2.0/Makefile.am
-@@ -142,7 +142,7 @@
- t_generated_code2_test_generated_code2_LDADD = \
- protobuf-c/libprotobuf-c.la
-
--noinst_PROGRAMS += \
-+check_PROGRAMS += \
- t/generated-code2/cxx-generate-packed-data
-
- t_generated_code2_cxx_generate_packed_data_SOURCES = \
-@@ -170,13 +170,6 @@
- t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT)
- $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc
-
--BUILT_SOURCES += \
-- t/test.pb-c.c t/test.pb-c.h \
-- t/test-full.pb-c.c t/test-full.pb-c.h \
-- t/test-optimized.pb-c.c t/test-optimized.pb-c.h \
-- t/test-full.pb.cc t/test-full.pb.h \
-- t/generated-code2/test-full-cxx-output.inc
--
- t_version_version_SOURCES = \
- t/version/version.c
- t_version_version_LDADD = \
diff --git a/dev-libs/protobuf-c/protobuf-c-1.0.2-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.0.2-r1.ebuild
deleted file mode 100644
index fc9d7452ffa5..000000000000
--- a/dev-libs/protobuf-c/protobuf-c-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Protocol Buffers implementation in C"
-HOMEPAGE="https://github.com/protobuf-c/protobuf-c/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/protobuf-2.5.0-r2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-libs/protobuf-c/protobuf-c-1.1.1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.1.1.ebuild
deleted file mode 100644
index 00dcc508cf72..000000000000
--- a/dev-libs/protobuf-c/protobuf-c-1.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Protocol Buffers implementation in C"
-HOMEPAGE="https://github.com/protobuf-c/protobuf-c/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="static-libs test"
-
-RDEPEND=">=dev-libs/protobuf-2.6.0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( ${AUTOTOOLS_DEPEND} )
- virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- if ! use test ; then
- epatch "${FILESDIR}"/${PN}-1.1.0-no-build-tests.patch
- AUTOTOOLS_AUTORECONF=true
- fi
- autotools-multilib_src_prepare
-}
diff --git a/dev-libs/protobuf-c/protobuf-c-1.2.1-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.2.1-r1.ebuild
deleted file mode 100644
index 7004d26b7e11..000000000000
--- a/dev-libs/protobuf-c/protobuf-c-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Protocol Buffers implementation in C"
-HOMEPAGE="https://github.com/protobuf-c/protobuf-c/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-# Subslot == SONAME version
-SLOT="0/1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs test"
-
-RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( ${AUTOTOOLS_DEPEND} )
- virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
- if ! use test ; then
- eapply "${FILESDIR}"/${PN}-1.2.0-no-build-tests.patch
- eautoreconf
- fi
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" \
- econf "${myeconfargs[@]}"
-}
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.0.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.0.ebuild
deleted file mode 100644
index 4e24a882515e..000000000000
--- a/dev-libs/protobuf-c/protobuf-c-1.3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Protocol Buffers implementation in C"
-HOMEPAGE="https://github.com/protobuf-c/protobuf-c/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-# Subslot == SONAME version
-SLOT="0/1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs test"
-
-RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( ${AUTOTOOLS_DEPEND} )
- virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- if ! use test ; then
- eapply "${FILESDIR}"/${PN}-1.3.0-no-build-tests.patch
- eautoreconf
- fi
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" \
- econf "${myeconfargs[@]}"
-}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index d919674fdff7..aa6d99043ce0 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,9 +1,3 @@
-DIST protobuf-2.5.0.tar.bz2 1866763 BLAKE2B e4cece402bbeaff4400732ee2401f1a80bb0e70728eb41052da26b969b6fa6672b11ca80e28343d03a9df97c72bb8d8e2f890b9b730bad3c23c829aaf36ff701 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee
-DIST protobuf-2.6.1.tar.bz2 2021416 BLAKE2B f58178a6081d58fff1582a907dfb9087f07b72e0701f19649b3adc9e1827a0f2670e25c6d177e60a59b965b3622b1eb11590b4b17083ee148c0da7eb07f02e55 SHA512 8b092b87fcd79223db199cd3d330f3d43689b47f345aa4e34028dcf1680d609a5d5a89ab08588e817b566d3b265834c38f1db580bc1c144b512ce74d35f2a174
-DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 BLAKE2B 44c6d0e42e92a822230b41fa732b58816d18e92e8466a59bb21de98cbb6cb3bcf6db29a7c5842ff8c754231c44626a95fd768f514f49bbb2ffc098618c7a50a2 SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b
-DIST protobuf-3.0.2.tar.gz 3917853 BLAKE2B 542beb7b16de0da2cdc6f7981381b6de1ff2c01f229005727a74b4e5ff16db3f44e91c026eed323ccb1a2a2b3f834afa3686df80ff5f90d54f5f030cbaf601cf SHA512 28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2
-DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f62b01a694d37c0b069956ef5d658df1beef68514b00a22005a36293b4a8a18654b5656f8c614309f0a744039c2fb SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a
-DIST protobuf-3.3.0.tar.gz 4336596 BLAKE2B 381b2961fe1de8a86225903d0cfe4c98c238336b8782e5191c57c6fcf60cf321f39163d50864bf9c119a90bd7796269dc7e34168a158f7affa7fa295ce5deae0 SHA512 0734a55ae92f0539dfb507e174539d290fd8e93633c1edd8810e0d51c37e67254337b75fc5ba9450316f6416e1f8f8cfb59415864657b55f2a1696fbcdfe7636
DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
diff --git a/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch b/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch
deleted file mode 100644
index 418622e547f4..000000000000
--- a/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fixing as-needed issue
-
-http://bugs.gentoo.org/show_bug.cgi?id=271509
-
---- m4/acx_pthread.m4
-+++ m4/acx_pthread.m4
-@@ -278,7 +278,8 @@
- fi
- fi
-
-- if test x"$done" = xno; then
-+ if test x"$done" = xyes; then
-+ done="no"
- AC_MSG_CHECKING([whether -pthread is sufficient with -shared])
- AC_TRY_LINK([#include ],
- [pthread_t th; pthread_join(th, 0);
---- gtest/m4/acx_pthread.m4
-+++ gtest/m4/acx_pthread.m4
-@@ -278,7 +278,8 @@
- fi
- fi
-
-- if test x"$done" = xno; then
-+ if test x"$done" = xyes; then
-+ done="no"
- AC_MSG_CHECKING([whether -pthread is sufficient with -shared])
- AC_TRY_LINK([#include ],
- [pthread_t th; pthread_join(th, 0);
diff --git a/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch b/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch
deleted file mode 100644
index 77d624938243..000000000000
--- a/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix build with emacs-24.4.
-
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18845
-
---- protobuf-2.5.0/editors/protobuf-mode.el
-+++ protobuf-2.5.0/editors/protobuf-mode.el
-@@ -66,6 +66,7 @@
- (require 'cc-mode)
-
- (eval-when-compile
-+ (require 'cl)
- (require 'cc-langs)
- (require 'cc-fonts))
-
diff --git a/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch b/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch
deleted file mode 100644
index 5c8d47831807..000000000000
--- a/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fix from upstream for building w/x32
-
-https://code.google.com/p/protobuf/issues/detail?id=474
-
---- src/google/protobuf/stubs/atomicops.h (revision 491)
-+++ src/google/protobuf/stubs/atomicops.h (revision 492)
-@@ -66,7 +66,7 @@ typedef int32 Atomic32;
- #ifdef GOOGLE_PROTOBUF_ARCH_64_BIT
- // We need to be able to go between Atomic64 and AtomicWord implicitly. This
- // means Atomic64 and AtomicWord should be the same type on 64-bit.
--#if defined(GOOGLE_PROTOBUF_OS_NACL)
-+#if defined(__ILP32__) || defined(GOOGLE_PROTOBUF_OS_NACL)
- // NaCl's intptr_t is not actually 64-bits on 64-bit!
- // http://code.google.com/p/nativeclient/issues/detail?id=1162
- typedef int64 Atomic64;
diff --git a/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch b/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch
deleted file mode 100644
index 894f2ffd095f..000000000000
--- a/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-https://github.com/google/protobuf/pull/235
-
-From 18f71a50a9000e7558ae48a971fa301d76220ff0 Mon Sep 17 00:00:00 2001
-From: Prathmesh Prabhu
-Date: Tue, 10 Mar 2015 17:04:40 -0400
-Subject: [PATCH] protoc: Add options to redirect input/output to files.
-
-When using protoc to encode/decode protobufs, the input/output was from
-stdin/stdout only. This patch adds command line flags to specify files to read
-the protobuf from and and write the encoded/decoded protobuf to.
----
- .../protobuf/compiler/command_line_interface.cc | 99 +++++++++++++++++-----
- .../protobuf/compiler/command_line_interface.h | 11 ++-
- .../compiler/command_line_interface_unittest.cc | 25 +++++-
- 3 files changed, 110 insertions(+), 25 deletions(-)
-
-diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc
-index 567238a..1db85c9 100644
---- a/src/google/protobuf/compiler/command_line_interface.cc
-+++ b/src/google/protobuf/compiler/command_line_interface.cc
-@@ -745,6 +745,28 @@ int CommandLineInterface::Run(int argc, const char* const argv[]) {
- }
-
- if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
-+ bool success = false;
-+ int in_fd = STDIN_FILENO;
-+ int out_fd = STDOUT_FILENO;
-+
-+ if (!protobuf_in_path_.empty()) {
-+ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
-+ if (in_fd == -1) {
-+ cerr << protobuf_in_path_ << ": error: failed to open file." << endl;
-+ return 1;
-+ }
-+ }
-+ if (!protobuf_out_path_.empty()) {
-+ out_fd = open(protobuf_out_path_.c_str(),
-+ O_WRONLY | O_CREAT | O_TRUNC,
-+ 0644);
-+ if (out_fd == -1) {
-+ cerr << protobuf_out_path_ << ": error: failed to open file." << endl;
-+ close(in_fd);
-+ return 1;
-+ }
-+ }
-+
- if (codec_type_.empty()) {
- // HACK: Define an EmptyMessage type to use for decoding.
- DescriptorPool pool;
-@@ -753,13 +775,20 @@ int CommandLineInterface::Run(int argc, const char* const argv[]) {
- file.add_message_type()->set_name("EmptyMessage");
- GOOGLE_CHECK(pool.BuildFile(file) != NULL);
- codec_type_ = "EmptyMessage";
-- if (!EncodeOrDecode(&pool)) {
-- return 1;
-- }
-+ success = EncodeOrDecode(&pool, in_fd, out_fd);
- } else {
-- if (!EncodeOrDecode(importer.pool())) {
-- return 1;
-- }
-+ success = EncodeOrDecode(importer.pool(), in_fd, out_fd);
-+ }
-+
-+ if (in_fd != STDIN_FILENO) {
-+ close(in_fd);
-+ }
-+ if (out_fd != STDOUT_FILENO) {
-+ close(out_fd);
-+ }
-+
-+ if (!success) {
-+ return 1;
- }
- }
-
-@@ -873,6 +902,11 @@ CommandLineInterface::ParseArguments(int argc, const char* const argv[]) {
- if (status != PARSE_ARGUMENT_DONE_AND_CONTINUE)
- return status;
- }
-+ if (mode_ == MODE_COMPILE &&
-+ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
-+ cerr << "--protobuf_in and --protobuf_out are only valid with "
-+ << "decode operations. Ignoring.";
-+ }
-
- // If no --proto_path was given, use the current working directory.
- if (proto_path_.empty()) {
-@@ -1123,6 +1157,12 @@ CommandLineInterface::InterpretArgument(const string& name,
-
- codec_type_ = value;
-
-+ } else if (name == "--protobuf_in") {
-+ protobuf_in_path_ = value;
-+
-+ } else if (name == "--protobuf_out") {
-+ protobuf_out_path_ = value;
-+
- } else if (name == "--error_format") {
- if (value == "gcc") {
- error_format_ = ERROR_FORMAT_GCC;
-@@ -1238,18 +1278,29 @@ void CommandLineInterface::PrintHelpText() {
- " --version Show version info and exit.\n"
- " -h, --help Show this text and exit.\n"
- " --encode=MESSAGE_TYPE Read a text-format message of the given type\n"
--" from standard input and write it in binary\n"
--" to standard output. The message type must\n"
--" be defined in PROTO_FILES or their imports.\n"
--" --decode=MESSAGE_TYPE Read a binary message of the given type from\n"
--" standard input and write it in text format\n"
--" to standard output. The message type must\n"
-+" an write it in binary. The message type must\n"
- " be defined in PROTO_FILES or their imports.\n"
--" --decode_raw Read an arbitrary protocol message from\n"
--" standard input and write the raw tag/value\n"
--" pairs in text format to standard output. No\n"
-+" The input/output protobuf files are specified\n"
-+" using the --protobuf_in and --protobuf_out\n"
-+" command line flags.\n"
-+" --decode=MESSAGE_TYPE Read a binary message of the given type and\n"
-+" write it in text format. The message type\n"
-+" must be defined in PROTO_FILES or their\n"
-+" imports. The input/output protobuf files are\n"
-+" specified using the --protobuf_in and \n"
-+" --protobuf_out command line flags.\n"
-+" --decode_raw Read an arbitrary protocol message and write\n"
-+" the raw tag/value pairs in text format. No\n"
- " PROTO_FILES should be given when using this\n"
--" flag.\n"
-+" flag. The input/output protobuf files are\n"
-+" specified using the --protobuf_in and \n"
-+" --protobuf_out command line flags.\n"
-+" --protobuf_in Absolute path to the protobuf file to read to\n"
-+" encode/decode. If omitted, file will be read\n"
-+" from STDIN.\n"
-+" --protobuf_out Absolute path to the protobuf file to write to\n"
-+" after encode/decode operation. If omitted,\n"
-+" output is written to STDOUT.\n"
- " -oFILE, Writes a FileDescriptorSet (a protocol buffer,\n"
- " --descriptor_set_out=FILE defined in descriptor.proto) containing all of\n"
- " the input files to FILE.\n"
-@@ -1490,7 +1541,9 @@ bool CommandLineInterface::GeneratePluginOutput(
- return true;
- }
-
--bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
-+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
-+ int in_fd,
-+ int out_fd) {
- // Look up the type.
- const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
- if (type == NULL) {
-@@ -1502,15 +1555,15 @@ bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
- google::protobuf::scoped_ptr message(dynamic_factory.GetPrototype(type)->New());
-
- if (mode_ == MODE_ENCODE) {
-- SetFdToTextMode(STDIN_FILENO);
-- SetFdToBinaryMode(STDOUT_FILENO);
-+ SetFdToTextMode(in_fd);
-+ SetFdToBinaryMode(out_fd);
- } else {
-- SetFdToBinaryMode(STDIN_FILENO);
-- SetFdToTextMode(STDOUT_FILENO);
-+ SetFdToBinaryMode(in_fd);
-+ SetFdToTextMode(out_fd);
- }
-
-- io::FileInputStream in(STDIN_FILENO);
-- io::FileOutputStream out(STDOUT_FILENO);
-+ io::FileInputStream in(in_fd);
-+ io::FileOutputStream out(out_fd);
-
- if (mode_ == MODE_ENCODE) {
- // Input is text.
-diff --git a/src/google/protobuf/compiler/command_line_interface.h b/src/google/protobuf/compiler/command_line_interface.h
-index 7e611c4..b6fc38a 100644
---- a/src/google/protobuf/compiler/command_line_interface.h
-+++ b/src/google/protobuf/compiler/command_line_interface.h
-@@ -244,7 +244,9 @@ class LIBPROTOC_EXPORT CommandLineInterface {
- string* error);
-
- // Implements --encode and --decode.
-- bool EncodeOrDecode(const DescriptorPool* pool);
-+ bool EncodeOrDecode(const DescriptorPool* pool,
-+ int in_fd,
-+ int out_fd);
-
- // Implements the --descriptor_set_out option.
- bool WriteDescriptorSet(const vector parsed_files);
-@@ -357,6 +359,13 @@ class LIBPROTOC_EXPORT CommandLineInterface {
- // decoding. (Empty string indicates --decode_raw.)
- string codec_type_;
-
-+ // When using --encode / --decode / --decode_raw absolute path to the output
-+ // file. (Empty string indicates write to STDOUT).
-+ string protobuf_out_path_;
-+ // When using --encode / --decode / --decode_raw, absolute path to the input
-+ // file. (Empty string indicates read from STDIN).
-+ string protobuf_in_path_;
-+
- // If --descriptor_set_out was given, this is the filename to which the
- // FileDescriptorSet should be written. Otherwise, empty.
- string descriptor_set_name_;
-diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc
-index 2b26f3b..78ff2cf 100644
---- a/src/google/protobuf/compiler/command_line_interface_unittest.cc
-+++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc
-@@ -94,7 +94,7 @@ class CommandLineInterfaceTest : public testing::Test {
- virtual void SetUp();
- virtual void TearDown();
-
-- // Runs the CommandLineInterface with the given command line. The
-+ // Run the CommandLineInterface with the given command line. The
- // command is automatically split on spaces, and the string "$tmpdir"
- // is replaced with TestTempDir().
- void Run(const string& command);
-@@ -1680,6 +1680,17 @@ class EncodeDecodeTest : public testing::Test {
- EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_));
- }
-
-+ void ExpectBinaryFilesMatch(const string &expected_file,
-+ const string &actual_file) {
-+ string expected_output, actual_output;
-+ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
-+ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
-+
-+ // Don't use EXPECT_EQ because we don't want to print raw binary data to
-+ // stdout on failure.
-+ EXPECT_TRUE(expected_output == actual_output);
-+ }
-+
- private:
- int duped_stdin_;
- string captured_stdout_;
-@@ -1745,6 +1756,18 @@ TEST_F(EncodeDecodeTest, ProtoParseError) {
- "google/protobuf/no_such_file.proto: File not found.\n");
- }
-
-+TEST_F(EncodeDecodeTest, RedirectInputOutput) {
-+ string out_file = TestTempDir() + "/golden_message_out.pbf";
-+ string cmd = "";
-+ cmd += "google/protobuf/unittest.proto ";
-+ cmd += "--encode=protobuf_unittest.TestAllTypes ";
-+ cmd += "--protobuf_in=" + TestSourceDir() +
-+ "/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt ";
-+ cmd += "--protobuf_out=" + out_file;
-+ EXPECT_TRUE(Run(cmd));
-+ ExpectBinaryFilesMatch(out_file, TestSourceDir() + "/google/protobuf/testdata/golden_message_oneof_implemented");
-+}
-+
- } // anonymous namespace
-
- } // namespace compiler
---
-2.3.1
-
diff --git a/dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch b/dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch
deleted file mode 100644
index 341d1128aa1a..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac 2015-12-30 22:21:46.000000000 +0100
-+++ b/configure.ac 2016-04-16 17:46:54.858904639 +0200
-@@ -176,9 +176,9 @@
- # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
- # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
- # too.
--export CFLAGS
--export CXXFLAGS
--AC_CONFIG_SUBDIRS([gmock])
-+#export CFLAGS
-+#export CXXFLAGS
-+#AC_CONFIG_SUBDIRS([gmock])
-
- AC_CONFIG_FILES([Makefile src/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
- AC_OUTPUT
-diff -Naur a/Makefile.am b/Makefile.am
---- a/Makefile.am 2015-12-30 22:21:46.000000000 +0100
-+++ b/Makefile.am 2016-04-16 17:46:25.355751203 +0200
-@@ -17,9 +17,10 @@
- # want "make install" to recurse into gmock since we don't want to overwrite
- # the installed version of gmock if there is one.
- check-local:
-- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
-- @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
-- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
-+ @echo "Making of gmock disabled"
-+# @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
-+# @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
-+# @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
-
- # We would like to clean gmock when "make clean" is invoked. But we have to
- # be careful because clean-local is also invoked during "make distclean", but
-diff -Naur a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am 2015-12-30 22:21:46.000000000 +0100
-+++ b/src/Makefile.am 2016-04-16 17:47:07.026967535 +0200
-@@ -669,11 +669,8 @@
- protobuf-lite-test test_plugin protobuf-lite-arena-test \
- $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-- ../gmock/gtest/lib/libgtest.la \
-- ../gmock/lib/libgmock.la \
-- ../gmock/lib/libgmock_main.la
--protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \
-- -I$(srcdir)/../gmock/include
-+ -L/usr/lib -lgmock -lgmock_main -lgtest
-+protobuf_test_CPPFLAGS = -I/usr/include
- # Disable optimization for tests unless the user explicitly asked for it,
- # since test_util.cc takes forever to compile with optimization (with GCC).
- # See configure.ac for more info.
-@@ -753,11 +750,8 @@
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
- libprotoc.la \
-- ../gmock/gtest/lib/libgtest.la \
-- ../gmock/lib/libgmock.la \
-- ../gmock/lib/libgmock_main.la
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \
-- -I$(srcdir)/../gmock/gtest/include \
-+ -L/usr/lib -lgmock -lgmock_main -lgtest
-+protobuf_lazy_descriptor_test_CPPFLAGS = -I/usr/include \
- -DPROTOBUF_TEST_NO_DESCRIPTORS
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lazy_descriptor_test_SOURCES = \
-@@ -788,11 +782,8 @@
- # gtest when building the test internally our memory sanitizer doesn't detect
- # memory leaks (don't know why).
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
-- ../gmock/gtest/lib/libgtest.la \
-- ../gmock/lib/libgmock.la \
-- ../gmock/lib/libgmock_main.la
--protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \
-- -I$(srcdir)/../gmock/gtest/include
-+ -L/usr/lib -lgmock -lgmock_main -lgtest
-+protobuf_lite_arena_test_CPPFLAGS = -I/usr/include
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_arena_test_SOURCES = \
- google/protobuf/lite_arena_unittest.cc \
-@@ -801,8 +792,8 @@
-
- # Test plugin binary.
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-- ../gmock/gtest/lib/libgtest.la
--test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include
-+ -L/usr/lib -lgtest
-+test_plugin_CPPFLAGS = -I/usr/include
- test_plugin_SOURCES = \
- google/protobuf/compiler/mock_code_generator.cc \
- google/protobuf/testing/file.cc \
diff --git a/dev-libs/protobuf/files/protobuf-3.0.2-disable-local-gmock.patch b/dev-libs/protobuf/files/protobuf-3.0.2-disable-local-gmock.patch
deleted file mode 100644
index a2dda8aafac1..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.0.2-disable-local-gmock.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -Naur protobuf-3.0.2.orig/Makefile.am protobuf-3.0.2/Makefile.am
---- protobuf-3.0.2.orig/Makefile.am 2016-09-06 15:40:51.000000000 -0700
-+++ protobuf-3.0.2/Makefile.am 2016-12-14 14:44:50.516520874 -0800
-@@ -17,9 +17,10 @@
- # want "make install" to recurse into gmock since we don't want to overwrite
- # the installed version of gmock if there is one.
- check-local:
-- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
-- @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
-- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
-+ @echo "Making of gmock disabled"
-+# @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
-+# @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
-+# @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
-
- # We would like to clean gmock when "make clean" is invoked. But we have to
- # be careful because clean-local is also invoked during "make distclean", but
-diff -Naur protobuf-3.0.2.orig/configure.ac protobuf-3.0.2/configure.ac
---- protobuf-3.0.2.orig/configure.ac 2016-09-06 15:40:51.000000000 -0700
-+++ protobuf-3.0.2/configure.ac 2016-12-14 14:44:50.516520874 -0800
-@@ -181,9 +181,9 @@
- # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
- # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
- # too.
--export CFLAGS
--export CXXFLAGS
--AC_CONFIG_SUBDIRS([gmock])
-+#export CFLAGS
-+#export CXXFLAGS
-+#AC_CONFIG_SUBDIRS([gmock])
-
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
- AC_OUTPUT
-diff -Naur protobuf-3.0.2.orig/src/Makefile.am protobuf-3.0.2/src/Makefile.am
---- protobuf-3.0.2.orig/src/Makefile.am 2016-09-06 15:40:51.000000000 -0700
-+++ protobuf-3.0.2/src/Makefile.am 2016-12-14 14:44:50.517520885 -0800
-@@ -688,11 +688,8 @@
- protobuf-lite-test test_plugin protobuf-lite-arena-test \
- no-warning-test $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-- ../gmock/gtest/lib/libgtest.la \
-- ../gmock/lib/libgmock.la \
-- ../gmock/lib/libgmock_main.la
--protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \
-- -I$(srcdir)/../gmock/include
-+ -L/usr/lib -lgmock -lgmock_main -lgtest
-+protobuf_test_CPPFLAGS = -I/usr/include
- # Disable optimization for tests unless the user explicitly asked for it,
- # since test_util.cc takes forever to compile with optimization (with GCC).
- # See configure.ac for more info.
-@@ -775,11 +772,8 @@
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
- libprotoc.la \
-- ../gmock/gtest/lib/libgtest.la \
-- ../gmock/lib/libgmock.la \
-- ../gmock/lib/libgmock_main.la
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \
-- -I$(srcdir)/../gmock/gtest/include \
-+ -L/usr/lib -lgmock -lgmock_main -lgtest
-+protobuf_lazy_descriptor_test_CPPFLAGS = -I/usr/include \
- -DPROTOBUF_TEST_NO_DESCRIPTORS
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lazy_descriptor_test_SOURCES = \
-@@ -810,11 +804,8 @@
- # gtest when building the test internally our memory sanitizer doesn't detect
- # memory leaks (don't know why).
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
-- ../gmock/gtest/lib/libgtest.la \
-- ../gmock/lib/libgmock.la \
-- ../gmock/lib/libgmock_main.la
--protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \
-- -I$(srcdir)/../gmock/gtest/include
-+ -L/usr/lib -lgmock -lgmock_main -lgtest
-+protobuf_lite_arena_test_CPPFLAGS = -I/usr/include
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_arena_test_SOURCES = \
- google/protobuf/lite_arena_unittest.cc \
-@@ -823,8 +814,8 @@
-
- # Test plugin binary.
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-- ../gmock/gtest/lib/libgtest.la
--test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include
-+ -L/usr/lib -lgtest
-+test_plugin_CPPFLAGS = -I/usr/include
- test_plugin_SOURCES = \
- google/protobuf/compiler/mock_code_generator.cc \
- google/protobuf/testing/file.cc \
-@@ -853,9 +844,8 @@
- echo "TEST(NoWarningTest, Empty) {}" >> no_warning_test.cc
-
- no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
-- ../gmock/gtest/lib/libgtest.la \
-- ../gmock/gtest/lib/libgtest_main.la
--no_warning_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include
-+ -L/usr/lib -lgtest -lgtest_main
-+no_warning_test_CPPFLAGS = -I/usr/include
- no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \
- -Wall -Werror
- nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs)
diff --git a/dev-libs/protobuf/files/protobuf-3.3.0-disable-local-gmock.patch b/dev-libs/protobuf/files/protobuf-3.3.0-disable-local-gmock.patch
deleted file mode 100644
index 25dc7bd074bf..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.3.0-disable-local-gmock.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -Naur protobuf-3.3.0.orig/Makefile.am protobuf-3.3.0/Makefile.am
---- protobuf-3.3.0.orig/Makefile.am 2017-05-01 20:04:35.448840428 -0700
-+++ protobuf-3.3.0/Makefile.am 2017-05-01 20:04:48.855978898 -0700
-@@ -17,9 +17,10 @@
- # want "make install" to recurse into gmock since we don't want to overwrite
- # the installed version of gmock if there is one.
- check-local:
-- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
-- @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
-- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
-+ @echo "Making of gmock disabled"
-+# @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
-+# @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
-+# @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
-
- # We would like to clean gmock when "make clean" is invoked. But we have to
- # be careful because clean-local is also invoked during "make distclean", but
-diff -Naur protobuf-3.3.0.orig/configure.ac protobuf-3.3.0/configure.ac
---- protobuf-3.3.0.orig/configure.ac 2017-05-01 20:04:35.497840933 -0700
-+++ protobuf-3.3.0/configure.ac 2017-05-01 20:04:48.856978908 -0700
-@@ -203,9 +203,9 @@
- # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
- # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
- # too.
--export CFLAGS
--export CXXFLAGS
--AC_CONFIG_SUBDIRS([gmock])
-+#export CFLAGS
-+#export CXXFLAGS
-+#AC_CONFIG_SUBDIRS([gmock])
-
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
- AC_OUTPUT
-diff -Naur protobuf-3.3.0.orig/src/Makefile.am protobuf-3.3.0/src/Makefile.am
---- protobuf-3.3.0.orig/src/Makefile.am 2017-05-01 20:04:35.549841471 -0700
-+++ protobuf-3.3.0/src/Makefile.am 2017-05-01 20:06:46.307191948 -0700
-@@ -748,11 +748,8 @@
- protobuf-lite-test test_plugin protobuf-lite-arena-test \
- no-warning-test $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-- ../gmock/gtest/lib/libgtest.la \
-- ../gmock/lib/libgmock.la \
-- ../gmock/lib/libgmock_main.la
--protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \
-- -I$(srcdir)/../gmock/include
-+ -L/usr/lib -lgmock -lgmock_main -lgtest
-+protobuf_test_CPPFLAGS = -I/usr/include
- # Disable optimization for tests unless the user explicitly asked for it,
- # since test_util.cc takes forever to compile with optimization (with GCC).
- # See configure.ac for more info.
-@@ -837,11 +834,8 @@
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
- libprotoc.la \
-- ../gmock/gtest/lib/libgtest.la \
-- ../gmock/lib/libgmock.la \
-- ../gmock/lib/libgmock_main.la
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \
-- -I$(srcdir)/../gmock/gtest/include \
-+ -L/usr/lib -lgmock -lgmock_main -lgtest
-+protobuf_lazy_descriptor_test_CPPFLAGS = -I/usr/include \
- -DPROTOBUF_TEST_NO_DESCRIPTORS
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lazy_descriptor_test_SOURCES = \
-@@ -862,11 +856,8 @@
- # full runtime and we want to make sure this test builds without full
- # runtime.
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
-- ../gmock/gtest/lib/libgtest.la \
-- ../gmock/lib/libgmock.la \
-- ../gmock/lib/libgmock_main.la
--protobuf_lite_test_CPPFLAGS= -I$(srcdir)/../gmock/include \
-- -I$(srcdir)/../gmock/gtest/include
-+ -L/usr/lib -lgmock -lgmock_main -lgtest
-+protobuf_lite_test_CPPFLAGS = -I/usr/include
- protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_test_SOURCES = \
- google/protobuf/lite_unittest.cc \
-@@ -877,11 +868,8 @@
- # gtest when building the test internally our memory sanitizer doesn't detect
- # memory leaks (don't know why).
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
-- ../gmock/gtest/lib/libgtest.la \
-- ../gmock/lib/libgmock.la \
-- ../gmock/lib/libgmock_main.la
--protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \
-- -I$(srcdir)/../gmock/gtest/include
-+ -L/usr/lib -lgmock -lgmock_main -lgtest
-+protobuf_lite_arena_test_CPPFLAGS = -I/usr/include
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_arena_test_SOURCES = \
- google/protobuf/lite_arena_unittest.cc \
-@@ -890,8 +878,8 @@
-
- # Test plugin binary.
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-- ../gmock/gtest/lib/libgtest.la
--test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include
-+ -L/usr/lib -lgtest
-+test_plugin_CPPFLAGS = -I/usr/include
- test_plugin_SOURCES = \
- google/protobuf/compiler/mock_code_generator.cc \
- google/protobuf/testing/file.cc \
-@@ -920,9 +908,8 @@
- echo "TEST(NoWarningTest, Empty) {}" >> no_warning_test.cc
-
- no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
-- ../gmock/gtest/lib/libgtest.la \
-- ../gmock/gtest/lib/libgtest_main.la
--no_warning_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include
-+ -L/usr/lib -lgtest -lgtest_main
-+no_warning_test_CPPFLAGS = -I/usr/include
- no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \
- -Wall -Werror
- nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs)
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index 27b704401617..6aeca898035f 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -12,10 +12,6 @@
Soname version number
-
google/protobuf
diff --git a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
deleted file mode 100644
index 5c13a2976edf..000000000000
--- a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-JAVA_PKG_IUSE="source"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools-multilib eutils flag-o-matic distutils-r1 java-pkg-opt-2 elisp-common
-
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
-HOMEPAGE="https://code.google.com/p/protobuf/"
-SRC_URI="https://protobuf.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/8" # subslot = soname major version
-KEYWORDS="amd64 arm -hppa ~ia64 ~mips ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples java python static-libs vim-syntax"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="emacs? ( virtual/emacs )
- python? ( ${PYTHON_DEPS} )"
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.5 )
- python? ( dev-python/setuptools[${PYTHON_USEDEP}] )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.5 )"
-
-src_prepare() {
- append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
-
- epatch "${FILESDIR}"/${P}-x32.patch
-
- # breaks Darwin, bug #472514
- [[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch
-
- # fix build with emacs-24.4 (bug #524100)
- epatch "${FILESDIR}"/${P}-emacs-24.4.patch
-
- autotools-multilib_src_prepare
-
- if use python; then
- cd python && distutils-r1_src_prepare
- fi
-}
-
-multilib_src_compile() {
- default
-
- if multilib_is_native_abi; then
- if use python; then
- einfo "Compiling Python library ..."
- pushd "${S}"/python >/dev/null
- PROTOC="${BUILD_DIR}"/src/protoc distutils-r1_src_compile
- popd >/dev/null
- fi
-
- if use java; then
- einfo "Compiling Java library ..."
- pushd "${S}" >/dev/null
- "${BUILD_DIR}"/src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
- mkdir java/build
- pushd java/src/main/java >/dev/null
- ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
- popd >/dev/null
- jar cf ${PN}.jar -C java/build . || die "jar failed"
- popd >/dev/null
- fi
- fi
-}
-
-src_compile() {
- autotools-multilib_src_compile
-
- if use emacs; then
- elisp-compile "${S}"/editors/protobuf-mode.el
- fi
-}
-
-src_test() {
- autotools-multilib_src_test check
-
- if use python; then
- pushd python >/dev/null
- distutils-r1_src_test
- popd >/dev/null
- fi
-}
-
-src_install() {
- autotools-multilib_src_install
-
- dodoc CHANGES.txt CONTRIBUTORS.txt README.txt
-
- if use python; then
- pushd python >/dev/null
- distutils-r1_src_install
- popd >/dev/null
- fi
-
- if use java; then
- java-pkg_dojar ${PN}.jar
- use source && java-pkg_dosrc java/src/main/java/*
- fi
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins editors/proto.vim
- insinto /usr/share/vim/vimfiles/ftdetect/
- doins "${FILESDIR}"/proto.vim
- fi
-
- if use emacs; then
- elisp-install ${PN} editors/protobuf-mode.el*
- elisp-site-file-install "${FILESDIR}"/70${PN}-gentoo.el
- fi
-
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild b/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild
deleted file mode 100644
index 8d93c1be7e41..000000000000
--- a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-JAVA_PKG_IUSE="source"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools-multilib eutils flag-o-matic toolchain-funcs distutils-r1 java-pkg-opt-2 elisp-common
-
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
-HOMEPAGE="https://code.google.com/p/protobuf/ https://github.com/google/protobuf/"
-SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/9" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples java python static-libs vim-syntax zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="emacs? ( virtual/emacs )
- python? ( ${PYTHON_DEPS} )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.5 )
- python? (
- dev-python/google-apputils[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- )"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.5 )"
-
-src_prepare() {
- append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
-
- # breaks Darwin, bug #472514
- [[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch
-
- # fix build with emacs-24.4 (bug #524100)
- epatch "${FILESDIR}"/${PN}-2.5.0-emacs-24.4.patch
- epatch "${FILESDIR}"/${PN}-2.6.1-protoc-cmdline.patch
-
- autotools-multilib_src_prepare
-
- if use python; then
- cd python && distutils-r1_src_prepare
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with zlib)
- )
-
- if tc-is-cross-compiler; then
- # The build system wants `protoc` when building, so we need a copy that
- # runs on the host. This is more hermetic than relying on the version
- # installed in the host being the exact same version.
- mkdir -p "${WORKDIR}"/build || die
- pushd "${WORKDIR}"/build >/dev/null
- ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}"
- myeconfargs+=( --with-protoc="${PWD}"/src/protoc )
- popd >/dev/null
- fi
-
- autotools-multilib_src_configure
-}
-
-multilib_src_compile() {
- default
-
- if multilib_is_native_abi; then
- if use python; then
- einfo "Compiling Python library ..."
- pushd "${S}"/python >/dev/null
- PROTOC="${BUILD_DIR}"/src/protoc distutils-r1_src_compile
- popd >/dev/null
- fi
-
- if use java; then
- einfo "Compiling Java library ..."
- pushd "${S}" >/dev/null
- "${BUILD_DIR}"/src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
- mkdir java/build
- pushd java/src/main/java >/dev/null
- ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
- popd >/dev/null
- jar cf ${PN}.jar -C java/build . || die "jar failed"
- popd >/dev/null
- fi
- fi
-}
-
-src_compile() {
- if tc-is-cross-compiler; then
- emake -C "${WORKDIR}"/build/src protoc
- fi
-
- autotools-multilib_src_compile
-
- if use emacs; then
- elisp-compile "${S}"/editors/protobuf-mode.el
- fi
-}
-
-src_test() {
- autotools-multilib_src_test check
-
- if use python; then
- pushd python >/dev/null
- distutils-r1_src_test
- popd >/dev/null
- fi
-}
-
-src_install() {
- autotools-multilib_src_install
-
- dodoc CHANGES.txt CONTRIBUTORS.txt README.md
-
- if use python; then
- pushd python >/dev/null
- distutils-r1_src_install
- popd >/dev/null
- fi
-
- if use java; then
- java-pkg_dojar ${PN}.jar
- use source && java-pkg_dosrc java/src/main/java/*
- fi
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins editors/proto.vim
- insinto /usr/share/vim/vimfiles/ftdetect/
- doins "${FILESDIR}"/proto.vim
- fi
-
- if use emacs; then
- elisp-install ${PN} editors/protobuf-mode.el*
- elisp-site-file-install "${FILESDIR}"/70${PN}-gentoo.el
- fi
-
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild
deleted file mode 100644
index c61f89d74ab0..000000000000
--- a/dev-libs/protobuf/protobuf-3.0.0_beta3_p1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-inherit python-r1 autotools flag-o-matic toolchain-funcs elisp-common multilib-minimal
-
-# If you bump this package, also consider bumping the official language bindings!
-# At the current time these are java and python.
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10b3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples java python static-libs test vim-syntax zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- emacs? ( virtual/emacs )
- python? ( ${PYTHON_DEPS} )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )"
-# This is provided for backwards compatibility due to (likely incorrect) use in consumers.
-PDEPEND="java? ( dev-java/protobuf-java )
- python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-PATCHES=(
- "${FILESDIR}/${PN}-2.5.0-emacs-24.4.patch"
- "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch"
- "${FILESDIR}/${PN}-3.0.0_beta2-disable-local-gmock.patch"
-)
-
-src_prepare() {
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_with zlib)
- )
- if tc-is-cross-compiler; then
- # The build system wants `protoc` when building, so we need a copy that
- # runs on the host. This is more hermetic than relying on the version
- # installed in the host being the exact same version.
- mkdir -p "${WORKDIR}"/build || die
- pushd "${WORKDIR}"/build >/dev/null || die
- ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}"
- myeconfargs+=( --with-protoc="${PWD}"/src/protoc )
- popd >/dev/null || die
- fi
- ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- if tc-is-cross-compiler; then
- emake -C "${WORKDIR}"/build/src protoc
- fi
-
- default
-
- if use emacs; then
- elisp-compile "${S}"/editors/protobuf-mode.el
- fi
-}
-
-multilib_src_test() {
- emake check
-}
-
-src_install() {
- multilib-minimal_src_install
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins editors/proto.vim
- insinto /usr/share/vim/vimfiles/ftdetect/
- doins "${FILESDIR}/proto.vim"
- fi
-
- if use emacs; then
- elisp-install "${PN}" editors/protobuf-mode.el*
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
- fi
-
- if use examples; then
- DOCS+=( examples )
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.0.2.ebuild b/dev-libs/protobuf/protobuf-3.0.2.ebuild
deleted file mode 100644
index e24d24c58011..000000000000
--- a/dev-libs/protobuf/protobuf-3.0.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-inherit autotools elisp-common flag-o-matic python-r1 toolchain-funcs multilib-minimal
-
-# If you bump this package, also consider bumping the official language bindings!
-# At the current time these are java and python.
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples java python static-libs test vim-syntax zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- emacs? ( virtual/emacs )
- python? ( ${PYTHON_DEPS} )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )"
-# This is provided for backwards compatibility due to (likely incorrect) use in consumers.
-PDEPEND="
- java? ( dev-java/protobuf-java )
- python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
-
-DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md )
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.5.0-emacs-24.4.patch"
- "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch"
- "${FILESDIR}/${PN}-3.0.2-disable-local-gmock.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-src_prepare() {
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_with zlib)
- )
- if tc-is-cross-compiler; then
- # The build system wants `protoc` when building, so we need a copy that
- # runs on the host. This is more hermetic than relying on the version
- # installed in the host being the exact same version.
- mkdir -p "${WORKDIR}"/build || die
- pushd "${WORKDIR}"/build >/dev/null || die
- ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}"
- myeconfargs+=( --with-protoc="${PWD}"/src/protoc )
- popd >/dev/null || die
- fi
- ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- if tc-is-cross-compiler; then
- emake -C "${WORKDIR}"/build/src protoc
- fi
-
- default
-
- if use emacs; then
- elisp-compile "${S}"/editors/protobuf-mode.el
- fi
-}
-
-multilib_src_test() {
- emake check
-}
-
-multilib_src_install_all() {
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins editors/proto.vim
- insinto /usr/share/vim/vimfiles/ftdetect/
- doins "${FILESDIR}/proto.vim"
- fi
-
- if use emacs; then
- elisp-install "${PN}" editors/protobuf-mode.el*
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
- fi
-
- if use examples; then
- DOCS+=( examples )
- docompress -x /usr/share/doc/"${PF}"/examples
- fi
-
- einstalldocs
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.1.0.ebuild b/dev-libs/protobuf/protobuf-3.1.0.ebuild
deleted file mode 100644
index 22bb288f8b48..000000000000
--- a/dev-libs/protobuf/protobuf-3.1.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-inherit autotools elisp-common flag-o-matic python-r1 toolchain-funcs multilib-minimal
-
-# If you bump this package, also consider bumping the official language bindings!
-# At the current time these are java and python.
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/11"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples java python static-libs test vim-syntax zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- emacs? ( virtual/emacs )
- python? ( ${PYTHON_DEPS} )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )"
-# This is provided for backwards compatibility due to (likely incorrect) use in consumers.
-PDEPEND="
- java? ( dev-java/protobuf-java )
- python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
-
-DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md )
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch"
- "${FILESDIR}/${PN}-3.0.2-disable-local-gmock.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-src_prepare() {
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_with zlib)
- )
- if tc-is-cross-compiler; then
- # The build system wants `protoc` when building, so we need a copy that
- # runs on the host. This is more hermetic than relying on the version
- # installed in the host being the exact same version.
- mkdir -p "${WORKDIR}"/build || die
- pushd "${WORKDIR}"/build >/dev/null || die
- ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}"
- myeconfargs+=( --with-protoc="${PWD}"/src/protoc )
- popd >/dev/null || die
- fi
- ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- if tc-is-cross-compiler; then
- emake -C "${WORKDIR}"/build/src protoc
- fi
-
- default
-
- if use emacs; then
- elisp-compile "${S}"/editors/protobuf-mode.el
- fi
-}
-
-multilib_src_test() {
- emake check
-}
-
-multilib_src_install_all() {
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins editors/proto.vim
- insinto /usr/share/vim/vimfiles/ftdetect/
- doins "${FILESDIR}/proto.vim"
- fi
-
- if use emacs; then
- elisp-install "${PN}" editors/protobuf-mode.el*
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
- fi
-
- if use examples; then
- DOCS+=( examples )
- docompress -x /usr/share/doc/"${PF}"/examples
- fi
-
- einstalldocs
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.3.0.ebuild b/dev-libs/protobuf/protobuf-3.3.0.ebuild
deleted file mode 100644
index 86b099daf476..000000000000
--- a/dev-libs/protobuf/protobuf-3.3.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit autotools elisp-common flag-o-matic python-r1 toolchain-funcs multilib-minimal
-
-# If you bump this package, also consider bumping the official language bindings!
-# At the current time these are java and python.
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples java python static-libs test zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- emacs? ( virtual/emacs )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )"
-
-# This is provided for backwards compatibility due to (likely incorrect) use in consumers.
-PDEPEND="
- java? ( dev-java/protobuf-java )
- python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
-
-DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md )
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch"
- "${FILESDIR}/${PN}-3.3.0-disable-local-gmock.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-src_prepare() {
- append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_with zlib)
- )
- if tc-is-cross-compiler; then
- # The build system wants `protoc` when building, so we need a copy that
- # runs on the host. This is more hermetic than relying on the version
- # installed in the host being the exact same version.
- mkdir -p "${WORKDIR}"/build || die
- pushd "${WORKDIR}"/build >/dev/null || die
- ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}"
- myeconfargs+=( --with-protoc="${PWD}"/src/protoc )
- popd >/dev/null || die
- fi
- ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- if tc-is-cross-compiler; then
- emake -C "${WORKDIR}"/build/src protoc
- fi
-
- default
-
- if use emacs; then
- elisp-compile "${S}"/editors/protobuf-mode.el
- fi
-}
-
-multilib_src_test() {
- emake check
-}
-
-multilib_src_install_all() {
- insinto /usr/share/vim/vimfiles/syntax
- doins editors/proto.vim
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/proto.vim"
-
- if use emacs; then
- elisp-install "${PN}" editors/protobuf-mode.el*
- elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
- fi
-
- if use examples; then
- DOCS+=( examples )
- docompress -x /usr/share/doc/"${PF}"/examples
- fi
-
- einstalldocs
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index 7f9c437a09c5..7f3144e852ad 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="doc static-libs test"
RDEPEND=""
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index cee5f272be7c..d4c08079a24c 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="doc static-libs test"
RDEPEND=">=dev-libs/serd-0.28.0-r1"
diff --git a/dev-libs/vala-common/vala-common-0.36.13.ebuild b/dev-libs/vala-common/vala-common-0.36.13.ebuild
index 914750231de3..b9d8d421f7b7 100644
--- a/dev-libs/vala-common/vala-common-0.36.13.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.13.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE=""
# Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/xmlsec/xmlsec-1.2.25.ebuild b/dev-libs/xmlsec/xmlsec-1.2.25.ebuild
index 06c0063365d2..7e85bca44a1e 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.25.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
IUSE="doc gcrypt gnutls libressl nss +openssl static-libs"
REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
gnutls? ( gcrypt )"
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 21e9ce5d35be..18a1b4de2f88 100644
Binary files a/dev-lisp/Manifest.gz and b/dev-lisp/Manifest.gz differ
diff --git a/dev-lisp/clozurecl/clozurecl-1.10.ebuild b/dev-lisp/clozurecl/clozurecl-1.10.ebuild
index a9b11fd14aa7..297b88a52db6 100644
--- a/dev-lisp/clozurecl/clozurecl-1.10.ebuild
+++ b/dev-lisp/clozurecl/clozurecl-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ MY_PN=ccl
MY_P=${MY_PN}-${PV}
DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="http://ccl.clozure.com/"
+HOMEPAGE="https://ccl.clozure.com/"
SRC_URI="
x86? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
amd64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )"
diff --git a/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild b/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
index 6c355750f542..511c012b7144 100644
--- a/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
+++ b/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,11 +9,11 @@ MY_PN=ccl
MY_P=${MY_PN}-${PV}
DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="http://ccl.clozure.com/"
+HOMEPAGE="https://ccl.clozure.com/"
SRC_URI="
x86? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
amd64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
- doc? ( http://ccl.clozure.com/docs/ccl.html )"
+ doc? ( https://ccl.clozure.com/docs/ccl.html )"
# ppc? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )
# ppc64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )"
diff --git a/dev-perl/Bio-DB-HTS/Bio-DB-HTS-2.10.ebuild b/dev-perl/Bio-DB-HTS/Bio-DB-HTS-2.10.ebuild
new file mode 100644
index 000000000000..02c38cd34f33
--- /dev/null
+++ b/dev-perl/Bio-DB-HTS/Bio-DB-HTS-2.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=AVULLO
+DIST_VERSION=2.10
+
+inherit perl-module
+
+DESCRIPTION="Perl bindings for sci-libs/htslib"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="sci-libs/htslib:="
+DEPEND="${RDEPEND}
+ dev-perl/Module-Build
+ test? ( dev-perl/Test-LeakTrace )"
+
+PATCHES=(
+ "${FILESDIR}/2.10-build_search_for_so.patch"
+)
+
+src_configure() {
+ local myconf="--htslib=${EPREFIX}/usr"
+ perl-module_src_configure
+}
diff --git a/dev-perl/Bio-DB-HTS/Manifest b/dev-perl/Bio-DB-HTS/Manifest
new file mode 100644
index 000000000000..536315137fa5
--- /dev/null
+++ b/dev-perl/Bio-DB-HTS/Manifest
@@ -0,0 +1 @@
+DIST Bio-DB-HTS-2.10.tar.gz 5245650 BLAKE2B a52d9b1e19d5920d61dd365eacfd1a40726500e25a3ab516df5a1d59a7a9d79ce02db7a2145801b6af5df2c41c95e80b49a39db83d27fd7ff3cf88ba0e6a328d SHA512 4e7c01022d9edf48a0e0dcffcbccf34812f236d1b581760ac115c323de5779fb6212eb4ad7d1953811930a6137cc8f5f59028c73d645d1ca5fb6118dd846ad57
diff --git a/dev-perl/Bio-DB-HTS/files/2.10-build_search_for_so.patch b/dev-perl/Bio-DB-HTS/files/2.10-build_search_for_so.patch
new file mode 100644
index 000000000000..b3d11bbbe7aa
--- /dev/null
+++ b/dev-perl/Bio-DB-HTS/files/2.10-build_search_for_so.patch
@@ -0,0 +1,29 @@
+--- a/Build.PL
++++ b/Build.PL
+@@ -125,7 +125,7 @@
+
+ my $hts_lib = "$root";
+ my $hts_include = "$root/htslib";
+- if (-f "$hts_lib/libhts.a" && -f "$hts_include/hts.h") {
++ if ((-f "$hts_lib/libhts.so" || -f "$hts_lib/libhts.a") && -f "$hts_include/hts.h") {
+ $self->config_data('hts_lib' => $hts_lib);
+ $self->config_data('hts_include' => $hts_include);
+ return 1;
+@@ -145,7 +145,7 @@
+
+ my $hts_lib = "$root/lib";
+ my $hts_include = "$root/include/htslib";
+- if (-f "$hts_lib/libhts.a" && -f "$hts_include/hts.h") {
++ if ((-f "$hts_lib/libhts.so" || -f "$hts_lib/libhts.a") && -f "$hts_include/hts.h") {
+ $self->config_data('hts_lib' => $hts_lib);
+ $self->config_data('hts_include' => $hts_include);
+ return 1;
+@@ -164,7 +164,7 @@
+ This module requires htslib (http://htslib/org)
+ Install it if you have not done so already.
+
+-This script will attempt to locate htslib by looking for hts.h and libhts.a in:
++This script will attempt to locate htslib by looking for hts.h and libhts.so/libhts.a in:
+
+ 1. --htslib command line argument
+ 2. HTSLIB_DIR environment variable
diff --git a/dev-perl/Bio-DB-HTS/metadata.xml b/dev-perl/Bio-DB-HTS/metadata.xml
new file mode 100644
index 000000000000..95abbb699ad4
--- /dev/null
+++ b/dev-perl/Bio-DB-HTS/metadata.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ marecki@gentoo.org
+ Marek Szuba
+
+
+ sci-biology@gentoo.org
+ Gentoo Biology Project
+
+
+ Ensembl/Bio-DB-HTS
+ Bio-DB-HTS
+ Bio::DB::HTS
+
+
diff --git a/dev-perl/CSS-Packer/CSS-Packer-2.50.0.ebuild b/dev-perl/CSS-Packer/CSS-Packer-2.50.0.ebuild
new file mode 100644
index 000000000000..4c8eaac82fee
--- /dev/null
+++ b/dev-perl/CSS-Packer/CSS-Packer-2.50.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_AUTHOR=LEEJO
+DIST_VERSION=2.05
+inherit perl-module
+
+DESCRIPTION="Another CSS minifier"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-perl/Regexp-RegGrp-1.1.1_rc
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ dev-perl/Test-File-Contents
+ virtual/perl-Test-Simple
+ )
+"
+PERL_RM_FILES=( "t/pod.t" )
diff --git a/dev-perl/CSS-Packer/Manifest b/dev-perl/CSS-Packer/Manifest
index 006e944ddfd6..c22b6b34fa8d 100644
--- a/dev-perl/CSS-Packer/Manifest
+++ b/dev-perl/CSS-Packer/Manifest
@@ -1 +1,2 @@
DIST CSS-Packer-2.03.tar.gz 9551 BLAKE2B af24d7ca38b9173a565f5b672868a2e1e1ec427e3a1a978d3b33fd55f80dcaba7faa4fd39020688d667fc6e0879da27f9307de034a0f0fa760061b4c3ae5a40a SHA512 fc41a6608c3427aefc5f0ba1d150df9e066277f9ca586c57d9c505be1a42f0e0f6fb8098a73f7d25923f1929b521e3967507a78ee46899a2f29aefc7e9065827
+DIST CSS-Packer-2.05.tar.gz 9666 BLAKE2B 9367cb025ecfc1781b213f2c002d9a51c8a5c843830cc6ad41b44ce9c51214c52e82c9eda43b0cfb9c8d3a990631f88aacf3ca989e3f2081808a3050a8a4729c SHA512 332c6d73ba23eb399df8052d318851eb5d7ce0f1f5a2972e3dd48f0da754b846e0d0e095306087393ed282ade701343c11007915f6215b3244cf8c5d456c3228
diff --git a/dev-perl/Cache-FastMmap/Cache-FastMmap-1.470.0.ebuild b/dev-perl/Cache-FastMmap/Cache-FastMmap-1.470.0.ebuild
new file mode 100644
index 000000000000..10d3a16b4b6e
--- /dev/null
+++ b/dev-perl/Cache-FastMmap/Cache-FastMmap-1.470.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_AUTHOR=ROBM
+DIST_VERSION=1.47
+inherit perl-module
+
+DESCRIPTION="Uses an mmaped file to act as a shared memory interprocess cache"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ virtual/perl-Storable
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Cache-FastMmap/Manifest b/dev-perl/Cache-FastMmap/Manifest
index 8679475162a6..295302b79b18 100644
--- a/dev-perl/Cache-FastMmap/Manifest
+++ b/dev-perl/Cache-FastMmap/Manifest
@@ -1 +1,2 @@
DIST Cache-FastMmap-1.46.tar.gz 51820 BLAKE2B 45e583b082aa0479b0454caddd96f95aba32d97ece227e20df71110ccc7f45f09c03ed914456e0759ed7a571ff56ab69c17d67c05f04307eb5b0ea3fa827d21d SHA512 155c55dcbb05b83a7bf35ef70d4436b54ad0dc8684871c03048ac7dc364c5ce408152409fdc88d7c53f38ff7d767ec2c181da8c1e6118826ba0120ef20b77f59
+DIST Cache-FastMmap-1.47.tar.gz 52311 BLAKE2B dc522da53f332ea8fd4130d4dcb3dcc60a82028ab7daf99b7bc5863bc1ffb83c9bac41ebec3f568a58ad66addac1a613db9bc7f817efbcdedfd842833a3d9855 SHA512 20d839ac10578387465a0d5e6d6d4018073eb644460b4e079bb7b774a6c7be453a7f2bd8d499be962d60bd51657bc49a651684e773efb02a5d5fcf6c341640b2
diff --git a/dev-perl/Calendar-Simple/Calendar-Simple-1.230.0.ebuild b/dev-perl/Calendar-Simple/Calendar-Simple-1.230.0.ebuild
new file mode 100644
index 000000000000..96ccf2c17042
--- /dev/null
+++ b/dev-perl/Calendar-Simple/Calendar-Simple-1.230.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DAVECROSS
+DIST_VERSION=1.23
+inherit perl-module
+
+DESCRIPTION="Perl extension to create simple calendars"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-aix"
+IUSE="test"
+
+RDEPEND="
+ virtual/perl-Carp
+ virtual/perl-Time-Local
+"
+DEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-0.28
+ test? ( virtual/perl-Test-Simple )
+"
+
+PERL_RM_FILES=( "t/pod_coverage.t" "t/pod.t" )
diff --git a/dev-perl/Calendar-Simple/Manifest b/dev-perl/Calendar-Simple/Manifest
index ad25df0099ce..11d2b7329fb2 100644
--- a/dev-perl/Calendar-Simple/Manifest
+++ b/dev-perl/Calendar-Simple/Manifest
@@ -1 +1,2 @@
DIST Calendar-Simple-1.21.tar.gz 7007 BLAKE2B e6e4f0528245dcff92b8c378418e47c719a954929f7b547a128099f13a1551be52c27e4ed5e3e9cec98b9599f87998c06965ee1c59a478d3f5e263a9745e439a SHA512 29ec836e774c5d3879c309eb58fdedddb12b146b382ed3c3cf014b602dd31edc7f4eff8929bd485968fa328931a589b4bde5cd87c3456b5665480ed51466252b
+DIST Calendar-Simple-1.23.tar.gz 7989 BLAKE2B 24c25e60021e6210e06645a51fd068c7e0887b5273c83b3fc2cf632deef2530e548d6c3282807c8564d4999ce2f133303a9bb2e6a40ae0aaa77cfb11f205bb5e SHA512 3d024e3de896a20b837adfc4fbac2bcd1dce969ac426445573ae0975e189ffde906e7c25d3c6f0595a7e49d47a09cd3e9bdfb6810ca7c9e20f9e01a4ecb7ec49
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild
deleted file mode 100644
index 867b2e76022d..000000000000
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ "${PV}" != "9999" ]]; then
- DIST_VERSION=${PV%.0}
- DIST_AUTHOR="AKHUETTEL"
- KEYWORDS="amd64 ~x86"
- inherit perl-module
-else
- EGIT_REPO_URI="https://github.com/lab-measurement/Lab-Measurement.git"
- EGIT_BRANCH="master"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
- inherit perl-module git-r3
-fi
-
-DESCRIPTION="Measurement control and automation with Perl"
-HOMEPAGE="http://www.labmeasurement.de/"
-
-SLOT="0"
-IUSE="test"
-
-DZIL_PLUGINS=( Git SurgicalPodWeaver RPM AuthorsFromGit )
-
-RDEPEND="
- virtual/perl-Carp
- dev-perl/Class-ISA
- >=dev-perl/Class-Method-Modifiers-2.110.0
- >=dev-perl/Clone-0.310.0
- virtual/perl-Data-Dumper
- virtual/perl-Encode
- >=dev-perl/Exception-Class-1.0.0
- virtual/perl-Exporter
- virtual/perl-File-Path
- virtual/perl-File-Spec
- virtual/perl-Getopt-Long
- dev-perl/Hook-LexWrap
- virtual/perl-IO
- >=dev-perl/IO-Socket-Timeout-0.320.0
- dev-perl/List-MoreUtils
- virtual/perl-Scalar-List-Utils
- virtual/perl-Math-Complex
- >=virtual/perl-Module-Load-0.260.0
- >=dev-perl/Moose-2.121.300
- >=dev-perl/MooseX-Params-Validate-0.180.0
- >=dev-perl/PDL-2.7.0
- dev-perl/PDL-Graphics-Gnuplot
- >=dev-perl/Role-Tiny-1.3.4
- virtual/perl-Socket
- dev-perl/Statistics-Descriptive
- virtual/perl-Storable
- >=dev-perl/TermReadKey-2.300.0
- virtual/perl-Thread-Semaphore
- virtual/perl-Time-HiRes
- >=dev-perl/Try-Tiny-0.220.0
- >=dev-perl/YAML-LibYAML-0.410.0
- virtual/perl-autodie
- >=dev-perl/namespace-autoclean-0.200.0
- virtual/perl-parent
- sci-visualization/gnuplot
-"
-DEPEND="
- ${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
- test? (
- dev-perl/File-Slurper
- virtual/perl-File-Temp
- dev-perl/Test-Fatal
- dev-perl/Test-File
- virtual/perl-Test-Simple
- dev-perl/Text-Diff
- dev-perl/aliased
- )
-"
-if [[ "${PV}" == "9999" ]]; then
- DEPEND="${DEPEND}
- dev-perl/Dist-Zilla"
- for dzp in "${DZIL_PLUGINS[@]}" ; do
- DEPEND="${DEPEND}
- dev-perl/Dist-Zilla-Plugin-${dzp}"
- done
-fi
-
-src_unpack() {
- if [[ "${PV}" == "9999" ]]; then
- git-r3_src_unpack
- mkdir -p "${S}" || die "Can't make ${S}"
- else
- default
- fi
-}
-
-dzil_to_distdir() {
- local dzil_root dest has_missing modname dzil_version
- dzil_root="$1"
- dest="$2"
-
- cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
-
- dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
- einfo "Generating CPAN dist with ${dzil_version}"
-
- has_missing=""
-
- einfo "Checking dzil authordeps"
- while IFS= read -d $'\n' -r modname; do
- if [[ -z "${has_missing}" ]]; then
- has_missing=1
- eerror "'dzil authordeps' indicates missing build dependencies"
- eerror "These will prevent building, please report a bug"
- eerror "Missing:"
- fi
- eerror " ${modname}"
- done < <( dzil authordeps --missing --versions )
-
- [[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
-
- einfo "Checking dzil build deps"
- while IFS= read -d $'\n' -r modname; do
- if [[ -z "${has_missing}" ]]; then
- has_missing=1
- ewarn "'dzil listdeps' indicates missing build dependencies"
- ewarn "These may prevent building, please report a bug if they do"
- ewarn "Missing:"
- fi
- ewarn " ${modname}"
- done < <( dzil listdeps --missing --versions --author )
-
- einfo "Generating release"
- dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
-}
-
-src_prepare() {
- if [[ ${PV} == 9999 ]]; then
- dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
- fi
- cd "${S}" || die "Can't enter build dir"
- perl-module_src_prepare
-}
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.613.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.631.ebuild
similarity index 96%
rename from dev-perl/Lab-Measurement/Lab-Measurement-3.613.ebuild
rename to dev-perl/Lab-Measurement/Lab-Measurement-3.631.ebuild
index 6f68ebe8c073..ae26b9fe6562 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.613.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-3.631.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
@@ -46,6 +46,7 @@ RDEPEND="
>=virtual/perl-Module-Load-0.260.0
>=dev-perl/Moose-2.121.300
>=dev-perl/MooseX-Params-Validate-0.180.0
+ dev-perl/MooseX-StrictConstructor
>=dev-perl/PDL-2.7.0
dev-perl/PDL-Graphics-Gnuplot
>=dev-perl/Role-Tiny-1.3.4
@@ -62,6 +63,8 @@ RDEPEND="
>=dev-perl/namespace-autoclean-0.200.0
virtual/perl-parent
sci-visualization/gnuplot
+ dev-perl/Lab-VXI11
+ dev-perl/USB-TMC
"
DEPEND="
${RDEPEND}
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
index 9f57ceaba96c..ae26b9fe6562 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
@@ -63,6 +63,8 @@ RDEPEND="
>=dev-perl/namespace-autoclean-0.200.0
virtual/perl-parent
sci-visualization/gnuplot
+ dev-perl/Lab-VXI11
+ dev-perl/USB-TMC
"
DEPEND="
${RDEPEND}
diff --git a/dev-perl/Lab-Measurement/Manifest b/dev-perl/Lab-Measurement/Manifest
index e9d744190ef8..159d865e7617 100644
--- a/dev-perl/Lab-Measurement/Manifest
+++ b/dev-perl/Lab-Measurement/Manifest
@@ -1,2 +1 @@
-DIST Lab-Measurement-3.600.tar.gz 513213 BLAKE2B 6ab87bc4b7f99864c02bd6bcc9f83a586e6db950af566a9af811906d621755973aef7b89e774bdfb865c27d357b4eed1f41a7bf37868354b0289242b0565d0fe SHA512 427e99594a9916e0e1f95d58d84d21e62ea619d9887badb3a8472c780842227acb0f50d2e5ab68c01b7fab487ca32585a83475de920d88936dd9fad65447a8d5
-DIST Lab-Measurement-3.613.tar.gz 548651 BLAKE2B 386b4ced272ed12620246eb08c3f21fe65be859e277f5dc26a056709746274459a3be9029290e06ff6b7c88ee8fd28338aceaf741bfeb15b9059f313b1b66fd8 SHA512 9645b9de7c845b3c4743cb27d572aa912f533a45a220cc21f1d60d051e18cf260676a990483adc0090d53c0dd305679d03e8497292a0801575c2bae28f87915b
+DIST Lab-Measurement-3.631.tar.gz 576050 BLAKE2B 1535dfedb6c3ed1aaa266f3b8d924195b2bfd4d5fa101b4aa1d1f9fa5156ab2fd2678f628dbbe0d66b51796fa3a0a1e679478f1eadb39df58c5d64eb1fe17954 SHA512 201a1782ecdb0d14a9a6274130af970535c2131c894469999d4f910ec8b345b4c68434a9b458e85b2f1e14e6426fe9b64aad7e898836583d346f2b088b2ba411
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 497b811c96ef..0708fefee77d 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Test-File-Contents/Manifest b/dev-perl/Test-File-Contents/Manifest
new file mode 100644
index 000000000000..226a6cf0bdab
--- /dev/null
+++ b/dev-perl/Test-File-Contents/Manifest
@@ -0,0 +1 @@
+DIST Test-File-Contents-0.23.tar.gz 10095 BLAKE2B 19d93050e7c607f0efcff4e2c5ecb034daa0d803f826218bc8764f268b73bed7427b11781e0468ef46184c85dd3b833e07af4d9c471b6c4aa09a94706cb16321 SHA512 8fe830e755660b32f79a82b84b55702a6dd2bd62136c456325340646fe11e82b5603fb3063fcbad393edaf68cabf84da79103be5ef4a5cb6de84ad8463de46db
diff --git a/dev-perl/Test-File-Contents/Test-File-Contents-0.230.0.ebuild b/dev-perl/Test-File-Contents/Test-File-Contents-0.230.0.ebuild
new file mode 100644
index 000000000000..6d585726d37b
--- /dev/null
+++ b/dev-perl/Test-File-Contents/Test-File-Contents-0.230.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DWHEELER
+DIST_VERSION=0.23
+inherit perl-module
+
+DESCRIPTION="Test routines for examining the contents of files"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ virtual/perl-Digest-MD5
+ virtual/perl-File-Spec
+ >=virtual/perl-Test-Simple-0.700.0
+ >=dev-perl/Text-Diff-0.350.0
+"
+DEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-0.300.0
+"
diff --git a/dev-perl/Test-File-Contents/metadata.xml b/dev-perl/Test-File-Contents/metadata.xml
new file mode 100644
index 000000000000..7f8d500a626d
--- /dev/null
+++ b/dev-perl/Test-File-Contents/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ perl@gentoo.org
+ Gentoo Perl Project
+
+
+ Test-File-Contents
+ Test::File::Contents
+
+
diff --git a/dev-perl/USB-TMC/Manifest b/dev-perl/USB-TMC/Manifest
index 1936dec0ed0a..2821acc8ded7 100644
--- a/dev-perl/USB-TMC/Manifest
+++ b/dev-perl/USB-TMC/Manifest
@@ -1,2 +1,2 @@
-DIST USB-TMC-0.005.tar.gz 14897 BLAKE2B e0ef62ce0263ab2c094562ad0ab23a2b7847c8e192d82cb3104a3e1cc0177de0d9cf384c337ff0ef1f81da68674063052b1fc217c00d542d6c0f557c176a253b SHA512 25646376dcabab92c4abf82e22649dcea3659762b17860b09280d314deeb373b32fae962d284d9d3eadcd5c2d07da1285f873dd3408c0c6425cafb3082c07575
DIST USB-TMC-0.006.tar.gz 15154 BLAKE2B a67846e4ab1e558f07498324253370f26a7392bc4cb5f8df078c73fc59fe897d36720f64d8a02e08ce59a5f12ee99c259f144d8ce3e7fbfb060b300fd45017f5 SHA512 8ac2e380bbc2cf78853502485d8af16141688cf6059db580439f1c10a3fcfbaf6241cab226f3845708f801651bd3cf0d8bcd89a1aa75c46f68e2bbe2430abbbf
+DIST USB-TMC-0.007.tar.gz 15325 BLAKE2B 0b4ccf52cf9ba9fc2877b36a9c7041274aeaa979e6f0ddd47667c2320e2d16223bc01318f7c5e9cc9447d232e0b2698a2cca4049f166bb8d1b59e8cb5e88876e SHA512 cc18defd8eef4fe07d479b3f6b11f92938dba6633dddfb1fad56975b888ce130dcd5aeef61b384d4ae4098d483704ea0aa7df6a8890f3155189de87c58d9a759
diff --git a/dev-perl/USB-TMC/USB-TMC-0.5.0.ebuild b/dev-perl/USB-TMC/USB-TMC-0.7.0.ebuild
similarity index 84%
rename from dev-perl/USB-TMC/USB-TMC-0.5.0.ebuild
rename to dev-perl/USB-TMC/USB-TMC-0.7.0.ebuild
index 0d028ca5ac00..b1674077e781 100644
--- a/dev-perl/USB-TMC/USB-TMC-0.5.0.ebuild
+++ b/dev-perl/USB-TMC/USB-TMC-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-DIST_VERSION=0.005
+DIST_VERSION=0.007
DIST_AUTHOR=AMBA
KEYWORDS="~amd64 ~x86"
inherit perl-module
@@ -23,7 +23,6 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? (
- virtual/perl-Module-Load
virtual/perl-Test-Simple
)
"
diff --git a/dev-perl/X11-XCB/Manifest b/dev-perl/X11-XCB/Manifest
index 16a5b8827209..98a6448dd20e 100644
--- a/dev-perl/X11-XCB/Manifest
+++ b/dev-perl/X11-XCB/Manifest
@@ -1,2 +1 @@
-DIST X11-XCB-0.16.tar.gz 89791 BLAKE2B 24107c6d9c3340ebe87a5569f4ffb45e892009cd954fb35dd1af93e0388870f76fab79319a618e322a2d3876008978b36b967085a913022e2668ef06eb6b7184 SHA512 08642ffe99b3bb83f68f05157613b895e5abf7f3c17e6bee4b835bde33654208d9bb1c34633163ccae0b9dafbd869c35fd36f3ce46d3220c6ca254f0ccf5926a
DIST X11-XCB-0.17.tar.gz 90833 BLAKE2B 7de56a99abb27373f0473e4d98c177d3db4f4811bdee358e79a85db26345e59f3dfa0998e10678fce1585ddbf1f58796f75d2adc198ec6d23ae521720b3d93ae SHA512 8a5457afdb3b32fd6d425a27dee1a6afbbded222cf71a9d7201ed2c0db0b0b7c803ae3e69a897c510b9b07b79e880efe0cf062ea025d2d3ff7ee16d364c568bc
diff --git a/dev-perl/X11-XCB/X11-XCB-0.160.0.ebuild b/dev-perl/X11-XCB/X11-XCB-0.160.0.ebuild
deleted file mode 100644
index 215dfcde73f8..000000000000
--- a/dev-perl/X11-XCB/X11-XCB-0.160.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MSTPLBG
-DIST_VERSION=0.16
-inherit perl-module virtualx
-
-DESCRIPTION="Perl bindings for libxcb"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
- dev-perl/Data-Dump
- dev-perl/Mouse
- dev-perl/MouseX-NativeTraits
- dev-perl/Try-Tiny
- dev-perl/XML-Descent
- dev-perl/XML-Simple
- >=virtual/perl-XSLoader-0.20.0
- x11-proto/xcb-proto
- >=x11-libs/libxcb-1.2
- x11-libs/xcb-util
- x11-libs/xcb-util-wm
-"
-DEPEND="${RDEPEND}
- >=virtual/perl-Devel-PPPort-3.190.0
- dev-perl/ExtUtils-Depends
- >=virtual/perl-ExtUtils-MakeMaker-6.590.0
- >=virtual/perl-ExtUtils-ParseXS-3.180.0
- dev-perl/ExtUtils-PkgConfig
- dev-perl/XS-Object-Magic
- test? (
- dev-perl/Test-Deep
- dev-perl/Test-Exception
- virtual/perl-Test-Simple
- )
-"
-PATCHES=( "${FILESDIR}/${P}-526.patch" )
-src_compile() {
- MAKEOPTS="-j1" perl-module_src_compile
-}
-src_test() {
- virtx perl-module_src_test
-}
diff --git a/dev-perl/X11-XCB/X11-XCB-0.170.0.ebuild b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
similarity index 97%
rename from dev-perl/X11-XCB/X11-XCB-0.170.0.ebuild
rename to dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
index dc970e896d51..7f439ecb1b9b 100644
--- a/dev-perl/X11-XCB/X11-XCB-0.170.0.ebuild
+++ b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
@@ -20,12 +20,12 @@ RDEPEND="
dev-perl/XML-Descent
dev-perl/XML-Simple
>=virtual/perl-XSLoader-0.20.0
- x11-proto/xcb-proto
>=x11-libs/libxcb-1.2
x11-libs/xcb-util
x11-libs/xcb-util-wm
"
DEPEND="${RDEPEND}
+ x11-base/xcb-proto
>=virtual/perl-Devel-PPPort-3.190.0
dev-perl/ExtUtils-Depends
>=virtual/perl-ExtUtils-MakeMaker-6.590.0
diff --git a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
index 4e0e152b6cb2..dd7d1cf977bd 100644
--- a/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
+++ b/dev-perl/XML-TreePP/XML-TreePP-0.430.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Pure Perl implementation for parsing/writing XML documents"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc x86"
IUSE=""
RDEPEND="
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index b820733d559a..1fe3bc803f30 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest
index 4ef39b86d5b6..0e6e65794b85 100644
--- a/dev-php/awl/Manifest
+++ b/dev-php/awl/Manifest
@@ -1,2 +1 @@
-DIST awl-0.56.tar.gz 769208 BLAKE2B 08513675d8d26fab26429a6e51cfd7dc3b00aa7cec6538789e6bbd2853989bf563ffba0df3cda61359f30ab672a74798251213e58423cbc4a77185ffd74e6716 SHA512 6336d6f938330eee0b51f04665776269d974086ba56a3c8f4b7f53e7e17b637d899e9b329aeba3dcd690673a1a95a8cf03ae8417ebb9f356294314790915886a
-DIST awl-0.59.tar.gz 601449 BLAKE2B 606c52bdad06e6fa130fd20f7da25bc75c7357c81c1d34d88bb62c43b56857eb95492581b8845ff97416d94d64135ccaa5bcba0b3989a115156ade05bc1b26b8 SHA512 d3e82e7f3269c1c02c801628498768ec94a8d215b719369e8ee997d67c86c5e4e780571852a077511ffffbe91ade1d05bfc60ee03624fbaada1ce23f7335d3e3
+DIST awl-0.59.tar.xz 124652 BLAKE2B 45b6271c175c23597c56f3d2ecc906ffc7d32feb4d8d51529e8ff861791b901f7076a1ed2aaa2309101c7d0e8aa1a48327f2d2cc4fca2738fffc55fe7665c310 SHA512 98a7bf336d5677146e06d3d8f320b67ae2a034d2b7ad32d64998993ed29431fbcf8f7c8f972ccfa55d81af32f1b413e265850181a505022e9ad350a8a670e6b6
diff --git a/dev-php/awl/awl-0.56.ebuild b/dev-php/awl/awl-0.56.ebuild
deleted file mode 100644
index 8a65231a9a6d..000000000000
--- a/dev-php/awl/awl-0.56.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Andrew McMillan's Web Libraries"
-HOMEPAGE="https://gitlab.com/davical-project/awl"
-SRC_URI="${HOMEPAGE}/repository/archive.tar.gz?ref=r${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="test? ( dev-php/phpunit )"
-RDEPEND="dev-lang/php:*[pdo,postgres,xml]"
-
-src_unpack() {
- default_src_unpack
- mv awl-* awl-${PV} || die "Ouch"
-}
-
-src_compile() {
- :
-}
-
-src_test() {
- phpunit tests/ || die "test suite failed"
-}
-
-src_install() {
- dodoc debian/changelog
- use doc && dohtml -r "docs/api/"
- insinto "/usr/share/php/${PN}"
- doins -r dba inc
-}
diff --git a/dev-php/awl/awl-0.59.ebuild b/dev-php/awl/awl-0.59.ebuild
index 24b33af893f7..3364d36a1b4d 100644
--- a/dev-php/awl/awl-0.59.ebuild
+++ b/dev-php/awl/awl-0.59.ebuild
@@ -3,11 +3,9 @@
EAPI=6
-inherit vcs-snapshot
-
DESCRIPTION="Andrew McMillan's Web Libraries"
HOMEPAGE="https://gitlab.com/davical-project/awl"
-SRC_URI="${HOMEPAGE}/repository/archive.tar.gz?ref=r${PV} -> ${P}.tar.gz"
+SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -17,6 +15,8 @@ IUSE="test"
DEPEND="test? ( dev-php/phpunit )"
RDEPEND="dev-lang/php:*[pdo,postgres,xml]"
+S="${WORKDIR}"
+
src_compile() {
:
}
@@ -26,7 +26,7 @@ src_test() {
}
src_install() {
- dodoc debian/changelog
+ einstalldocs
insinto /usr/share/php/${PN}
doins -r dba inc
}
diff --git a/dev-php/awl/metadata.xml b/dev-php/awl/metadata.xml
index 459eb5cd3042..ce3237c0bb82 100644
--- a/dev-php/awl/metadata.xml
+++ b/dev-php/awl/metadata.xml
@@ -2,10 +2,14 @@
- patrick@gentoo.org
- Patrick Lauer
+ till2.schaefer@uni-dortmund.de
+ Till Schäfer
-
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
php-bugs@gentoo.org
PHP
diff --git a/dev-php/doctrine/Manifest b/dev-php/doctrine/Manifest
index f456f5ec7b49..2aa5531d9ab7 100644
--- a/dev-php/doctrine/Manifest
+++ b/dev-php/doctrine/Manifest
@@ -1,2 +1,3 @@
DIST doctrine-1.2.5.tar.gz 659173 BLAKE2B fd703eb52d209548dd44950cdb23c2e3298e044f9387acadb2edc67bba79dd9b0a60fdf9a98d46e8078415c1e0ff21976323a6df1ab9f798ee475690ce50d4d8 SHA512 c72f4e829a92b011af0bd96d2f8a780c3106afb57a9677a21aed683473ff00aebdf7143a276c7cc70f1b142196968b5e2e5e1f744dba5c8ae1267b867b4e0310
DIST doctrine-2.4.6.tar.gz 456426 BLAKE2B 775c14750954ced8728c220dee6ca41cbfa66a7c34b00476f6941d5681302b1f10cc8dfa5e206780bb3b4b5d0e591b0e770de182340c6e7a881d3c4ca3f5795c SHA512 d7aeb58e8c76df384a472df08618a058b70f2b8499de6a3157c36bde125ab32c7bf4f80d1e6d880502ccfed2db704f3218a6f1f1ecbf603cc828e2a757c366b5
+DIST doctrine-2.6.1.tar.gz 554462 BLAKE2B 3481a1e7c8acfb0de5c4aa64aa32d583e8f01b2175b2957ec8aa0ae29c962e7482ae1d36217aa765fc38198dc851cbecb5e8ee24829f9e335ad4d18bec3bb1f5 SHA512 f2ca1df4a1da814a0047d2da76da0df64ef704e8f5b2464f2a546e61e615d40de9508c72543ae5574188882dd2a3917d8205ec194c63d7b264257443cdfd47c8
diff --git a/dev-php/doctrine/doctrine-2.6.1.ebuild b/dev-php/doctrine/doctrine-2.6.1.ebuild
new file mode 100644
index 000000000000..c716c1274c2c
--- /dev/null
+++ b/dev-php/doctrine/doctrine-2.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}2-${PV}"
+DESCRIPTION="An object relational mapper for PHP"
+HOMEPAGE="http://www.doctrine-project.org/"
+SRC_URI="https://github.com/${PN}/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/php-7.1:*[cli,pdo]"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r lib/Doctrine
+ insinto /usr/share/php/Doctrine
+ exeinto /usr/share/php/Doctrine
+ doins bin/doctrine.php
+ doexe bin/doctrine
+ dosym ../share/php/Doctrine/doctrine /usr/bin/doctrine
+}
diff --git a/dev-php/igbinary/igbinary-2.0.5.ebuild b/dev-php/igbinary/igbinary-2.0.5.ebuild
index 114414a580a1..7bb040ccb2de 100644
--- a/dev-php/igbinary/igbinary-2.0.5.ebuild
+++ b/dev-php/igbinary/igbinary-2.0.5.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2"
inherit php-ext-source-r3
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
HOMEPAGE="https://github.com/${PN}/${PN}"
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
index 6b5b2b389544..852b0db4b78d 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php7-0 php7-1 php7-2" # But only truly build for these two.
DESCRIPTION="Interface PHP with memcached via libmemcached library"
LICENSE="PHP-3"
SLOT="7"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="examples igbinary json sasl +session "
COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
diff --git a/dev-php/php-openid/Manifest b/dev-php/php-openid/Manifest
index 0a746dc54ec4..946b6e6c7660 100644
--- a/dev-php/php-openid/Manifest
+++ b/dev-php/php-openid/Manifest
@@ -1 +1 @@
-DIST php-openid-fff9217fb1acda132702730b66b10981ea9d4cac.tar.gz 396390 BLAKE2B 68cd024d88666d60e8490a1fa00f939160a249b1146caf80649f05637db3847712b869ecfbfa838ecf7af11f33241d3fa8135969473a3a5a1779d920d7fba94e SHA512 930567426a5aa7d5967f4ef231f78c5719e174e6be7b78f62ecdd9e2bc2ec99e7c6051585ae3a92c6e005e05460d394d81b4c0cdb80ac0ffdfe5eaf6fdb9f625
+DIST php-openid-26d5e12ea2a1eae180b11b061160d6f78fbedd17.tar.gz 399502 BLAKE2B f18b74c9db19d30710ad35cb97fd426e515cfb1426c887d194a5ef62352fca09ac801c32501eb95005bf2c6cfa13ff5b166972d1b10dbb8a2dcdab2780073f56 SHA512 d63bc7e4f79ecb07958a71dfc8eedae3d1fb0b41070be9b8d1036a08861497cd858602d23158f92ccf7bfa2b1ecdc999397c62f99b8ebb2dc65a8f1f2e2911f3
diff --git a/dev-php/php-openid/php-openid-2.2.3_pre20140423.ebuild b/dev-php/php-openid/php-openid-2.3.1_pre20180219.ebuild
similarity index 84%
rename from dev-php/php-openid/php-openid-2.2.3_pre20140423.ebuild
rename to dev-php/php-openid/php-openid-2.3.1_pre20180219.ebuild
index d8edbc19b047..f1991435566f 100644
--- a/dev-php/php-openid/php-openid-2.2.3_pre20140423.ebuild
+++ b/dev-php/php-openid/php-openid-2.3.1_pre20180219.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-MY_PV="fff9217fb1acda132702730b66b10981ea9d4cac"
+EAPI=6
+MY_PV="26d5e12ea2a1eae180b11b061160d6f78fbedd17"
MY_P="${PN}-${MY_PV}"
PHP_LIB_NAME="Auth"
@@ -31,5 +31,5 @@ src_install() {
pkg_postinst() {
elog "This ebuild can optionally make use of:"
- elog " dev-php/PEAR-DB"
+ elog " dev-php/PEAR-MDB2"
}
diff --git a/dev-php/phptal/Manifest b/dev-php/phptal/Manifest
index e986e5a817ac..e24092ed7848 100644
--- a/dev-php/phptal/Manifest
+++ b/dev-php/phptal/Manifest
@@ -1 +1 @@
-DIST PHPTAL-1.2.2.tar.gz 163248 BLAKE2B d0b48a5131a4567eb058e6c3395bdfff7d0e9535dae036616dbfcb11564ce9db07bec8a77ee3201dcaff7a0bcdbb451b4d7443307d6092ba81d35b849f05603f SHA512 7af41180bccbc81481a48f474b1d2c811ba678706f85045611ff1e69c3ee820e27e6cf17ea58ec562120dcdaae1cf3d91f606a13b5c262906ceba7570b092d9b
+DIST phptal-1.3.1.tar.gz 272883 BLAKE2B 4914b8bb40464f22417fd7ed7dbf88709b95b69a69a905a5152ff640dd5af6af2be7c7d67a622d78029e4075b6b19d8d1bf537a4a6ccc0c97260e5183a961ecd SHA512 74856cbeab3f8d9d552bcb7275a0180fd25e7703230c90e4343fbe9be4001118b091fabbace89efa98a8bf0344f46edf36c4ba709ed0e9b040b82204ea3b7290
diff --git a/dev-php/phptal/phptal-1.2.2.ebuild b/dev-php/phptal/phptal-1.2.2.ebuild
deleted file mode 100644
index d09c2bf8e06e..000000000000
--- a/dev-php/phptal/phptal-1.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PHP_LIB_NAME="PHPTAL"
-
-DESCRIPTION="A templating engine for PHP5 that implements Zope Page Templates syntax"
-HOMEPAGE="http://phptal.org/"
-SRC_URI="http://phptal.org/files/${PHP_LIB_NAME}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php"
-
-S="${WORKDIR}/${PHP_LIB_NAME}-${PV}"
-
-src_install() {
- insinto /usr/share/php/${PN}
- doins -r "${PHP_LIB_NAME}"
- doins PHPTAL.php phptal_lint.php
-
- dodoc README
-}
diff --git a/dev-php/phptal/phptal-1.3.1.ebuild b/dev-php/phptal/phptal-1.3.1.ebuild
new file mode 100644
index 000000000000..f5ab86bdfd82
--- /dev/null
+++ b/dev-php/phptal/phptal-1.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_LIB_NAME="PHPTAL"
+
+DESCRIPTION="A templating engine for PHP5 that implements Zope Page Templates syntax"
+HOMEPAGE="https://phptal.org/"
+SRC_URI="https://github.com/${PN}/${PHP_LIB_NAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+S="${WORKDIR}/${PHP_LIB_NAME}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+ insinto /usr/share/php/${PN}
+ doins -r "classes/${PHP_LIB_NAME}"
+ doins classes/PHPTAL.php tools/phptal_lint.php
+
+ dodoc README.md
+}
+
+src_test() {
+ [[ -z $(locale -a |grep en_GB) ]] && ewarn "Tests require en_GB locale to complete"
+ phpunit || die
+}
diff --git a/dev-python/3to2/3to2-1.1.1-r1.ebuild b/dev-python/3to2/3to2-1.1.1-r1.ebuild
index f4d854d52b8a..e37f6271ca66 100644
--- a/dev-python/3to2/3to2-1.1.1-r1.ebuild
+++ b/dev-python/3to2/3to2-1.1.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Tool to refactor valid 3.x syntax into valid 2.x syntax"
-HOMEPAGE="https://pypi.org/project/3to2"
+HOMEPAGE="https://pypi.org/project/3to2/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="Apache-1.1"
diff --git a/dev-python/3to2/3to2-1.1.1.ebuild b/dev-python/3to2/3to2-1.1.1.ebuild
index 49a0231dc1fd..8a18fe04f319 100644
--- a/dev-python/3to2/3to2-1.1.1.ebuild
+++ b/dev-python/3to2/3to2-1.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Tool to refactor valid 3.x syntax into valid 2.x syntax"
-HOMEPAGE="https://pypi.org/project/3to2"
+HOMEPAGE="https://pypi.org/project/3to2/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="Apache-1.1"
diff --git a/dev-python/Babel/Babel-2.5.0.ebuild b/dev-python/Babel/Babel-2.5.0.ebuild
index a7bd48b1fd44..7c0fc25e2672 100644
--- a/dev-python/Babel/Babel-2.5.0.ebuild
+++ b/dev-python/Babel/Babel-2.5.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.org/project/Babel"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.org/project/Babel/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/Babel/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
index e8c25b429ee1..1afa7d0dd8c1 100644
--- a/dev-python/Babel/Babel-2.5.3-r1.ebuild
+++ b/dev-python/Babel/Babel-2.5.3-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.org/project/Babel"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.org/project/Babel/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/Babel/Babel-2.5.3.ebuild b/dev-python/Babel/Babel-2.5.3.ebuild
index 57d86f760e2a..760a35531d9b 100644
--- a/dev-python/Babel/Babel-2.5.3.ebuild
+++ b/dev-python/Babel/Babel-2.5.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="http://babel.edgewall.org/ https://pypi.org/project/Babel"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.org/project/Babel/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/BitVector/BitVector-3.4.4.ebuild b/dev-python/BitVector/BitVector-3.4.4.ebuild
index 541e15859572..525377e72461 100644
--- a/dev-python/BitVector/BitVector-3.4.4.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
-HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector/"
SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/BitVector/BitVector-3.4.6.ebuild b/dev-python/BitVector/BitVector-3.4.6.ebuild
index 6cf249bd04bc..05814c052c2c 100644
--- a/dev-python/BitVector/BitVector-3.4.6.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
-HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector/"
SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/BitVector/BitVector-3.4.7.ebuild b/dev-python/BitVector/BitVector-3.4.7.ebuild
index 286965d00b67..aa12a3706ccb 100644
--- a/dev-python/BitVector/BitVector-3.4.7.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
-HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector/"
SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND=""
diff --git a/dev-python/Coffin/Coffin-2.0.1.ebuild b/dev-python/Coffin/Coffin-2.0.1.ebuild
index 78a1915e6239..cc7340f5fd3c 100644
--- a/dev-python/Coffin/Coffin-2.0.1.ebuild
+++ b/dev-python/Coffin/Coffin-2.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
inherit distutils-r1
DESCRIPTION="Jinja2 adapter for Django"
-HOMEPAGE="https://pypi.org/project/Coffin"
+HOMEPAGE="https://pypi.org/project/Coffin/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild b/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild
index 7d5d3b83096f..8ae32e018a2e 100644
--- a/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild
+++ b/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Transparent server-side session support for flask"
-HOMEPAGE="https://pypi.org/project/Flask-KVSession https://github.com/mbr/flask-kvsession"
+HOMEPAGE="https://pypi.org/project/Flask-KVSession/ https://github.com/mbr/flask-kvsession"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild b/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild
index c873a2ca60a2..74f6577d1821 100644
--- a/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild
+++ b/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Transparent server-side session support for flask"
-HOMEPAGE="https://pypi.org/project/Flask-KVSession https://github.com/mbr/flask-kvsession"
+HOMEPAGE="https://pypi.org/project/Flask-KVSession/ https://github.com/mbr/flask-kvsession"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.2.2.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.2.2.ebuild
index 8367c4c9bbd8..1e09652b1273 100644
--- a/dev-python/GridDataFormats/GridDataFormats-0.2.2.ebuild
+++ b/dev-python/GridDataFormats/GridDataFormats-0.2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Reading and writing of data on regular grids in Python"
-HOMEPAGE="https://pypi.org/project/GridDataFormats"
+HOMEPAGE="https://pypi.org/project/GridDataFormats/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.2.5.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.2.5.ebuild
index 7183fcb29b1d..8e7aa7140714 100644
--- a/dev-python/GridDataFormats/GridDataFormats-0.2.5.ebuild
+++ b/dev-python/GridDataFormats/GridDataFormats-0.2.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Reading and writing of data on regular grids in Python"
-HOMEPAGE="https://pypi.org/project/GridDataFormats https://github.com/MDAnalysis/GridDataFormats"
+HOMEPAGE="https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6a7608fd2941..d26e359af7d7 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
index 5e20cc4047e0..4a08dd209a0c 100644
--- a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
+++ b/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
@@ -15,7 +15,7 @@ else
fi
DESCRIPTION="A python library for automating interaction with web sites"
-HOMEPAGE="https://pypi.org/project/MechanicalSoup"
+HOMEPAGE="https://pypi.org/project/MechanicalSoup/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
index 8de31be44f0e..fa52ca3b83d4 100644
--- a/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
+++ b/dev-python/Numdifftools/Numdifftools-0.9.12.ebuild
@@ -11,7 +11,7 @@ MY_PN=numdifftools
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.org/project/Numdifftools https://github.com/pbrod/numdifftools"
+HOMEPAGE="https://pypi.org/project/Numdifftools/ https://github.com/pbrod/numdifftools"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
SLOT="0"
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
index c8f3f623b3bc..192b7ebbe89c 100644
--- a/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
+++ b/dev-python/Numdifftools/Numdifftools-0.9.13.ebuild
@@ -11,7 +11,7 @@ MY_PN=numdifftools
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.org/project/Numdifftools https://github.com/pbrod/numdifftools"
+HOMEPAGE="https://pypi.org/project/Numdifftools/ https://github.com/pbrod/numdifftools"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
SLOT="0"
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild
index 650846454b90..4579ccedb017 100644
--- a/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild
+++ b/dev-python/Numdifftools/Numdifftools-0.9.14.ebuild
@@ -11,7 +11,7 @@ MY_PN=numdifftools
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.org/project/Numdifftools https://github.com/pbrod/numdifftools"
+HOMEPAGE="https://pypi.org/project/Numdifftools/ https://github.com/pbrod/numdifftools"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
SLOT="0"
diff --git a/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild b/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
index bab2a087f7a5..829d15faa62e 100644
--- a/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
+++ b/dev-python/Numdifftools/Numdifftools-0.9.17.ebuild
@@ -11,7 +11,7 @@ MY_PN=numdifftools
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Solves automatic numerical differentiation problems in one or more variables"
-HOMEPAGE="https://pypi.org/project/Numdifftools https://github.com/pbrod/numdifftools"
+HOMEPAGE="https://pypi.org/project/Numdifftools/ https://github.com/pbrod/numdifftools"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
SLOT="0"
diff --git a/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild b/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild
index d0c41f54668d..66b291f01bf5 100644
--- a/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild
+++ b/dev-python/PyDbLite/PyDbLite-3.0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3)
inherit distutils-r1
DESCRIPTION="A fast, pure-Python in-memory database"
-HOMEPAGE="https://pypi.org/project/PyDbLite"
+HOMEPAGE="https://pypi.org/project/PyDbLite/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/PyECLib/PyECLib-1.5.0.ebuild b/dev-python/PyECLib/PyECLib-1.5.0.ebuild
index 888d7165dedf..6df4178712b4 100644
--- a/dev-python/PyECLib/PyECLib-1.5.0.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.5.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 eutils multilib
DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/PyECLib"
+HOMEPAGE="https://pypi.org/project/PyECLib/"
SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
S="${WORKDIR}/pyeclib-${PV}"
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
index 28824b8cfc92..929f770ba763 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.0.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="RSS feed generator written in Python"
-HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.org/project/PyRSS2Gen"
+HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.org/project/PyRSS2Gen/"
SRC_URI="http://www.dalkescientific.com/Python/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
index 7ea9acf03488..3f6b61a6ed14 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="RSS feed generator written in Python"
-HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.org/project/PyRSS2Gen"
+HOMEPAGE="http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.org/project/PyRSS2Gen/"
SRC_URI="http://www.dalkescientific.com/Python/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/PySDL2/PySDL2-0.9.6.ebuild b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
index 632d33c3ca3d..77afc908e4e3 100644
--- a/dev-python/PySDL2/PySDL2-0.9.6.ebuild
+++ b/dev-python/PySDL2/PySDL2-0.9.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Python (ctypes) bindings for SDL2 libraries"
-HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2"
+HOMEPAGE="https://github.com/marcusva/py-sdl2 https://pypi.org/project/PySDL2/"
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
diff --git a/dev-python/PySocks/PySocks-1.6.7.ebuild b/dev-python/PySocks/PySocks-1.6.7.ebuild
index 44c20191af98..ccff933616fa 100644
--- a/dev-python/PySocks/PySocks-1.6.7.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks https://pypi.org/project/PySocks"
+HOMEPAGE="https://github.com/Anorov/PySocks https://pypi.org/project/PySocks/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild b/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild
index 41a3d5ddb9a0..fb8425a4c794 100644
--- a/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild
+++ b/dev-python/PyZilla/PyZilla-0.1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Python wrapper for the BugZilla XML-RPC API"
-HOMEPAGE="https://pypi.org/project/PyZilla"
+HOMEPAGE="https://pypi.org/project/PyZilla/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/dev-python/ReParser/ReParser-1.4.3.ebuild b/dev-python/ReParser/ReParser-1.4.3.ebuild
index 4773ab4542a4..1ccebd22f265 100644
--- a/dev-python/ReParser/ReParser-1.4.3.ebuild
+++ b/dev-python/ReParser/ReParser-1.4.3.ebuild
@@ -15,7 +15,7 @@ else
fi
DESCRIPTION="Simple regex-based lexer/parser for inline markup"
-HOMEPAGE="https://pypi.org/project/ReParser"
+HOMEPAGE="https://pypi.org/project/ReParser/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/URLObject/URLObject-2.4.0.ebuild b/dev-python/URLObject/URLObject-2.4.0.ebuild
index b5cd1dfb24fd..646d043befdc 100644
--- a/dev-python/URLObject/URLObject-2.4.0.ebuild
+++ b/dev-python/URLObject/URLObject-2.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="A utility class for manipulating URLs"
-HOMEPAGE="https://pypi.org/project/URLObject"
+HOMEPAGE="https://pypi.org/project/URLObject/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/URLObject/URLObject-2.4.2-r1.ebuild b/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
index 286ebb6f7d5d..1aed683577d1 100644
--- a/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
+++ b/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
GITHUB_P=${P,,}
DESCRIPTION="A utility class for manipulating URLs"
-HOMEPAGE="https://pypi.org/project/URLObject"
+HOMEPAGE="https://pypi.org/project/URLObject/"
# note: pypi tarball lacks tests
# https://github.com/zacharyvoase/urlobject/issues/39
SRC_URI="https://github.com/zacharyvoase/urlobject/archive/v${PV}.tar.gz -> ${GITHUB_P}.tar.gz"
diff --git a/dev-python/YURL/YURL-0.13.ebuild b/dev-python/YURL/YURL-0.13.ebuild
index 10f5b821533a..102bffc98df2 100644
--- a/dev-python/YURL/YURL-0.13.ebuild
+++ b/dev-python/YURL/YURL-0.13.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Yurl is the replacement of built in python urlparse module"
-HOMEPAGE="https://pypi.org/project/YURL"
+HOMEPAGE="https://pypi.org/project/YURL/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/aadict/aadict-0.2.3.ebuild b/dev-python/aadict/aadict-0.2.3.ebuild
index 391cafc019a8..f5f468b1d0db 100644
--- a/dev-python/aadict/aadict-0.2.3.ebuild
+++ b/dev-python/aadict/aadict-0.2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="An auto-attribute dict (and a couple of other useful dict functions)"
-HOMEPAGE="https://github.com/metagriffin/aadict https://pypi.org/project/aadict"
+HOMEPAGE="https://github.com/metagriffin/aadict https://pypi.org/project/aadict/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
diff --git a/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild b/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
index 4cb5e0487ddf..7acfd9f6802b 100644
--- a/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
+++ b/dev-python/abstract_rendering/abstract_rendering-0.5.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Rendering as a binning process"
HOMEPAGE="
https://github.com/JosephCottam/AbstractRendering
- https://pypi.org/project/abstract_rendering
+ https://pypi.org/project/abstract_rendering/
"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild b/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
index 5b4be83d762c..78fd2c5a3f4b 100644
--- a/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
+++ b/dev-python/aioeventlet/aioeventlet-0.5.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="asyncio event loop scheduling callbacks in eventlet"
-HOMEPAGE="https://pypi.org/project/aioeventlet"
+HOMEPAGE="https://pypi.org/project/aioeventlet/"
SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/aiohttp/aiohttp-1.3.3.ebuild b/dev-python/aiohttp/aiohttp-1.3.3.ebuild
index 0c0ccb308e77..0a01f09a7fa0 100644
--- a/dev-python/aiohttp/aiohttp-1.3.3.ebuild
+++ b/dev-python/aiohttp/aiohttp-1.3.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
inherit distutils-r1 vcs-snapshot
DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
diff --git a/dev-python/aiohttp/aiohttp-1.3.5.ebuild b/dev-python/aiohttp/aiohttp-1.3.5.ebuild
index 0c0ccb308e77..0a01f09a7fa0 100644
--- a/dev-python/aiohttp/aiohttp-1.3.5.ebuild
+++ b/dev-python/aiohttp/aiohttp-1.3.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
inherit distutils-r1 vcs-snapshot
DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
diff --git a/dev-python/aiohttp/aiohttp-2.3.10.ebuild b/dev-python/aiohttp/aiohttp-2.3.10.ebuild
index 1fe286e155c9..ed08f9b902cb 100644
--- a/dev-python/aiohttp/aiohttp-2.3.10.ebuild
+++ b/dev-python/aiohttp/aiohttp-2.3.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
inherit distutils-r1 vcs-snapshot
DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
diff --git a/dev-python/aiohttp/aiohttp-2.3.2.ebuild b/dev-python/aiohttp/aiohttp-2.3.2.ebuild
index 1be5b8c10582..6c1360106ea0 100644
--- a/dev-python/aiohttp/aiohttp-2.3.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-2.3.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
inherit distutils-r1 vcs-snapshot
DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
diff --git a/dev-python/aiohttp/aiohttp-3.0.5.ebuild b/dev-python/aiohttp/aiohttp-3.0.5.ebuild
index 4d5c721221b4..7ab77ee184c1 100644
--- a/dev-python/aiohttp/aiohttp-3.0.5.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.0.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{5,6} )
inherit distutils-r1
DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/aiohttp/aiohttp-3.0.6.ebuild b/dev-python/aiohttp/aiohttp-3.0.6.ebuild
index 5bbe4da31d8f..578bdb459407 100644
--- a/dev-python/aiohttp/aiohttp-3.0.6.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{5,6} )
inherit distutils-r1
DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.org/project/aiohttp"
+HOMEPAGE="https://pypi.org/project/aiohttp/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild b/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild
index 45c65ce85385..34479d0a1a91 100644
--- a/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild
+++ b/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_{6,7} )
inherit distutils-r1
DESCRIPTION="Allows re-usable apps to provide sets of templates and staticfiles"
-HOMEPAGE="https://pypi.org/project/aldryn-boilerplates"
+HOMEPAGE="https://pypi.org/project/aldryn-boilerplates/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild b/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild
index 1a2fae0854ce..42b399f6bb32 100644
--- a/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild
+++ b/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="django CMS plugins with common utilities"
-HOMEPAGE="https://pypi.org/project/aldryn-common"
+HOMEPAGE="https://pypi.org/project/aldryn-common/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild b/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild
index 454fd4d8ef95..3b3667ebca26 100644
--- a/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild
+++ b/dev-python/aldryn-search/aldryn-search-0.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="An extension to django CMS to provide multilingual Haystack indexes"
-HOMEPAGE="https://pypi.org/project/aldryn-search"
+HOMEPAGE="https://pypi.org/project/aldryn-search/"
SRC_URI="https://github.com/aldryn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/algopy/algopy-0.5.3.ebuild b/dev-python/algopy/algopy-0.5.3.ebuild
index e929ce230a60..b428b322ec9d 100644
--- a/dev-python/algopy/algopy-0.5.3.ebuild
+++ b/dev-python/algopy/algopy-0.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="Taylor Arithmetic Computation and Algorithmic Differentiation"
-HOMEPAGE="https://pypi.org/project/algopy http://packages.python.org/algopy"
+HOMEPAGE="https://pypi.org/project/algopy/ http://packages.python.org/algopy"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/ansi2html/ansi2html-1.1.1.ebuild b/dev-python/ansi2html/ansi2html-1.1.1.ebuild
index fa499b0c0c54..5ac70ed761f6 100644
--- a/dev-python/ansi2html/ansi2html-1.1.1.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
inherit distutils-r1
DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html https://github.com/ralphbean/ansi2html"
+HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
diff --git a/dev-python/ansi2html/ansi2html-1.2.0.ebuild b/dev-python/ansi2html/ansi2html-1.2.0.ebuild
index 8b9858129a5b..04c67b7c70a1 100644
--- a/dev-python/ansi2html/ansi2html-1.2.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
inherit distutils-r1
DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html https://github.com/ralphbean/ansi2html"
+HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
diff --git a/dev-python/ansi2html/ansi2html-1.3.0.ebuild b/dev-python/ansi2html/ansi2html-1.3.0.ebuild
index 5afc323380c9..ac9d5dedba2e 100644
--- a/dev-python/ansi2html/ansi2html-1.3.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
inherit distutils-r1
DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html https://github.com/ralphbean/ansi2html"
+HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3+"
diff --git a/dev-python/ansi2html/ansi2html-1.4.2.ebuild b/dev-python/ansi2html/ansi2html-1.4.2.ebuild
index 5afc323380c9..e138b3ed628c 100644
--- a/dev-python/ansi2html/ansi2html-1.4.2.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.4.2.ebuild
@@ -3,12 +3,12 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html https://github.com/ralphbean/ansi2html"
+HOMEPAGE="https://pypi.org/project/ansi2html/ https://github.com/ralphbean/ansi2html"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3+"
diff --git a/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild b/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
index 4bd7048f3105..741f89054941 100644
--- a/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
+++ b/dev-python/anyvc/anyvc-0.3.7.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Library to access any version control system"
-HOMEPAGE="https://pypi.org/project/anyvc"
+HOMEPAGE="https://pypi.org/project/anyvc/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/apipkg/apipkg-1.4.ebuild b/dev-python/apipkg/apipkg-1.4.ebuild
index d9a5e0a64622..22b3c3a64f11 100644
--- a/dev-python/apipkg/apipkg-1.4.ebuild
+++ b/dev-python/apipkg/apipkg-1.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="namespace control and lazy-import mechanism"
-HOMEPAGE="https://pypi.org/project/apipkg"
+HOMEPAGE="https://pypi.org/project/apipkg/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/apptools/apptools-4.2.1.ebuild b/dev-python/apptools/apptools-4.2.1.ebuild
index 5de917ec546c..dfa685967dc9 100644
--- a/dev-python/apptools/apptools-4.2.1.ebuild
+++ b/dev-python/apptools/apptools-4.2.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
DESCRIPTION="Enthought Tool Suite: Application tools"
HOMEPAGE="http://docs.enthought.com/apptools/
https://github.com/enthought/apptools
- https://pypi.org/project/apptools"
+ https://pypi.org/project/apptools/"
SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/apptools/apptools-4.3.0.ebuild b/dev-python/apptools/apptools-4.3.0.ebuild
index 3673b071602e..0a9200944972 100644
--- a/dev-python/apptools/apptools-4.3.0.ebuild
+++ b/dev-python/apptools/apptools-4.3.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
DESCRIPTION="Enthought Tool Suite: Application tools"
HOMEPAGE="http://docs.enthought.com/apptools/
https://github.com/enthought/apptools
- https://pypi.org/project/apptools"
+ https://pypi.org/project/apptools/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/aquarium/aquarium-2.3-r1.ebuild b/dev-python/aquarium/aquarium-2.3-r1.ebuild
index 1d1be6ad4b04..199103e4047e 100644
--- a/dev-python/aquarium/aquarium-2.3-r1.ebuild
+++ b/dev-python/aquarium/aquarium-2.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Aquarium web application framework"
-HOMEPAGE="http://aquarium.sourceforge.net/ https://pypi.org/project/aquarium"
+HOMEPAGE="http://aquarium.sourceforge.net/ https://pypi.org/project/aquarium/"
SRC_URI="mirror://sourceforge/aquarium/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/argcomplete/argcomplete-1.4.1.ebuild b/dev-python/argcomplete/argcomplete-1.4.1.ebuild
index c0e16311ef2f..04c2e025dc40 100644
--- a/dev-python/argcomplete/argcomplete-1.4.1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.4.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1 bash-completion-r1
DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete"
+HOMEPAGE="https://pypi.org/project/argcomplete/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/argcomplete/argcomplete-1.9.2.ebuild b/dev-python/argcomplete/argcomplete-1.9.2.ebuild
index 3510477d0012..57c5338fd7a8 100644
--- a/dev-python/argcomplete/argcomplete-1.9.2.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.9.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
inherit bash-completion-r1 distutils-r1
DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete"
+HOMEPAGE="https://pypi.org/project/argcomplete/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/argcomplete/argcomplete-1.9.4.ebuild b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
index fc18ea940372..8ad059a2c767 100644
--- a/dev-python/argcomplete/argcomplete-1.9.4.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
inherit bash-completion-r1 distutils-r1
DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete"
+HOMEPAGE="https://pypi.org/project/argcomplete/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/arpeggio/arpeggio-1.5.ebuild b/dev-python/arpeggio/arpeggio-1.5.ebuild
index 3569d2f712be..69cffc79776d 100644
--- a/dev-python/arpeggio/arpeggio-1.5.ebuild
+++ b/dev-python/arpeggio/arpeggio-1.5.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_PN=Arpeggio
MY_P=${MY_PN}-${PV}
DESCRIPTION="Parser interpreter based on PEG grammars"
-HOMEPAGE="https://pypi.org/project/Arpeggio https://github.com/igordejanovic/Arpeggio"
+HOMEPAGE="https://pypi.org/project/Arpeggio/ https://github.com/igordejanovic/Arpeggio"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
# pypi tarball omits tests
RESTRICT="test"
diff --git a/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild b/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
index e7f6731325fd..b4299a09a288 100644
--- a/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
+++ b/dev-python/arrayterator/arrayterator-1.0.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="A buffered iterator for reading big arrays in small contiguous blocks"
-HOMEPAGE="https://pypi.org/project/arrayterator"
+HOMEPAGE="https://pypi.org/project/arrayterator/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/asset/asset-0.6.11.ebuild b/dev-python/asset/asset-0.6.11.ebuild
index 7abb928040f4..d39b012f5f0a 100644
--- a/dev-python/asset/asset-0.6.11.ebuild
+++ b/dev-python/asset/asset-0.6.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
inherit distutils-r1
DESCRIPTION="A package resource and symbol loading helper library"
-HOMEPAGE="https://pypi.org/project/asset https://github.com/metagriffin/asset"
+HOMEPAGE="https://pypi.org/project/asset/ https://github.com/metagriffin/asset"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/astng/astng-0.24.3-r1.ebuild b/dev-python/astng/astng-0.24.3-r1.ebuild
index f90029b97c7a..c082787d9da0 100644
--- a/dev-python/astng/astng-0.24.3-r1.ebuild
+++ b/dev-python/astng/astng-0.24.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://www.logilab.org/project/logilab-astng https://pypi.org/project/logilab-astng"
+HOMEPAGE="https://www.logilab.org/project/logilab-astng https://pypi.org/project/logilab-astng/"
SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/astng/astng-0.24.3.ebuild b/dev-python/astng/astng-0.24.3.ebuild
index 9466adb6d03d..4bbd302c3dd6 100644
--- a/dev-python/astng/astng-0.24.3.ebuild
+++ b/dev-python/astng/astng-0.24.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://www.logilab.org/project/logilab-astng https://pypi.org/project/logilab-astng"
+HOMEPAGE="https://www.logilab.org/project/logilab-astng https://pypi.org/project/logilab-astng/"
SRC_URI="ftp://ftp.logilab.org/pub/astng/logilab-${P}.tar.gz mirror://pypi/l/logilab-astng/logilab-${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/astor/astor-0.5.ebuild b/dev-python/astor/astor-0.5.ebuild
index 27a770957e12..20ad333455a4 100644
--- a/dev-python/astor/astor-0.5.ebuild
+++ b/dev-python/astor/astor-0.5.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
DESCRIPTION="Read/rewrite/write Python ASTs"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/astor"
+HOMEPAGE="https://pypi.org/project/astor/"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/astor/astor-0.6.ebuild b/dev-python/astor/astor-0.6.ebuild
index bd8d335b0e39..836a2d1f34e6 100644
--- a/dev-python/astor/astor-0.6.ebuild
+++ b/dev-python/astor/astor-0.6.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
DESCRIPTION="Read/rewrite/write Python ASTs"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/astor"
+HOMEPAGE="https://pypi.org/project/astor/"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/astroid/astroid-1.4.8.ebuild b/dev-python/astroid/astroid-1.4.8.ebuild
index 826ca5691085..d479129973ca 100644
--- a/dev-python/astroid/astroid-1.4.8.ebuild
+++ b/dev-python/astroid/astroid-1.4.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.org/project/astroid"
+HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.org/project/astroid/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/astroid/astroid-1.5.3.ebuild b/dev-python/astroid/astroid-1.5.3.ebuild
index 5c6114d4514c..b250c9a812d4 100644
--- a/dev-python/astroid/astroid-1.5.3.ebuild
+++ b/dev-python/astroid/astroid-1.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.org/project/astroid"
+HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.org/project/astroid/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/astroid/astroid-1.6.0.ebuild b/dev-python/astroid/astroid-1.6.0.ebuild
index 5d7d8f5be47b..8d1dd59ff80b 100644
--- a/dev-python/astroid/astroid-1.6.0.ebuild
+++ b/dev-python/astroid/astroid-1.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid"
+HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/atom/Manifest b/dev-python/atom/Manifest
index f2c23a694f86..599eff802013 100644
--- a/dev-python/atom/Manifest
+++ b/dev-python/atom/Manifest
@@ -1,2 +1 @@
-DIST atom-0.3.10.zip 102102 BLAKE2B ed67aac137ed1ec983d45296756a6cd716201f412783287e2c054edae1d4ac25923fa53af832d77e5ec2c9ce4ee064d2be8013526e41b679235e5eeacccbf39f SHA512 ae22747f96e42b9cc4f7c92ddb7d7b8af647e17b917481cd267d4162bd9260b906a019a73de2ca6e3c72a9430dacd535001da7dcb809c1c3dc18c7297be14b76
DIST atom-0.4.1.tar.gz 65082 BLAKE2B 9f2f1fe4a910e69a083567472d1d442570b922e1aafd3a94ec55541b406d7fa876a5260193137f9de37b1c44fd97f95d0868fd345cc82e0c1c73683c149aa2e7 SHA512 95c5b5a78fb8466a78b8f983290e722d7f797ecbd9d149e37f2f52f0604c932bb747c791a4d16922535e0ef2c992c59021c2f695563d5a320a86538a6a80b958
diff --git a/dev-python/atom/atom-0.3.10.ebuild b/dev-python/atom/atom-0.3.10.ebuild
deleted file mode 100644
index d98b0c8d4f64..000000000000
--- a/dev-python/atom/atom-0.3.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Memory efficient Python objects"
-HOMEPAGE="https://github.com/nucleic/atom"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- app-arch/unzip
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- # Required to avoid file collisions at install
- sed -e "s:find_packages():find_packages(exclude=['tests']):" -i setup.py || die
-
- # Reset from use of local paths
- if use test; then
- sed -e 's:from .catom:from catom:g' -i ${PN}/*.py || die
- fi
-
- append-flags -fno-strict-aliasing
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- PYTHONPATH="${BUILD_DIR}"/lib:"${BUILD_DIR}"/lib/${PN} \
- nosetests || die "Tests failed"
- pushd "${BUILD_DIR}"/lib > /dev/null
- # Change the state back to original ready for installing
- sed -e 's:from catom:from .catom:g' -i ${PN}/*.py
- popd > /dev/null
-}
-
-python_install_all() {
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/atom/atom-0.4.1.ebuild b/dev-python/atom/atom-0.4.1.ebuild
index 5636bcca7e64..413485df8be2 100644
--- a/dev-python/atom/atom-0.4.1.ebuild
+++ b/dev-python/atom/atom-0.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Clear-BSD"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-python/attrs/attrs-16.3.0-r1.ebuild b/dev-python/attrs/attrs-16.3.0-r1.ebuild
index 4c286fdba153..0fb231779980 100644
--- a/dev-python/attrs/attrs-16.3.0-r1.ebuild
+++ b/dev-python/attrs/attrs-16.3.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Attributes without boilerplate"
HOMEPAGE="
https://github.com/hynek/attrs
https://attrs.readthedocs.org/
- https://pypi.org/project/attrs"
+ https://pypi.org/project/attrs/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/attrs/attrs-17.4.0.ebuild b/dev-python/attrs/attrs-17.4.0.ebuild
index b2af1ea18627..b9f32fe9dd4d 100644
--- a/dev-python/attrs/attrs-17.4.0.ebuild
+++ b/dev-python/attrs/attrs-17.4.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Attributes without boilerplate"
HOMEPAGE="
https://github.com/hynek/attrs
https://attrs.readthedocs.org/
- https://pypi.org/project/attrs"
+ https://pypi.org/project/attrs/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/audioread/audioread-1.0.1-r1.ebuild b/dev-python/audioread/audioread-1.0.1-r1.ebuild
index 59c1bcf8b710..b340d5ab3daf 100644
--- a/dev-python/audioread/audioread-1.0.1-r1.ebuild
+++ b/dev-python/audioread/audioread-1.0.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Module for decoding audio files using whichever backend is available"
-HOMEPAGE="https://pypi.org/project/audioread"
+HOMEPAGE="https://pypi.org/project/audioread/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/authres/authres-0.800.ebuild b/dev-python/authres/authres-0.800.ebuild
index b71e8a6ef450..1e4d080bd77a 100644
--- a/dev-python/authres/authres-0.800.ebuild
+++ b/dev-python/authres/authres-0.800.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Authentication Results Header Module"
-HOMEPAGE="https://launchpad.net/authentication-results-python https://pypi.org/project/authres"
+HOMEPAGE="https://launchpad.net/authentication-results-python https://pypi.org/project/authres/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/autobahn/autobahn-17.10.1.ebuild b/dev-python/autobahn/autobahn-17.10.1.ebuild
index b83d36f975ae..98b0dac20903 100644
--- a/dev-python/autobahn/autobahn-17.10.1.ebuild
+++ b/dev-python/autobahn/autobahn-17.10.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 versionator
MY_P="${PN}-$(replace_version_separator 3 -)"
DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn
+HOMEPAGE="https://pypi.org/project/autobahn/
https://crossbar.io/autobahn/
https://github.com/crossbario/autobahn-python"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
index 9067dc563bad..df3f5964e5ce 100644
--- a/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
+++ b/dev-python/autobahn/autobahn-17.5.1-r2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 versionator
MY_P="${PN}-$(replace_version_separator 3 -)"
DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn
+HOMEPAGE="https://pypi.org/project/autobahn/
https://crossbar.io/autobahn/
https://github.com/crossbario/autobahn-python"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/autobahn/autobahn-17.9.1.ebuild b/dev-python/autobahn/autobahn-17.9.1.ebuild
index b83d36f975ae..98b0dac20903 100644
--- a/dev-python/autobahn/autobahn-17.9.1.ebuild
+++ b/dev-python/autobahn/autobahn-17.9.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 versionator
MY_P="${PN}-$(replace_version_separator 3 -)"
DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn
+HOMEPAGE="https://pypi.org/project/autobahn/
https://crossbar.io/autobahn/
https://github.com/crossbario/autobahn-python"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/autobahn/autobahn-17.9.2.ebuild b/dev-python/autobahn/autobahn-17.9.2.ebuild
index b83d36f975ae..98b0dac20903 100644
--- a/dev-python/autobahn/autobahn-17.9.2.ebuild
+++ b/dev-python/autobahn/autobahn-17.9.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 versionator
MY_P="${PN}-$(replace_version_separator 3 -)"
DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn
+HOMEPAGE="https://pypi.org/project/autobahn/
https://crossbar.io/autobahn/
https://github.com/crossbario/autobahn-python"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/autobahn/autobahn-18.3.1.ebuild b/dev-python/autobahn/autobahn-18.3.1.ebuild
index f283332faf25..aaff729745a8 100644
--- a/dev-python/autobahn/autobahn-18.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-18.3.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 versionator
MY_P="${PN}-$(replace_version_separator 3 -)"
DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn
+HOMEPAGE="https://pypi.org/project/autobahn/
https://crossbar.io/autobahn/
https://github.com/crossbario/autobahn-python"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/automat/automat-0.5.0.ebuild b/dev-python/automat/automat-0.5.0.ebuild
index a77e5ca024cc..cb55da3ea120 100644
--- a/dev-python/automat/automat-0.5.0.ebuild
+++ b/dev-python/automat/automat-0.5.0.ebuild
@@ -10,7 +10,7 @@ MYPN="Automat"
MYP="${MYPN}-${PV}"
DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat"
+HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/automat/automat-0.6.0.ebuild b/dev-python/automat/automat-0.6.0.ebuild
index fea781427c2a..f7b1b84730d2 100644
--- a/dev-python/automat/automat-0.6.0.ebuild
+++ b/dev-python/automat/automat-0.6.0.ebuild
@@ -10,7 +10,7 @@ MYPN="Automat"
MYP="${MYPN}-${PV}"
DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat"
+HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/automaton/automaton-0.8.0.ebuild b/dev-python/automaton/automaton-0.8.0.ebuild
index 5693fca7f162..ae82b5cda018 100644
--- a/dev-python/automaton/automaton-0.8.0.ebuild
+++ b/dev-python/automaton/automaton-0.8.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Friendly state machines for python."
-HOMEPAGE="https://pypi.org/project/automaton"
+HOMEPAGE="https://pypi.org/project/automaton/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/automaton/automaton-1.12.1.ebuild b/dev-python/automaton/automaton-1.12.1.ebuild
index 0cd3480185dc..04bdb25fea39 100644
--- a/dev-python/automaton/automaton-1.12.1.ebuild
+++ b/dev-python/automaton/automaton-1.12.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
inherit distutils-r1
DESCRIPTION="Friendly state machines for python."
-HOMEPAGE="https://pypi.org/project/automaton"
+HOMEPAGE="https://pypi.org/project/automaton/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/autopep8/autopep8-1.3.2.ebuild b/dev-python/autopep8/autopep8-1.3.2.ebuild
index 5c04122e0400..d26545d20f21 100644
--- a/dev-python/autopep8/autopep8-1.3.2.ebuild
+++ b/dev-python/autopep8/autopep8-1.3.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/autopep8/autopep8-1.3.3.ebuild b/dev-python/autopep8/autopep8-1.3.3.ebuild
index 938bf36e30c1..48c985d0e5cd 100644
--- a/dev-python/autopep8/autopep8-1.3.3.ebuild
+++ b/dev-python/autopep8/autopep8-1.3.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index fee2230def65..9b6187b0add6 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1 git-2
DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
SRC_URI=""
EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
diff --git a/dev-python/awscli/awscli-1.10.51.ebuild b/dev-python/awscli/awscli-1.10.51.ebuild
index 0d128e1e1ec8..12e8e0655ec2 100644
--- a/dev-python/awscli/awscli-1.10.51.ebuild
+++ b/dev-python/awscli/awscli-1.10.51.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli"
+HOMEPAGE="https://pypi.org/project/awscli/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.10.53.ebuild b/dev-python/awscli/awscli-1.10.53.ebuild
index 0d128e1e1ec8..12e8e0655ec2 100644
--- a/dev-python/awscli/awscli-1.10.53.ebuild
+++ b/dev-python/awscli/awscli-1.10.53.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli"
+HOMEPAGE="https://pypi.org/project/awscli/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.10.59.ebuild b/dev-python/awscli/awscli-1.10.59.ebuild
index 0d128e1e1ec8..12e8e0655ec2 100644
--- a/dev-python/awscli/awscli-1.10.59.ebuild
+++ b/dev-python/awscli/awscli-1.10.59.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli"
+HOMEPAGE="https://pypi.org/project/awscli/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.11.0.ebuild b/dev-python/awscli/awscli-1.11.0.ebuild
index f0d4235ecc88..b63f9201b2f0 100644
--- a/dev-python/awscli/awscli-1.11.0.ebuild
+++ b/dev-python/awscli/awscli-1.11.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli"
+HOMEPAGE="https://pypi.org/project/awscli/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.11.154.ebuild b/dev-python/awscli/awscli-1.11.154.ebuild
index c5dcf73ed1a0..9a7d55693c0e 100644
--- a/dev-python/awscli/awscli-1.11.154.ebuild
+++ b/dev-python/awscli/awscli-1.11.154.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli"
+HOMEPAGE="https://pypi.org/project/awscli/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.11.158.ebuild b/dev-python/awscli/awscli-1.11.158.ebuild
index c5dcf73ed1a0..9a7d55693c0e 100644
--- a/dev-python/awscli/awscli-1.11.158.ebuild
+++ b/dev-python/awscli/awscli-1.11.158.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli"
+HOMEPAGE="https://pypi.org/project/awscli/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.11.81.ebuild b/dev-python/awscli/awscli-1.11.81.ebuild
index f0d4235ecc88..b63f9201b2f0 100644
--- a/dev-python/awscli/awscli-1.11.81.ebuild
+++ b/dev-python/awscli/awscli-1.11.81.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli"
+HOMEPAGE="https://pypi.org/project/awscli/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.14.16.ebuild b/dev-python/awscli/awscli-1.14.16.ebuild
index 14819b4ab67c..f83b1d547406 100644
--- a/dev-python/awscli/awscli-1.14.16.ebuild
+++ b/dev-python/awscli/awscli-1.14.16.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli"
+HOMEPAGE="https://pypi.org/project/awscli/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/awscli/awscli-1.14.50.ebuild b/dev-python/awscli/awscli-1.14.50.ebuild
index bdc5b7aa5a65..401b5eaad5a9 100644
--- a/dev-python/awscli/awscli-1.14.50.ebuild
+++ b/dev-python/awscli/awscli-1.14.50.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli"
+HOMEPAGE="https://pypi.org/project/awscli/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/axiom/axiom-0.7.2.ebuild b/dev-python/axiom/axiom-0.7.2.ebuild
index e9c17169d301..be028747221f 100644
--- a/dev-python/axiom/axiom-0.7.2.ebuild
+++ b/dev-python/axiom/axiom-0.7.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite"
inherit twisted-r1
DESCRIPTION="Object database implemented on top of SQLite"
-HOMEPAGE="https://github.com/twisted/axiom https://pypi.org/project/Axiom"
+HOMEPAGE="https://github.com/twisted/axiom https://pypi.org/project/Axiom/"
SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/axiom/axiom-0.7.5.ebuild b/dev-python/axiom/axiom-0.7.5.ebuild
index 640644c91a7a..163466a47772 100644
--- a/dev-python/axiom/axiom-0.7.5.ebuild
+++ b/dev-python/axiom/axiom-0.7.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="sqlite"
inherit twisted-r1
DESCRIPTION="Object database implemented on top of SQLite"
-HOMEPAGE="https://github.com/twisted/axiom https://pypi.org/project/Axiom"
+HOMEPAGE="https://github.com/twisted/axiom https://pypi.org/project/Axiom/"
SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
index f478e9bb193f..ebe3d3d4814a 100644
--- a/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
+++ b/dev-python/babelfish/babelfish-0.5.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Python library to work with countries and languages"
-HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.org/project/babelfish"
+HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.org/project/babelfish/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/babelfish/babelfish-9999.ebuild b/dev-python/babelfish/babelfish-9999.ebuild
index d1acbf41eb04..a9e53bd954ad 100644
--- a/dev-python/babelfish/babelfish-9999.ebuild
+++ b/dev-python/babelfish/babelfish-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1 git-r3
DESCRIPTION="Python library to work with countries and languages"
-HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.org/project/babelfish"
+HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.org/project/babelfish/"
EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
LICENSE="BSD"
diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild b/dev-python/basemap/basemap-1.0.7-r1.ebuild
index 13bc34601973..71e1f0548063 100644
--- a/dev-python/basemap/basemap-1.0.7-r1.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.org/project/basemap"
+HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.org/project/basemap/"
SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
IUSE="examples test"
diff --git a/dev-python/basemap/basemap-1.0.7-r2.ebuild b/dev-python/basemap/basemap-1.0.7-r2.ebuild
index 740a68fea772..6c21c113bf73 100644
--- a/dev-python/basemap/basemap-1.0.7-r2.ebuild
+++ b/dev-python/basemap/basemap-1.0.7-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.org/project/basemap"
+HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.org/project/basemap/"
SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
IUSE="examples test"
diff --git a/dev-python/bashate/bashate-0.3.1.ebuild b/dev-python/bashate/bashate-0.3.1.ebuild
index a07b21fba5fd..2f938d16f2d9 100644
--- a/dev-python/bashate/bashate-0.3.1.ebuild
+++ b/dev-python/bashate/bashate-0.3.1.ebuild
@@ -11,7 +11,7 @@ RESTRICT="test"
inherit distutils-r1
DESCRIPTION="A pep8 equivalent for bash scripts"
-HOMEPAGE="https://pypi.org/project/bashate"
+HOMEPAGE="https://pypi.org/project/bashate/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/batinfo/batinfo-0.3.ebuild b/dev-python/batinfo/batinfo-0.3.ebuild
index e4d4b202c664..6e5aa6e80645 100644
--- a/dev-python/batinfo/batinfo-0.3.ebuild
+++ b/dev-python/batinfo/batinfo-0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="A simple Python lib to retreive battery information"
-HOMEPAGE="https://github.com/nicolargo/batinfo https://pypi.org/project/batinfo"
+HOMEPAGE="https://github.com/nicolargo/batinfo https://pypi.org/project/batinfo/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/beaker/beaker-1.6.4-r1.ebuild b/dev-python/beaker/beaker-1.6.4-r1.ebuild
index 86c2bf9b7295..0a2b6475dc93 100644
--- a/dev-python/beaker/beaker-1.6.4-r1.ebuild
+++ b/dev-python/beaker/beaker-1.6.4-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN="Beaker"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A Session and Caching library with WSGI Middleware"
-HOMEPAGE="http://beaker.groovie.org/ https://pypi.org/project/Beaker"
+HOMEPAGE="http://beaker.groovie.org/ https://pypi.org/project/Beaker/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/beaker/beaker-1.8.1.ebuild b/dev-python/beaker/beaker-1.8.1.ebuild
index 5bf10454427b..3302f3dca488 100644
--- a/dev-python/beaker/beaker-1.8.1.ebuild
+++ b/dev-python/beaker/beaker-1.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="A Session and Caching library with WSGI Middleware"
-HOMEPAGE="https://github.com/bbangert/beaker https://pypi.org/project/Beaker"
+HOMEPAGE="https://github.com/bbangert/beaker https://pypi.org/project/Beaker/"
# pypi tarball lacks tests
SRC_URI="https://github.com/bbangert/beaker/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild b/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild
index f7e8aa4b0ea5..5d0a167ccafd 100644
--- a/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild
+++ b/dev-python/beanstalkc/beanstalkc-0.4.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="A simple beanstalkd client library"
-HOMEPAGE="https://github.com/earl/beanstalkc https://pypi.org/project/beanstalkc"
+HOMEPAGE="https://github.com/earl/beanstalkc https://pypi.org/project/beanstalkc/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild b/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
index 1fb32354eeeb..669df4843c19 100644
--- a/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
+++ b/dev-python/beanstalkc/beanstalkc-0.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="A simple beanstalkd client library"
-HOMEPAGE="https://github.com/earl/beanstalkc https://pypi.org/project/beanstalkc"
+HOMEPAGE="https://github.com/earl/beanstalkc https://pypi.org/project/beanstalkc/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
index 462a34a35f08..46cd66be7bb2 100644
--- a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="BeautifulSoup"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="HTML/XML parser for quick-turnaround applications like screen-scraping"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/ https://pypi.org/project/BeautifulSoup"
+HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/ https://pypi.org/project/BeautifulSoup/"
SRC_URI="https://www.crummy.com/software/${MY_PN}/download/3.x/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
index 2ff59864aee0..84f52ff0e4bd 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.5.1.ebuild
@@ -12,7 +12,7 @@ MY_P=${MY_PN}-${PV}
DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
HOMEPAGE="https://bugs.launchpad.net/beautifulsoup/
- https://pypi.org/project/beautifulsoup4"
+ https://pypi.org/project/beautifulsoup4/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/bert/bert-2.0.0.ebuild b/dev-python/bert/bert-2.0.0.ebuild
index 09e59f1e8cc2..ff1b9ae8e8ef 100644
--- a/dev-python/bert/bert-2.0.0.ebuild
+++ b/dev-python/bert/bert-2.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="BERT Serialization Library"
-HOMEPAGE="https://pypi.org/project/bert"
+HOMEPAGE="https://pypi.org/project/bert/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/dev-python/billiard/billiard-3.3.0.23.ebuild b/dev-python/billiard/billiard-3.3.0.23.ebuild
index 4ee96e84df83..5a114a417215 100644
--- a/dev-python/billiard/billiard-3.3.0.23.ebuild
+++ b/dev-python/billiard/billiard-3.3.0.23.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Python multiprocessing fork"
-HOMEPAGE="https://pypi.org/project/billiard https://github.com/celery/billiard"
+HOMEPAGE="https://pypi.org/project/billiard/ https://github.com/celery/billiard"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/billiard/billiard-3.5.0.0.ebuild b/dev-python/billiard/billiard-3.5.0.0.ebuild
index f47d6ac951a3..d727dd556a97 100644
--- a/dev-python/billiard/billiard-3.5.0.0.ebuild
+++ b/dev-python/billiard/billiard-3.5.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Python multiprocessing fork"
-HOMEPAGE="https://pypi.org/project/billiard https://github.com/celery/billiard"
+HOMEPAGE="https://pypi.org/project/billiard/ https://github.com/celery/billiard"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/billiard/billiard-3.5.0.2.ebuild b/dev-python/billiard/billiard-3.5.0.2.ebuild
index c2dbb24089d8..038495a8b193 100644
--- a/dev-python/billiard/billiard-3.5.0.2.ebuild
+++ b/dev-python/billiard/billiard-3.5.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Python multiprocessing fork"
-HOMEPAGE="https://pypi.org/project/billiard https://github.com/celery/billiard"
+HOMEPAGE="https://pypi.org/project/billiard/ https://github.com/celery/billiard"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/bitarray/bitarray-0.8.1.ebuild b/dev-python/bitarray/bitarray-0.8.1.ebuild
index 594f89e2d55e..86f56df8ef4b 100644
--- a/dev-python/bitarray/bitarray-0.8.1.ebuild
+++ b/dev-python/bitarray/bitarray-0.8.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
inherit distutils-r1
DESCRIPTION="efficient arrays of booleans -- C extension"
-HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray"
+HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/bleach/bleach-1.5.0.ebuild b/dev-python/bleach/bleach-1.5.0.ebuild
index 3ed216f9a575..632e3e55c879 100644
--- a/dev-python/bleach/bleach-1.5.0.ebuild
+++ b/dev-python/bleach/bleach-1.5.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach"
+HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/bleach/bleach-2.1.1.ebuild b/dev-python/bleach/bleach-2.1.1.ebuild
index d662a702cba1..7b249d5a841f 100644
--- a/dev-python/bleach/bleach-2.1.1.ebuild
+++ b/dev-python/bleach/bleach-2.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach"
+HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/bleach/bleach-2.1.3.ebuild b/dev-python/bleach/bleach-2.1.3.ebuild
index d662a702cba1..7b249d5a841f 100644
--- a/dev-python/bleach/bleach-2.1.3.ebuild
+++ b/dev-python/bleach/bleach-2.1.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach"
+HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/blinker/blinker-1.4.ebuild b/dev-python/blinker/blinker-1.4.ebuild
index 9beb75b95c03..9375f25c79b8 100644
--- a/dev-python/blinker/blinker-1.4.ebuild
+++ b/dev-python/blinker/blinker-1.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Fast, simple object-to-object and broadcast signaling"
-HOMEPAGE="https://pythonhosted.org/blinker/ https://pypi.org/project/blinker"
+HOMEPAGE="https://pythonhosted.org/blinker/ https://pypi.org/project/blinker/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
index 93978429b5bb..98526227197a 100644
--- a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
+++ b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
DESCRIPTION="Enthought Tool Suite: Numerical modeling"
HOMEPAGE="http://docs.enthought.com/blockcanvas/
https://github.com/enthought/blockcanvas
- https://pypi.org/project/blockcanvas"
+ https://pypi.org/project/blockcanvas/"
SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/bluelet/bluelet-0.2.0.ebuild b/dev-python/bluelet/bluelet-0.2.0.ebuild
index 4c0092ff93d6..5f50a472e81d 100644
--- a/dev-python/bluelet/bluelet-0.2.0.ebuild
+++ b/dev-python/bluelet/bluelet-0.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Module for pure Python asynchronous I/O using coroutines"
-HOMEPAGE="https://pypi.org/project/bluelet"
+HOMEPAGE="https://pypi.org/project/bluelet/"
SRC_URI="https://github.com/sampsyo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/bokeh/bokeh-0.11.1.ebuild b/dev-python/bokeh/bokeh-0.11.1.ebuild
index 49eddd87ed27..bb7d27a052ef 100644
--- a/dev-python/bokeh/bokeh-0.11.1.ebuild
+++ b/dev-python/bokeh/bokeh-0.11.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="Statistical and novel interactive HTML plots for Python"
-HOMEPAGE="http://bokeh.pydata.org/ https://github.com/bokeh/bokeh http://pypi.org/project/bokeh"
+HOMEPAGE="http://bokeh.pydata.org/ https://github.com/bokeh/bokeh http://pypi.org/project/bokeh/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/boto/boto-2.41.0.ebuild b/dev-python/boto/boto-2.41.0.ebuild
index 322e630e5def..c3b00d0dbf3f 100644
--- a/dev-python/boto/boto-2.41.0.ebuild
+++ b/dev-python/boto/boto-2.41.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto"
+HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/boto/boto-2.48.0.ebuild b/dev-python/boto/boto-2.48.0.ebuild
index a978bd9f9368..08a852151e64 100644
--- a/dev-python/boto/boto-2.48.0.ebuild
+++ b/dev-python/boto/boto-2.48.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Amazon Web Services API"
-HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto"
+HOMEPAGE="https://github.com/boto/boto https://pypi.org/project/boto/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/bottle/bottle-0.12.12.ebuild b/dev-python/bottle/bottle-0.12.12.ebuild
index ae590cf85856..17fb9272a22b 100644
--- a/dev-python/bottle/bottle-0.12.12.ebuild
+++ b/dev-python/bottle/bottle-0.12.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1 eutils
DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="https://pypi.org/project/bottle http://bottlepy.org/"
+HOMEPAGE="https://pypi.org/project/bottle/ http://bottlepy.org/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/bottle/bottle-0.12.13.ebuild b/dev-python/bottle/bottle-0.12.13.ebuild
index f855160cb8aa..b75ec9750ab3 100644
--- a/dev-python/bottle/bottle-0.12.13.ebuild
+++ b/dev-python/bottle/bottle-0.12.13.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1 eutils
DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="https://pypi.org/project/bottle http://bottlepy.org/"
+HOMEPAGE="https://pypi.org/project/bottle/ http://bottlepy.org/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/bottleneck/bottleneck-0.8.0.ebuild b/dev-python/bottleneck/bottleneck-0.8.0.ebuild
index aae727b7e016..80a55c122fb2 100644
--- a/dev-python/bottleneck/bottleneck-0.8.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-0.8.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="Bottleneck"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="https://pypi.org/project/Bottleneck"
+HOMEPAGE="https://pypi.org/project/Bottleneck/"
SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
SLOT="0"
diff --git a/dev-python/bottleneck/bottleneck-1.0.0.ebuild b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
index f9e1b247d5d3..c83ab09655da 100644
--- a/dev-python/bottleneck/bottleneck-1.0.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="Bottleneck"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Fast NumPy array functions written in Cython"
-HOMEPAGE="https://pypi.org/project/Bottleneck"
+HOMEPAGE="https://pypi.org/project/Bottleneck/"
SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
SLOT="0"
diff --git a/dev-python/bpython/bpython-0.16-r1.ebuild b/dev-python/bpython/bpython-0.16-r1.ebuild
index 11285027b8f6..70407a76fccd 100644
--- a/dev-python/bpython/bpython-0.16-r1.ebuild
+++ b/dev-python/bpython/bpython-0.16-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython"
+HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/bpython/bpython-0.16.ebuild b/dev-python/bpython/bpython-0.16.ebuild
index 847fd374b79f..35036333262e 100644
--- a/dev-python/bpython/bpython-0.16.ebuild
+++ b/dev-python/bpython/bpython-0.16.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython"
+HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/bpython/bpython-0.17.1.ebuild b/dev-python/bpython/bpython-0.17.1.ebuild
index 94cbeb694d22..5c37145681cb 100644
--- a/dev-python/bpython/bpython-0.17.1.ebuild
+++ b/dev-python/bpython/bpython-0.17.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython"
+HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/bpython/bpython-0.17.ebuild b/dev-python/bpython/bpython-0.17.ebuild
index 94cbeb694d22..5c37145681cb 100644
--- a/dev-python/bpython/bpython-0.17.ebuild
+++ b/dev-python/bpython/bpython-0.17.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
-HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython"
+HOMEPAGE="https://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.org/project/bpython/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/bsddb3/bsddb3-6.1.1.ebuild b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
index 21cb44c6d2ed..870e85826470 100644
--- a/dev-python/bsddb3/bsddb3-6.1.1.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit db-use distutils-r1 multilib
DESCRIPTION="Python bindings for Berkeley DB"
-HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3"
+HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index e1e36cb1f4cf..6394b1711490 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit db-use distutils-r1
DESCRIPTION="Python bindings for Berkeley DB"
-HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3"
+HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/buzhug/buzhug-1.8-r1.ebuild b/dev-python/buzhug/buzhug-1.8-r1.ebuild
index e4aeeb2ebeb6..010e251a8d8b 100644
--- a/dev-python/buzhug/buzhug-1.8-r1.ebuild
+++ b/dev-python/buzhug/buzhug-1.8-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Fast, pure-Python database engine"
-HOMEPAGE="http://buzhug.sourceforge.net/ https://pypi.org/project/buzhug"
+HOMEPAGE="http://buzhug.sourceforge.net/ https://pypi.org/project/buzhug/"
SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
LICENSE="BSD"
diff --git a/dev-python/bz2file/bz2file-0.98.ebuild b/dev-python/bz2file/bz2file-0.98.ebuild
index f2ec09ca6650..bc75674029bc 100644
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ b/dev-python/bz2file/bz2file-0.98.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Replacement for bz2.BZ2File with features from newest CPython"
-HOMEPAGE="https://pypi.org/project/bz2file https://github.com/nvawda/bz2file"
+HOMEPAGE="https://pypi.org/project/bz2file/ https://github.com/nvawda/bz2file"
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/cachetools/cachetools-1.1.5.ebuild b/dev-python/cachetools/cachetools-1.1.5.ebuild
index ac9af20aa969..e8c2e2194b21 100644
--- a/dev-python/cachetools/cachetools-1.1.5.ebuild
+++ b/dev-python/cachetools/cachetools-1.1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools"
+HOMEPAGE="https://pypi.org/project/cachetools/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/cachetools/cachetools-2.0.0.ebuild b/dev-python/cachetools/cachetools-2.0.0.ebuild
index de100961d66f..26e716820ade 100644
--- a/dev-python/cachetools/cachetools-2.0.0.ebuild
+++ b/dev-python/cachetools/cachetools-2.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools"
+HOMEPAGE="https://pypi.org/project/cachetools/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/cachetools/cachetools-2.0.1.ebuild b/dev-python/cachetools/cachetools-2.0.1.ebuild
index de100961d66f..26e716820ade 100644
--- a/dev-python/cachetools/cachetools-2.0.1.ebuild
+++ b/dev-python/cachetools/cachetools-2.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools"
+HOMEPAGE="https://pypi.org/project/cachetools/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/capturer/capturer-2.3.ebuild b/dev-python/capturer/capturer-2.3.ebuild
index 4f98af431bd7..8a2d9f16e3a0 100644
--- a/dev-python/capturer/capturer-2.3.ebuild
+++ b/dev-python/capturer/capturer-2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
-HOMEPAGE="https://capturer.readthedocs.org/ https://pypi.org/project/capturer https://github.com/xolox/python-capturer"
+HOMEPAGE="https://capturer.readthedocs.org/ https://pypi.org/project/capturer/ https://github.com/xolox/python-capturer"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/case/case-1.5.2-r1.ebuild b/dev-python/case/case-1.5.2-r1.ebuild
index 46296c5770e8..5a903a8eb1b8 100644
--- a/dev-python/case/case-1.5.2-r1.ebuild
+++ b/dev-python/case/case-1.5.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python unittest Utilities"
-HOMEPAGE="https://pypi.org/project/case https://github.com/celery/case"
+HOMEPAGE="https://pypi.org/project/case/ https://github.com/celery/case"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/castellan/castellan-0.12.2.ebuild b/dev-python/castellan/castellan-0.12.2.ebuild
index 2bd53b73f73b..af3a46cafef3 100644
--- a/dev-python/castellan/castellan-0.12.2.ebuild
+++ b/dev-python/castellan/castellan-0.12.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Generic Key Manager interface for OpenStack"
-HOMEPAGE="https://pypi.org/project/castellan"
+HOMEPAGE="https://pypi.org/project/castellan/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/castellan/castellan-0.17.0.ebuild b/dev-python/castellan/castellan-0.17.0.ebuild
index aa08f17422a4..6cf7e57b00cf 100644
--- a/dev-python/castellan/castellan-0.17.0.ebuild
+++ b/dev-python/castellan/castellan-0.17.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Generic Key Manager interface for OpenStack"
-HOMEPAGE="https://pypi.org/project/castellan"
+HOMEPAGE="https://pypi.org/project/castellan/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/cbor/cbor-1.0.0.ebuild b/dev-python/cbor/cbor-1.0.0.ebuild
index a261a8ff04d4..c92ca745b035 100644
--- a/dev-python/cbor/cbor-1.0.0.ebuild
+++ b/dev-python/cbor/cbor-1.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://bitbucket.org/bodhisnarkva/cbor https://pypi.org/project/cbor"
+HOMEPAGE="https://bitbucket.org/bodhisnarkva/cbor https://pypi.org/project/cbor/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/celementtree/celementtree-1.0.5-r2.ebuild b/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
index aed6ec653035..d249e06a3072 100644
--- a/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
+++ b/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_P="cElementTree-${PV}-20051216"
DESCRIPTION="The cElementTree module is a C implementation of the ElementTree API"
-HOMEPAGE="http://effbot.org/zone/celementtree.htm https://pypi.org/project/cElementTree"
+HOMEPAGE="http://effbot.org/zone/celementtree.htm https://pypi.org/project/cElementTree/"
SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
LICENSE="ElementTree"
diff --git a/dev-python/celery/celery-3.1.24-r1.ebuild b/dev-python/celery/celery-3.1.24-r1.ebuild
index 40dc640e22da..57b09e0c912f 100644
--- a/dev-python/celery/celery-3.1.24-r1.ebuild
+++ b/dev-python/celery/celery-3.1.24-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1 bash-completion-r1
DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
-HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery"
+HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/celery/celery-4.0.2.ebuild b/dev-python/celery/celery-4.0.2.ebuild
index 71008b17d9c4..762d6dc8a342 100644
--- a/dev-python/celery/celery-4.0.2.ebuild
+++ b/dev-python/celery/celery-4.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1 bash-completion-r1
DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
-HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery"
+HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/celery/celery-4.1.0.ebuild b/dev-python/celery/celery-4.1.0.ebuild
index 01ad0576d19d..ba8b5a3c6b87 100644
--- a/dev-python/celery/celery-4.1.0.ebuild
+++ b/dev-python/celery/celery-4.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1 bash-completion-r1
DESCRIPTION="Asynchronous task queue/job queue based on distributed message passing"
-HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery"
+HOMEPAGE="http://celeryproject.org/ https://pypi.org/project/celery/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/certifi/certifi-2016.9.26.ebuild b/dev-python/certifi/certifi-2016.9.26.ebuild
index 9b9c95b4a563..a56a36384443 100644
--- a/dev-python/certifi/certifi-2016.9.26.ebuild
+++ b/dev-python/certifi/certifi-2016.9.26.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/certifi/certifi-2017.1.23.ebuild b/dev-python/certifi/certifi-2017.1.23.ebuild
index ed328310c524..04cacf5f1bef 100644
--- a/dev-python/certifi/certifi-2017.1.23.ebuild
+++ b/dev-python/certifi/certifi-2017.1.23.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/certifi/certifi-2017.11.5.ebuild b/dev-python/certifi/certifi-2017.11.5.ebuild
index ce0cebc75e57..f9bb27bfec02 100644
--- a/dev-python/certifi/certifi-2017.11.5.ebuild
+++ b/dev-python/certifi/certifi-2017.11.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MPL-2.0"
diff --git a/dev-python/certifi/certifi-2017.4.17.ebuild b/dev-python/certifi/certifi-2017.4.17.ebuild
index b1bf9ff39c5d..940c7adbb812 100644
--- a/dev-python/certifi/certifi-2017.4.17.ebuild
+++ b/dev-python/certifi/certifi-2017.4.17.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/certifi/certifi-2017.7.27.1.ebuild b/dev-python/certifi/certifi-2017.7.27.1.ebuild
index ce0cebc75e57..f9bb27bfec02 100644
--- a/dev-python/certifi/certifi-2017.7.27.1.ebuild
+++ b/dev-python/certifi/certifi-2017.7.27.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
+HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MPL-2.0"
diff --git a/dev-python/cffi/cffi-1.11.2.ebuild b/dev-python/cffi/cffi-1.11.2.ebuild
index d16c9679d2a9..0e086e82f5fb 100644
--- a/dev-python/cffi/cffi-1.11.2.ebuild
+++ b/dev-python/cffi/cffi-1.11.2.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/cffi/cffi-1.11.4.ebuild b/dev-python/cffi/cffi-1.11.4.ebuild
index b476f44418b0..fc98a79a146c 100644
--- a/dev-python/cffi/cffi-1.11.4.ebuild
+++ b/dev-python/cffi/cffi-1.11.4.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/cffi/cffi-1.9.1.ebuild b/dev-python/cffi/cffi-1.9.1.ebuild
index c9dee226807b..b8e2ed10c434 100644
--- a/dev-python/cffi/cffi-1.9.1.ebuild
+++ b/dev-python/cffi/cffi-1.9.1.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi"
+HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/cfgio/metadata.xml b/dev-python/cfgio/metadata.xml
index a24f0895edd8..7c0336919544 100644
--- a/dev-python/cfgio/metadata.xml
+++ b/dev-python/cfgio/metadata.xml
@@ -1,10 +1,7 @@
-
- ercpe@gentoo.org
- Johann Schmitz (ercpe)
-
+
ercpe/cfgio
diff --git a/dev-python/cfgparse/cfgparse-1.3-r1.ebuild b/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
index e73625570e32..064a8ef7f86d 100644
--- a/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
+++ b/dev-python/cfgparse/cfgparse-1.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Config File parser for Python"
-HOMEPAGE="http://cfgparse.sourceforge.net https://pypi.org/project/cfgparse"
+HOMEPAGE="http://cfgparse.sourceforge.net https://pypi.org/project/cfgparse/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="PSF-2.3"
diff --git a/dev-python/chaco/chaco-4.5.0.ebuild b/dev-python/chaco/chaco-4.5.0.ebuild
index 6014aa20d76a..798acf87ae0e 100644
--- a/dev-python/chaco/chaco-4.5.0.ebuild
+++ b/dev-python/chaco/chaco-4.5.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx flag-o-matic
DESCRIPTION="Enthought Tool Suite: Interactive plotting toolkit"
HOMEPAGE="http://docs.enthought.com/chaco/
https://github.com/enthought/chaco
- https://pypi.org/project/chaco"
+ https://pypi.org/project/chaco/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/chameleon/chameleon-2.25.ebuild b/dev-python/chameleon/chameleon-2.25.ebuild
index 821a742744f1..de0d3b0cf0d3 100644
--- a/dev-python/chameleon/chameleon-2.25.ebuild
+++ b/dev-python/chameleon/chameleon-2.25.ebuild
@@ -11,7 +11,7 @@ MY_PN="Chameleon"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="http://chameleon.repoze.org https://pypi.org/project/Chameleon"
+HOMEPAGE="http://chameleon.repoze.org https://pypi.org/project/Chameleon/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="repoze"
diff --git a/dev-python/chardet/chardet-3.0.4.ebuild b/dev-python/chardet/chardet-3.0.4.ebuild
index a0433040f35a..16910a427f31 100644
--- a/dev-python/chardet/chardet-3.0.4.ebuild
+++ b/dev-python/chardet/chardet-3.0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Universal encoding detector"
-HOMEPAGE="https://github.com/chardet/chardet https://pypi.org/project/chardet"
+HOMEPAGE="https://github.com/chardet/chardet https://pypi.org/project/chardet/"
SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
# SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild b/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
index 0752e881ecd6..93980236036a 100644
--- a/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
+++ b/dev-python/cheetah/cheetah-2.4.4-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Cheetah"
MY_P="${MY_PN}-${PV/_}"
DESCRIPTION="Python-powered template engine and code generator"
-HOMEPAGE="http://www.cheetahtemplate.org/ https://rtyler.github.com/cheetah/ https://pypi.org/project/Cheetah"
+HOMEPAGE="http://www.cheetahtemplate.org/ https://rtyler.github.com/cheetah/ https://pypi.org/project/Cheetah/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild b/dev-python/cheroot/cheroot-6.0.0.ebuild
index 2522f6fc1329..3df90615c864 100644
--- a/dev-python/cheroot/cheroot-6.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/Cheroot https://github.com/cherrypy/cheroot"
+HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/cherrypy/cherrypy-13.1.0.ebuild b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
index 3cb3232bd32d..2f0430365316 100644
--- a/dev-python/cherrypy/cherrypy-13.1.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_P="CherryPy-${PV}"
DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/CherryPy"
+HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/CherryPy/"
SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/cherrypy/cherrypy-3.8.0.ebuild b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
index 4083f06d4d80..ab8cf193674b 100644
--- a/dev-python/cherrypy/cherrypy-3.8.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-3.8.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_P="CherryPy-${PV}"
DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/CherryPy"
+HOMEPAGE="http://www.cherrypy.org/ https://pypi.org/project/CherryPy/"
SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/click-log/click-log-0.1.3.ebuild b/dev-python/click-log/click-log-0.1.3.ebuild
index 5b0403fe5abf..bc63e078aaf7 100644
--- a/dev-python/click-log/click-log-0.1.3.ebuild
+++ b/dev-python/click-log/click-log-0.1.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="Logging integration for Click."
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log"
+HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/click-log/click-log-0.1.4.ebuild b/dev-python/click-log/click-log-0.1.4.ebuild
index 354d68ea9dc2..be453496b597 100644
--- a/dev-python/click-log/click-log-0.1.4.ebuild
+++ b/dev-python/click-log/click-log-0.1.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="Logging integration for Click."
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log"
+HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/click-log/click-log-0.1.8.ebuild b/dev-python/click-log/click-log-0.1.8.ebuild
index 815b5575fca7..d8718bfa82e2 100644
--- a/dev-python/click-log/click-log-0.1.8.ebuild
+++ b/dev-python/click-log/click-log-0.1.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Logging integration for Click."
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log"
+HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/click-log/click-log-0.2.1.ebuild b/dev-python/click-log/click-log-0.2.1.ebuild
index bd1dada2488e..7f3e58c4a7b4 100644
--- a/dev-python/click-log/click-log-0.2.1.ebuild
+++ b/dev-python/click-log/click-log-0.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Logging integration for Click."
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log"
+HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/click-plugins/click-plugins-1.0.3.ebuild b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
index e0a78f68be9f..9e69ef2c2e91 100644
--- a/dev-python/click-plugins/click-plugins-1.0.3.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
inherit distutils-r1
DESCRIPTION="Module for click to enable registering CLI commands via setuptools entry-points"
-HOMEPAGE="https://pypi.org/project/click-plugins"
+HOMEPAGE="https://pypi.org/project/click-plugins/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/click-threading/click-threading-0.1.2.ebuild b/dev-python/click-threading/click-threading-0.1.2.ebuild
index 4e444c374fcf..7d9b9a05b966 100644
--- a/dev-python/click-threading/click-threading-0.1.2.ebuild
+++ b/dev-python/click-threading/click-threading-0.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="Multithreaded Click apps made easy."
-HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading"
+HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/click-threading/click-threading-0.3.0.ebuild b/dev-python/click-threading/click-threading-0.3.0.ebuild
index 7d8b8bafcd09..f9960eb37bf2 100644
--- a/dev-python/click-threading/click-threading-0.3.0.ebuild
+++ b/dev-python/click-threading/click-threading-0.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Multithreaded Click apps made easy."
-HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading"
+HOMEPAGE="https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading/"
SRC_URI="https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/click/click-6.6.ebuild b/dev-python/click/click-6.6.ebuild
index e20abfe6a2a7..5d3769cf9729 100644
--- a/dev-python/click/click-6.6.ebuild
+++ b/dev-python/click/click-6.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A Python package for creating beautiful command line interfaces"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click/"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/click/click-6.7.ebuild b/dev-python/click/click-6.7.ebuild
index f6e2cb5dd55e..a594f6dc8176 100644
--- a/dev-python/click/click-6.7.ebuild
+++ b/dev-python/click/click-6.7.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A Python package for creating beautiful command line interfaces"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.org/project/click/"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild b/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
index 78f68f641ef4..026c593b482c 100644
--- a/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
+++ b/dev-python/clientcookie/clientcookie-1.3.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_P="ClientCookie-${PV}"
DESCRIPTION="Python module for handling HTTP cookies on the client side"
-HOMEPAGE="http://wwwsearch.sourceforge.net/ClientCookie/ https://pypi.org/project/ClientCookie"
+HOMEPAGE="http://wwwsearch.sourceforge.net/ClientCookie/ https://pypi.org/project/ClientCookie/"
SRC_URI="http://wwwsearch.sourceforge.net/ClientCookie/src/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/codetools/codetools-4.2.0.ebuild b/dev-python/codetools/codetools-4.2.0.ebuild
index aa514e09c429..fe151340e438 100644
--- a/dev-python/codetools/codetools-4.2.0.ebuild
+++ b/dev-python/codetools/codetools-4.2.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 virtualx
DESCRIPTION="Enthought Tool Suite: Code analysis and execution tools"
HOMEPAGE="http://docs.enthought.com/codetools/
https://github.com/enthought/codetools
- https://pypi.org/project/codetools"
+ https://pypi.org/project/codetools/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
IUSE="test"
diff --git a/dev-python/colander/colander-1.3.1.ebuild b/dev-python/colander/colander-1.3.1.ebuild
index adab8e5e1d9f..b646c5102f01 100644
--- a/dev-python/colander/colander-1.3.1.ebuild
+++ b/dev-python/colander/colander-1.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="A simple schema-based serialization and deserialization library"
-HOMEPAGE="https://docs.pylonsproject.org/projects/colander/en/latest/ https://pypi.org/project/colander"
+HOMEPAGE="https://docs.pylonsproject.org/projects/colander/en/latest/ https://pypi.org/project/colander/"
MY_P=${P/_beta1/b1}
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
diff --git a/dev-python/collectd-rabbitmq/collectd-rabbitmq-1.19.0-r1.ebuild b/dev-python/collectd-rabbitmq/collectd-rabbitmq-1.19.0-r1.ebuild
index 9b342eb1c588..400fc6f928bd 100644
--- a/dev-python/collectd-rabbitmq/collectd-rabbitmq-1.19.0-r1.ebuild
+++ b/dev-python/collectd-rabbitmq/collectd-rabbitmq-1.19.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Collectd plugin to gather statistics from RabbitMQ"
-HOMEPAGE="https://pypi.org/project/collectd-rabbitmq"
+HOMEPAGE="https://pypi.org/project/collectd-rabbitmq/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="amd64"
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
index 6318e27c08ab..344ddc5ebdc8 100644
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
HOMEPAGE="
- https://pypi.org/project/colorama
+ https://pypi.org/project/colorama/
https://github.com/tartley/colorama"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/colorama/colorama-0.3.9.ebuild b/dev-python/colorama/colorama-0.3.9.ebuild
index d64ab64e1af2..7a1cb051c8b4 100644
--- a/dev-python/colorama/colorama-0.3.9.ebuild
+++ b/dev-python/colorama/colorama-0.3.9.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
HOMEPAGE="
- https://pypi.org/project/colorama
+ https://pypi.org/project/colorama/
https://github.com/tartley/colorama"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/coloredlogs/coloredlogs-6.1.ebuild b/dev-python/coloredlogs/coloredlogs-6.1.ebuild
index 1df9545a08db..f8a2c00c34c6 100644
--- a/dev-python/coloredlogs/coloredlogs-6.1.ebuild
+++ b/dev-python/coloredlogs/coloredlogs-6.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Colored stream handler for the logging module"
HOMEPAGE="
- https://pypi.org/project/coloredlogs
+ https://pypi.org/project/coloredlogs/
https://github.com/xolox/python-coloredlogs
http://coloredlogs.readthedocs.org"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/colorlog/colorlog-2.7.0.ebuild b/dev-python/colorlog/colorlog-2.7.0.ebuild
index 3b1c2d81dda9..a278410a4750 100644
--- a/dev-python/colorlog/colorlog-2.7.0.ebuild
+++ b/dev-python/colorlog/colorlog-2.7.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Log formatting with colors"
-HOMEPAGE="https://pypi.org/project/colorlog https://github.com/borntyping/python-colorlog"
+HOMEPAGE="https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/columnize/columnize-0.3.5-r1.ebuild b/dev-python/columnize/columnize-0.3.5-r1.ebuild
index fd1b2633d134..43a96abc203f 100644
--- a/dev-python/columnize/columnize-0.3.5-r1.ebuild
+++ b/dev-python/columnize/columnize-0.3.5-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Format a simple (i.e. not nested) list into aligned columns"
-HOMEPAGE="https://github.com/rocky/pycolumnize https://pypi.org/project/columnize"
+HOMEPAGE="https://github.com/rocky/pycolumnize https://pypi.org/project/columnize/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/columnize/columnize-0.3.9.ebuild b/dev-python/columnize/columnize-0.3.9.ebuild
index a6fc1df8fde0..660a77388dfd 100644
--- a/dev-python/columnize/columnize-0.3.9.ebuild
+++ b/dev-python/columnize/columnize-0.3.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Format a simple (i.e. not nested) list into aligned columns"
-HOMEPAGE="https://github.com/rocky/pycolumnize https://pypi.org/project/columnize"
+HOMEPAGE="https://github.com/rocky/pycolumnize https://pypi.org/project/columnize/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/common/common-0.1.2.ebuild b/dev-python/common/common-0.1.2.ebuild
index 644f3c82be60..78db39794182 100644
--- a/dev-python/common/common-0.1.2.ebuild
+++ b/dev-python/common/common-0.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Common tools and data structures implemented in pure python"
-HOMEPAGE="https://pypi.org/project/common"
+HOMEPAGE="https://pypi.org/project/common/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/configargparse/configargparse-0.11.0.ebuild b/dev-python/configargparse/configargparse-0.11.0.ebuild
index dcb379a6e739..f05d8ce6f3a3 100644
--- a/dev-python/configargparse/configargparse-0.11.0.ebuild
+++ b/dev-python/configargparse/configargparse-0.11.0.ebuild
@@ -10,7 +10,7 @@ MY_PN=ConfigArgParse
MY_P=${MY_PN}-${PV}
DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
-HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.org/project/ConfigArgParse"
+HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/configargparse/configargparse-0.12.0.ebuild b/dev-python/configargparse/configargparse-0.12.0.ebuild
index f990d5a35e2d..2a23f5a2bf39 100644
--- a/dev-python/configargparse/configargparse-0.12.0.ebuild
+++ b/dev-python/configargparse/configargparse-0.12.0.ebuild
@@ -10,7 +10,7 @@ MY_PN=ConfigArgParse
MY_P=${MY_PN}-${PV}
DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
-HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.org/project/ConfigArgParse"
+HOMEPAGE="https://github.com/zorro3/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
index 72795decba1e..b2dc4a321727 100644
--- a/dev-python/configobj/configobj-5.0.6.ebuild
+++ b/dev-python/configobj/configobj-5.0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Simple config file reader and writer"
-HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj"
+HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 8071c4dca36f..83d70c85da06 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Symbolic constants in Python"
-HOMEPAGE="https://github.com/twisted/constantly https://pypi.org/project/constantly"
+HOMEPAGE="https://github.com/twisted/constantly https://pypi.org/project/constantly/"
SRC_URI="https://github.com/twisted/constantly/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/constantly/constantly-15.1.0.ebuild b/dev-python/constantly/constantly-15.1.0.ebuild
index d3497d5fba17..8fad33e64a97 100644
--- a/dev-python/constantly/constantly-15.1.0.ebuild
+++ b/dev-python/constantly/constantly-15.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="Symbolic constants in Python"
-HOMEPAGE="https://github.com/twisted/constantly https://pypi.org/project/constantly"
+HOMEPAGE="https://github.com/twisted/constantly https://pypi.org/project/constantly/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/construct/construct-2.8.17.ebuild b/dev-python/construct/construct-2.8.17.ebuild
index c9a9aa0cae7d..4235c921ade4 100644
--- a/dev-python/construct/construct-2.8.17.ebuild
+++ b/dev-python/construct/construct-2.8.17.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="http://construct.readthedocs.io/ https://pypi.org/project/construct"
+HOMEPAGE="http://construct.readthedocs.io/ https://pypi.org/project/construct/"
SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/construct/construct-2.8.21.ebuild b/dev-python/construct/construct-2.8.21.ebuild
index 2064c6fe9e8b..be8e7c29cc9d 100644
--- a/dev-python/construct/construct-2.8.21.ebuild
+++ b/dev-python/construct/construct-2.8.21.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="http://construct.readthedocs.io/ https://pypi.org/project/construct"
+HOMEPAGE="http://construct.readthedocs.io/ https://pypi.org/project/construct/"
SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/contextlib2/contextlib2-0.5.4.ebuild b/dev-python/contextlib2/contextlib2-0.5.4.ebuild
index 99359f588b84..485efcd13e65 100644
--- a/dev-python/contextlib2/contextlib2-0.5.4.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Backports and enhancements for the contextlib module"
-HOMEPAGE="https://pypi.org/project/contextlib2"
+HOMEPAGE="https://pypi.org/project/contextlib2/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2.4"
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
index f9e2c4af392d..add08a62c816 100644
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Backports and enhancements for the contextlib module"
-HOMEPAGE="https://pypi.org/project/contextlib2"
+HOMEPAGE="https://pypi.org/project/contextlib2/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2.4"
diff --git a/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild b/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild
index 422b8182840f..701d2d6a7a3d 100644
--- a/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild
+++ b/dev-python/cosmolopy/cosmolopy-0.1.104-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN=CosmoloPy
MY_P=${MY_PN}-${PV}
DESCRIPTION="Cosmology routines built on NumPy/SciPy"
-HOMEPAGE="https://roban.github.com/CosmoloPy/ https://pypi.org/project/CosmoloPy"
+HOMEPAGE="https://roban.github.com/CosmoloPy/ https://pypi.org/project/CosmoloPy/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/couchdb-python/couchdb-python-1.1.ebuild b/dev-python/couchdb-python/couchdb-python-1.1.ebuild
index 5b4a7a889037..ad8aef7ffd00 100644
--- a/dev-python/couchdb-python/couchdb-python-1.1.ebuild
+++ b/dev-python/couchdb-python/couchdb-python-1.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="CouchDB"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python library for working with CouchDB"
-HOMEPAGE="https://github.com/djc/couchdb-python https://pypi.org/project/CouchDB"
+HOMEPAGE="https://github.com/djc/couchdb-python https://pypi.org/project/CouchDB/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/coverage/coverage-4.2.ebuild b/dev-python/coverage/coverage-4.2.ebuild
index 13862ea9395f..dd7c3307578f 100644
--- a/dev-python/coverage/coverage-4.2.ebuild
+++ b/dev-python/coverage/coverage-4.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.org/project/coverage"
+HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.org/project/coverage/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/croniter/croniter-0.3.11.ebuild b/dev-python/croniter/croniter-0.3.11.ebuild
index 716e6ef1c29f..374afe25e368 100644
--- a/dev-python/croniter/croniter-0.3.11.ebuild
+++ b/dev-python/croniter/croniter-0.3.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/croniter/croniter-0.3.15.ebuild b/dev-python/croniter/croniter-0.3.15.ebuild
index d92ef341c4be..449501801ad3 100644
--- a/dev-python/croniter/croniter-0.3.15.ebuild
+++ b/dev-python/croniter/croniter-0.3.15.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/croniter/croniter-0.3.17.ebuild b/dev-python/croniter/croniter-0.3.17.ebuild
index 8b88ce14558f..0c79746cfed2 100644
--- a/dev-python/croniter/croniter-0.3.17.ebuild
+++ b/dev-python/croniter/croniter-0.3.17.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/cssselect/cssselect-0.9.1.ebuild b/dev-python/cssselect/cssselect-0.9.1.ebuild
index edf096061d70..c23c008becc1 100644
--- a/dev-python/cssselect/cssselect-0.9.1.ebuild
+++ b/dev-python/cssselect/cssselect-0.9.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
- https://pypi.org/project/cssselect"
+ https://pypi.org/project/cssselect/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/cssselect/cssselect-1.0.1.ebuild b/dev-python/cssselect/cssselect-1.0.1.ebuild
index e4af217e6fe2..39d82d54ef59 100644
--- a/dev-python/cssselect/cssselect-1.0.1.ebuild
+++ b/dev-python/cssselect/cssselect-1.0.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
- https://pypi.org/project/cssselect"
+ https://pypi.org/project/cssselect/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/cssselect/cssselect-1.0.3.ebuild b/dev-python/cssselect/cssselect-1.0.3.ebuild
index 12e72c73afbf..6747eb5c3925 100644
--- a/dev-python/cssselect/cssselect-1.0.3.ebuild
+++ b/dev-python/cssselect/cssselect-1.0.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
- https://pypi.org/project/cssselect
+ https://pypi.org/project/cssselect/
https://github.com/scrapy/cssselect"
SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/cssselect2/cssselect2-0.2.0.ebuild b/dev-python/cssselect2/cssselect2-0.2.0.ebuild
index ad8559b907af..a48b0236ae0b 100644
--- a/dev-python/cssselect2/cssselect2-0.2.0.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.2.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="parses CSS3 Selectors and translates them to XPath 1.0"
HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
- https://pypi.org/project/cssselect"
+ https://pypi.org/project/cssselect/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/cython/cython-0.25.2.ebuild b/dev-python/cython/cython-0.25.2.ebuild
index 160a3b3f26f6..c15cad675f1c 100644
--- a/dev-python/cython/cython-0.25.2.ebuild
+++ b/dev-python/cython/cython-0.25.2.ebuild
@@ -12,7 +12,7 @@ MY_PN="Cython"
MY_P="${MY_PN}-${PV/_/}"
DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.org/project/Cython"
+HOMEPAGE="http://cython.org https://pypi.org/project/Cython/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/cython/cython-0.26.1.ebuild b/dev-python/cython/cython-0.26.1.ebuild
index dcf0672f4984..a60e11c5fd03 100644
--- a/dev-python/cython/cython-0.26.1.ebuild
+++ b/dev-python/cython/cython-0.26.1.ebuild
@@ -12,7 +12,7 @@ MY_PN="Cython"
MY_P="${MY_PN}-${PV/_/}"
DESCRIPTION="A Python to C compiler"
-HOMEPAGE="http://cython.org https://pypi.org/project/Cython"
+HOMEPAGE="http://cython.org https://pypi.org/project/Cython/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/cytoolz/cytoolz-0.8.0.ebuild b/dev-python/cytoolz/cytoolz-0.8.0.ebuild
index 12bae5774278..a8d79168c28a 100644
--- a/dev-python/cytoolz/cytoolz-0.8.0.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.8.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Cython implementation of Toolz: High performance functional utilities"
-HOMEPAGE="https://pypi.org/project/cytoolz"
+HOMEPAGE="https://pypi.org/project/cytoolz/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/cytoolz/cytoolz-0.8.2.ebuild b/dev-python/cytoolz/cytoolz-0.8.2.ebuild
index 6f93312e55c9..96e4132bbe54 100644
--- a/dev-python/cytoolz/cytoolz-0.8.2.ebuild
+++ b/dev-python/cytoolz/cytoolz-0.8.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Cython implementation of Toolz: High performance functional utilities"
-HOMEPAGE="https://pypi.org/project/cytoolz"
+HOMEPAGE="https://pypi.org/project/cytoolz/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/d2to1/d2to1-0.2.12_p1.ebuild b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
index c6fa33a3399b..9b52754a24c6 100644
--- a/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
+++ b/dev-python/d2to1/d2to1-0.2.12_p1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_P="${P/_p/.post}"
DESCRIPTION="Allows using distutils2-like setup.cfg files for a package metadata"
-HOMEPAGE="https://pypi.org/project/d2to1 https://github.com/embray/d2to1"
+HOMEPAGE="https://pypi.org/project/d2to1/ https://github.com/embray/d2to1"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/dap/dap-2.2.6.7-r1.ebuild b/dev-python/dap/dap-2.2.6.7-r1.ebuild
index c6b5fb43a044..3a4577fa507a 100644
--- a/dev-python/dap/dap-2.2.6.7-r1.ebuild
+++ b/dev-python/dap/dap-2.2.6.7-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Data Access Protocol client and server"
-HOMEPAGE="http://pydap.org https://pypi.org/project/dap https://pypi.org/project/Pydap"
+HOMEPAGE="http://pydap.org https://pypi.org/project/dap/ https://pypi.org/project/Pydap/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/dbutils/dbutils-1.1-r1.ebuild b/dev-python/dbutils/dbutils-1.1-r1.ebuild
index 34896e18ca65..c38aa2a4269a 100644
--- a/dev-python/dbutils/dbutils-1.1-r1.ebuild
+++ b/dev-python/dbutils/dbutils-1.1-r1.ebuild
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="Database connections for multi-threaded environments"
HOMEPAGE="https://cito.github.io/DBUtils/
https://github.com/Cito/DBUtils
- https://pypi.org/project/DBUtils"
+ https://pypi.org/project/DBUtils/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="OSL-2.0"
diff --git a/dev-python/ddt/ddt-1.1.1.ebuild b/dev-python/ddt/ddt-1.1.1.ebuild
index 28b98db37142..e72f2e687f99 100644
--- a/dev-python/ddt/ddt-1.1.1.ebuild
+++ b/dev-python/ddt/ddt-1.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="A library to multiply test cases"
-HOMEPAGE="https://pypi.org/project/ddt https://github.com/txels/ddt"
+HOMEPAGE="https://pypi.org/project/ddt/ https://github.com/txels/ddt"
SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/decorator/decorator-4.1.2.ebuild b/dev-python/decorator/decorator-4.1.2.ebuild
index fa585aaa7936..2c0093cc52a1 100644
--- a/dev-python/decorator/decorator-4.1.2.ebuild
+++ b/dev-python/decorator/decorator-4.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator"
+HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/decorator/decorator-4.2.1.ebuild b/dev-python/decorator/decorator-4.2.1.ebuild
index fa585aaa7936..2c0093cc52a1 100644
--- a/dev-python/decorator/decorator-4.2.1.ebuild
+++ b/dev-python/decorator/decorator-4.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator"
+HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
index 2053c45630fb..c938c40e6c26 100644
--- a/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
+++ b/dev-python/decoratortools/decoratortools-1.8-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="DecoratorTools"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Class, function, and metaclass decorators"
-HOMEPAGE="https://pypi.org/project/DecoratorTools"
+HOMEPAGE="https://pypi.org/project/DecoratorTools/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="|| ( PSF-2 ZPL )"
diff --git a/dev-python/deform/deform-0.9.9.ebuild b/dev-python/deform/deform-0.9.9.ebuild
index ddfd8276ae23..dac24b3d30c6 100644
--- a/dev-python/deform/deform-0.9.9.ebuild
+++ b/dev-python/deform/deform-0.9.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Another form generation library"
-HOMEPAGE="https://docs.pylonsproject.org/projects/deform/en/latest/ https://pypi.org/project/deform https://github.com/Pylons/deform"
+HOMEPAGE="https://docs.pylonsproject.org/projects/deform/en/latest/ https://pypi.org/project/deform/ https://github.com/Pylons/deform"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="repoze"
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
index 9bb47fecfd72..c02a5144d6fd 100644
--- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml(+)"
inherit distutils-r1
DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
-HOMEPAGE="https://bitbucket.org/tiran/defusedxml https://pypi.org/project/defusedxml"
+HOMEPAGE="https://bitbucket.org/tiran/defusedxml https://pypi.org/project/defusedxml/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
IUSE="examples"
diff --git a/dev-python/demjson/demjson-2.2.4.ebuild b/dev-python/demjson/demjson-2.2.4.ebuild
index 07d6ad5b8630..3a42c4a5e0ae 100644
--- a/dev-python/demjson/demjson-2.2.4.ebuild
+++ b/dev-python/demjson/demjson-2.2.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="encoder, decoder, and lint/validator for JSON (JavaScript Object Notation) compliant with RFC 4627"
-HOMEPAGE="http://deron.meranda.us/python/demjson/ https://pypi.org/project/demjson"
+HOMEPAGE="http://deron.meranda.us/python/demjson/ https://pypi.org/project/demjson/"
SRC_URI="http://deron.meranda.us/python/${PN}/dist/${P}.tar.gz"
LICENSE="LGPL-3"
diff --git a/dev-python/detox/detox-0.11.ebuild b/dev-python/detox/detox-0.11.ebuild
index c25ad9c152b1..ce2827617291 100644
--- a/dev-python/detox/detox-0.11.ebuild
+++ b/dev-python/detox/detox-0.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="distributed tox"
-HOMEPAGE="https://github.com/tox-dev/detox https://pypi.org/project/detox"
+HOMEPAGE="https://github.com/tox-dev/detox https://pypi.org/project/detox/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/dexml/dexml-0.5.1.ebuild b/dev-python/dexml/dexml-0.5.1.ebuild
index 8d8b45f902b9..44f4d7b70904 100644
--- a/dev-python/dexml/dexml-0.5.1.ebuild
+++ b/dev-python/dexml/dexml-0.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Dead-simple Object-XML mapper for Python"
-HOMEPAGE="https://pypi.org/project/dexml"
+HOMEPAGE="https://pypi.org/project/dexml/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/dill/dill-0.2.5.ebuild b/dev-python/dill/dill-0.2.5.ebuild
index c01c5073b679..954cd7b836d7 100644
--- a/dev-python/dill/dill-0.2.5.ebuild
+++ b/dev-python/dill/dill-0.2.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Serialize all of python (almost)"
-HOMEPAGE="https://pypi.org/project/dill"
+HOMEPAGE="https://pypi.org/project/dill/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tgz"
LICENSE="BSD"
diff --git a/dev-python/discogs-client/discogs-client-2.0.2.ebuild b/dev-python/discogs-client/discogs-client-2.0.2.ebuild
index f610682e5511..53f41c931481 100644
--- a/dev-python/discogs-client/discogs-client-2.0.2.ebuild
+++ b/dev-python/discogs-client/discogs-client-2.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Official Python API client for Discogs"
-HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.org/project/discogs-client"
+HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.org/project/discogs-client/"
#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
SRC_URI="https://github.com/discogs/${PN/-/_}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/discogs-client/discogs-client-2.2.1.ebuild b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
index 6ccbc25fc36d..18916d20c850 100644
--- a/dev-python/discogs-client/discogs-client-2.2.1.ebuild
+++ b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Official Python API client for Discogs"
-HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.org/project/discogs-client"
+HOMEPAGE="https://github.com/discogs/discogs_client https://pypi.org/project/discogs-client/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-python/disqus-python/metadata.xml b/dev-python/disqus-python/metadata.xml
index 303b73aa52c5..88317eb4e109 100644
--- a/dev-python/disqus-python/metadata.xml
+++ b/dev-python/disqus-python/metadata.xml
@@ -1,10 +1,6 @@
-
- ercpe@gentoo.org
- Johann Schmitz
-
python@gentoo.org
Python
diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild
index 74b04d71d5a8..df75b4c73260 100644
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Distribution utilities"
-HOMEPAGE="https://pypi.org/project/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
+HOMEPAGE="https://pypi.org/project/distlib/ https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
SLOT="0"
diff --git a/dev-python/distlib/distlib-0.2.4.ebuild b/dev-python/distlib/distlib-0.2.4.ebuild
index cf22159a1cc2..2739e18ac59e 100644
--- a/dev-python/distlib/distlib-0.2.4.ebuild
+++ b/dev-python/distlib/distlib-0.2.4.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Distribution utilities"
-HOMEPAGE="https://pypi.org/project/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
+HOMEPAGE="https://pypi.org/project/distlib/ https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
SLOT="0"
diff --git a/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
index e5b9cdc40f6a..f58766e9d2b5 100644
--- a/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Use Database URLs in your Django Application"
HOMEPAGE="
- https://pypi.org/project/dj-database-url
+ https://pypi.org/project/dj-database-url/
https://github.com/kennethreitz/dj-database-url"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/django-appconf/django-appconf-1.0.1.ebuild b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
index f836d297dd1e..2eb78a82f0a7 100644
--- a/dev-python/django-appconf/django-appconf-1.0.1.ebuild
+++ b/dev-python/django-appconf/django-appconf-1.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="A helper class for handling configuration defaults of packaged apps gracefully"
-HOMEPAGE="https://github.com/jezdez/django-appconf http://django-appconf.readthedocs.org/ https://pypi.org/project/django-appconf"
+HOMEPAGE="https://github.com/jezdez/django-appconf http://django-appconf.readthedocs.org/ https://pypi.org/project/django-appconf/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
index e004e8ee61d7..e35e9de678fb 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="https://pypi.org/project/django-auth-ldap https://bitbucket.org/psagers/django-auth-ldap/"
+HOMEPAGE="https://pypi.org/project/django-auth-ldap/ https://bitbucket.org/psagers/django-auth-ldap/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="amd64 x86"
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
index 80ef3a07be1c..304dfc4d0d70 100644
--- a/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
+++ b/dev-python/django-auth-ldap/django-auth-ldap-1.2.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="https://pypi.org/project/django-auth-ldap https://bitbucket.org/psagers/django-auth-ldap/"
+HOMEPAGE="https://pypi.org/project/django-auth-ldap/ https://bitbucket.org/psagers/django-auth-ldap/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/django-baker/django-baker-0.11-r2.ebuild b/dev-python/django-baker/django-baker-0.11-r2.ebuild
index fc19194f65a0..ac92885103d3 100644
--- a/dev-python/django-baker/django-baker-0.11-r2.ebuild
+++ b/dev-python/django-baker/django-baker-0.11-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Management command that generates views, forms, urls, admin, and templates for models"
-HOMEPAGE="https://pypi.org/project/django-baker https://github.com/krisfields/django-baker"
+HOMEPAGE="https://pypi.org/project/django-baker/ https://github.com/krisfields/django-baker"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild b/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild
index 67c315059d04..77e7e1be3241 100644
--- a/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild
+++ b/dev-python/django-classy-tags/django-classy-tags-0.7.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="Class based template tags for Django"
-HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.org/project/django-classy-tags"
+HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.org/project/django-classy-tags/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild b/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild
index 76df987602b9..548da29ce21f 100644
--- a/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild
+++ b/dev-python/django-classy-tags/django-classy-tags-0.8.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
inherit distutils-r1
DESCRIPTION="Class based template tags for Django"
-HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.org/project/django-classy-tags"
+HOMEPAGE="https://github.com/ojii/django-classy-tags https://pypi.org/project/django-classy-tags/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild b/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
index 0d00dd1dfdec..a2e712c2e5fe 100644
--- a/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
+++ b/dev-python/django-discover-runner/django-discover-runner-1.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
DESCRIPTION="A Django test runner based on unittest2's test discovery"
HOMEPAGE="https://github.com/jezdez/django-discover-runner
- https://pypi.org/project/django-discover-runner"
+ https://pypi.org/project/django-discover-runner/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild b/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild
index 1ccdc3bfdde5..73a5682460f4 100644
--- a/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild
+++ b/dev-python/django-durationfield/django-durationfield-0.5.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
inherit distutils-r1
DESCRIPTION="Reusable app for adding a DurationField to Django"
-HOMEPAGE="https://pypi.org/project/django-durationfield"
+HOMEPAGE="https://pypi.org/project/django-durationfield/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild b/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild
index e2c8ccbff0bf..6f47a1efcfde 100644
--- a/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild
+++ b/dev-python/django-durationfield/django-durationfield-0.5.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
inherit distutils-r1
DESCRIPTION="Reusable app for adding a DurationField to Django"
-HOMEPAGE="https://pypi.org/project/django-durationfield"
+HOMEPAGE="https://pypi.org/project/django-durationfield/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-filer/django-filer-1.2.0.ebuild b/dev-python/django-filer/django-filer-1.2.0.ebuild
index c4d705adbec5..563448e5214b 100644
--- a/dev-python/django-filer/django-filer-1.2.0.ebuild
+++ b/dev-python/django-filer/django-filer-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="File management application for django that makes handling of files and images"
-HOMEPAGE="https://pypi.org/project/django-filer"
+HOMEPAGE="https://pypi.org/project/django-filer/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-filer/django-filer-1.2.7.ebuild b/dev-python/django-filer/django-filer-1.2.7.ebuild
index b1262d7e04ef..443dfc1be2ce 100644
--- a/dev-python/django-filer/django-filer-1.2.7.ebuild
+++ b/dev-python/django-filer/django-filer-1.2.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="File management application for django that makes handling of files and images"
-HOMEPAGE="https://pypi.org/project/django-filer"
+HOMEPAGE="https://pypi.org/project/django-filer/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild b/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
index ae986a958640..08dfef2ed209 100644
--- a/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
+++ b/dev-python/django-grappelli/django-grappelli-2.7.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A jazzy skin for the Django Admin-Interface"
HOMEPAGE="
- https://pypi.org/project/django-grappelli
+ https://pypi.org/project/django-grappelli/
https://django-grappelli.readthedocs.org
https://github.com/sehmaschine/django-grappelli"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/django-international/django-international-0.0.6.ebuild b/dev-python/django-international/django-international-0.0.6.ebuild
index 0250d1d2d4f4..7db3f68cd50d 100644
--- a/dev-python/django-international/django-international-0.0.6.ebuild
+++ b/dev-python/django-international/django-international-0.0.6.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Country and currency data for Django projects"
-HOMEPAGE="https://pypi.org/project/django-international https://bitbucket.org/monwara/django-international"
+HOMEPAGE="https://pypi.org/project/django-international/ https://bitbucket.org/monwara/django-international"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild b/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
index e432b241541f..6e591f9a74c3 100644
--- a/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
+++ b/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="A reusable application for the Django web framework"
-HOMEPAGE="https://pypi.org/project/django-ldap-groups"
+HOMEPAGE="https://pypi.org/project/django-ldap-groups/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="amd64 x86"
diff --git a/dev-python/django-mptt/django-mptt-0.7.4.ebuild b/dev-python/django-mptt/django-mptt-0.7.4.ebuild
index 7a6fc018d67f..7eb84d48fd50 100644
--- a/dev-python/django-mptt/django-mptt-0.7.4.ebuild
+++ b/dev-python/django-mptt/django-mptt-0.7.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="Utilities for implementing Modified Preorder Tree Traversal"
-HOMEPAGE="https://pypi.org/project/django-mptt"
+HOMEPAGE="https://pypi.org/project/django-mptt/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-mptt/django-mptt-0.8.4.ebuild b/dev-python/django-mptt/django-mptt-0.8.4.ebuild
index bc515fe38413..f994f75cae8b 100644
--- a/dev-python/django-mptt/django-mptt-0.8.4.ebuild
+++ b/dev-python/django-mptt/django-mptt-0.8.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Utilities for implementing Modified Preorder Tree Traversal"
-HOMEPAGE="https://pypi.org/project/django-mptt"
+HOMEPAGE="https://pypi.org/project/django-mptt/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild b/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
index cbac8dd23554..3ac3f880ea8d 100644
--- a/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
+++ b/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Support of OAuth 1.0a in Django using python-oauth2"
-HOMEPAGE="https://pypi.org/project/django-oauth-plus http://code.welldev.org/django-oauth-plus/"
+HOMEPAGE="https://pypi.org/project/django-oauth-plus/ http://code.welldev.org/django-oauth-plus/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-openid-auth/metadata.xml b/dev-python/django-openid-auth/metadata.xml
index 6c869455fed2..53e9f1e77234 100644
--- a/dev-python/django-openid-auth/metadata.xml
+++ b/dev-python/django-openid-auth/metadata.xml
@@ -1,10 +1,6 @@
-
- ercpe@gentoo.org
- Johann Schmitz
-
python@gentoo.org
Python
diff --git a/dev-python/django-opensearch/metadata.xml b/dev-python/django-opensearch/metadata.xml
index fb2493cc272e..6e90fd29d0fd 100644
--- a/dev-python/django-opensearch/metadata.xml
+++ b/dev-python/django-opensearch/metadata.xml
@@ -1,10 +1,7 @@
-
- ercpe@gentoo.org
- Johann Schmitz (ercpe)
-
+
vint21h/django-opensearch
diff --git a/dev-python/django-otp-yubikey/metadata.xml b/dev-python/django-otp-yubikey/metadata.xml
index 4f87fbc55a4d..b600756496f9 100644
--- a/dev-python/django-otp-yubikey/metadata.xml
+++ b/dev-python/django-otp-yubikey/metadata.xml
@@ -1,10 +1,7 @@
-
- ercpe@gentoo.org
- Johann Schmitz (ercpe)
-
+
django-otp-yubikey
psagers/django-otp
diff --git a/dev-python/django-otp/django-otp-0.3.4.ebuild b/dev-python/django-otp/django-otp-0.3.4.ebuild
index 9a5fb3483f14..eb05d4af0f2d 100644
--- a/dev-python/django-otp/django-otp-0.3.4.ebuild
+++ b/dev-python/django-otp/django-otp-0.3.4.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
-DESCRIPTION="Framework for adding two-factor authentication to Django using one-time passwords"
+DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
HOMEPAGE="https://bitbucket.org/psagers/django-otp"
SRC_URI="mirror://pypi/d/${PN}/${P}.tar.gz"
diff --git a/dev-python/django-otp/metadata.xml b/dev-python/django-otp/metadata.xml
index ee82c4d80662..553985bc1948 100644
--- a/dev-python/django-otp/metadata.xml
+++ b/dev-python/django-otp/metadata.xml
@@ -1,10 +1,7 @@
-
- ercpe@gentoo.org
- Johann Schmitz (ercpe)
-
+
django-otp
psagers/django-otp
diff --git a/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.2.ebuild b/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.2.ebuild
index d2e537afd089..011aa81e4d56 100644
--- a/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.2.ebuild
+++ b/dev-python/django-phonenumber-field/django-phonenumber-field-0.7.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=5
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
inherit distutils-r1
-DESCRIPTION="Django model and form field for normalised phone numbers using python-phonenumbers"
+DESCRIPTION="Phone number normalisation in Django with python-phonenumbers"
HOMEPAGE="https://github.com/stefanfoulis/django-phonenumber-field"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/django-phonenumber-field/django-phonenumber-field-1.3.0.ebuild b/dev-python/django-phonenumber-field/django-phonenumber-field-1.3.0.ebuild
index ad3dd41f6c95..3b3b1dec8f15 100644
--- a/dev-python/django-phonenumber-field/django-phonenumber-field-1.3.0.ebuild
+++ b/dev-python/django-phonenumber-field/django-phonenumber-field-1.3.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=5
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
-DESCRIPTION="Django model and form field for normalised phone numbers using python-phonenumbers"
+DESCRIPTION="Phone number normalisation in Django with python-phonenumbers"
HOMEPAGE="https://github.com/stefanfoulis/django-phonenumber-field"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/django-phonenumber-field/metadata.xml b/dev-python/django-phonenumber-field/metadata.xml
index 4be288e13588..2f001bbd9a63 100644
--- a/dev-python/django-phonenumber-field/metadata.xml
+++ b/dev-python/django-phonenumber-field/metadata.xml
@@ -1,10 +1,7 @@
-
+
-
- ercpe@gentoo.org
- Johann Schmitz (ercpe)
-
+
stefanfoulis/django-phonenumber-field
django-phonenumber-field
diff --git a/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild b/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
index 25a9a73d3744..7354afbf9f5f 100644
--- a/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
+++ b/dev-python/django-recaptcha/django-recaptcha-1.0.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Django recaptcha form field/widget app"
-HOMEPAGE="https://github.com/praekelt/django-recaptcha https://pypi.org/project/django-recaptcha"
+HOMEPAGE="https://github.com/praekelt/django-recaptcha https://pypi.org/project/django-recaptcha/"
#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SRC_URI="https://github.com/praekelt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/django-registration/django-registration-1.0.ebuild b/dev-python/django-registration/django-registration-1.0.ebuild
index 4133300b72c3..38ad16b2c8e8 100644
--- a/dev-python/django-registration/django-registration-1.0.ebuild
+++ b/dev-python/django-registration/django-registration-1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="An extensible user-registration application for Django"
-HOMEPAGE="https://www.bitbucket.org/ubernostrum/django-registration/wiki/ https://pypi.org/project/django-registration"
+HOMEPAGE="https://www.bitbucket.org/ubernostrum/django-registration/wiki/ https://pypi.org/project/django-registration/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild b/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild
index f2223c14da5a..487e509d67b8 100644
--- a/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild
+++ b/dev-python/django-sekizai/django-sekizai-0.10.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
inherit distutils-r1
DESCRIPTION="Django Template Blocks with extra functionality"
-HOMEPAGE="https://github.com/ojii/django-sekizai https://pypi.org/project/django-sekizai"
+HOMEPAGE="https://github.com/ojii/django-sekizai https://pypi.org/project/django-sekizai/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-select2/django-select2-4.2.2.ebuild b/dev-python/django-select2/django-select2-4.2.2.ebuild
index 96b27cb5601e..3cc8d0994f54 100644
--- a/dev-python/django-select2/django-select2-4.2.2.ebuild
+++ b/dev-python/django-select2/django-select2-4.2.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_PN="Django-Select2"
DESCRIPTION="A Django integration of Select2"
-HOMEPAGE="https://pypi.org/project/Django-Select2"
+HOMEPAGE="https://pypi.org/project/Django-Select2/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/django-select2/django-select2-5.5.0.ebuild b/dev-python/django-select2/django-select2-5.5.0.ebuild
index 6969dc59b877..828e14903a7e 100644
--- a/dev-python/django-select2/django-select2-5.5.0.ebuild
+++ b/dev-python/django-select2/django-select2-5.5.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_PN="Django-Select2"
DESCRIPTION="A Django integration of Select2"
-HOMEPAGE="https://pypi.org/project/Django-Select2"
+HOMEPAGE="https://pypi.org/project/Django-Select2/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild
index 59aa4ba5f275..13e0e6e74fce 100644
--- a/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild
+++ b/dev-python/django-sortedm2m/django-sortedm2m-1.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="Drop-in replacement for django's many to many field with sorted relations"
-HOMEPAGE="https://pypi.org/project/django-sortedm2m"
+HOMEPAGE="https://pypi.org/project/django-sortedm2m/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
index a8999c83e18b..fed14f2cec10 100644
--- a/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
+++ b/dev-python/django-sortedm2m/django-sortedm2m-1.3.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Drop-in replacement for django's many to many field with sorted relations"
-HOMEPAGE="https://pypi.org/project/django-sortedm2m"
+HOMEPAGE="https://pypi.org/project/django-sortedm2m/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-spurl/django-spurl-0.6.4.ebuild b/dev-python/django-spurl/django-spurl-0.6.4.ebuild
index 96dccf955263..9a14c9ac695c 100644
--- a/dev-python/django-spurl/django-spurl-0.6.4.ebuild
+++ b/dev-python/django-spurl/django-spurl-0.6.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="A Django template library for manipulating URLs"
-HOMEPAGE="https://pypi.org/project/django-spurl"
+HOMEPAGE="https://pypi.org/project/django-spurl/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild b/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild
index 1c4a0932c0c2..170d16f3ef73 100644
--- a/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild
+++ b/dev-python/django-standard-form/django-standard-form-1.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_{6,7} )
inherit distutils-r1
DESCRIPTION="Quick and simple django templatetags for displaying forms"
-HOMEPAGE="https://pypi.org/project/django-standard-form"
+HOMEPAGE="https://pypi.org/project/django-standard-form/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-tagging/django-tagging-0.4.1.ebuild b/dev-python/django-tagging/django-tagging-0.4.1.ebuild
index 6d0f69a1a659..217d1bac00c0 100644
--- a/dev-python/django-tagging/django-tagging-0.4.1.ebuild
+++ b/dev-python/django-tagging/django-tagging-0.4.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Generic tagging application for Django"
-HOMEPAGE="https://pypi.org/project/django-tagging"
+HOMEPAGE="https://pypi.org/project/django-tagging/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild b/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild
index e5e1f7aa0227..30df05b94e5a 100644
--- a/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild
+++ b/dev-python/django-tastypie/django-tastypie-0.13.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A flexible and capable API layer for django utilising serialisers"
HOMEPAGE="https://pypi.org/project/django-tastypie/ https://github.com/toastdriven/django-tastypie"
SRC_URI="https://github.com/toastdriven/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="bip doc test"
LICENSE="BSD"
diff --git a/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild b/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild
index 09da81c6c34c..10c03106ac0d 100644
--- a/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild
+++ b/dev-python/django-treebeard/django-treebeard-4.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Efficient tree implementations for Django 1.6+"
-HOMEPAGE="https://tabo.pe/projects/django-treebeard/ https://pypi.org/project/django-treebeard"
+HOMEPAGE="https://tabo.pe/projects/django-treebeard/ https://pypi.org/project/django-treebeard/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/django-two-factor-auth/metadata.xml b/dev-python/django-two-factor-auth/metadata.xml
index 0c5c87a23b02..f1167dc31e6f 100644
--- a/dev-python/django-two-factor-auth/metadata.xml
+++ b/dev-python/django-two-factor-auth/metadata.xml
@@ -1,10 +1,7 @@
-
- ercpe@gentoo.org
- Johann Schmitz (ercpe)
-
+
diff --git a/dev-python/django/django-1.10.7.ebuild b/dev-python/django/django-1.10.7.ebuild
index dc83d0ea01b9..1e04f2344036 100644
--- a/dev-python/django/django-1.10.7.ebuild
+++ b/dev-python/django/django-1.10.7.ebuild
@@ -13,7 +13,7 @@ MY_PN="Django"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
SRC_URI="
https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
diff --git a/dev-python/django/django-1.11.2.ebuild b/dev-python/django/django-1.11.2.ebuild
index 898efe13d909..d6f33979805d 100644
--- a/dev-python/django/django-1.11.2.ebuild
+++ b/dev-python/django/django-1.11.2.ebuild
@@ -13,7 +13,7 @@ MY_PN="Django"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
SRC_URI="
https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
diff --git a/dev-python/django/django-1.4.22.ebuild b/dev-python/django/django-1.4.22.ebuild
index 4ae2e0bf58cf..0f0ba08919dc 100644
--- a/dev-python/django/django-1.4.22.ebuild
+++ b/dev-python/django/django-1.4.22.ebuild
@@ -11,7 +11,7 @@ inherit bash-completion-r1 distutils-r1 eutils versionator webapp
MY_P="Django-${PV}"
DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django/django-1.5.12.ebuild b/dev-python/django/django-1.5.12.ebuild
index c92e7e623452..79854907c61a 100644
--- a/dev-python/django/django-1.5.12.ebuild
+++ b/dev-python/django/django-1.5.12.ebuild
@@ -11,7 +11,7 @@ inherit bash-completion-r1 distutils-r1 versionator webapp
MY_P="Django-${PV}"
DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django/django-1.6.11.ebuild b/dev-python/django/django-1.6.11.ebuild
index 1f2e5600a2af..a46445f638c1 100644
--- a/dev-python/django/django-1.6.11.ebuild
+++ b/dev-python/django/django-1.6.11.ebuild
@@ -13,7 +13,7 @@ inherit bash-completion-r1 distutils-r1 eutils versionator webapp
MY_P="Django-${PV}"
DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django/django-1.7.11.ebuild b/dev-python/django/django-1.7.11.ebuild
index 621b774549b9..86ddb5fc5dfc 100644
--- a/dev-python/django/django-1.7.11.ebuild
+++ b/dev-python/django/django-1.7.11.ebuild
@@ -12,7 +12,7 @@ inherit bash-completion-r1 distutils-r1 eutils versionator webapp
MY_P="Django-${PV}"
DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django/django-1.8.18.ebuild b/dev-python/django/django-1.8.18.ebuild
index 19b325373b77..413258c4600e 100644
--- a/dev-python/django/django-1.8.18.ebuild
+++ b/dev-python/django/django-1.8.18.ebuild
@@ -13,7 +13,7 @@ MY_PN="Django"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
SRC_URI="
https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
diff --git a/dev-python/django/django-1.9.13.ebuild b/dev-python/django/django-1.9.13.ebuild
index a2e8fd4e4c44..481a4e6cfeb5 100644
--- a/dev-python/django/django-1.9.13.ebuild
+++ b/dev-python/django/django-1.9.13.ebuild
@@ -13,7 +13,7 @@ MY_PN="Django"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
SRC_URI="
https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
diff --git a/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild
index 00326505e0b6..1958ce30ff78 100644
--- a/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild
+++ b/dev-python/django_polymorphic/django_polymorphic-0.7.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
-HOMEPAGE="https://pypi.org/project/django-polymorphic"
+HOMEPAGE="https://pypi.org/project/django-polymorphic/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild
index cb1dad0294f2..213f2695e98e 100644
--- a/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild
+++ b/dev-python/django_polymorphic/django_polymorphic-0.9.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
-HOMEPAGE="https://pypi.org/project/django-polymorphic"
+HOMEPAGE="https://pypi.org/project/django-polymorphic/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild b/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild
index 5a263eed9e8a..d382d84bef5b 100644
--- a/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild
+++ b/dev-python/django_polymorphic/django_polymorphic-1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4,5,6}} )
inherit distutils-r1
DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
-HOMEPAGE="https://pypi.org/project/django-polymorphic"
+HOMEPAGE="https://pypi.org/project/django-polymorphic/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P//_/-}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild b/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild
index c771aa67805c..c7ab2bb43f6f 100644
--- a/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild
+++ b/dev-python/djangocms-admin-style/djangocms-admin-style-1.2.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
inherit distutils-r1
DESCRIPTION="Adds pretty CSS styles for the django CMS admin interface."
-HOMEPAGE="https://pypi.org/project/djangocms-admin-style"
+HOMEPAGE="https://pypi.org/project/djangocms-admin-style/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild b/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
index ff1203bc8871..710616145f78 100644
--- a/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
+++ b/dev-python/djangocms-flash/djangocms-flash-0.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="Flash plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-flash"
+HOMEPAGE="https://pypi.org/project/djangocms-flash/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild b/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild
index f68460ce98a1..d75d0fe77ed4 100644
--- a/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild
+++ b/dev-python/djangocms-flash/djangocms-flash-0.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
inherit distutils-r1
DESCRIPTION="Flash plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-flash"
+HOMEPAGE="https://pypi.org/project/djangocms-flash/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild b/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
index c9612fb95df5..7c3589bf217d 100644
--- a/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
+++ b/dev-python/djangocms-inherit/djangocms-inherit-0.2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
inherit distutils-r1
DESCRIPTION="Inherit plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-inherit"
+HOMEPAGE="https://pypi.org/project/djangocms-inherit/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild b/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild
index 5828b9159079..8f0275e08a1e 100644
--- a/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild
+++ b/dev-python/djangocms-link/djangocms-link-2.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Link plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-link"
+HOMEPAGE="https://pypi.org/project/djangocms-link/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild b/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild
index 6557a013161d..68f8281a4353 100644
--- a/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild
+++ b/dev-python/djangocms-picture/djangocms-picture-2.0.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Picture plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-picture"
+HOMEPAGE="https://pypi.org/project/djangocms-picture/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild b/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild
index 749ee0a1862b..aa6ab26c06b4 100644
--- a/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild
+++ b/dev-python/djangocms-snippet/djangocms-snippet-1.9.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}} )
inherit distutils-r1
DESCRIPTION="Snippet plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-snippet"
+HOMEPAGE="https://pypi.org/project/djangocms-snippet/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild b/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild
index 401309b48afc..6b42239e1992 100644
--- a/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild
+++ b/dev-python/djangocms-teaser/djangocms-teaser-0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="Teaser plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-teaser"
+HOMEPAGE="https://pypi.org/project/djangocms-teaser/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild b/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild
index af8da6a6236a..fab35cfc8cfb 100644
--- a/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild
+++ b/dev-python/djangocms-teaser/djangocms-teaser-0.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
inherit distutils-r1
DESCRIPTION="Teaser plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-teaser"
+HOMEPAGE="https://pypi.org/project/djangocms-teaser/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild b/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild
index c3ab5149496e..9b2f84a62c63 100644
--- a/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild
+++ b/dev-python/djangocms-video/djangocms-video-2.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Video plugin for django CMS"
-HOMEPAGE="https://pypi.org/project/djangocms-video"
+HOMEPAGE="https://pypi.org/project/djangocms-video/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
index 40a26a5f763d..464b5c7c119c 100644
--- a/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.15.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython"
+HOMEPAGE="http://www.dnspython.org/ https://pypi.org/project/dnspython/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="ISC"
diff --git a/dev-python/docopt/docopt-0.6.2-r2.ebuild b/dev-python/docopt/docopt-0.6.2-r2.ebuild
index d9ac0337bc9a..51c42a024d9c 100644
--- a/dev-python/docopt/docopt-0.6.2-r2.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Pythonic argument parser, that will make you smile"
-HOMEPAGE="https://pypi.org/project/docopt https://github.com/docopt/docopt"
+HOMEPAGE="https://pypi.org/project/docopt/ https://github.com/docopt/docopt"
SRC_URI="
mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
index 26182c731c7f..08441d09edbd 100644
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Add flag to ignore unicode literal prefixes in doctests"
-HOMEPAGE="https://pypi.org/project/doctest-ignore-unicode https://github.com/gnublade/doctest-ignore-unicode"
+HOMEPAGE="https://pypi.org/project/doctest-ignore-unicode/ https://github.com/gnublade/doctest-ignore-unicode"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/docutils/docutils-0.11.ebuild b/dev-python/docutils/docutils-0.11.ebuild
index eb967062f5cf..80f1a11de170 100644
--- a/dev-python/docutils/docutils-0.11.ebuild
+++ b/dev-python/docutils/docutils-0.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} pypy )
inherit distutils-r1
DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD-2 GPL-3 public-domain"
diff --git a/dev-python/docutils/docutils-0.12.ebuild b/dev-python/docutils/docutils-0.12.ebuild
index 01a17e3d0a17..587257ff032c 100644
--- a/dev-python/docutils/docutils-0.12.ebuild
+++ b/dev-python/docutils/docutils-0.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD-2 GPL-3 public-domain"
diff --git a/dev-python/docutils/docutils-0.13.1.ebuild b/dev-python/docutils/docutils-0.13.1.ebuild
index dcd41b2dd7c6..447102f391c8 100644
--- a/dev-python/docutils/docutils-0.13.1.ebuild
+++ b/dev-python/docutils/docutils-0.13.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD-2 GPL-3 public-domain"
diff --git a/dev-python/docutils/docutils-0.14.ebuild b/dev-python/docutils/docutils-0.14.ebuild
index 84b516e7eaab..b7fb3c6832d9 100644
--- a/dev-python/docutils/docutils-0.14.ebuild
+++ b/dev-python/docutils/docutils-0.14.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD-2 GPL-3 public-domain"
diff --git a/dev-python/doit/doit-0.23.0-r1.ebuild b/dev-python/doit/doit-0.23.0-r1.ebuild
index 3f6094b10dc4..be6079f28e09 100644
--- a/dev-python/doit/doit-0.23.0-r1.ebuild
+++ b/dev-python/doit/doit-0.23.0-r1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4} pypy )
inherit eutils distutils-r1
DESCRIPTION="Automation tool"
-HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.org/project/doit"
+HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.org/project/doit/"
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/doit/doit-0.29.0.ebuild b/dev-python/doit/doit-0.29.0.ebuild
index c4a6be8b9fbb..c7fff2e71f7c 100644
--- a/dev-python/doit/doit-0.29.0.ebuild
+++ b/dev-python/doit/doit-0.29.0.ebuild
@@ -8,7 +8,7 @@ inherit eutils distutils-r1
RESTRICT="test" # can't work as it imports nonexistant modules from coverage
DESCRIPTION="Automation tool"
-HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.org/project/doit"
+HOMEPAGE="http://python-doit.sourceforge.net/ https://pypi.org/project/doit/"
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/dulwich/dulwich-0.18.5.ebuild b/dev-python/dulwich/dulwich-0.18.5.ebuild
index 5ea67c430be8..8acc57c095bc 100644
--- a/dev-python/dulwich/dulwich-0.18.5.ebuild
+++ b/dev-python/dulwich/dulwich-0.18.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich"
+HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
diff --git a/dev-python/dulwich/dulwich-0.18.6.ebuild b/dev-python/dulwich/dulwich-0.18.6.ebuild
index 2207513463fb..af79a4fb7d13 100644
--- a/dev-python/dulwich/dulwich-0.18.6.ebuild
+++ b/dev-python/dulwich/dulwich-0.18.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich"
+HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild
index 38ad877210e1..670f50aaae28 100644
--- a/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="Easy thumbnails for Django"
-HOMEPAGE="https://pypi.org/project/easy-thumbnails"
+HOMEPAGE="https://pypi.org/project/easy-thumbnails/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild
index 2afa3c5517d4..760acd625ec2 100644
--- a/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4}} )
inherit distutils-r1
DESCRIPTION="Easy thumbnails for Django"
-HOMEPAGE="https://pypi.org/project/easy-thumbnails"
+HOMEPAGE="https://pypi.org/project/easy-thumbnails/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild
index e440d88e828b..fc86f73fe35f 100644
--- a/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild
+++ b/dev-python/easy-thumbnails/easy-thumbnails-2.4.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{3,4,5,6}} )
inherit distutils-r1
DESCRIPTION="Easy thumbnails for Django"
-HOMEPAGE="https://pypi.org/project/easy-thumbnails"
+HOMEPAGE="https://pypi.org/project/easy-thumbnails/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/ed25519ll/ed25519ll-0.6.ebuild b/dev-python/ed25519ll/ed25519ll-0.6.ebuild
index c608a7772179..b55559e763e1 100644
--- a/dev-python/ed25519ll/ed25519ll-0.6.ebuild
+++ b/dev-python/ed25519ll/ed25519ll-0.6.ebuild
@@ -3,12 +3,12 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="A low-level ctypes wrapper for Ed25519 digital signatures."
-HOMEPAGE="https://bitbucket.org/dholth/ed25519ll/ https://pypi.org/project/ed25519ll"
+HOMEPAGE="https://bitbucket.org/dholth/ed25519ll/ https://pypi.org/project/ed25519ll/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
@@ -23,9 +23,6 @@ DEPEND="${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
)"
-# https://bitbucket.org/dholth/ed25519ll/issues/1/testfailures-with-python-3
-RESTRICT=test
-
python_test() {
esetup.py test
}
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
index 7ef17ed702f8..4e05aed42db1 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="eGenix utils for Python"
-HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.org/project/egenix-mx-base"
+HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.org/project/egenix-mx-base/"
SRC_URI="https://downloads.egenix.com/python/${P}.tar.gz"
LICENSE="eGenixPublic-1.1"
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
index 9c1bb8b2cbf5..e30dce15afad 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="eGenix utils for Python"
-HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.org/project/egenix-mx-base"
+HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.org/project/egenix-mx-base/"
SRC_URI="https://downloads.egenix.com/python/${P}.tar.gz"
LICENSE="eGenixPublic-1.1"
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
index a208c0766d24..2f4240fa7654 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="eGenix utils for Python"
-HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.org/project/egenix-mx-base"
+HOMEPAGE="https://www.egenix.com/products/python/mxBase https://pypi.org/project/egenix-mx-base/"
SRC_URI="https://downloads.egenix.com/python/${P}.tar.gz"
LICENSE="eGenixPublic-1.1"
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.4.1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.4.1.ebuild
index 512861e8c575..a8c8f21dca22 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.4.1.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RESTRICT="test"
IUSE="doc test"
diff --git a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
index 713df42564a0..c225af2dd530 100644
--- a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
+++ b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_P="${P}-20050316"
DESCRIPTION="A light-weight XML object model for Python"
-HOMEPAGE="http://effbot.org/zone/element-index.htm https://pypi.org/project/elementtree"
+HOMEPAGE="http://effbot.org/zone/element-index.htm https://pypi.org/project/elementtree/"
SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
LICENSE="ElementTree"
diff --git a/dev-python/embedly/embedly-0.5.0-r1.ebuild b/dev-python/embedly/embedly-0.5.0-r1.ebuild
index 368e573dbbc2..0a5d90656131 100644
--- a/dev-python/embedly/embedly-0.5.0-r1.ebuild
+++ b/dev-python/embedly/embedly-0.5.0-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Embedly"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python Library for Embedly"
-HOMEPAGE="https://github.com/embedly/embedly-python/ https://pypi.org/project/Embedly"
+HOMEPAGE="https://github.com/embedly/embedly-python/ https://pypi.org/project/Embedly/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/enable/Manifest b/dev-python/enable/Manifest
index 9f250de258bd..4f4928116dc3 100644
--- a/dev-python/enable/Manifest
+++ b/dev-python/enable/Manifest
@@ -1,2 +1,3 @@
DIST enable-4.4.1.tar.gz 2507048 BLAKE2B e3414a0505acafece3242a40400aab9ea00062bb605baa500f604df875b1caacd446c30189a23bac856c6cb39067f120be6e89ac9c95a05e92dc882d839a7e4b SHA512 72c879f19e26a4311b900cb4665969b9f806ce47b23c214a25e3ec308cc5300b6d71084a793215b05302fbeba09e13a4561e661c3bddb700d529bd31cfeb4dff
DIST enable-4.5.1.tar.gz 2571975 BLAKE2B dfd294f80e22fa89243057f405fe83ecadeb3768cae5a103e62219cfc62ecb5bd3acf1bd2d575da3276e8111c5c5330fa88e1ed06c6eb67a04974a57dd0cbd98 SHA512 1095a4490f4918756dd33864aaba2636c294c3b177d3f500d98a355ec86ef86ab211d33cdec95c2d37e7e1df41622acf2c8ecf524a1d93cc39797804c49e6971
+DIST enable-4.7.1.tar.gz 2728889 BLAKE2B 2952c1772ea902b2a040a5dbc1ade4fcb41f38da41cb9cfd3a574d16397fcceedb5d2216e19bd14ca9881ff27efa93ec0fe4b94db8f3baedf174fe062c825f1e SHA512 49ca414d1273fb5ddcb1732e621f91a5ac49ff02d63b5b36b8d9e28dd737eb4a312f35345fc29db555db1c6e0e8c9bf2204f8662b43a2761db6c2d656c6b2140
diff --git a/dev-python/enable/enable-4.4.1.ebuild b/dev-python/enable/enable-4.4.1.ebuild
index 6a01fbfe447e..ad35ba85b45b 100644
--- a/dev-python/enable/enable-4.4.1.ebuild
+++ b/dev-python/enable/enable-4.4.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 virtualx flag-o-matic
DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
HOMEPAGE="http://docs.enthought.com/enable/
- https://pypi.org/project/enable
+ https://pypi.org/project/enable/
https://github.com/enthought/enable"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/enable/enable-4.5.1.ebuild b/dev-python/enable/enable-4.5.1.ebuild
index 293aeea9451a..ef3d56907cc6 100644
--- a/dev-python/enable/enable-4.5.1.ebuild
+++ b/dev-python/enable/enable-4.5.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 virtualx flag-o-matic
DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
HOMEPAGE="http://docs.enthought.com/enable/
- https://pypi.org/project/enable
+ https://pypi.org/project/enable/
https://github.com/enthought/enable"
#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SRC_URI="https://github.com/enthought/enable/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/enable/enable-4.7.1.ebuild b/dev-python/enable/enable-4.7.1.ebuild
new file mode 100644
index 000000000000..1672c3a01efa
--- /dev/null
+++ b/dev-python/enable/enable-4.7.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 virtualx flag-o-matic
+
+DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
+HOMEPAGE="http://docs.enthought.com/enable/
+ https://pypi.org/project/enable
+ https://github.com/enthought/enable"
+SRC_URI="https://github.com/enthought/enable/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+ dev-python/apptools[${PYTHON_USEDEP}]
+ dev-python/kiwisolver[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/reportlab[${PYTHON_USEDEP}]
+ >=dev-python/traitsui-4[${PYTHON_USEDEP}]
+ media-libs/freetype:2
+ virtual/opengl
+ virtual/glu
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-lang/swig:0
+ dev-python/cython[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/fonttools[${PYTHON_USEDEP}]
+ dev-python/hypothesis[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pyface[${PYTHON_USEDEP}]
+ media-fonts/font-cursor-misc
+ media-fonts/font-misc-misc
+ )
+"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+ append-cflags -fno-strict-aliasing
+
+ sed -e 's:html_favicon = "et.ico":html_favicon = "_static/et.ico":' \
+ -i docs/source/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ pushd "${BUILD_DIR}"/lib > /dev/null
+ # https://github.com/enthought/enable/issues/158
+ PYTHONPATH=.:kiva \
+ virtx nosetests --verbose
+ popd > /dev/null
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/enaml/Manifest b/dev-python/enaml/Manifest
index 52f8f39d0bad..e52a7059aa77 100644
--- a/dev-python/enaml/Manifest
+++ b/dev-python/enaml/Manifest
@@ -1,2 +1 @@
DIST enaml-0.10.2.tar.gz 1568147 BLAKE2B 627e34f0703a54a7298c405406c2d96eb29f0d278c535f9e0a49d981dc8c4264a935fe34e97e4a1cfbcf4f4f1b9c24e00596bd850bdc87a29ef4429f9d620dce SHA512 fb78d5202fb595d28aae92455a70d4e6057c8a5daf05b4487f6e3aca38b7e495684ef6ccd4ce5bdd04e53be7231e6d39db73341005c12922d69ccfde38b84957
-DIST enaml-0.9.8.tar.gz 1455642 BLAKE2B f17b5a4a531b231babc44ea9c81d607989fe0a80a4c2b1c9ea7c0ef880388523b72b5e276d7815196b515052cefce78f3d29b08c67c181ffd080557d87098e30 SHA512 e9b88d1fbb9e82564d3a865f74685b1b1f8b8918e29dd4d7ce7d6b4b2e6d386c6388e99f9bf0adb02fb9277a57519f8502a33bd6e0548fd1a4d52d0a4b33cf02
diff --git a/dev-python/enaml/enaml-0.10.2.ebuild b/dev-python/enaml/enaml-0.10.2.ebuild
index 0152f3005b90..b1675570e66c 100644
--- a/dev-python/enaml/enaml-0.10.2.ebuild
+++ b/dev-python/enaml/enaml-0.10.2.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit distutils-r1 flag-o-matic virtualx
DESCRIPTION="Enthought Tool Suite: framework for writing declarative interfaces"
-HOMEPAGE="https://github.com/nucleic/enaml https://pypi.org/project/enaml"
+HOMEPAGE="https://github.com/nucleic/enaml https://pypi.org/project/enaml/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/enaml/enaml-0.9.8.ebuild b/dev-python/enaml/enaml-0.9.8.ebuild
deleted file mode 100644
index 7c36eb826f98..000000000000
--- a/dev-python/enaml/enaml-0.9.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx flag-o-matic
-
-DESCRIPTION="Enthought Tool Suite: framework for writing declarative interfaces"
-HOMEPAGE="https://github.com/nucleic/enaml https://pypi.org/project/enaml"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/atom-0.3.8[${PYTHON_USEDEP}]
- >=dev-python/kiwisolver-0.1.2[${PYTHON_USEDEP}]
- >=dev-python/ply-3.4[${PYTHON_USEDEP}]
- || (
- dev-python/wxpython:*[${PYTHON_USEDEP}] \
- dev-python/PyQt4[${PYTHON_USEDEP}] \
- dev-python/pyside[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
- test? ( dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/wxpython[${PYTHON_USEDEP}]
- dev-python/pyside[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}] )"
-
-# The testsuite antagonises gentoo conventions far beyond what can currently be dealt with
-# It also passes all once run
-RESTRICT="test"
-
-# Doc build now fails, missing required folder, use doc removed for now
-# https://github.com/nucleic/enaml/issues/170
-#python_compile_all() {
-# use doc && emake -C docs html
-#}
-
-python_prepare_all() {
- append-flags -fno-strict-aliasing
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- export ETS_TOOLKIT=qt4
- export QT_API=pyside
- VIRTUALX_COMMAND="nosetests -v" virtualmake
-}
-
-python_install_all() {
-# use doc && local HTML_DOCS=( docs/build/html/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/enum34/enum34-1.1.6.ebuild b/dev-python/enum34/enum34-1.1.6.ebuild
index cbfacaeada3b..44c220e15a44 100644
--- a/dev-python/enum34/enum34-1.1.6.ebuild
+++ b/dev-python/enum34/enum34-1.1.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python 3.4 Enum backported"
-HOMEPAGE="https://pypi.org/project/enum34"
+HOMEPAGE="https://pypi.org/project/enum34/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/envisage/envisage-4.4.0.ebuild b/dev-python/envisage/envisage-4.4.0.ebuild
index 3b7c984bd7bc..4065db128cc1 100644
--- a/dev-python/envisage/envisage-4.4.0.ebuild
+++ b/dev-python/envisage/envisage-4.4.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1 virtualx
DESCRIPTION="Enthought Tool Suite: Extensible application framework"
HOMEPAGE="http://docs.enthought.com/envisage/
https://github.com/enthought/envisage
- https://pypi.org/project/envisage"
+ https://pypi.org/project/envisage/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/envoy/envoy-0.0.3-r1.ebuild b/dev-python/envoy/envoy-0.0.3-r1.ebuild
index da1b3213e724..ea8dae01ac8d 100644
--- a/dev-python/envoy/envoy-0.0.3-r1.ebuild
+++ b/dev-python/envoy/envoy-0.0.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Simple API for running external processes"
-HOMEPAGE="https://github.com/kennethreitz/envoy https://pypi.org/project/envoy"
+HOMEPAGE="https://github.com/kennethreitz/envoy https://pypi.org/project/envoy/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/envoy/envoy-0.0.3.ebuild b/dev-python/envoy/envoy-0.0.3.ebuild
index 6b670b4ce962..7b301de7df93 100644
--- a/dev-python/envoy/envoy-0.0.3.ebuild
+++ b/dev-python/envoy/envoy-0.0.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Simple API for running external processes"
-HOMEPAGE="https://github.com/kennethreitz/envoy https://pypi.org/project/envoy"
+HOMEPAGE="https://github.com/kennethreitz/envoy https://pypi.org/project/envoy/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
index fad01dafc4a2..6091971465d3 100644
--- a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
+++ b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='xml(+)'
inherit distutils-r1
DESCRIPTION="Python video metadata parser"
-HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.org/project/enzyme"
+HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.org/project/enzyme/"
SRC_URI="
mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
diff --git a/dev-python/enzyme/enzyme-9999.ebuild b/dev-python/enzyme/enzyme-9999.ebuild
index 907cfab57d78..7f2df624691c 100644
--- a/dev-python/enzyme/enzyme-9999.ebuild
+++ b/dev-python/enzyme/enzyme-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='xml(+)'
inherit distutils-r1 git-r3
DESCRIPTION="Python video metadata parser"
-HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.org/project/enzyme"
+HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.org/project/enzyme/"
EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )"
diff --git a/dev-python/epsilon/epsilon-0.7.0.ebuild b/dev-python/epsilon/epsilon-0.7.0.ebuild
index 415800d236d3..30a42d3d2844 100644
--- a/dev-python/epsilon/epsilon-0.7.0.ebuild
+++ b/dev-python/epsilon/epsilon-0.7.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit twisted-r1 eutils
DESCRIPTION="Epsilon is a Python utilities package, most famous for its Time class"
-HOMEPAGE="https://github.com/twisted/epsilon https://pypi.org/project/Epsilon"
+HOMEPAGE="https://github.com/twisted/epsilon https://pypi.org/project/Epsilon/"
SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
KEYWORDS="amd64 ppc ppc64 sparc x86"
diff --git a/dev-python/epsilon/epsilon-0.7.1.ebuild b/dev-python/epsilon/epsilon-0.7.1.ebuild
index aa493cd5e3ed..110e0e768c54 100644
--- a/dev-python/epsilon/epsilon-0.7.1.ebuild
+++ b/dev-python/epsilon/epsilon-0.7.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit twisted-r1
DESCRIPTION="Epsilon is a Python utilities package, most famous for its Time class"
-HOMEPAGE="https://github.com/twisted/epsilon https://pypi.org/project/Epsilon"
+HOMEPAGE="https://github.com/twisted/epsilon https://pypi.org/project/Epsilon/"
SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild b/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
index 741be69b0a37..98478dddd8c5 100644
--- a/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
+++ b/dev-python/errorhandler/errorhandler-1.1.1-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Logging framework handler that tracks when messages above a certain level have been logged"
-HOMEPAGE="https://pypi.org/project/errorhandler"
+HOMEPAGE="https://pypi.org/project/errorhandler/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="amd64 x86"
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
index 9db27f1cc449..0e82eb214a0a 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="An implementation of lxml.xmlfile for the standard library"
-HOMEPAGE="https://pypi.org/project/et_xmlfile https://bitbucket.org/openpyxl/et_xmlfile"
+HOMEPAGE="https://pypi.org/project/et_xmlfile/ https://bitbucket.org/openpyxl/et_xmlfile"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/ets/ets-4.4.1-r1.ebuild b/dev-python/ets/ets-4.4.1-r1.ebuild
index 575b79305e28..77b4992bc69e 100644
--- a/dev-python/ets/ets-4.4.1-r1.ebuild
+++ b/dev-python/ets/ets-4.4.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Meta package for the Enthought Tool Suite"
-HOMEPAGE="https://pypi.org/project/ets
+HOMEPAGE="https://pypi.org/project/ets/
https://github.com/enthought/ets"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
index b5a27394bc87..80bca3a84fba 100644
--- a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
+++ b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
DESCRIPTION="Enthought Tool Suite: Tools to support Python development"
HOMEPAGE="https://github.com/enthought/etsdevtools
http://docs.enthought.com/etsdevtools/
- https://pypi.org/project/etsdevtools"
+ https://pypi.org/project/etsdevtools/"
SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild b/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
index 5bb2131d3def..06ad7e7a17f2 100644
--- a/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
+++ b/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Enthought Tool Suite: Proxy modules for backwards compatibility"
-HOMEPAGE="https://pypi.org/project/etsproxy"
+HOMEPAGE="https://pypi.org/project/etsproxy/"
SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
index eba4fa8a5713..b21e7178c4f4 100644
--- a/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
+++ b/dev-python/eunuchs/eunuchs-20050320.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1 eutils
DESCRIPTION="Missing manly parts of UNIX API for Python"
-HOMEPAGE="http://www.inoi.fi/open/trac/eunuchs https://pypi.org/project/python-eunuchs"
+HOMEPAGE="http://www.inoi.fi/open/trac/eunuchs https://pypi.org/project/python-eunuchs/"
SRC_URI="mirror://debian/pool/main/e/${PN}/${PN}_${PV}.tar.gz"
LICENSE="LGPL-2"
diff --git a/dev-python/eventlet/eventlet-0.18.4.ebuild b/dev-python/eventlet/eventlet-0.18.4.ebuild
index e098b10f4336..7a296cf22585 100644
--- a/dev-python/eventlet/eventlet-0.18.4.ebuild
+++ b/dev-python/eventlet/eventlet-0.18.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet https://github.com/eventlet/eventlet/"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/eventlet/eventlet-0.20.0-r1.ebuild b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
index 13da82e3981c..93294ed76447 100644
--- a/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.20.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet https://github.com/eventlet/eventlet/"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/eventlet/eventlet-0.20.1-r1.ebuild b/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
index 66d8972d424e..64752f214f21 100644
--- a/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.20.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet https://github.com/eventlet/eventlet/"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/eventlet/eventlet-0.21.0-r1.ebuild b/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
index 8e8326375928..d9267f004c82 100644
--- a/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.21.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet https://github.com/eventlet/eventlet/"
+HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/extremes/extremes-1.1.1.ebuild b/dev-python/extremes/extremes-1.1.1.ebuild
index 2f20ab4b8f55..913f2d29e9a7 100644
--- a/dev-python/extremes/extremes-1.1.1.ebuild
+++ b/dev-python/extremes/extremes-1.1.1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
MY_PN="Extremes"
DESCRIPTION="Production-quality 'Min' and 'Max' objects"
-HOMEPAGE="https://pypi.org/project/Extremes"
+HOMEPAGE="https://pypi.org/project/Extremes/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
KEYWORDS="amd64 x86"
diff --git a/dev-python/fabric/fabric-1.10.0-r1.ebuild b/dev-python/fabric/fabric-1.10.0-r1.ebuild
index a69cd2564a74..8fc24c231424 100644
--- a/dev-python/fabric/fabric-1.10.0-r1.ebuild
+++ b/dev-python/fabric/fabric-1.10.0-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Fabric"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric"
+HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/fabric/fabric-1.12.0.ebuild b/dev-python/fabric/fabric-1.12.0.ebuild
index 5b6908546f55..4b345890112a 100644
--- a/dev-python/fabric/fabric-1.12.0.ebuild
+++ b/dev-python/fabric/fabric-1.12.0.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
COMP_HASH="83d303e9fb352deaf4885b6db0781b3d9115e9c6"
DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric"
+HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric/"
SRC_URI="
mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
https://raw.githubusercontent.com/kbakulin/fabric-completion/${COMP_HASH}/fabric-completion.bash -> ${P}-completion.bash"
diff --git a/dev-python/fabric/fabric-1.14.0.ebuild b/dev-python/fabric/fabric-1.14.0.ebuild
index 5b6908546f55..4b345890112a 100644
--- a/dev-python/fabric/fabric-1.14.0.ebuild
+++ b/dev-python/fabric/fabric-1.14.0.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
COMP_HASH="83d303e9fb352deaf4885b6db0781b3d9115e9c6"
DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric"
+HOMEPAGE="http://fabfile.org https://pypi.org/project/Fabric/"
SRC_URI="
mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
https://raw.githubusercontent.com/kbakulin/fabric-completion/${COMP_HASH}/fabric-completion.bash -> ${P}-completion.bash"
diff --git a/dev-python/falcon/falcon-0.1.6.ebuild b/dev-python/falcon/falcon-0.1.6.ebuild
index 6d74152901ff..cc18513864ad 100644
--- a/dev-python/falcon/falcon-0.1.6.ebuild
+++ b/dev-python/falcon/falcon-0.1.6.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon"
+HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/falcon/falcon-0.1.7.ebuild b/dev-python/falcon/falcon-0.1.7.ebuild
index 614254801dc6..9acb24d616f8 100644
--- a/dev-python/falcon/falcon-0.1.7.ebuild
+++ b/dev-python/falcon/falcon-0.1.7.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon"
+HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/falcon/falcon-0.1.8.ebuild b/dev-python/falcon/falcon-0.1.8.ebuild
index 34ded6347e94..8ad9ec362b92 100644
--- a/dev-python/falcon/falcon-0.1.8.ebuild
+++ b/dev-python/falcon/falcon-0.1.8.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_4} pypy )
inherit distutils-r1
DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon"
+HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/falcon/falcon-0.1.9.ebuild b/dev-python/falcon/falcon-0.1.9.ebuild
index 7c359e2fbea7..2331263a6899 100644
--- a/dev-python/falcon/falcon-0.1.9.ebuild
+++ b/dev-python/falcon/falcon-0.1.9.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
inherit distutils-r1
DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon"
+HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/falcon/falcon-1.3.0.ebuild b/dev-python/falcon/falcon-1.3.0.ebuild
index 1d13bb9362ea..1b301d950b2c 100644
--- a/dev-python/falcon/falcon-1.3.0.ebuild
+++ b/dev-python/falcon/falcon-1.3.0.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon"
+HOMEPAGE="http://falconframework.org/ https://pypi.org/project/falcon/"
SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/faulthandler/faulthandler-2.6.ebuild b/dev-python/faulthandler/faulthandler-2.6.ebuild
index 8f42a8da66aa..4288a90b9688 100644
--- a/dev-python/faulthandler/faulthandler-2.6.ebuild
+++ b/dev-python/faulthandler/faulthandler-2.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="functions to dump Python tracebacks explicitly (on fault, user signal, timeout)"
-HOMEPAGE="https://github.com/haypo/faulthandler https://pypi.org/project/faulthandler"
+HOMEPAGE="https://github.com/haypo/faulthandler https://pypi.org/project/faulthandler/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-python/faulthandler/faulthandler-3.0.ebuild b/dev-python/faulthandler/faulthandler-3.0.ebuild
index e6edb4bc3d4d..f50cf6fbad1d 100644
--- a/dev-python/faulthandler/faulthandler-3.0.ebuild
+++ b/dev-python/faulthandler/faulthandler-3.0.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="functions to dump Python tracebacks explicitly (on fault, user signal, timeout)"
-HOMEPAGE="https://github.com/haypo/faulthandler https://pypi.org/project/faulthandler"
+HOMEPAGE="https://github.com/haypo/faulthandler https://pypi.org/project/faulthandler/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/fedmsg/fedmsg-0.18.3.ebuild b/dev-python/fedmsg/fedmsg-0.18.3.ebuild
index 875ae53228b8..19c5ed2f6af1 100644
--- a/dev-python/fedmsg/fedmsg-0.18.3.ebuild
+++ b/dev-python/fedmsg/fedmsg-0.18.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="Fedora Messaging Client API"
-HOMEPAGE="http://www.fedmsg.com/ https://pypi.org/project/fedmsg"
+HOMEPAGE="http://www.fedmsg.com/ https://pypi.org/project/fedmsg/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2+"
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.ebuild
index 38a1f77d79ff..ff29417192db 100644
--- a/dev-python/feedgenerator/feedgenerator-1.9.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-1.9.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
inherit distutils-r1
DESCRIPTION="Standalone version of django.utils.feedgenerator"
-HOMEPAGE="https://pypi.org/project/feedgenerator"
+HOMEPAGE="https://pypi.org/project/feedgenerator/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild
index 402db9841423..37130504168b 100644
--- a/dev-python/feedparser/feedparser-5.2.1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser"
+HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
# sgmllib is licensed under PSF-2.
diff --git a/dev-python/figleaf/figleaf-0.6.1-r1.ebuild b/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
index 5d684405a5dc..40d7a6fc9148 100644
--- a/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
+++ b/dev-python/figleaf/figleaf-0.6.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Code coverage tool"
-HOMEPAGE="http://darcs.idyll.org/~t/projects/figleaf/doc/ https://pypi.org/project/figleaf"
+HOMEPAGE="http://darcs.idyll.org/~t/projects/figleaf/doc/ https://pypi.org/project/figleaf/"
SRC_URI="http://darcs.idyll.org/~t/projects/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/filemagic/filemagic-1.6.ebuild b/dev-python/filemagic/filemagic-1.6.ebuild
index 6159d6015d53..c1d66290dce1 100644
--- a/dev-python/filemagic/filemagic-1.6.ebuild
+++ b/dev-python/filemagic/filemagic-1.6.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="A Python API for libmagic, the library behind the Unix file command"
-HOMEPAGE="https://pypi.org/project/filemagic https://github.com/aliles/filemagic"
+HOMEPAGE="https://pypi.org/project/filemagic/ https://github.com/aliles/filemagic"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/fixtures/fixtures-1.4.0.ebuild b/dev-python/fixtures/fixtures-1.4.0.ebuild
index 732f127d05ca..25eb0ffb0702 100644
--- a/dev-python/fixtures/fixtures-1.4.0.ebuild
+++ b/dev-python/fixtures/fixtures-1.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
-HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.org/project/fixtures"
+HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.org/project/fixtures/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 BSD )"
diff --git a/dev-python/fixtures/fixtures-3.0.0.ebuild b/dev-python/fixtures/fixtures-3.0.0.ebuild
index 17a95c509dc8..2944bd6d13f1 100644
--- a/dev-python/fixtures/fixtures-3.0.0.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
-HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.org/project/fixtures"
+HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.org/project/fixtures/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 BSD )"
diff --git a/dev-python/flake8/flake8-2.2.5.ebuild b/dev-python/flake8/flake8-2.2.5.ebuild
index c109afcefcb6..d6d365f53664 100644
--- a/dev-python/flake8/flake8-2.2.5.ebuild
+++ b/dev-python/flake8/flake8-2.2.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8"
+HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/flake8/flake8-2.5.4.ebuild b/dev-python/flake8/flake8-2.5.4.ebuild
index 43b584aa8880..f561da9fb34d 100644
--- a/dev-python/flake8/flake8-2.5.4.ebuild
+++ b/dev-python/flake8/flake8-2.5.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8"
+HOMEPAGE="https://bitbucket.org/tarek/flake8 https://pypi.org/project/flake8/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-python/flake8/flake8-3.5.0.ebuild b/dev-python/flake8/flake8-3.5.0.ebuild
index f1ca5c709aca..798293722355 100644
--- a/dev-python/flake8/flake8-3.5.0.ebuild
+++ b/dev-python/flake8/flake8-3.5.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/flaky/flaky-3.1.1.ebuild b/dev-python/flaky/flaky-3.1.1.ebuild
index d64b2dbb5ffd..345ac0686287 100644
--- a/dev-python/flaky/flaky-3.1.1.ebuild
+++ b/dev-python/flaky/flaky-3.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
-HOMEPAGE="https://pypi.org/project/flaky https://github.com/box/flaky"
+HOMEPAGE="https://pypi.org/project/flaky/ https://github.com/box/flaky"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/flaky/flaky-3.4.0.ebuild b/dev-python/flaky/flaky-3.4.0.ebuild
index 67a47da94d81..60c307a51b05 100644
--- a/dev-python/flaky/flaky-3.4.0.ebuild
+++ b/dev-python/flaky/flaky-3.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
-HOMEPAGE="https://pypi.org/project/flaky https://github.com/box/flaky"
+HOMEPAGE="https://pypi.org/project/flaky/ https://github.com/box/flaky"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/flask-admin/flask-admin-1.0.6.ebuild b/dev-python/flask-admin/flask-admin-1.0.6.ebuild
index f066aa005012..8433ca9aadab 100644
--- a/dev-python/flask-admin/flask-admin-1.0.6.ebuild
+++ b/dev-python/flask-admin/flask-admin-1.0.6.ebuild
@@ -12,7 +12,7 @@ MY_PN="Flask-Admin"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Simple and extensible admin interface framework for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-Admin"
+HOMEPAGE="https://pypi.org/project/Flask-Admin/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-admin/flask-admin-1.5.0.ebuild b/dev-python/flask-admin/flask-admin-1.5.0.ebuild
index 9aef07d8acd3..f372d0b52f38 100644
--- a/dev-python/flask-admin/flask-admin-1.5.0.ebuild
+++ b/dev-python/flask-admin/flask-admin-1.5.0.ebuild
@@ -12,7 +12,7 @@ MY_PN="Flask-Admin"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Simple and extensible admin interface framework for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-Admin"
+HOMEPAGE="https://pypi.org/project/Flask-Admin/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
index 0ec54e9dfe51..72abf671063f 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-BabelEx"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Adds i18n/l10n support to Flask applications"
-HOMEPAGE="https://github.com/mrjoes/flask-babelex https://pypi.org/project/Flask-BabelEx"
+HOMEPAGE="https://github.com/mrjoes/flask-babelex https://pypi.org/project/Flask-BabelEx/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-cors/flask-cors-1.8.0.ebuild b/dev-python/flask-cors/flask-cors-1.8.0.ebuild
index 2ff16ca1d5bd..9d189c3a8003 100644
--- a/dev-python/flask-cors/flask-cors-1.8.0.ebuild
+++ b/dev-python/flask-cors/flask-cors-1.8.0.ebuild
@@ -18,7 +18,7 @@ else
fi
DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/flask-cors/flask-cors-1.9.0.ebuild b/dev-python/flask-cors/flask-cors-1.9.0.ebuild
index fa355aae91d7..fc8a01d89abc 100644
--- a/dev-python/flask-cors/flask-cors-1.9.0.ebuild
+++ b/dev-python/flask-cors/flask-cors-1.9.0.ebuild
@@ -18,7 +18,7 @@ else
fi
DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/flask-cors/flask-cors-2.1.0.ebuild b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
index d4da672f29ed..b0740f903043 100644
--- a/dev-python/flask-cors/flask-cors-2.1.0.ebuild
+++ b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
@@ -18,7 +18,7 @@ else
fi
DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild b/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
index e82eec1e5ae1..8782153aee51 100644
--- a/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
+++ b/dev-python/flask-evolution/flask-evolution-0.5-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Evolution"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Simple migrations for Flask/SQLAlchemy projects"
-HOMEPAGE="https://pypi.org/project/Flask-Evolution"
+HOMEPAGE="https://pypi.org/project/Flask-Evolution/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-evolution/flask-evolution-0.6.ebuild b/dev-python/flask-evolution/flask-evolution-0.6.ebuild
index f772f8a6836b..511bffdef127 100644
--- a/dev-python/flask-evolution/flask-evolution-0.6.ebuild
+++ b/dev-python/flask-evolution/flask-evolution-0.6.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Evolution"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Simple migrations for Flask/SQLAlchemy projects"
-HOMEPAGE="https://pypi.org/project/Flask-Evolution"
+HOMEPAGE="https://pypi.org/project/Flask-Evolution/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-login/flask-login-0.3.2-r1.ebuild b/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
index a59d1fdd399a..e64688ad472c 100644
--- a/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
+++ b/dev-python/flask-login/flask-login-0.3.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
inherit distutils-r1
DESCRIPTION="Login session support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-Login"
+HOMEPAGE="https://pypi.org/project/Flask-Login/"
SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
# pypi tarball is missing tests
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
index b5321ce0576e..ec83ddfc5d8b 100644
--- a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Mail"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Flask extension for sending email"
-HOMEPAGE="http://pythonhosted.org/Flask-Mail/ https://pypi.org/project/Flask-Mail"
+HOMEPAGE="http://pythonhosted.org/Flask-Mail/ https://pypi.org/project/Flask-Mail/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild b/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild
index fe5c63776eb7..75621c18bb14 100644
--- a/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-2.1.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Migrate"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
-HOMEPAGE="https://pypi.org/project/Flask-Migrate"
+HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-openid/flask-openid-1.2.4.ebuild b/dev-python/flask-openid/flask-openid-1.2.4.ebuild
index 862fdc17cd4f..46814c914fc8 100644
--- a/dev-python/flask-openid/flask-openid-1.2.4.ebuild
+++ b/dev-python/flask-openid/flask-openid-1.2.4.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-OpenID"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="OpenID support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-OpenID"
+HOMEPAGE="https://pypi.org/project/Flask-OpenID/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-openid/flask-openid-1.2.5.ebuild b/dev-python/flask-openid/flask-openid-1.2.5.ebuild
index 9a36d87e5e5a..b177ec5259c4 100644
--- a/dev-python/flask-openid/flask-openid-1.2.5.ebuild
+++ b/dev-python/flask-openid/flask-openid-1.2.5.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-OpenID"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="OpenID support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-OpenID"
+HOMEPAGE="https://pypi.org/project/Flask-OpenID/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild b/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild
index d186dead915c..82d4af6c18f9 100644
--- a/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild
+++ b/dev-python/flask-peewee/flask-peewee-0.6.5.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
RESTRICT="test" # broken
DESCRIPTION="Flask integration layer for the Peewee ORM"
-HOMEPAGE="https://pypi.org/project/Flask-Admin"
+HOMEPAGE="https://pypi.org/project/Flask-Admin/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild b/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
index 41824e467dac..cddfc580b3ff 100644
--- a/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
+++ b/dev-python/flask-peewee/flask-peewee-0.6.7.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
RESTRICT="test" # broken
DESCRIPTION="Flask integration layer for the Peewee ORM"
-HOMEPAGE="https://pypi.org/project/Flask-Admin"
+HOMEPAGE="https://pypi.org/project/Flask-Admin/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
index 9362cf93921d..b3f0aefa3a57 100644
--- a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
+++ b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
inherit distutils-r1
DESCRIPTION="Identity management for flask"
-HOMEPAGE="http://pythonhosted.org/Flask-Principal/ https://pypi.org/project/Flask-Principal"
+HOMEPAGE="http://pythonhosted.org/Flask-Principal/ https://pypi.org/project/Flask-Principal/"
SRC_URI="https://github.com/mattupstate/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
# pypi tarball is missing tests
diff --git a/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild b/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
index 50c3c0091ed1..f03e1062ded0 100644
--- a/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
+++ b/dev-python/flask-pymongo/flask-pymongo-0.3.0.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-PyMongo"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="PyMongo support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-PyMongo"
+HOMEPAGE="https://pypi.org/project/Flask-PyMongo/"
SRC_URI="https://github.com/dcrosta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
index a29ca91b49de..6b000c5b9114 100644
--- a/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
+++ b/dev-python/flask-pymongo/flask-pymongo-0.4.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="PyMongo support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-PyMongo"
+HOMEPAGE="https://pypi.org/project/Flask-PyMongo/"
SRC_URI="https://github.com/dcrosta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-script/flask-script-2.0.5-r1.ebuild b/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
index b3bc617ce465..a069d29929db 100644
--- a/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
+++ b/dev-python/flask-script/flask-script-2.0.5-r1.ebuild
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="Flask support for writing external scripts"
HOMEPAGE="https://flask-script.readthedocs.io/en/latest/
https://flask-script.readthedocs.io/en/latest/
- https://pypi.org/project/Flask-Script"
+ https://pypi.org/project/Flask-Script/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-script/flask-script-2.0.6.ebuild b/dev-python/flask-script/flask-script-2.0.6.ebuild
index ef69bc840b4b..2edd623d7dca 100644
--- a/dev-python/flask-script/flask-script-2.0.6.ebuild
+++ b/dev-python/flask-script/flask-script-2.0.6.ebuild
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="Flask support for writing external scripts"
HOMEPAGE="https://flask-script.readthedocs.io/en/latest/
https://flask-script.readthedocs.io/en/latest/
- https://pypi.org/project/Flask-Script"
+ https://pypi.org/project/Flask-Script/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-security/flask-security-1.7.5-r1.ebuild b/dev-python/flask-security/flask-security-1.7.5-r1.ebuild
index 57793597185c..58d88290bf8b 100644
--- a/dev-python/flask-security/flask-security-1.7.5-r1.ebuild
+++ b/dev-python/flask-security/flask-security-1.7.5-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Security"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Simple security for Flask apps"
-HOMEPAGE="http://pythonhosted.org/Flask-Security/ https://pypi.org/project/Flask-Security"
+HOMEPAGE="http://pythonhosted.org/Flask-Security/ https://pypi.org/project/Flask-Security/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild b/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
index e42237625a37..1b13e9412a86 100644
--- a/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
+++ b/dev-python/flask-socketio/flask-socketio-2.9.2.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
MY_PN="Flask-SocketIO"
DESCRIPTION="Socket.IO integration for Flask applications."
-HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/Flask-SocketIO/ https://pypi.org/project/Flask-SocketIO"
+HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/Flask-SocketIO/ https://pypi.org/project/Flask-SocketIO/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
index 3741db7dd47b..5bb500903fe6 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-Sphinx-Themes"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
-HOMEPAGE="https://github.com/pallets/flask-sphinx-themes https://pypi.org/project/Flask-Sphinx-Themes"
+HOMEPAGE="https://github.com/pallets/flask-sphinx-themes https://pypi.org/project/Flask-Sphinx-Themes/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
index 59c0ed602c17..c21d204ee83a 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-SQLAlchemy"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="SQLAlchemy support for Flask applications"
-HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy"
+HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
index 33ac475f98fc..e0ed187173da 100644
--- a/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
+++ b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
@@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="Infrastructure for theming support in Flask applications"
HOMEPAGE="https://pythonhosted.org/Flask-Themes/
- https://pypi.org/project/Flask-Themes"
+ https://pypi.org/project/Flask-Themes/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/flask-whooshalchemy/Manifest b/dev-python/flask-whooshalchemy/Manifest
deleted file mode 100644
index 5987a087710b..000000000000
--- a/dev-python/flask-whooshalchemy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Flask-WhooshAlchemy-0.8.tar.gz 8916 BLAKE2B e1664a12f8c44af8e4c456ce0efd3ca018edb030f1056789db48bcf92e9212cb3a12f10023c01d57d68db3aab59b9c60abe937bfc2b572c84cf12185826ab3f1 SHA512 c8eff47cedd955d8ad758c8441c3f4e715eed77fbe2749d0830130f6c63547ba7d7fbcade635da0be5f03967c1be01ab7a62939a6d2eba28f9a58b1ab83469a6
diff --git a/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.8.ebuild b/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.8.ebuild
deleted file mode 100644
index 4e7f84b3142f..000000000000
--- a/dev-python/flask-whooshalchemy/flask-whooshalchemy-0.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy )
-
-inherit distutils-r1
-
-MY_PN="Flask-WhooshAlchemy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Whoosh extension to Flask/SQLAlchemy"
-HOMEPAGE="https://github.com/gyllstromk/Flask-WhooshAlchemy https://pypi.org/project/Flask-WhooshAlchemy"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-# TODO: figure out how to make it happy about the newer whoosh
-# (i.e. if it's broken test or broken package)
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
- dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
- dev-python/sqlalchemy[${PYTHON_USEDEP}]
- dev-python/blinker[${PYTHON_USEDEP}]
- =dev-python/whoosh-2.6.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/flask-testing[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
- # unbind dependencies from specific versions
- sed -i -e 's/==.*$//' requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- # esetup.py test -- test module decl is broken
- "${PYTHON}" test/test_all.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
index 71f34d57fe71..be26fe133f99 100644
--- a/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.14.2.ebuild
@@ -10,7 +10,7 @@ MY_PN="Flask-WTF"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Simple integration of Flask and WTForms"
-HOMEPAGE="http://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF"
+HOMEPAGE="http://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild b/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
index acbd6158b0f7..abb2d3211250 100644
--- a/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
+++ b/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
@@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="XML-RPC support for Flask applications"
HOMEPAGE="https://pythonhosted.org/Flask-XML-RPC/
- https://pypi.org/project/Flask-XML-RPC"
+ https://pypi.org/project/Flask-XML-RPC/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index 51fbaecc3533..0b68b4717e59 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
MY_PN="Flask"
MY_P="${MY_PN}-${PV}"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/Flask"
+HOMEPAGE="https://pypi.org/project/Flask/"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/flexx/flexx-0.3.1.ebuild b/dev-python/flexx/flexx-0.3.1.ebuild
index d6929e25899c..ec907e211f7c 100644
--- a/dev-python/flexx/flexx-0.3.1.ebuild
+++ b/dev-python/flexx/flexx-0.3.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Pure Python toolkit for creating GUI's using web technology"
HOMEPAGE="
https://flexx.readthedocs.org
https://github.com/zoofio/flexx
- https://pypi.org/project/flexx"
+ https://pypi.org/project/flexx/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
LICENSE="BSD"
diff --git a/dev-python/flexx/flexx-0.4.1.ebuild b/dev-python/flexx/flexx-0.4.1.ebuild
index 6f3975739360..53e6c78f0fc2 100644
--- a/dev-python/flexx/flexx-0.4.1.ebuild
+++ b/dev-python/flexx/flexx-0.4.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Pure Python toolkit for creating GUI's using web technology"
HOMEPAGE="
https://flexx.readthedocs.org
https://github.com/zoofio/flexx
- https://pypi.org/project/flexx"
+ https://pypi.org/project/flexx/"
SRC_URI="https://github.com/zoofIO//${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/flower/flower-0.9.1-r1.ebuild b/dev-python/flower/flower-0.9.1-r1.ebuild
index 5b7f6b4ed963..a727fb00f638 100644
--- a/dev-python/flower/flower-0.9.1-r1.ebuild
+++ b/dev-python/flower/flower-0.9.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1 systemd user
DESCRIPTION="Real-time monitor and web admin for Celery distributed task queue"
-HOMEPAGE="https://flower.readthedocs.org/ https://github.com/mher/flower/ https://pypi.org/project/flower"
+HOMEPAGE="https://flower.readthedocs.org/ https://github.com/mher/flower/ https://pypi.org/project/flower/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/foolscap/foolscap-0.11.0.ebuild b/dev-python/foolscap/foolscap-0.11.0.ebuild
index c158d74fa1ed..e096ba770f6f 100644
--- a/dev-python/foolscap/foolscap-0.11.0.ebuild
+++ b/dev-python/foolscap/foolscap-0.11.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="RPC protocol for Twisted"
-HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.org/project/foolscap"
+HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.org/project/foolscap/"
SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/foolscap/foolscap-0.7.0.ebuild b/dev-python/foolscap/foolscap-0.7.0.ebuild
index 5d8a03f6cf48..f7f1ceaf0029 100644
--- a/dev-python/foolscap/foolscap-0.7.0.ebuild
+++ b/dev-python/foolscap/foolscap-0.7.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="RPC protocol for Twisted"
-HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.org/project/foolscap"
+HOMEPAGE="http://foolscap.lothar.com/trac https://pypi.org/project/foolscap/"
SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/formencode/formencode-1.3.0-r2.ebuild b/dev-python/formencode/formencode-1.3.0-r2.ebuild
index 7242aebf3e98..f22b38bfd608 100644
--- a/dev-python/formencode/formencode-1.3.0-r2.ebuild
+++ b/dev-python/formencode/formencode-1.3.0-r2.ebuild
@@ -10,7 +10,7 @@ MY_PN="FormEncode"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="HTML form validation, generation, and conversion package"
-HOMEPAGE="http://formencode.org/ https://pypi.org/project/FormEncode"
+HOMEPAGE="http://formencode.org/ https://pypi.org/project/FormEncode/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="PSF-2"
diff --git a/dev-python/fpconst/fpconst-0.7.3-r1.ebuild b/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
index da792615a254..9591f228c444 100644
--- a/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
+++ b/dev-python/fpconst/fpconst-0.7.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Python Module for handling IEEE 754 floating point special values"
-HOMEPAGE="http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/ https://pypi.org/project/fpconst https://sourceforge.net/projects/rsoap/files/"
+HOMEPAGE="http://chaco.bst.rochester.edu:8080/statcomp/projects/RStatServer/fpconst/ https://pypi.org/project/fpconst/ https://sourceforge.net/projects/rsoap/files/"
SRC_URI="mirror://sourceforge/rsoap/${P}.tar.gz"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
diff --git a/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild b/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
index bc54f293fc29..2f0c498379a1 100644
--- a/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.11-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Frozen-Flask"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.org/project/Frozen-Flask"
+HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/frozen-flask/frozen-flask-0.15.ebuild b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
index ac5c20dd16bd..26e42dc69260 100644
--- a/dev-python/frozen-flask/frozen-flask-0.15.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
@@ -10,7 +10,7 @@ MY_PN="Frozen-Flask"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.org/project/Frozen-Flask"
+HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/fs/fs-0.5.4.ebuild b/dev-python/fs/fs-0.5.4.ebuild
index f69d17684aed..c657c5f97cf5 100644
--- a/dev-python/fs/fs-0.5.4.ebuild
+++ b/dev-python/fs/fs-0.5.4.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 eutils
DESCRIPTION="Filesystem abstraction layer"
HOMEPAGE="
- https://pypi.org/project/fs
+ https://pypi.org/project/fs/
https://docs.pyfilesystem.org
https://www.willmcgugan.com/tag/fs/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/fudge/fudge-0.9.6-r1.ebuild b/dev-python/fudge/fudge-0.9.6-r1.ebuild
index 8e44dada1d7b..ff7d192d2c4f 100644
--- a/dev-python/fudge/fudge-0.9.6-r1.ebuild
+++ b/dev-python/fudge/fudge-0.9.6-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
-HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge"
+HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/fudge/fudge-1.1.0.ebuild b/dev-python/fudge/fudge-1.1.0.ebuild
index ce249786eef2..1b5365d283e3 100644
--- a/dev-python/fudge/fudge-1.1.0.ebuild
+++ b/dev-python/fudge/fudge-1.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Replace real objects with fakes (mocks, stubs, etc) while testing"
-HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge"
+HOMEPAGE="http://farmdev.com/projects/fudge/ https://pypi.org/project/fudge/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
index 6f4b76334e91..9f2bea939018 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib"
+HOMEPAGE="https://pypi.org/project/funcparserlib/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/funcsigs/funcsigs-0.4.ebuild b/dev-python/funcsigs/funcsigs-0.4.ebuild
index 6852a8f293a5..b9a168f60dff 100644
--- a/dev-python/funcsigs/funcsigs-0.4.ebuild
+++ b/dev-python/funcsigs/funcsigs-0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python function signatures from PEP362 for Python 2.7"
-HOMEPAGE="https://pypi.org/project/funcsigs"
+HOMEPAGE="https://pypi.org/project/funcsigs/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
index 93dfbb991896..361c21a2e348 100644
--- a/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
+++ b/dev-python/funcsigs/funcsigs-1.0.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Python function signatures backport from PEP362 for Python 2.7-3.5"
-HOMEPAGE="https://pypi.org/project/funcsigs"
+HOMEPAGE="https://pypi.org/project/funcsigs/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/functest/functest-0.8.8-r1.ebuild b/dev-python/functest/functest-0.8.8-r1.ebuild
index ee000f15fb7f..9ee5be32dcd6 100644
--- a/dev-python/functest/functest-0.8.8-r1.ebuild
+++ b/dev-python/functest/functest-0.8.8-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Functest is a test tool/framework for testing in Python"
-HOMEPAGE="https://pypi.org/project/functest"
+HOMEPAGE="https://pypi.org/project/functest/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
index 731d0c6ee7f6..3708a8e950eb 100644
--- a/dev-python/functools32/functools32-3.2.3.ebuild
+++ b/dev-python/functools32/functools32-3.2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Backport of the functools module from Python 3"
-HOMEPAGE="https://pypi.org/project/functools32 https://github.com/MiCHiLU/python-functools32"
+HOMEPAGE="https://pypi.org/project/functools32/ https://github.com/MiCHiLU/python-functools32"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-2.tar.gz"
SLOT="0"
diff --git a/dev-python/fusil/fusil-1.5-r1.ebuild b/dev-python/fusil/fusil-1.5-r1.ebuild
index 59ee083a3d24..e7a28cd94155 100644
--- a/dev-python/fusil/fusil-1.5-r1.ebuild
+++ b/dev-python/fusil/fusil-1.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1 user
DESCRIPTION="Python library to write fuzzing programs"
-HOMEPAGE="https://bitbucket.org/haypo/fusil/wiki/Home https://pypi.org/project/fusil"
+HOMEPAGE="https://bitbucket.org/haypo/fusil/wiki/Home https://pypi.org/project/fusil/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/fusil/fusil-1.5.ebuild b/dev-python/fusil/fusil-1.5.ebuild
index 789fb33ed2c6..4a13a9f1b432 100644
--- a/dev-python/fusil/fusil-1.5.ebuild
+++ b/dev-python/fusil/fusil-1.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1 user
DESCRIPTION="Fusil the fuzzer is a Python library used to write fuzzing programs"
-HOMEPAGE="https://bitbucket.org/haypo/fusil/wiki/Home https://pypi.org/project/fusil"
+HOMEPAGE="https://bitbucket.org/haypo/fusil/wiki/Home https://pypi.org/project/fusil/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/futures/futures-3.1.1.ebuild b/dev-python/futures/futures-3.1.1.ebuild
index 640d2a98fd23..1e3c384b14fc 100644
--- a/dev-python/futures/futures-3.1.1.ebuild
+++ b/dev-python/futures/futures-3.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
-HOMEPAGE="https://pypi.org/project/futures"
+HOMEPAGE="https://pypi.org/project/futures/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/futures/futures-3.2.0.ebuild b/dev-python/futures/futures-3.2.0.ebuild
index 2ac6a2ae3c06..5cacc0a02f22 100644
--- a/dev-python/futures/futures-3.2.0.ebuild
+++ b/dev-python/futures/futures-3.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Backport of the concurrent.futures package from Python 3.2"
-HOMEPAGE="https://github.com/agronholm/pythonfutures https://pypi.org/project/futures"
+HOMEPAGE="https://github.com/agronholm/pythonfutures https://pypi.org/project/futures/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/futurist/futurist-1.3.1.ebuild b/dev-python/futurist/futurist-1.3.1.ebuild
index 524e4fa43f94..d2d394d46820 100644
--- a/dev-python/futurist/futurist-1.3.1.ebuild
+++ b/dev-python/futurist/futurist-1.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
inherit distutils-r1
DESCRIPTION="Useful additions to futures, from the future"
-HOMEPAGE="https://pypi.org/project/futurist http://docs.openstack.org/developer/futurist"
+HOMEPAGE="https://pypi.org/project/futurist/ http://docs.openstack.org/developer/futurist"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/futurist/futurist-1.6.0.ebuild b/dev-python/futurist/futurist-1.6.0.ebuild
index 8100cfe66050..646a426bd78a 100644
--- a/dev-python/futurist/futurist-1.6.0.ebuild
+++ b/dev-python/futurist/futurist-1.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
inherit distutils-r1
DESCRIPTION="Useful additions to futures, from the future"
-HOMEPAGE="https://pypi.org/project/futurist http://docs.openstack.org/developer/futurist"
+HOMEPAGE="https://pypi.org/project/futurist/ http://docs.openstack.org/developer/futurist"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
index 2e4aaa7b132d..abbe0eee421f 100644
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.14.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin"
+HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
index 6961045f4ef6..aa3fe6a5f38d 100644
--- a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
-HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin"
+HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/gdata/gdata-2.0.18.ebuild b/dev-python/gdata/gdata-2.0.18.ebuild
index aa2b3bfb2259..a90fa6858bee 100644
--- a/dev-python/gdata/gdata-2.0.18.ebuild
+++ b/dev-python/gdata/gdata-2.0.18.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ssl(+),xml(+)"
inherit distutils-r1
DESCRIPTION="Python client library for Google data APIs"
-HOMEPAGE="https://github.com/google/gdata-python-client https://pypi.org/project/gdata"
+HOMEPAGE="https://github.com/google/gdata-python-client https://pypi.org/project/gdata/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/genshi/genshi-0.7-r1.ebuild b/dev-python/genshi/genshi-0.7-r1.ebuild
index 3c8fece1e90d..1980216a9f33 100644
--- a/dev-python/genshi/genshi-0.7-r1.ebuild
+++ b/dev-python/genshi/genshi-0.7-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_P="Genshi-${PV}"
DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="http://genshi.edgewall.org/ https://pypi.org/project/Genshi"
+HOMEPAGE="http://genshi.edgewall.org/ https://pypi.org/project/Genshi/"
SRC_URI="http://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/genshi/genshi-0.7.ebuild b/dev-python/genshi/genshi-0.7.ebuild
index 18ced74d9e4f..2c8f3aaed63d 100644
--- a/dev-python/genshi/genshi-0.7.ebuild
+++ b/dev-python/genshi/genshi-0.7.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_P="Genshi-${PV}"
DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="http://genshi.edgewall.org/ https://pypi.org/project/Genshi"
+HOMEPAGE="http://genshi.edgewall.org/ https://pypi.org/project/Genshi/"
SRC_URI="http://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/genty/genty-1.3.2.ebuild b/dev-python/genty/genty-1.3.2.ebuild
index 2519e7cbb94a..cb325bcc51a2 100644
--- a/dev-python/genty/genty-1.3.2.ebuild
+++ b/dev-python/genty/genty-1.3.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Allows you to run a test with multiple data sets"
-HOMEPAGE="https://pypi.org/project/genty https://github.com/box/genty"
+HOMEPAGE="https://pypi.org/project/genty/ https://github.com/box/genty"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/git-python/git-python-1.0.2.ebuild b/dev-python/git-python/git-python-1.0.2.ebuild
index 9764e041c020..933b962880b2 100644
--- a/dev-python/git-python/git-python-1.0.2.ebuild
+++ b/dev-python/git-python/git-python-1.0.2.ebuild
@@ -13,7 +13,7 @@ MY_PV="${PV/_rc/.RC}"
MY_P="${MY_PN}-${MY_PV}"
DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/git-python/git-python-2.1.7.ebuild b/dev-python/git-python/git-python-2.1.7.ebuild
index d89b18c39351..c4106293b3a6 100644
--- a/dev-python/git-python/git-python-2.1.7.ebuild
+++ b/dev-python/git-python/git-python-2.1.7.ebuild
@@ -13,7 +13,7 @@ MY_PV="${PV/_rc/.RC}"
MY_P="${MY_PN}-${MY_PV}"
DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/gitdb/gitdb-0.6.4.ebuild b/dev-python/gitdb/gitdb-0.6.4.ebuild
index 792806454da1..3d817050b4e9 100644
--- a/dev-python/gitdb/gitdb-0.6.4.ebuild
+++ b/dev-python/gitdb/gitdb-0.6.4.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="GitDB is a pure-Python git object database"
HOMEPAGE="
https://github.com/gitpython-developers/gitdb
- https://pypi.org/project/gitdb"
+ https://pypi.org/project/gitdb/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/gitdb2/gitdb2-2.0.3.ebuild b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
index 77e4c9087b85..da2f3014de58 100644
--- a/dev-python/gitdb2/gitdb2-2.0.3.ebuild
+++ b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="GitDB is a pure-Python git object database"
HOMEPAGE="
https://github.com/gitpython-developers/gitdb
- https://pypi.org/project/gitdb2"
+ https://pypi.org/project/gitdb2/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/globre/globre-0.1.4.ebuild b/dev-python/globre/globre-0.1.4.ebuild
index 10c320bd9ad7..91fae9c50715 100644
--- a/dev-python/globre/globre-0.1.4.ebuild
+++ b/dev-python/globre/globre-0.1.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
inherit distutils-r1
DESCRIPTION="A glob matching library, providing an interface similar to the 're' module"
-HOMEPAGE="https://pypi.org/project/globre https://github.com/metagriffin/globre"
+HOMEPAGE="https://pypi.org/project/globre/ https://github.com/metagriffin/globre"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/gntp/gntp-1.0.1.ebuild b/dev-python/gntp/gntp-1.0.1.ebuild
index 2f726322b0bf..afaf45e733a5 100644
--- a/dev-python/gntp/gntp-1.0.1.ebuild
+++ b/dev-python/gntp/gntp-1.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Python library for working with the Growl Notification Transport Protocol"
-HOMEPAGE="https://github.com/kfdm/gntp https://pypi.org/project/gntp"
+HOMEPAGE="https://github.com/kfdm/gntp https://pypi.org/project/gntp/"
SRC_URI="mirror://pypi/g/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
index 6fae2a8369a9..0dc982d38631 100644
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.0.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
EGIT_COMMIT="607e86011141e8885b1f52826d57c8b5ff588ffc"
MY_PN=google-auth-library-python-httplib2
DESCRIPTION="httplib2 Transport for Google Auth"
-HOMEPAGE="https://pypi.org/project/google-auth-httplib2 https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"
+HOMEPAGE="https://pypi.org/project/google-auth-httplib2/ https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"
# PyPi tarball is missing unit tests
#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SRC_URI="https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/gql/gql-0.1.0.ebuild b/dev-python/gql/gql-0.1.0.ebuild
index 8f3e259ed7a0..4c5defa83988 100644
--- a/dev-python/gql/gql-0.1.0.ebuild
+++ b/dev-python/gql/gql-0.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit distutils-r1
DESCRIPTION="GraphQL client for Python."
-HOMEPAGE="https://pypi.org/project/gql"
+HOMEPAGE="https://pypi.org/project/gql/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild b/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
index 1b7e44783438..5dc30a4db693 100644
--- a/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
+++ b/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Enthought Tool Suite: Interactive Graph (network) Visualization"
-HOMEPAGE="https://pypi.org/project/graphcanvas"
+HOMEPAGE="https://pypi.org/project/graphcanvas/"
SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/graphy/graphy-1.0-r1.ebuild b/dev-python/graphy/graphy-1.0-r1.ebuild
index e930458f2583..67fe60064caa 100644
--- a/dev-python/graphy/graphy-1.0-r1.ebuild
+++ b/dev-python/graphy/graphy-1.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_P=${PN}_${PV}
DESCRIPTION="Simple Chart Library for Python"
-HOMEPAGE="https://pypi.org/project/Graphy"
+HOMEPAGE="https://pypi.org/project/Graphy/"
SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.bz2"
LICENSE="Apache-2.0"
diff --git a/dev-python/guessit/guessit-2.1.4.ebuild b/dev-python/guessit/guessit-2.1.4.ebuild
index 550085eb65c1..9618ff066721 100644
--- a/dev-python/guessit/guessit-2.1.4.ebuild
+++ b/dev-python/guessit/guessit-2.1.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.org/project/guessit"
+HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.org/project/guessit/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
diff --git a/dev-python/guessit/guessit-9999.ebuild b/dev-python/guessit/guessit-9999.ebuild
index 575a56c8b76e..c4c9f2b9ce04 100644
--- a/dev-python/guessit/guessit-9999.ebuild
+++ b/dev-python/guessit/guessit-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1 git-r3
DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.org/project/guessit"
+HOMEPAGE="https://github.com/guessit-io/guessit https://pypi.org/project/guessit/"
EGIT_REPO_URI="https://github.com/${PN}-io/${PN}.git"
EGIT_BRANCH="develop"
diff --git a/dev-python/guppy/guppy-0.1.10-r1.ebuild b/dev-python/guppy/guppy-0.1.10-r1.ebuild
index 81dcd0eee3b3..f4cbb03c3eeb 100644
--- a/dev-python/guppy/guppy-0.1.10-r1.ebuild
+++ b/dev-python/guppy/guppy-0.1.10-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Guppy-PE -- A Python Programming Environment"
-HOMEPAGE="http://guppy-pe.sourceforge.net/ https://pypi.org/project/guppy"
+HOMEPAGE="http://guppy-pe.sourceforge.net/ https://pypi.org/project/guppy/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild b/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
index aa4fd3ba6051..15d353d94399 100644
--- a/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
+++ b/dev-python/hachoir-core/hachoir-core-1.3.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Core of Hachoir framework: parse and edit binary files"
-HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-core https://pypi.org/project/hachoir-core"
+HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-core https://pypi.org/project/hachoir-core/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild b/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
index d92d5a536931..a0614f9c2476 100644
--- a/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
+++ b/dev-python/hachoir-parser/hachoir-parser-1.3.4-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Package of Hachoir parsers used to open binary files"
-HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-parser https://pypi.org/project/hachoir-parser"
+HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-parser https://pypi.org/project/hachoir-parser/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild b/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
index 17a6069da105..972fb79af879 100644
--- a/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
+++ b/dev-python/hachoir-regex/hachoir-regex-1.0.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Manipulation of regular expressions (regex)"
-HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-regex https://pypi.org/project/hachoir-regex"
+HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-regex https://pypi.org/project/hachoir-regex/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/hcluster/hcluster-0.2.0-r1.ebuild b/dev-python/hcluster/hcluster-0.2.0-r1.ebuild
index 402fb839f25d..bc8f6180ae66 100644
--- a/dev-python/hcluster/hcluster-0.2.0-r1.ebuild
+++ b/dev-python/hcluster/hcluster-0.2.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Python hierarchical clustering package for Scipy"
-HOMEPAGE="https://pypi.org/project/hcluster"
+HOMEPAGE="https://pypi.org/project/hcluster/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/hcs-utils/hcs-utils-1.5.ebuild b/dev-python/hcs-utils/hcs-utils-1.5.ebuild
index 13a8bec895b1..7fe04435067c 100644
--- a/dev-python/hcs-utils/hcs-utils-1.5.ebuild
+++ b/dev-python/hcs-utils/hcs-utils-1.5.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
MY_P=${P/_rc/rc}
DESCRIPTION="A library containing some useful snippets"
-HOMEPAGE="https://pypi.org/project/hcs_utils"
+HOMEPAGE="https://pypi.org/project/hcs_utils/"
SRC_URI="mirror://pypi/h/${PN/-/_}/${MY_P/-/_}.tar.gz"
LICENSE="GPL-3"
diff --git a/dev-python/hcs-utils/hcs-utils-2.0.ebuild b/dev-python/hcs-utils/hcs-utils-2.0.ebuild
index 9416d2946be0..fb8377528b99 100644
--- a/dev-python/hcs-utils/hcs-utils-2.0.ebuild
+++ b/dev-python/hcs-utils/hcs-utils-2.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
MY_P=${P/_rc/rc}
DESCRIPTION="A library containing some useful snippets"
-HOMEPAGE="https://pypi.org/project/hcs_utils"
+HOMEPAGE="https://pypi.org/project/hcs_utils/"
SRC_URI="mirror://pypi/h/${PN/-/_}/${MY_P/-/_}.tar.gz"
LICENSE="GPL-3"
diff --git a/dev-python/hgdistver/hgdistver-0.25.ebuild b/dev-python/hgdistver/hgdistver-0.25.ebuild
index ae243c9c0a2f..3ffdba231f01 100644
--- a/dev-python/hgdistver/hgdistver-0.25.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.25.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="utility lib to generate python package version infos from mercurial tags"
-HOMEPAGE="https://pypi.org/project/hgdistver"
+HOMEPAGE="https://pypi.org/project/hgdistver/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/hgtools/hgtools-6.5.1.ebuild b/dev-python/hgtools/hgtools-6.5.1.ebuild
index 6d04e695fb50..46923cb6df04 100644
--- a/dev-python/hgtools/hgtools-6.5.1.ebuild
+++ b/dev-python/hgtools/hgtools-6.5.1.ebuild
@@ -9,7 +9,7 @@ RESTRICT="test"
inherit distutils-r1 eutils
DESCRIPTION="Classes and setuptools plugin for Mercurial repositories"
-HOMEPAGE="https://pypi.org/project/hgtools https://github.com/jaraco/hgtools"
+HOMEPAGE="https://pypi.org/project/hgtools/ https://github.com/jaraco/hgtools"
SRC_URI="mirror://pypi/h/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/hpack/hpack-2.3.0-r1.ebuild b/dev-python/hpack/hpack-2.3.0-r1.ebuild
index 249a2a9754bc..bb2be6eddbbd 100644
--- a/dev-python/hpack/hpack-2.3.0-r1.ebuild
+++ b/dev-python/hpack/hpack-2.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="Pure-Python HPACK header compression"
-HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.org/project/hpack"
+HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.org/project/hpack/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index eae4a7ed2f91..07eac8c2bbc1 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="Pure-Python HPACK header compression"
-HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.org/project/hpack"
+HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.org/project/hpack/"
SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/html2text/html2text-2016.5.29.ebuild b/dev-python/html2text/html2text-2016.5.29.ebuild
index 012759e92279..01a6299390dd 100644
--- a/dev-python/html2text/html2text-2016.5.29.ebuild
+++ b/dev-python/html2text/html2text-2016.5.29.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
HOMEPAGE="https://github.com/html2text/html2text
- https://github.com/Alir3z4/html2text https://pypi.org/project/html2text"
+ https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/dev-python/html2text/html2text-2017.10.4.ebuild b/dev-python/html2text/html2text-2017.10.4.ebuild
index a0733a605783..19d096f7bbfc 100644
--- a/dev-python/html2text/html2text-2017.10.4.ebuild
+++ b/dev-python/html2text/html2text-2017.10.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text"
+HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/dev-python/html2text/html2text-2018.1.9.ebuild b/dev-python/html2text/html2text-2018.1.9.ebuild
index 217ed20796f6..5bb615018eeb 100644
--- a/dev-python/html2text/html2text-2018.1.9.ebuild
+++ b/dev-python/html2text/html2text-2018.1.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
-HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text"
+HOMEPAGE="https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/"
SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}-1.tar.gz"
LICENSE="GPL-3"
diff --git a/dev-python/httpbin/httpbin-0.4.1.ebuild b/dev-python/httpbin/httpbin-0.4.1.ebuild
index 6fd15c613932..dc292762e451 100644
--- a/dev-python/httpbin/httpbin-0.4.1.ebuild
+++ b/dev-python/httpbin/httpbin-0.4.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="HTTP Request and Response Service"
-HOMEPAGE="https://github.com/Runscope/httpbin https://pypi.org/project/httpbin"
+HOMEPAGE="https://github.com/Runscope/httpbin https://pypi.org/project/httpbin/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
index 1ae8bbf849c8..0dac092d04eb 100644
--- a/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
+++ b/dev-python/httplib2/httplib2-0.10.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.org/project/httplib2 https://github.com/jcgregorio/httplib2"
+HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/httreplay/httreplay-0.2.0.ebuild b/dev-python/httreplay/httreplay-0.2.0.ebuild
index f7485f5c5f55..471ded4fc0b2 100644
--- a/dev-python/httreplay/httreplay-0.2.0.ebuild
+++ b/dev-python/httreplay/httreplay-0.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="A HTTP replay library for testing."
-HOMEPAGE="https://github.com/agriffis/httreplay https://pypi.org/project/httreplay"
+HOMEPAGE="https://github.com/agriffis/httreplay https://pypi.org/project/httreplay/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/humanfriendly/humanfriendly-2.4.ebuild b/dev-python/humanfriendly/humanfriendly-2.4.ebuild
index a4f9df826199..f8de554ce4ed 100644
--- a/dev-python/humanfriendly/humanfriendly-2.4.ebuild
+++ b/dev-python/humanfriendly/humanfriendly-2.4.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Human friendly output for text interfaces using Python"
-HOMEPAGE="https://pypi.org/project/humanfriendly https://humanfriendly.readthedocs.org"
+HOMEPAGE="https://pypi.org/project/humanfriendly/ https://humanfriendly.readthedocs.org"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
index 7373076821c8..63ac10260b96 100644
--- a/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-2.5.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="h2"
DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
HOMEPAGE="https://python-hyper.org/h2/en/stable
https://github.com/python-hyper/hyper-h2
- https://pypi.org/project/h2"
+ https://pypi.org/project/h2/"
SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
index 56916088d09e..9bf1fd6ffd19 100644
--- a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
-HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2"
+HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2/"
SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/hyperframe/hyperframe-4.0.1.ebuild b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
index 4ee406bc7138..df5070bac346 100644
--- a/dev-python/hyperframe/hyperframe-4.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="HTTP/2 framing layer for Python"
-HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.org/project/hyperframe"
+HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.org/project/hyperframe/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/hyperframe/hyperframe-5.1.0.ebuild b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
index 764ea25d9d7f..e25f36759814 100644
--- a/dev-python/hyperframe/hyperframe-5.1.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="HTTP/2 framing layer for Python"
-HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.org/project/hyperframe"
+HOMEPAGE="https://python-hyper.org/en/latest/ https://pypi.org/project/hyperframe/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/hyperlink/hyperlink-17.1.1.ebuild b/dev-python/hyperlink/hyperlink-17.1.1.ebuild
index 43992e66e773..ac6dfded277d 100644
--- a/dev-python/hyperlink/hyperlink-17.1.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-17.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="A featureful, correct URL for Python"
-HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink"
+HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD MIT"
diff --git a/dev-python/hyperlink/hyperlink-17.3.1.ebuild b/dev-python/hyperlink/hyperlink-17.3.1.ebuild
index 6a990b39704a..bbe44b2dd654 100644
--- a/dev-python/hyperlink/hyperlink-17.3.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-17.3.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="A featureful, correct URL for Python"
-HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink"
+HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD MIT"
diff --git a/dev-python/hypothesis/hypothesis-3.38.5.ebuild b/dev-python/hypothesis/hypothesis-3.38.5.ebuild
index 540270cf37c2..89e39704e7ae 100644
--- a/dev-python/hypothesis/hypothesis-3.38.5.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.38.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
inherit distutils-r1 eutils
DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis/"
SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-2.0"
diff --git a/dev-python/hypothesis/hypothesis-3.44.26.ebuild b/dev-python/hypothesis/hypothesis-3.44.26.ebuild
index fe1e2a436995..ddfd398cafb2 100644
--- a/dev-python/hypothesis/hypothesis-3.44.26.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.44.26.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
inherit distutils-r1 eutils
DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis/"
SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-2.0"
diff --git a/dev-python/hypothesis/hypothesis-3.44.7.ebuild b/dev-python/hypothesis/hypothesis-3.44.7.ebuild
index 540270cf37c2..89e39704e7ae 100644
--- a/dev-python/hypothesis/hypothesis-3.44.7.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.44.7.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
inherit distutils-r1 eutils
DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis/"
SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-2.0"
diff --git a/dev-python/hypothesis/hypothesis-3.45.3.ebuild b/dev-python/hypothesis/hypothesis-3.45.3.ebuild
index fe1e2a436995..ddfd398cafb2 100644
--- a/dev-python/hypothesis/hypothesis-3.45.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.45.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
inherit distutils-r1 eutils
DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis/"
SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-2.0"
diff --git a/dev-python/hypothesis/hypothesis-3.50.1.ebuild b/dev-python/hypothesis/hypothesis-3.50.1.ebuild
index fe1e2a436995..ddfd398cafb2 100644
--- a/dev-python/hypothesis/hypothesis-3.50.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.50.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
inherit distutils-r1 eutils
DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis-python https://pypi.org/project/hypothesis/"
SRC_URI="https://github.com/HypothesisWorks/hypothesis-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-2.0"
diff --git a/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild b/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
index b9764635f66d..ed074d038c83 100644
--- a/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.6.0-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+),sqlite"
inherit distutils-r1 eutils
DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/DRMacIver/hypothesis https://pypi.org/project/hypothesis"
+HOMEPAGE="https://github.com/DRMacIver/hypothesis https://pypi.org/project/hypothesis/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MPL-2.0"
diff --git a/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
index f923e155efcb..54b75a659617 100644
--- a/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.0.0.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/_}
MY_P=${MY_PN}-${PV}
DESCRIPTION="Patch ssl.match_hostname for Unicode(idna) domains support"
-HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl"
+HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl/"
SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
SLOT="0"
diff --git a/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild b/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild
index da8aa8bc2750..e56535d395d5 100644
--- a/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Patch ssl.match_hostname for Unicode(idna) domains support"
-HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl"
+HOMEPAGE="https://github.com/aio-libs/idna-ssl https://pypi.org/project/idna_ssl/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/idna/idna-2.6.ebuild b/dev-python/idna/idna-2.6.ebuild
index 55f894ad6b49..f57d72cfe473 100644
--- a/dev-python/idna/idna-2.6.ebuild
+++ b/dev-python/idna/idna-2.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna"
+HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/imdbpy/imdbpy-5.0.ebuild b/dev-python/imdbpy/imdbpy-5.0.ebuild
index 80ec214e0751..824232084770 100644
--- a/dev-python/imdbpy/imdbpy-5.0.ebuild
+++ b/dev-python/imdbpy/imdbpy-5.0.ebuild
@@ -10,7 +10,7 @@ MY_PN="IMDbPY"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python package to access the IMDb movie database"
-HOMEPAGE="http://imdbpy.sourceforge.net/ https://pypi.org/project/IMDbPY"
+HOMEPAGE="http://imdbpy.sourceforge.net/ https://pypi.org/project/IMDbPY/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/incremental/incremental-16.10.1.ebuild b/dev-python/incremental/incremental-16.10.1.ebuild
index ccda3bd2d2f1..501f908d0fc2 100644
--- a/dev-python/incremental/incremental-16.10.1.ebuild
+++ b/dev-python/incremental/incremental-16.10.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="Incremental is a small library that versions your Python projects"
-HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.org/project/incremental"
+HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.org/project/incremental/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index 944fb1dd5cf6..499a38b4d93a 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="Incremental is a small library that versions your Python projects"
-HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.org/project/incremental"
+HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.org/project/incremental/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/influxdb/influxdb-2.12.0.ebuild b/dev-python/influxdb/influxdb-2.12.0.ebuild
index 47b318e74c08..fbb8dcf6a0ba 100644
--- a/dev-python/influxdb/influxdb-2.12.0.ebuild
+++ b/dev-python/influxdb/influxdb-2.12.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="InfluxDB client"
-HOMEPAGE="https://github.com/influxdb/influxdb-python https://pypi.org/project/influxdb"
+HOMEPAGE="https://github.com/influxdb/influxdb-python https://pypi.org/project/influxdb/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/iniparse/iniparse-0.4-r2.ebuild b/dev-python/iniparse/iniparse-0.4-r2.ebuild
index dd3b30034e3d..421effd64e4f 100644
--- a/dev-python/iniparse/iniparse-0.4-r2.ebuild
+++ b/dev-python/iniparse/iniparse-0.4-r2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Better INI parser for Python"
-HOMEPAGE="https://pypi.org/project/iniparse"
+HOMEPAGE="https://pypi.org/project/iniparse/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT PSF-2"
diff --git a/dev-python/intervaltree/intervaltree-2.1.0.ebuild b/dev-python/intervaltree/intervaltree-2.1.0.ebuild
index 6c5e19641c48..3cc37411d885 100644
--- a/dev-python/intervaltree/intervaltree-2.1.0.ebuild
+++ b/dev-python/intervaltree/intervaltree-2.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Editable interval tree data structure for Python 2 and 3"
-HOMEPAGE="https://pypi.org/project/intervaltree"
+HOMEPAGE="https://pypi.org/project/intervaltree/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild b/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
index e916bb6c5689..6b0f9979b682 100644
--- a/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.1.11-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Python IP address manipulation library"
-HOMEPAGE="https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr"
+HOMEPAGE="https://github.com/google/ipaddr-py https://pypi.org/project/ipaddr/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/ipdb/ipdb-0.10.3.ebuild b/dev-python/ipdb/ipdb-0.10.3.ebuild
index 17d15afc07c7..d3b671780932 100644
--- a/dev-python/ipdb/ipdb-0.10.3.ebuild
+++ b/dev-python/ipdb/ipdb-0.10.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="IPython-enabled pdb"
-HOMEPAGE="https://pypi.org/project/ipdb"
+HOMEPAGE="https://pypi.org/project/ipdb/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild b/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild
index 6796b7e8efaa..704738ea38c4 100644
--- a/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild
+++ b/dev-python/ipdbplugin/ipdbplugin-1.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Nose plugin to use iPdb instead of Pdb when tests fail"
-HOMEPAGE="https://pypi.org/project/ipdbplugin"
+HOMEPAGE="https://pypi.org/project/ipdbplugin/"
if [[ ${PV} == "9999" ]] ; then
inherit git-r3
diff --git a/dev-python/ipdbplugin/ipdbplugin-9999.ebuild b/dev-python/ipdbplugin/ipdbplugin-9999.ebuild
index 6796b7e8efaa..704738ea38c4 100644
--- a/dev-python/ipdbplugin/ipdbplugin-9999.ebuild
+++ b/dev-python/ipdbplugin/ipdbplugin-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Nose plugin to use iPdb instead of Pdb when tests fail"
-HOMEPAGE="https://pypi.org/project/ipdbplugin"
+HOMEPAGE="https://pypi.org/project/ipdbplugin/"
if [[ ${PV} == "9999" ]] ; then
inherit git-r3
diff --git a/dev-python/ipy/ipy-0.83.ebuild b/dev-python/ipy/ipy-0.83.ebuild
index 1a1d7cd4522d..c09ae0c657ab 100644
--- a/dev-python/ipy/ipy-0.83.ebuild
+++ b/dev-python/ipy/ipy-0.83.ebuild
@@ -11,7 +11,7 @@ MY_PN="IPy"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Class and tools for handling of IPv4 and IPv6 addresses and networks"
-HOMEPAGE="https://github.com/haypo/python-ipy/wiki https://pypi.org/project/IPy"
+HOMEPAGE="https://github.com/haypo/python-ipy/wiki https://pypi.org/project/IPy/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/iso3166/iso3166-0.8.ebuild b/dev-python/iso3166/iso3166-0.8.ebuild
index 1ca0c0efc1fd..6de0eb856d08 100644
--- a/dev-python/iso3166/iso3166-0.8.ebuild
+++ b/dev-python/iso3166/iso3166-0.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
inherit distutils-r1
DESCRIPTION="Self-contained ISO 3166-1 country definitions."
-HOMEPAGE="https://pypi.org/project/iso3166 https://github.com/deactivated/python-iso3166"
+HOMEPAGE="https://pypi.org/project/iso3166/ https://github.com/deactivated/python-iso3166"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/iso8601/iso8601-0.1.10.ebuild b/dev-python/iso8601/iso8601-0.1.10.ebuild
index 4a983e73de76..cc06f77532c6 100644
--- a/dev-python/iso8601/iso8601-0.1.10.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.org/project/iso8601"
+HOMEPAGE="https://pypi.org/project/iso8601/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/iso8601/iso8601-0.1.11.ebuild b/dev-python/iso8601/iso8601-0.1.11.ebuild
index 6ff7480fe031..e0129397f678 100644
--- a/dev-python/iso8601/iso8601-0.1.11.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.org/project/iso8601"
+HOMEPAGE="https://pypi.org/project/iso8601/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/iso8601/iso8601-0.1.12.ebuild b/dev-python/iso8601/iso8601-0.1.12.ebuild
index e5df1e9b8970..77e38feb6cf6 100644
--- a/dev-python/iso8601/iso8601-0.1.12.ebuild
+++ b/dev-python/iso8601/iso8601-0.1.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.org/project/iso8601"
+HOMEPAGE="https://pypi.org/project/iso8601/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/iso_639/iso_639-0.4.5.ebuild b/dev-python/iso_639/iso_639-0.4.5.ebuild
index 320d919e0863..b7a4f26812d6 100644
--- a/dev-python/iso_639/iso_639-0.4.5.ebuild
+++ b/dev-python/iso_639/iso_639-0.4.5.ebuild
@@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}"
inherit distutils-r1
DESCRIPTION="Python library for ISO 639 standard"
-HOMEPAGE="https://pypi.org/project/iso-639 https://github.com/noumar/iso639"
+HOMEPAGE="https://pypi.org/project/iso-639/ https://github.com/noumar/iso639"
SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="AGPL-3"
diff --git a/dev-python/isodate/isodate-0.5.4.ebuild b/dev-python/isodate/isodate-0.5.4.ebuild
index 24b7b9bd7a19..882a6521c5bb 100644
--- a/dev-python/isodate/isodate-0.5.4.ebuild
+++ b/dev-python/isodate/isodate-0.5.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
inherit distutils-r1
DESCRIPTION="ISO 8601 date/time/duration parser and formatter"
-HOMEPAGE="https://pypi.org/project/isodate"
+HOMEPAGE="https://pypi.org/project/isodate/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/isodate/isodate-0.6.0.ebuild b/dev-python/isodate/isodate-0.6.0.ebuild
index 27777d58e631..a098d7cb995c 100644
--- a/dev-python/isodate/isodate-0.6.0.ebuild
+++ b/dev-python/isodate/isodate-0.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
inherit distutils-r1
DESCRIPTION="ISO 8601 date/time/duration parser and formatter"
-HOMEPAGE="https://pypi.org/project/isodate"
+HOMEPAGE="https://pypi.org/project/isodate/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/isort/isort-4.2.5.ebuild b/dev-python/isort/isort-4.2.5.ebuild
index f73b2bce1f84..4494fe9ae659 100644
--- a/dev-python/isort/isort-4.2.5.ebuild
+++ b/dev-python/isort/isort-4.2.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort"
+HOMEPAGE="https://pypi.org/project/isort/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/itsdangerous/itsdangerous-0.24.ebuild b/dev-python/itsdangerous/itsdangerous-0.24.ebuild
index 3aa8e32d5151..f05a2c5d0ef9 100644
--- a/dev-python/itsdangerous/itsdangerous-0.24.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-0.24.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE="http://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous"
+HOMEPAGE="http://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild b/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
index 8beedb2fe446..b8e5e6213587 100644
--- a/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
+++ b/dev-python/jaraco-utils/jaraco-utils-10.0.2.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
MY_PN="jaraco.util"
DESCRIPTION="General utility modules that supply commonly-used functionality"
-HOMEPAGE="https://pypi.org/project/jaraco.util"
+HOMEPAGE="https://pypi.org/project/jaraco.util/"
SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
LICENSE="MIT"
diff --git a/dev-python/jaxml/jaxml-3.02-r1.ebuild b/dev-python/jaxml/jaxml-3.02-r1.ebuild
index a2fa4e584e5b..40e9b3195c50 100644
--- a/dev-python/jaxml/jaxml-3.02-r1.ebuild
+++ b/dev-python/jaxml/jaxml-3.02-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="XML generator written in Python"
-HOMEPAGE="http://www.librelogiciel.com/software/jaxml/action_Presentation https://pypi.org/project/jaxml"
+HOMEPAGE="http://www.librelogiciel.com/software/jaxml/action_Presentation https://pypi.org/project/jaxml/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/jellyfish/jellyfish-0.5.6.ebuild b/dev-python/jellyfish/jellyfish-0.5.6.ebuild
index beeac583d8f8..c7cea2598f81 100644
--- a/dev-python/jellyfish/jellyfish-0.5.6.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.5.6.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
inherit distutils-r1
DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
-HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish"
+HOMEPAGE="https://github.com/jamesturk/jellyfish https://pypi.org/project/jellyfish/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-python/jinja/jinja-2.10.ebuild b/dev-python/jinja/jinja-2.10.ebuild
index eaedaf963190..abf3450a5297 100644
--- a/dev-python/jinja/jinja-2.10.ebuild
+++ b/dev-python/jinja/jinja-2.10.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit eutils distutils-r1
DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2"
+HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
# pypi tarball is missing tests
SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/jinja/jinja-2.9.5.ebuild b/dev-python/jinja/jinja-2.9.5.ebuild
index 21fa78eb36c4..804c1f5e493c 100644
--- a/dev-python/jinja/jinja-2.9.5.ebuild
+++ b/dev-python/jinja/jinja-2.9.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit eutils distutils-r1
DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2"
+HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
# pypi tarball is missing tests
SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/jmespath/jmespath-0.9.3.ebuild b/dev-python/jmespath/jmespath-0.9.3.ebuild
index bd40e283cb92..1d3d7d7bdffc 100644
--- a/dev-python/jmespath/jmespath-0.9.3.ebuild
+++ b/dev-python/jmespath/jmespath-0.9.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="JSON Matching Expressions"
-HOMEPAGE="https://github.com/boto/jmespath https://pypi.org/project/jmespath"
+HOMEPAGE="https://github.com/boto/jmespath https://pypi.org/project/jmespath/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/jonpy/jonpy-0.11.ebuild b/dev-python/jonpy/jonpy-0.11.ebuild
index 3703a36d1940..bd7f0957f0ee 100644
--- a/dev-python/jonpy/jonpy-0.11.ebuild
+++ b/dev-python/jonpy/jonpy-0.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Powerful multi-threaded object-oriented CGI/FastCGI/mod_python/html-templating facilities"
-HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.org/project/jonpy"
+HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.org/project/jonpy/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/jonpy/jonpy-0.13.ebuild b/dev-python/jonpy/jonpy-0.13.ebuild
index 7cc12ef1fb75..e43339d67032 100644
--- a/dev-python/jonpy/jonpy-0.13.ebuild
+++ b/dev-python/jonpy/jonpy-0.13.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Powerful multi-threaded object-oriented CGI/FastCGI/mod_python/html-templating facilities"
-HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.org/project/jonpy"
+HOMEPAGE="http://jonpy.sourceforge.net/ https://pypi.org/project/jonpy/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/jplephem/jplephem-2.6.ebuild b/dev-python/jplephem/jplephem-2.6.ebuild
index cd2d78935847..5bea13a393c5 100644
--- a/dev-python/jplephem/jplephem-2.6.ebuild
+++ b/dev-python/jplephem/jplephem-2.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Python version of NASA DE4xx ephemerides for Astronomical Alamanac"
-HOMEPAGE="https://pypi.org/project/jplephem"
+HOMEPAGE="https://pypi.org/project/jplephem/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/jsmin/jsmin-2.2.1.ebuild b/dev-python/jsmin/jsmin-2.2.1.ebuild
index 72fac8d737d9..eab212ecd76d 100644
--- a/dev-python/jsmin/jsmin-2.2.1.ebuild
+++ b/dev-python/jsmin/jsmin-2.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="JavaScript minifier"
-HOMEPAGE="https://pypi.org/project/jsmin https://github.com/tikitu/jsmin/"
+HOMEPAGE="https://pypi.org/project/jsmin/ https://github.com/tikitu/jsmin/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="amd64 x86"
diff --git a/dev-python/json-tools/json-tools-0.4.0.ebuild b/dev-python/json-tools/json-tools-0.4.0.ebuild
index 4e89f4881d51..7ee159687316 100644
--- a/dev-python/json-tools/json-tools-0.4.0.ebuild
+++ b/dev-python/json-tools/json-tools-0.4.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="json_tools"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A set of tools to manipulate JSON: diff, patch, and pretty-printing"
-HOMEPAGE="https://pypi.org/project/json_tools https://bitbucket.org/vadim_semenov/json_tools"
+HOMEPAGE="https://pypi.org/project/json_tools/ https://bitbucket.org/vadim_semenov/json_tools"
SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/json-tools/json-tools-0.4.1.ebuild b/dev-python/json-tools/json-tools-0.4.1.ebuild
index 08760cf22ece..9e241b00725c 100644
--- a/dev-python/json-tools/json-tools-0.4.1.ebuild
+++ b/dev-python/json-tools/json-tools-0.4.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="json_tools"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A set of tools to manipulate JSON: diff, patch, and pretty-printing"
-HOMEPAGE="https://pypi.org/project/json_tools https://bitbucket.org/vadim_semenov/json_tools"
+HOMEPAGE="https://pypi.org/project/json_tools/ https://bitbucket.org/vadim_semenov/json_tools"
SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/jsonfield/jsonfield-1.0.3.ebuild b/dev-python/jsonfield/jsonfield-1.0.3.ebuild
index fc51285f25df..e95f545cfbd8 100644
--- a/dev-python/jsonfield/jsonfield-1.0.3.ebuild
+++ b/dev-python/jsonfield/jsonfield-1.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Reusable Django field that allows you to store validated JSON in your model"
-HOMEPAGE="https://pypi.org/project/jsonfield https://github.com/bradjasper/django-jsonfield"
+HOMEPAGE="https://pypi.org/project/jsonfield/ https://github.com/bradjasper/django-jsonfield"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild b/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
index e2a2178cdee7..9ae49299d838 100644
--- a/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-0.9.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle"
+HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/jsonref/jsonref-0.1.ebuild b/dev-python/jsonref/jsonref-0.1.ebuild
index 56024f070b19..18eb07b26650 100644
--- a/dev-python/jsonref/jsonref-0.1.ebuild
+++ b/dev-python/jsonref/jsonref-0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit eutils distutils-r1
DESCRIPTION="An implementation of JSON Reference for Python"
-HOMEPAGE="https://github.com/gazpachoking/jsonref https://pypi.org/project/jsonref"
+HOMEPAGE="https://github.com/gazpachoking/jsonref https://pypi.org/project/jsonref/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/jsonschema/jsonschema-2.3.0.ebuild b/dev-python/jsonschema/jsonschema-2.3.0.ebuild
index 14bcf727f4c8..9d5f10d89b0f 100644
--- a/dev-python/jsonschema/jsonschema-2.3.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.3.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=(python{2_7,3_4} pypy)
inherit distutils-r1
DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.org/project/jsonschema"
+HOMEPAGE="https://pypi.org/project/jsonschema/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/jsonschema/jsonschema-2.4.0.ebuild b/dev-python/jsonschema/jsonschema-2.4.0.ebuild
index 5a0208dd2023..f4af8dd45078 100644
--- a/dev-python/jsonschema/jsonschema-2.4.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=(python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.org/project/jsonschema"
+HOMEPAGE="https://pypi.org/project/jsonschema/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
index 2bc2d72d2974..6b1d39eee208 100644
--- a/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.5.1-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.org/project/jsonschema https://github.com/Julian/jsonschema"
+HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/jsonschema/jsonschema-2.6.0.ebuild b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
index ceb09cf502a2..c063f0ffb11e 100644
--- a/dev-python/jsonschema/jsonschema-2.6.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="https://pypi.org/project/jsonschema https://github.com/Julian/jsonschema"
+HOMEPAGE="https://pypi.org/project/jsonschema/ https://github.com/Julian/jsonschema"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/keepassx/keepassx-0.1.0-r1.ebuild b/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
index b60292579042..a51cc7db0419 100644
--- a/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
+++ b/dev-python/keepassx/keepassx-0.1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Python API and CLI for KeePassX"
-HOMEPAGE="https://github.com/jamesls/python-keepassx https://pypi.org/project/keepassx"
+HOMEPAGE="https://github.com/jamesls/python-keepassx https://pypi.org/project/keepassx/"
SRC_URI="https://github.com/jamesls/python-keepassx/archive/${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 79ce055167f1..12ef4c2964c3 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -4,3 +4,4 @@ DIST keyring-11.1.0.tar.gz 25518 BLAKE2B 8b23853a15217a4d51a30d2add4f2e4eaa9af78
DIST keyring-12.0.1.tar.gz 41430 BLAKE2B 5717aeab6cb25f909679565b16f9400c599b5bc235b459483e704446d52b1119598827140e44cbc39aff527e8e60a9ed66b2555527cb268a2daa843c42c41d03 SHA512 f55639429500b571ff648bac91dc63cad2988296bc9d89a69f0dfe4fffd62db5996acc2d88884a144aa63ed6e9b68c068bee8b3f0bdca8dc1c9120c08d0c77ec
DIST keyring-12.0.2.tar.gz 41757 BLAKE2B 3cc08da13b475dd01eff33782494d580a231311778678646b44ee289a1fcdb9ae0cf431f8f678ad07418f9d829bb2ec651a343e2624624923632cb2c6bf9c5b9 SHA512 79fd05505b14cd60d6dd1f0d2843d79ce31730705d72459ea008101cb03d3e0249a1b48177c528f3bf475c8bd52142b4771ef00b3676ea730e0122b4930ccb4b
DIST keyring-12.1.0.tar.gz 41959 BLAKE2B 203b1423485e10b04ae46dee23b0f7961a24743bc384fd50c9a1ce6b058decd091d3bebf5da1c8fdfb552dbcaeb79895dbcd3a4c6e79a5015a314cacbd991945 SHA512 b94f5cdb021b8b4fdb3a9aa95ae6b0f20e14bf2a1f0abdcbf0a3d6b41d3740d555e7313e561ce828c4652f34297933e7230ad64aa588880faf4ae144c35660d2
+DIST keyring-12.2.0.tar.gz 42106 BLAKE2B af218786a033d1f8aa4fe0144bf70f89656d21bb7b6d2574386623483f86d0be7ede522e4370111d6b56cb836f70873b4591b242241cb9ec30353cfa0041a82f SHA512 1bdec1d9775157c47710280cb95ac1419f357840ca0b1aba5bdb48f4851ceb04c9ef56f74e5ab564b1365ce2ec45a3ff15d1ae23360bb9b9e098b3684a06e80f
diff --git a/dev-python/keyring/keyring-12.2.0.ebuild b/dev-python/keyring/keyring-12.2.0.ebuild
new file mode 100644
index 000000000000..9b35a1c4afbe
--- /dev/null
+++ b/dev-python/keyring/keyring-12.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+ dev-python/secretstorage[${PYTHON_USEDEP}]
+ dev-python/entrypoints[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pytest-runner[${PYTHON_USEDEP}]
+ >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+ dev-python/pytest-flake8[${PYTHON_USEDEP}]
+ dev-python/collective-checkdocs[${PYTHON_USEDEP}]
+ )"
+RDEPEND=""
+
+src_unpack() {
+ unpack $A
+ # This is an interactive test.
+ rm -f "${S}"/keyring/tests/backends/test_kwallet.py
+}
+
+python_test() {
+ py.test -v -v || die "testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild b/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild
index a4a545f8b35b..1a7c5e62d668 100644
--- a/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild
+++ b/dev-python/keyrings_alt/keyrings_alt-2.3.ebuild
@@ -11,7 +11,7 @@ MY_PN="${PN/_/.}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Alternate keyring implementations"
-HOMEPAGE="https://github.com/jaraco/keyrings.alt https://pypi.org/project/keyrings.alt"
+HOMEPAGE="https://github.com/jaraco/keyrings.alt https://pypi.org/project/keyrings.alt/"
SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/kid/kid-0.9.6-r1.ebuild b/dev-python/kid/kid-0.9.6-r1.ebuild
index eaa6711d673a..628a0d8210a2 100644
--- a/dev-python/kid/kid-0.9.6-r1.ebuild
+++ b/dev-python/kid/kid-0.9.6-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="A simple and Pythonic XML template language"
-HOMEPAGE="http://www.kid-templating.org/ https://pypi.org/project/kid"
+HOMEPAGE="http://www.kid-templating.org/ https://pypi.org/project/kid/"
SRC_URI="http://www.kid-templating.org/dist/${PV}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/kitchen/kitchen-1.2.4.ebuild b/dev-python/kitchen/kitchen-1.2.4.ebuild
index b92d4713e91b..583f8303832b 100644
--- a/dev-python/kitchen/kitchen-1.2.4.ebuild
+++ b/dev-python/kitchen/kitchen-1.2.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="A cornucopia of useful code"
-HOMEPAGE="https://pypi.org/project/kitchen"
+HOMEPAGE="https://pypi.org/project/kitchen/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2+"
diff --git a/dev-python/kiwi/kiwi-1.9.39.2.ebuild b/dev-python/kiwi/kiwi-1.9.39.2.ebuild
index 291127fd572d..7ae149f76646 100644
--- a/dev-python/kiwi/kiwi-1.9.39.2.ebuild
+++ b/dev-python/kiwi/kiwi-1.9.39.2.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1 versionator virtualx
DESCRIPTION="Kiwi is a pure Python framework and set of enhanced PyGTK widgets"
HOMEPAGE="https://launchpad.net/kiwi
- https://pypi.org/project/kiwi-gtk"
+ https://pypi.org/project/kiwi-gtk/"
MY_PN="${PN}-gtk"
MY_P="${MY_PN}-${PV}"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/kiwi/kiwi-1.9.40.ebuild b/dev-python/kiwi/kiwi-1.9.40.ebuild
index ac9eb5801246..d0219774e889 100644
--- a/dev-python/kiwi/kiwi-1.9.40.ebuild
+++ b/dev-python/kiwi/kiwi-1.9.40.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1 versionator virtualx
DESCRIPTION="Kiwi is a pure Python framework and set of enhanced PyGTK widgets"
HOMEPAGE="https://launchpad.net/kiwi
- https://pypi.org/project/kiwi-gtk"
+ https://pypi.org/project/kiwi-gtk/"
MY_PN="${PN}-gtk"
MY_P="${MY_PN}-${PV}"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 5c857de0be66..8813b7aea8c4 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,2 +1 @@
-DIST kiwisolver-0.1.3.zip 48696 BLAKE2B c5a89ae53b21e188cd7bbb82162fc81814f7794cb786dbb0c3f54f05f845d7b8780f159b55f42cd358ede8b0d8a0bc12132e10ea8249ba31f8e5e64075953c49 SHA512 ce5ccf03da88743f091aba7e01ec3d7f4d7a83cb1d2e33b52a4a825bc4b9919329e73bb85a05effc83f6cc449082c5534a036a8d639937229fc7bedcc90d5089
DIST kiwisolver-1.0.1.tar.gz 34783 BLAKE2B 104fb7789e004841921bc43fe98a98b247c7f0506a94b07d10ff1e758287a272c9d2f119b7a086847653cdf1bfc9d5c94823d1eb0b4a30ea93cf2b8b05027013 SHA512 01002ae1dbf6482ed68c49ad3da80b772db84ec221c4b111c42f1b493f19299e0ddb187e43e64b380eb2ddc292d5848d6e09a5a1dbfaf68950a65423a913ec18
diff --git a/dev-python/kiwisolver/kiwisolver-0.1.3.ebuild b/dev-python/kiwisolver/kiwisolver-0.1.3.ebuild
deleted file mode 100644
index b7356a2414ee..000000000000
--- a/dev-python/kiwisolver/kiwisolver-0.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
-HOMEPAGE="https://github.com/nucleic/kiwi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
- app-arch/unzip
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- chmod o-w *egg*/* || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
index 2beac8a79961..aaee070363a0 100644
--- a/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
@@ -10,6 +10,6 @@ HOMEPAGE="https://github.com/nucleic/kiwi"
SRC_URI="https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Clear-BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
S="${WORKDIR}"/kiwi-${PV}
diff --git a/dev-python/kombu/kombu-3.0.37-r1.ebuild b/dev-python/kombu/kombu-3.0.37-r1.ebuild
index e36f103e8253..b562ae575218 100644
--- a/dev-python/kombu/kombu-3.0.37-r1.ebuild
+++ b/dev-python/kombu/kombu-3.0.37-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
inherit distutils-r1
DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.org/project/kombu https://github.com/celery/kombu"
+HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/kombu/kombu-4.1.0-r1.ebuild b/dev-python/kombu/kombu-4.1.0-r1.ebuild
index ca357e340a44..59ee8853b284 100644
--- a/dev-python/kombu/kombu-4.1.0-r1.ebuild
+++ b/dev-python/kombu/kombu-4.1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.org/project/kombu https://github.com/celery/kombu"
+HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
index 009b07179882..8cb0eee4626f 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.2.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="A fast and thorough lazy object proxy"
HOMEPAGE="
https://github.com/ionelmc/python-lazy-object-proxy
- https://pypi.org/project/lazy-object-proxy
+ https://pypi.org/project/lazy-object-proxy/
https://python-lazy-object-proxy.readthedocs.org/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
index d68dc142c979..886cdb2fe518 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="A fast and thorough lazy object proxy"
HOMEPAGE="
https://github.com/ionelmc/python-lazy-object-proxy
- https://pypi.org/project/lazy-object-proxy
+ https://pypi.org/project/lazy-object-proxy/
https://python-lazy-object-proxy.readthedocs.org/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/ldap3/ldap3-2.2.3.ebuild b/dev-python/ldap3/ldap3-2.2.3.ebuild
index d76c51791353..79692644bb5c 100644
--- a/dev-python/ldap3/ldap3-2.2.3.ebuild
+++ b/dev-python/ldap3/ldap3-2.2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="A strictly RFC 4511 conforming LDAP V3 pure Python client"
-HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.org/project/ldap3"
+HOMEPAGE="https://github.com/cannatag/ldap3 https://pypi.org/project/ldap3/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
diff --git a/dev-python/lesscpy/lesscpy-0.11.1.ebuild b/dev-python/lesscpy/lesscpy-0.11.1.ebuild
index 7efcdb35e3de..6b64ea897777 100644
--- a/dev-python/lesscpy/lesscpy-0.11.1.ebuild
+++ b/dev-python/lesscpy/lesscpy-0.11.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
RESTRICT="test"
DESCRIPTION="A compiler written in Python for the LESS language"
-HOMEPAGE="https://pypi.org/project/lesscpy"
+HOMEPAGE="https://pypi.org/project/lesscpy/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/lesscpy/lesscpy-0.13.0.ebuild b/dev-python/lesscpy/lesscpy-0.13.0.ebuild
index 35e5966d112e..02eb90078825 100644
--- a/dev-python/lesscpy/lesscpy-0.13.0.ebuild
+++ b/dev-python/lesscpy/lesscpy-0.13.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
RESTRICT="test"
DESCRIPTION="A compiler written in Python for the LESS language"
-HOMEPAGE="https://pypi.org/project/lesscpy"
+HOMEPAGE="https://pypi.org/project/lesscpy/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/lesscpy/lesscpy-0.9j.ebuild b/dev-python/lesscpy/lesscpy-0.9j.ebuild
index 71ceaa3dc1b6..748908d3ee0b 100644
--- a/dev-python/lesscpy/lesscpy-0.9j.ebuild
+++ b/dev-python/lesscpy/lesscpy-0.9j.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="A compiler written in Python for the LESS language"
-HOMEPAGE="https://pypi.org/project/lesscpy"
+HOMEPAGE="https://pypi.org/project/lesscpy/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/librharris/librharris-0.1.14-r1.ebuild b/dev-python/librharris/librharris-0.1.14-r1.ebuild
index 5d13b4556bdf..eee5c5a63f30 100644
--- a/dev-python/librharris/librharris-0.1.14-r1.ebuild
+++ b/dev-python/librharris/librharris-0.1.14-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="lib_rharris"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python Internet Programming Library"
-HOMEPAGE="https://pypi.org/project/lib_rharris"
+HOMEPAGE="https://pypi.org/project/lib_rharris/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/line_profiler/line_profiler-2.0.ebuild b/dev-python/line_profiler/line_profiler-2.0.ebuild
index cd062b32d431..deafa2e96f54 100644
--- a/dev-python/line_profiler/line_profiler-2.0.ebuild
+++ b/dev-python/line_profiler/line_profiler-2.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Line-by-line profiler"
HOMEPAGE="
https://github.com/rkern/line_profiler
- https://pypi.org/project/line_profiler"
+ https://pypi.org/project/line_profiler/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64"
diff --git a/dev-python/line_profiler/line_profiler-2.1.2.ebuild b/dev-python/line_profiler/line_profiler-2.1.2.ebuild
index c5fbf69f645f..1928a30d51d9 100644
--- a/dev-python/line_profiler/line_profiler-2.1.2.ebuild
+++ b/dev-python/line_profiler/line_profiler-2.1.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Line-by-line profiler"
HOMEPAGE="
https://github.com/rkern/line_profiler
- https://pypi.org/project/line_profiler"
+ https://pypi.org/project/line_profiler/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64"
diff --git a/dev-python/llfuse/llfuse-1.3.2.ebuild b/dev-python/llfuse/llfuse-1.3.2.ebuild
index f51dd392f83b..31e87a88930b 100644
--- a/dev-python/llfuse/llfuse-1.3.2.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Python bindings for the low-level FUSE API"
-HOMEPAGE="https://bitbucket.org/nikratio/python-llfuse/ https://pypi.org/project/llfuse"
+HOMEPAGE="https://bitbucket.org/nikratio/python-llfuse/ https://pypi.org/project/llfuse/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2"
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 48de8fd0b211..308985953f77 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -2,3 +2,4 @@ DIST llvmlite-0.19.0.tar.gz 97109 BLAKE2B c4d22d130d12d7e61e9ddc177e28c6d8c3d0a1
DIST llvmlite-0.20.0.tar.gz 96753 BLAKE2B ec9cfa554f44162c0d6e755628603c9afd85642998f56ed49c2ff29c3ef975ef4ce14c6555382ca282b70d71a1ff7347c0b773b339b14345e10d3b9ac96ac55e SHA512 c2e0918e7acfba68922f60889180ec660da13ea199c9e8dfb3ac075c295baeb8c90784a6acc3c463cdd696f8f61c42226548d38db5bd8c4397a23cfa7c7ff764
DIST llvmlite-0.21.0.tar.gz 96462 BLAKE2B 8458037ca49c2c7035cc65539c1dc933f26c694e07502bfb0f37adfa389c56d715b53310fa977461fa75d7f826384a9c408682bee942e7cda6a299b16192c183 SHA512 25fb0986faf558995e6405a77d675d1dfcda2f79f8e6f5183d66a16f7b1f323df7eefb54455d9a15412c4eb88cd2e160d9f45038b7d97da6fffe78d7adc0e296
DIST llvmlite-0.22.0.gh.tar.gz 156077 BLAKE2B 1b95a0636807fcf38955b32bd5c7c19784df2cc6708f23624c047f0e9caf4eb2fc26c7a1cb778d7cc7e42b8aeaee1ed43c92bcdaf7eb2e798c25f692b96b786a SHA512 633ec4d294dc246ebff5c7931e9bea86efa28323242411f3f54bc34c99085ebaef477b5bfd8224080790a12b188308ff9662c284b360e1a2939f4fe9b84a9458
+DIST llvmlite-0.23.0.gh.tar.gz 167384 BLAKE2B f0f64f389004b8c07b40ad42bfe2aa10b06769c59c6ca84fd89c5c38e0f453bc079d435418fe19bdd5b97b9cac698eae5c537417bee181485390745b8d319fc8 SHA512 e4fa0096d73351a73b0509ca312dd79f8b4a50eeae03d7491761c68738e1c4f8204be1c2eefad71e10edfbcaef062dafa4270029e1b254febc580016aff2d3b9
diff --git a/dev-python/llvmlite/llvmlite-0.23.0.ebuild b/dev-python/llvmlite/llvmlite-0.23.0.ebuild
new file mode 100644
index 000000000000..e7d50fc0b39f
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.23.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="http://llvmlite.pydata.org/"
+# upstream slacks in making pypi releases
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=6
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ >=sys-devel/llvm-6.0.0-r1:${LLVM_MAX_SLOT}
+ sys-libs/zlib:0=
+ virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PATCHES=(
+ "${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
+)
+
+python_prepare_all() {
+ # disable -flto, we do not force it against user's wishes
+ # add -fPIC, needed to link against shared libraries
+ # plus use those vars to force our CXXFLAGS/LDFLAGS in...
+ export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
+ export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
index e4e0213f1897..b26c70c9c2a5 100644
--- a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
+++ b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Platform-independent file locking module"
-HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile"
+HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild b/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
index 76f2db772ff1..50b7b609be19 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Platform-independent file locking module"
-HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile"
+HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/logbook/logbook-0.9.1.ebuild b/dev-python/logbook/logbook-0.9.1.ebuild
index a4b48fb2bf46..f1302244d6cf 100644
--- a/dev-python/logbook/logbook-0.9.1.ebuild
+++ b/dev-python/logbook/logbook-0.9.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="A logging replacement for Python"
HOMEPAGE="https://logbook.readthedocs.io/en/stable/
https://github.com/getlogbook/logbook
- https://pypi.org/project/Logbook"
+ https://pypi.org/project/Logbook/"
SRC_URI="https://github.com/getlogbook/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/logbook/logbook-1.1.0.ebuild b/dev-python/logbook/logbook-1.1.0.ebuild
index ed0c045abf4c..2f9194af0ade 100644
--- a/dev-python/logbook/logbook-1.1.0.ebuild
+++ b/dev-python/logbook/logbook-1.1.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="A logging replacement for Python"
HOMEPAGE="https://logbook.readthedocs.io/en/stable/
https://github.com/getlogbook/logbook
- https://pypi.org/project/Logbook"
+ https://pypi.org/project/Logbook/"
SRC_URI="https://github.com/getlogbook/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/logilab-common/logilab-common-1.2.2.ebuild b/dev-python/logilab-common/logilab-common-1.2.2.ebuild
index f31be4c88a6d..8ba0caf8087d 100644
--- a/dev-python/logilab-common/logilab-common-1.2.2.ebuild
+++ b/dev-python/logilab-common/logilab-common-1.2.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
-HOMEPAGE="https://www.logilab.org/project/logilab-common https://pypi.org/project/logilab-common"
+HOMEPAGE="https://www.logilab.org/project/logilab-common https://pypi.org/project/logilab-common/"
SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/logilab-common/logilab-common-1.4.1.ebuild b/dev-python/logilab-common/logilab-common-1.4.1.ebuild
index 7ab8c0ea087e..dd8fe62baecc 100644
--- a/dev-python/logilab-common/logilab-common-1.4.1.ebuild
+++ b/dev-python/logilab-common/logilab-common-1.4.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Useful miscellaneous modules used by Logilab projects"
-HOMEPAGE="https://www.logilab.org/project/logilab-common https://pypi.org/project/logilab-common"
+HOMEPAGE="https://www.logilab.org/project/logilab-common https://pypi.org/project/logilab-common/"
SRC_URI="ftp://ftp.logilab.org/pub/common/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/louie/louie-1.1-r1.ebuild b/dev-python/louie/louie-1.1-r1.ebuild
index f503cfc6aca5..7ff8a31b7ae7 100644
--- a/dev-python/louie/louie-1.1-r1.ebuild
+++ b/dev-python/louie/louie-1.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Signal dispatching mechanism for Python"
-HOMEPAGE="https://pypi.org/project/Louie"
+HOMEPAGE="https://pypi.org/project/Louie/"
SRC_URI="mirror://pypi/L/${PN^}/${P^}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/lupy/lupy-0.2.1-r2.ebuild b/dev-python/lupy/lupy-0.2.1-r2.ebuild
index c4d802e25f44..c828e128b7ac 100644
--- a/dev-python/lupy/lupy-0.2.1-r2.ebuild
+++ b/dev-python/lupy/lupy-0.2.1-r2.ebuild
@@ -10,7 +10,7 @@ MY_PN="Lupy"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Lupy is a is a full-text indexer and search engine written in Python"
-HOMEPAGE="https://pypi.org/project/Lupy"
+HOMEPAGE="https://pypi.org/project/Lupy/"
SRC_URI="mirror://sourceforge/lupy/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/lz4/lz4-0.10.1.ebuild b/dev-python/lz4/lz4-0.10.1.ebuild
index 674622adef40..cbac3c788121 100644
--- a/dev-python/lz4/lz4-0.10.1.ebuild
+++ b/dev-python/lz4/lz4-0.10.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.org/project/lz4 https://github.com/python-lz4/python-lz4"
+HOMEPAGE="https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/lz4/lz4-0.8.2.ebuild b/dev-python/lz4/lz4-0.8.2.ebuild
index 3f4c89a25b66..91f8666013ed 100644
--- a/dev-python/lz4/lz4-0.8.2.ebuild
+++ b/dev-python/lz4/lz4-0.8.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.org/project/lz4 https://github.com/steeve/python-lz4"
+HOMEPAGE="https://pypi.org/project/lz4/ https://github.com/steeve/python-lz4"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/m2crypto/m2crypto-0.24.0.ebuild b/dev-python/m2crypto/m2crypto-0.24.0.ebuild
index 8a2d95a812ad..ce90c01e5abe 100644
--- a/dev-python/m2crypto/m2crypto-0.24.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.24.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
MY_PN="M2Crypto"
DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild b/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild
index fe1440bcf30c..a4f86f5cf7c6 100644
--- a/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.27.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
MY_PN="M2Crypto"
DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/m2crypto/m2crypto-0.27.0.ebuild b/dev-python/m2crypto/m2crypto-0.27.0.ebuild
index b4d81c3e22e8..1829934ad28e 100644
--- a/dev-python/m2crypto/m2crypto-0.27.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.27.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
MY_PN="M2Crypto"
DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/m2r/m2r-0.1.12.ebuild b/dev-python/m2r/m2r-0.1.12.ebuild
index 5e7852267000..9e4247b61b3b 100644
--- a/dev-python/m2r/m2r-0.1.12.ebuild
+++ b/dev-python/m2r/m2r-0.1.12.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r"
+HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/m2r/m2r-0.1.5.ebuild b/dev-python/m2r/m2r-0.1.5.ebuild
index e7f654f004cf..e5725d72ae3b 100644
--- a/dev-python/m2r/m2r-0.1.5.ebuild
+++ b/dev-python/m2r/m2r-0.1.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r"
+HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/m2r/m2r-0.1.6.ebuild b/dev-python/m2r/m2r-0.1.6.ebuild
index e7f654f004cf..e5725d72ae3b 100644
--- a/dev-python/m2r/m2r-0.1.6.ebuild
+++ b/dev-python/m2r/m2r-0.1.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r"
+HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/m2secret/m2secret-0.1.1-r1.ebuild b/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
index d2476abeb1ad..61a745150e74 100644
--- a/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
+++ b/dev-python/m2secret/m2secret-0.1.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Encryption and decryption module and CLI utility"
-HOMEPAGE="http://www.heikkitoivonen.net/m2secret https://pypi.org/project/m2secret"
+HOMEPAGE="http://www.heikkitoivonen.net/m2secret https://pypi.org/project/m2secret/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/maintboot/maintboot-0.1.0.ebuild b/dev-python/maintboot/maintboot-0.1.0.ebuild
index bb1409eac0f5..1571ded87d02 100644
--- a/dev-python/maintboot/maintboot-0.1.0.ebuild
+++ b/dev-python/maintboot/maintboot-0.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Run maintenance tasks outside the OS"
-HOMEPAGE="https://pypi.org/project/maintboot"
+HOMEPAGE="https://pypi.org/project/maintboot/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/mako/mako-1.0.3.ebuild b/dev-python/mako/mako-1.0.3.ebuild
index 84a95c5efc4a..11a0191f097d 100644
--- a/dev-python/mako/mako-1.0.3.ebuild
+++ b/dev-python/mako/mako-1.0.3.ebuild
@@ -11,7 +11,7 @@ MY_PN="Mako"
MY_P=${MY_PN}-${PV}
DESCRIPTION="A Python templating language"
-HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/mako/mako-1.0.6.ebuild b/dev-python/mako/mako-1.0.6.ebuild
index dd8a59488f99..93e22b35772e 100644
--- a/dev-python/mako/mako-1.0.6.ebuild
+++ b/dev-python/mako/mako-1.0.6.ebuild
@@ -11,7 +11,7 @@ MY_PN="Mako"
MY_P=${MY_PN}-${PV}
DESCRIPTION="A Python templating language"
-HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.org/project/Mako/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
index 2c045b5b1ee1..d1779b496aa2 100644
--- a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
+++ b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit twisted-r1
DESCRIPTION="An extensible, multi-protocol, multi-user, interactive application server"
-HOMEPAGE="https://github.com/twisted/mantissa https://pypi.org/project/Mantissa"
+HOMEPAGE="https://github.com/twisted/mantissa https://pypi.org/project/Mantissa/"
SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
KEYWORDS="amd64 x86"
diff --git a/dev-python/mantissa/mantissa-0.8.4.ebuild b/dev-python/mantissa/mantissa-0.8.4.ebuild
index 9e336b489043..a745d6a24ad8 100644
--- a/dev-python/mantissa/mantissa-0.8.4.ebuild
+++ b/dev-python/mantissa/mantissa-0.8.4.ebuild
@@ -8,7 +8,7 @@ inherit twisted-r1
MY_PN="${PN/m/M}"
DESCRIPTION="An extensible, multi-protocol, multi-user, interactive application server"
-HOMEPAGE="https://github.com/twisted/mantissa https://pypi.org/project/Mantissa"
+HOMEPAGE="https://github.com/twisted/mantissa https://pypi.org/project/Mantissa/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/manuel/manuel-1.8.0.ebuild b/dev-python/manuel/manuel-1.8.0.ebuild
index 9f7dfb38bde4..8b9197a65bb4 100644
--- a/dev-python/manuel/manuel-1.8.0.ebuild
+++ b/dev-python/manuel/manuel-1.8.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
inherit distutils-r1
DESCRIPTION="Manuel lets you build tested documentation"
-HOMEPAGE="https://github.com/benji-york/manuel/ https://pypi.org/project/manuel"
+HOMEPAGE="https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/markdown/markdown-2.6.5.ebuild b/dev-python/markdown/markdown-2.6.5.ebuild
index 334909bae7f2..a257e31b2178 100644
--- a/dev-python/markdown/markdown-2.6.5.ebuild
+++ b/dev-python/markdown/markdown-2.6.5.ebuild
@@ -13,7 +13,7 @@ MY_P=${MY_PN}-${PV}
DESCRIPTION="Python implementation of the markdown markup language"
HOMEPAGE="
http://www.freewisdom.org/projects/python-markdown
- https://pypi.org/project/Markdown
+ https://pypi.org/project/Markdown/
https://pythonhosted.org/Markdown/
https://github.com/waylan/Python-Markdown"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild
index c33d7cbb6f88..24caf04eba3b 100644
--- a/dev-python/markdown/markdown-2.6.8.ebuild
+++ b/dev-python/markdown/markdown-2.6.8.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Python implementation of the markdown markup language"
HOMEPAGE="
http://www.freewisdom.org/projects/python-markdown
- https://pypi.org/project/Markdown
+ https://pypi.org/project/Markdown/
https://pythonhosted.org/Markdown/
https://github.com/waylan/Python-Markdown"
SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
diff --git a/dev-python/markdown/markdown-2.6.9.ebuild b/dev-python/markdown/markdown-2.6.9.ebuild
index 0e72a636e7b0..fe96e55f6c14 100644
--- a/dev-python/markdown/markdown-2.6.9.ebuild
+++ b/dev-python/markdown/markdown-2.6.9.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Python implementation of the markdown markup language"
HOMEPAGE="
http://www.freewisdom.org/projects/python-markdown
- https://pypi.org/project/Markdown
+ https://pypi.org/project/Markdown/
https://pythonhosted.org/Markdown/
https://github.com/waylan/Python-Markdown"
SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
diff --git a/dev-python/markups/markups-2.0.0.ebuild b/dev-python/markups/markups-2.0.0.ebuild
index 085c15605a74..2f123ab52894 100644
--- a/dev-python/markups/markups-2.0.0.ebuild
+++ b/dev-python/markups/markups-2.0.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A wrapper around various text markups"
HOMEPAGE="
http://pythonhosted.org/Markups/
https://github.com/retext-project/pymarkups
- https://pypi.org/project/Markups"
+ https://pypi.org/project/Markups/"
SRC_URI="mirror://pypi/M/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/markupsafe/markupsafe-0.23.ebuild b/dev-python/markupsafe/markupsafe-0.23.ebuild
index c2450e92a50f..b95bf1f21dbd 100644
--- a/dev-python/markupsafe/markupsafe-0.23.ebuild
+++ b/dev-python/markupsafe/markupsafe-0.23.ebuild
@@ -11,7 +11,7 @@ MY_PN="MarkupSafe"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
-HOMEPAGE="https://pypi.org/project/MarkupSafe"
+HOMEPAGE="https://pypi.org/project/MarkupSafe/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
index 022d6ae8a0e9..8e97e04dfa11 100644
--- a/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
# matplotlib/backends/qt4_editor: MIT
# Fonts: BitstreamVera, OFL-1.1
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
diff --git a/dev-python/maybe/maybe-0.3.0.ebuild b/dev-python/maybe/maybe-0.3.0.ebuild
index 50e461b91ede..6a56c7734406 100644
--- a/dev-python/maybe/maybe-0.3.0.ebuild
+++ b/dev-python/maybe/maybe-0.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="See what a program does before deciding whether you really want it to happen"
-HOMEPAGE="https://github.com/p-e-w/maybe http://pypi.org/project/maybe"
+HOMEPAGE="https://github.com/p-e-w/maybe http://pypi.org/project/maybe/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/dev-python/maybe/maybe-0.4.0.ebuild b/dev-python/maybe/maybe-0.4.0.ebuild
index 175483354503..a423bd13f445 100644
--- a/dev-python/maybe/maybe-0.4.0.ebuild
+++ b/dev-python/maybe/maybe-0.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="See what a program does before deciding whether you really want it to happen"
-HOMEPAGE="https://github.com/p-e-w/maybe http://pypi.org/project/maybe"
+HOMEPAGE="https://github.com/p-e-w/maybe http://pypi.org/project/maybe/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/dev-python/mechanize/mechanize-0.2.5-r1.ebuild b/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
index afaf6ff310f1..34eb574b0ce5 100644
--- a/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
+++ b/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Stateful programmatic web browsing in Python"
-HOMEPAGE="http://wwwsearch.sourceforge.net/mechanize/ https://pypi.org/project/mechanize"
+HOMEPAGE="http://wwwsearch.sourceforge.net/mechanize/ https://pypi.org/project/mechanize/"
SRC_URI="http://wwwsearch.sourceforge.net/${PN}/src/${P}.tar.gz"
LICENSE="|| ( BSD ZPL )"
diff --git a/dev-python/medusa/medusa-0.5.4-r1.ebuild b/dev-python/medusa/medusa-0.5.4-r1.ebuild
index fdebe9119efd..9ea7f116d976 100644
--- a/dev-python/medusa/medusa-0.5.4-r1.ebuild
+++ b/dev-python/medusa/medusa-0.5.4-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="A framework for writing asynchronous long-running, high-performance network servers in Python"
-HOMEPAGE="http://www.amk.ca/python/code/medusa.html https://pypi.org/project/medusa"
+HOMEPAGE="http://www.amk.ca/python/code/medusa.html https://pypi.org/project/medusa/"
SRC_URI="http://www.amk.ca/files/python/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/meld3/meld3-1.0.2-r1.ebuild b/dev-python/meld3/meld3-1.0.2-r1.ebuild
index 422fd46f91d4..a839e35c048b 100644
--- a/dev-python/meld3/meld3-1.0.2-r1.ebuild
+++ b/dev-python/meld3/meld3-1.0.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
inherit distutils-r1
DESCRIPTION="meld3 is an HTML/XML templating engine"
-HOMEPAGE="https://github.com/supervisor/meld3 https://pypi.org/project/meld3"
+HOMEPAGE="https://github.com/supervisor/meld3 https://pypi.org/project/meld3/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="repoze"
diff --git a/dev-python/mem_top/mem_top-0.1.6.ebuild b/dev-python/mem_top/mem_top-0.1.6.ebuild
index 2fe232adce8c..908e14b6f552 100644
--- a/dev-python/mem_top/mem_top-0.1.6.ebuild
+++ b/dev-python/mem_top/mem_top-0.1.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Shows top suspects for memory leaks in your Python program"
-HOMEPAGE="https://github.com/denis-ryzhkov/mem_top https://pypi.org/project/mem_top"
+HOMEPAGE="https://github.com/denis-ryzhkov/mem_top https://pypi.org/project/mem_top/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/memory_profiler/memory_profiler-0.47.ebuild b/dev-python/memory_profiler/memory_profiler-0.47.ebuild
index 7efdfc340126..8df09d8d4b0a 100644
--- a/dev-python/memory_profiler/memory_profiler-0.47.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.47.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="A module for monitoring memory usage of a python program"
-HOMEPAGE="https://pypi.org/project/memory_profiler https://github.com/fabianp/memory_profiler"
+HOMEPAGE="https://pypi.org/project/memory_profiler/ https://github.com/fabianp/memory_profiler"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
index 3cbffc84a00e..e25e2c95092f 100644
--- a/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
+++ b/dev-python/meteor-ejson/meteor-ejson-1.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Encoder and Decoder for Extended JSON (EJSON) as used in Meteor and DDP"
-HOMEPAGE="https://pypi.org/project/meteor-ejson https://github.com/lyschoening/meteor-ejson-python"
+HOMEPAGE="https://pypi.org/project/meteor-ejson/ https://github.com/lyschoening/meteor-ejson-python"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/mimerender/mimerender-0.6.0.ebuild b/dev-python/mimerender/mimerender-0.6.0.ebuild
index a05d3de4ff37..d8f3f72a1554 100644
--- a/dev-python/mimerender/mimerender-0.6.0.ebuild
+++ b/dev-python/mimerender/mimerender-0.6.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
DESCRIPTION="RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/mimerender"
+HOMEPAGE="https://pypi.org/project/mimerender/"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-python/minimock/minimock-1.2.8-r1.ebuild b/dev-python/minimock/minimock-1.2.8-r1.ebuild
index aecf9a2a0d81..be09d2a4c471 100644
--- a/dev-python/minimock/minimock-1.2.8-r1.ebuild
+++ b/dev-python/minimock/minimock-1.2.8-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="MiniMock"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="The simplest possible mock library"
-HOMEPAGE="https://pypi.org/project/MiniMock"
+HOMEPAGE="https://pypi.org/project/MiniMock/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/mistune/mistune-0.7.2.ebuild b/dev-python/mistune/mistune-0.7.2.ebuild
index c820f81f9be2..4e44d3a572bf 100644
--- a/dev-python/mistune/mistune-0.7.2.ebuild
+++ b/dev-python/mistune/mistune-0.7.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="The fastest markdown parser in pure Python"
-HOMEPAGE="https://pypi.org/project/mistune https://github.com/lepture/mistune"
+HOMEPAGE="https://pypi.org/project/mistune/ https://github.com/lepture/mistune"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/mistune/mistune-0.7.4.ebuild b/dev-python/mistune/mistune-0.7.4.ebuild
index 34417473adf6..d4c8f276c622 100644
--- a/dev-python/mistune/mistune-0.7.4.ebuild
+++ b/dev-python/mistune/mistune-0.7.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="The fastest markdown parser in pure Python"
-HOMEPAGE="https://pypi.org/project/mistune https://github.com/lepture/mistune"
+HOMEPAGE="https://pypi.org/project/mistune/ https://github.com/lepture/mistune"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/mmh3/Manifest b/dev-python/mmh3/Manifest
index 52798523e3ba..eccec880a29f 100644
--- a/dev-python/mmh3/Manifest
+++ b/dev-python/mmh3/Manifest
@@ -1 +1,2 @@
DIST mmh3-2.3.1.tar.gz 6122 BLAKE2B 5dbc5d0cc2185d587bab061bc66edab65e92b71aefe589545439785dd1fc74cb5f4c0330fbaef2094ef3c4581e93672387e36e2f0207a261f7b06964d005992a SHA512 9ffdf23f7fe33583713daf299fad64d4e3bc3ba433eec4e1d24a47daeffa39b13aedcedd3005f2d873a01dbc2d1b1ed931eed30d09e1887eaa0980586af37cc5
+DIST mmh3-2.5.1.tar.gz 9797 BLAKE2B af83f2e93bad0160a73d93eb41528b5ad6e5e022bf82a356df95ada3e3b73e7c0ad5ce95cd62ae956e42d7b650e53794abda6cc749d7e441ec044c14b4d5de9c SHA512 1cc2bdaceda00e90355fcca990517aec77e60c2117e716cf7311a5b4aa1a78635cee16ad4d551d73ea72a18fe9c40fb24b7ff042171eae252cc4fb5660592d37
diff --git a/dev-python/mmh3/mmh3-2.3.1.ebuild b/dev-python/mmh3/mmh3-2.3.1.ebuild
index f6a4c9722004..320011a1c8cd 100644
--- a/dev-python/mmh3/mmh3-2.3.1.ebuild
+++ b/dev-python/mmh3/mmh3-2.3.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="Python library for MurmurHash3, fast and robust hash functions."
-HOMEPAGE="https://pypi.org/project/mmh3"
+HOMEPAGE="https://pypi.org/project/mmh3/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="public-domain"
diff --git a/dev-python/mmh3/mmh3-2.5.1.ebuild b/dev-python/mmh3/mmh3-2.5.1.ebuild
new file mode 100644
index 000000000000..20612ee438c5
--- /dev/null
+++ b/dev-python/mmh3/mmh3-2.5.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Python library for MurmurHash3, fast and robust hash functions."
+HOMEPAGE="https://pypi.org/project/mmh3/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/mock/mock-1.0.1-r2.ebuild b/dev-python/mock/mock-1.0.1-r2.ebuild
index 089fd9b90ce2..891538afdf95 100644
--- a/dev-python/mock/mock-1.0.1-r2.ebuild
+++ b/dev-python/mock/mock-1.0.1-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="A Python Mocking and Patching Library for Testing"
-HOMEPAGE="http://www.voidspace.org.uk/python/mock/ https://pypi.org/project/mock"
+HOMEPAGE="http://www.voidspace.org.uk/python/mock/ https://pypi.org/project/mock/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/mocker/mocker-1.1.1-r1.ebuild b/dev-python/mocker/mocker-1.1.1-r1.ebuild
index 0248cfb70a49..8ffc410daae4 100644
--- a/dev-python/mocker/mocker-1.1.1-r1.ebuild
+++ b/dev-python/mocker/mocker-1.1.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Platform for Python test doubles: mocks, stubs, fakes, and dummies"
-HOMEPAGE="http://labix.org/mocker https://pypi.org/project/mocker"
+HOMEPAGE="http://labix.org/mocker https://pypi.org/project/mocker/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="BSD"
diff --git a/dev-python/mockldap/mockldap-0.2.3.ebuild b/dev-python/mockldap/mockldap-0.2.3.ebuild
index 7423bba8ff0a..5dc47bdac1a8 100644
--- a/dev-python/mockldap/mockldap-0.2.3.ebuild
+++ b/dev-python/mockldap/mockldap-0.2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1 eutils
DESCRIPTION="A simple mock implementation of python-ldap"
-HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.org/project/mockldap"
+HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.org/project/mockldap/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/mockldap/mockldap-0.2.6.ebuild b/dev-python/mockldap/mockldap-0.2.6.ebuild
index 1b9498d2cf20..f91fb8a51ae6 100644
--- a/dev-python/mockldap/mockldap-0.2.6.ebuild
+++ b/dev-python/mockldap/mockldap-0.2.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1 eutils
DESCRIPTION="A simple mock implementation of python-ldap"
-HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.org/project/mockldap"
+HOMEPAGE="https://bitbucket.org/psagers/mockldap/ https://pypi.org/project/mockldap/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/morbid/morbid-0.8.7.3-r1.ebuild b/dev-python/morbid/morbid-0.8.7.3-r1.ebuild
index fa8fe9956f49..3aff351396da 100644
--- a/dev-python/morbid/morbid-0.8.7.3-r1.ebuild
+++ b/dev-python/morbid/morbid-0.8.7.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="A Twisted-based publish/subscribe messaging server that uses the STOMP protocol"
-HOMEPAGE="https://pypi.org/project/morbid"
+HOMEPAGE="https://pypi.org/project/morbid/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/more-itertools/more-itertools-3.0.0.ebuild b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
index 94db710e4d76..50b22feb0655 100644
--- a/dev-python/more-itertools/more-itertools-3.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
inherit distutils-r1
DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools"
+HOMEPAGE="https://pypi.org/project/more-itertools/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/mox/mox-0.5.3-r1.ebuild b/dev-python/mox/mox-0.5.3-r1.ebuild
index 4fc5a09701ac..a1bff16fc542 100644
--- a/dev-python/mox/mox-0.5.3-r1.ebuild
+++ b/dev-python/mox/mox-0.5.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="A mock object framework for Python, loosely based on EasyMock for Java"
-HOMEPAGE="https://pypi.org/project/mox"
+HOMEPAGE="https://pypi.org/project/mox/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/mpi4py/mpi4py-2.0.0.ebuild b/dev-python/mpi4py/mpi4py-2.0.0.ebuild
index 076e4f21c48f..ee20e4c6d564 100644
--- a/dev-python/mpi4py/mpi4py-2.0.0.ebuild
+++ b/dev-python/mpi4py/mpi4py-2.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Message Passing Interface for Python"
-HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py"
+HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/mpi4py/mpi4py-3.0.0.ebuild b/dev-python/mpi4py/mpi4py-3.0.0.ebuild
index ce8971862e3d..f4eebf6042af 100644
--- a/dev-python/mpi4py/mpi4py-3.0.0.ebuild
+++ b/dev-python/mpi4py/mpi4py-3.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Message Passing Interface for Python"
-HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py"
+HOMEPAGE="https://bitbucket.org/mpi4py/ https://pypi.org/project/mpi4py/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild b/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild
index 517b46b8df5e..33361917a939 100644
--- a/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild
+++ b/dev-python/mwlib-ext/mwlib-ext-0.13.2.ebuild
@@ -11,7 +11,7 @@ MY_PN="${PN/-/.}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Extension module to mwlib to pull in reportlab"
-HOMEPAGE="http://code.pediapress.com/wiki/wiki https://pypi.org/project/mwlib.ext"
+HOMEPAGE="http://code.pediapress.com/wiki/wiki https://pypi.org/project/mwlib.ext/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="BSD"
diff --git a/dev-python/myghty/myghty-1.2-r1.ebuild b/dev-python/myghty/myghty-1.2-r1.ebuild
index ee1fc90edb7c..66668284403b 100644
--- a/dev-python/myghty/myghty-1.2-r1.ebuild
+++ b/dev-python/myghty/myghty-1.2-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="Myghty"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Template and view-controller framework derived from HTML::Mason"
-HOMEPAGE="http://www.myghty.org/ https://pypi.org/project/Myghty"
+HOMEPAGE="http://www.myghty.org/ https://pypi.org/project/Myghty/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild b/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild
index 1b813f6593e9..556f6b1641df 100644
--- a/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild
+++ b/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="MyghtyUtils"
MY_P=${MY_PN}-${PV}
DESCRIPTION="Set of utility classes used by Myghty templating"
-HOMEPAGE="http://www.myghty.org https://pypi.org/project/MyghtyUtils"
+HOMEPAGE="http://www.myghty.org https://pypi.org/project/MyghtyUtils/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="MIT"
diff --git a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
index 0da0e240f1fe..2c9febb9ea39 100644
--- a/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 flag-o-matic
MY_P="MySQL-python-${PV}"
DESCRIPTION="Python interface to MySQL"
-HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.org/project/MySQL-python"
+HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.org/project/MySQL-python/"
SRC_URI="mirror://sourceforge/mysql-python/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
index a9dc7da6a74a..809eaa37f000 100644
--- a/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.5-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="MySQL-python"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python interface to MySQL"
-HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.org/project/MySQL-python"
+HOMEPAGE="https://sourceforge.net/projects/mysql-python/ https://pypi.org/project/MySQL-python/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="GPL-2"
diff --git a/dev-python/natsort/natsort-4.0.4.ebuild b/dev-python/natsort/natsort-4.0.4.ebuild
index 94d5d1d39638..498975f6f3b5 100644
--- a/dev-python/natsort/natsort-4.0.4.ebuild
+++ b/dev-python/natsort/natsort-4.0.4.ebuild
@@ -10,7 +10,7 @@ RESTRICT="test"
inherit distutils-r1
DESCRIPTION="Natural sorting for Python"
-HOMEPAGE="https://pypi.org/project/natsort"
+HOMEPAGE="https://pypi.org/project/natsort/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
index 2a11a4e6294e..99e961e55593 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
HOMEPAGE="
https://github.com/cedadev/ndg_httpsclient/
- https://pypi.org/project/ndg-httpsclient"
+ https://pypi.org/project/ndg-httpsclient/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
index a142c0a16b0e..6f43d4f8b6da 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
HOMEPAGE="
https://github.com/cedadev/ndg_httpsclient/
- https://pypi.org/project/ndg-httpsclient"
+ https://pypi.org/project/ndg-httpsclient/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.12.ebuild b/dev-python/netaddr/netaddr-0.7.12.ebuild
index ae8c0c1bd680..b395360e7eea 100644
--- a/dev-python/netaddr/netaddr-0.7.12.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.12.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit distutils-r1
DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.13.ebuild b/dev-python/netaddr/netaddr-0.7.13.ebuild
index 908ab660ef37..fd70f55936f6 100644
--- a/dev-python/netaddr/netaddr-0.7.13.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.13.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
inherit distutils-r1
DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.14.ebuild b/dev-python/netaddr/netaddr-0.7.14.ebuild
index 908ab660ef37..fd70f55936f6 100644
--- a/dev-python/netaddr/netaddr-0.7.14.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.14.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
inherit distutils-r1
DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.15.ebuild b/dev-python/netaddr/netaddr-0.7.15.ebuild
index db4a9eacff54..b35cb285b468 100644
--- a/dev-python/netaddr/netaddr-0.7.15.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.15.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
inherit distutils-r1
DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.17.ebuild b/dev-python/netaddr/netaddr-0.7.17.ebuild
index 7bd6a4662804..73d87be8652c 100644
--- a/dev-python/netaddr/netaddr-0.7.17.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.17.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
inherit distutils-r1
DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr https://netaddr.readthedocs.org"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr/ https://netaddr.readthedocs.org"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.18.ebuild b/dev-python/netaddr/netaddr-0.7.18.ebuild
index 11383cd75de8..ed3f6b584d38 100644
--- a/dev-python/netaddr/netaddr-0.7.18.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.18.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr https://netaddr.readthedocs.org"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr/ https://netaddr.readthedocs.org"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/netaddr/netaddr-0.7.19.ebuild b/dev-python/netaddr/netaddr-0.7.19.ebuild
index 592112ae62d5..4266e494c78f 100644
--- a/dev-python/netaddr/netaddr-0.7.19.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.19.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr https://netaddr.readthedocs.org"
+HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr/ https://netaddr.readthedocs.org"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/nevow/nevow-0.11.1.ebuild b/dev-python/nevow/nevow-0.11.1.ebuild
index e901ef9d460b..5522b434193c 100644
--- a/dev-python/nevow/nevow-0.11.1.ebuild
+++ b/dev-python/nevow/nevow-0.11.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit twisted-r1
DESCRIPTION="A web templating framework that provides LivePage, an automatic AJAX toolkit"
-HOMEPAGE="https://github.com/twisted/nevow https://pypi.org/project/Nevow"
+HOMEPAGE="https://github.com/twisted/nevow https://pypi.org/project/Nevow/"
SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/nevow/nevow-0.14.3.ebuild b/dev-python/nevow/nevow-0.14.3.ebuild
index 44c46db055d3..91f8d3cffa5f 100644
--- a/dev-python/nevow/nevow-0.14.3.ebuild
+++ b/dev-python/nevow/nevow-0.14.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit twisted-r1
DESCRIPTION="A web templating framework that provides LivePage, an automatic AJAX toolkit"
-HOMEPAGE="https://github.com/twisted/nevow https://pypi.org/project/Nevow"
+HOMEPAGE="https://github.com/twisted/nevow https://pypi.org/project/Nevow/"
SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/node-semver/node-semver-0.2.0.ebuild b/dev-python/node-semver/node-semver-0.2.0.ebuild
index ca4f56cfe2cd..990728b59e42 100644
--- a/dev-python/node-semver/node-semver-0.2.0.ebuild
+++ b/dev-python/node-semver/node-semver-0.2.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Python version of node-semver, the semantic versioner for npm"
HOMEPAGE="
- https://pypi.org/project/node-semver
+ https://pypi.org/project/node-semver/
https://github.com/podhmo/python-semver
https://github.com/npm/node-semver"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
index fb3c29db4ccf..da8765cfb9ce 100644
--- a/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
+++ b/dev-python/nose-cover3/nose-cover3-0.1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Coverage 3.x support for Nose"
-HOMEPAGE="https://github.com/ask/nosecover3 https://pypi.org/project/nose-cover3"
+HOMEPAGE="https://github.com/ask/nosecover3 https://pypi.org/project/nose-cover3/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
diff --git a/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild b/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
index 1048f9466f65..0ea2ae6ca400 100644
--- a/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
+++ b/dev-python/nose-descriptionfixer/nose-descriptionfixer-0.0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3)
inherit distutils-r1
DESCRIPTION="Fix the way tests are described when the verbose flag is used"
-HOMEPAGE="https://pypi.org/project/nose-descriptionfixer"
+HOMEPAGE="https://pypi.org/project/nose-descriptionfixer/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
index 54a2e800059c..05bd248f2231 100644
--- a/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
+++ b/dev-python/nose-show-skipped/nose-show-skipped-0.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A nose plugin to show skipped tests and their messages"
HOMEPAGE="https://github.com/cpcloud/nose-show-skipped
- https://pypi.org/project/nose-show-skipped"
+ https://pypi.org/project/nose-show-skipped/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/nose/nose-1.3.7-r1.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
index 934cdf20d5c2..98650c11bb11 100644
--- a/dev-python/nose/nose-1.3.7-r1.ebuild
+++ b/dev-python/nose/nose-1.3.7-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
HOMEPAGE="
- https://pypi.org/project/nose
+ https://pypi.org/project/nose/
https://nose.readthedocs.io/en/latest/
https://bitbucket.org/jpellerin/nose"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
index 46721a398c35..a9fa699fcc6b 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
HOMEPAGE="
- https://pypi.org/project/nose
+ https://pypi.org/project/nose/
https://nose.readthedocs.io/en/latest/
https://bitbucket.org/jpellerin/nose"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index 40d1e3da5492..d3f5375f2559 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 git-r3
DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
HOMEPAGE="
- https://pypi.org/project/nose
+ https://pypi.org/project/nose/
https://nose.readthedocs.io/en/latest/
https://github.com/nose-devs/nose"
SRC_URI=""
diff --git a/dev-python/numpydoc/numpydoc-0.6.0.ebuild b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
index a88581ddac2b..0985da99df23 100644
--- a/dev-python/numpydoc/numpydoc-0.6.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.org/project/numpydoc"
+HOMEPAGE="https://pypi.org/project/numpydoc/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/numpydoc/numpydoc-0.7.0.ebuild b/dev-python/numpydoc/numpydoc-0.7.0.ebuild
index 7b77412a0956..7a3f961da19a 100644
--- a/dev-python/numpydoc/numpydoc-0.7.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.7.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.org/project/numpydoc"
+HOMEPAGE="https://pypi.org/project/numpydoc/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/oauth/oauth-1.0.1-r1.ebuild b/dev-python/oauth/oauth-1.0.1-r1.ebuild
index 6167bf95f854..32feaddc9414 100644
--- a/dev-python/oauth/oauth-1.0.1-r1.ebuild
+++ b/dev-python/oauth/oauth-1.0.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Python OAuth module"
-HOMEPAGE="https://pypi.org/project/oauth"
+HOMEPAGE="https://pypi.org/project/oauth/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
index e9fe9bc012f5..9587054d0e20 100644
--- a/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
+++ b/dev-python/oauth2/oauth2-1.9.0_p1-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_P="${P/_p/.post}"
DESCRIPTION="Library for OAuth version 1.0"
-HOMEPAGE="https://pypi.org/project/oauth2"
+HOMEPAGE="https://pypi.org/project/oauth2/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/oauthlib/oauthlib-1.0.3.ebuild b/dev-python/oauthlib/oauthlib-1.0.3.ebuild
index 5b96331b654b..ff23121c83e7 100644
--- a/dev-python/oauthlib/oauthlib-1.0.3.ebuild
+++ b/dev-python/oauthlib/oauthlib-1.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/oauthlib/oauthlib-2.0.2.ebuild b/dev-python/oauthlib/oauthlib-2.0.2.ebuild
index f518acd47adb..174c88ceaf92 100644
--- a/dev-python/oauthlib/oauthlib-2.0.2.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/oauthlib/oauthlib-2.0.3.ebuild b/dev-python/oauthlib/oauthlib-2.0.3.ebuild
index 856cd966b676..229e91a32f81 100644
--- a/dev-python/oauthlib/oauthlib-2.0.3.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/oauthlib/oauthlib-2.0.6.ebuild b/dev-python/oauthlib/oauthlib-2.0.6.ebuild
index 67ecb85ce590..8a6c26105c4d 100644
--- a/dev-python/oauthlib/oauthlib-2.0.6.ebuild
+++ b/dev-python/oauthlib/oauthlib-2.0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.org/project/oauthlib/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/oct2py/oct2py-3.6.0.ebuild b/dev-python/oct2py/oct2py-3.6.0.ebuild
index ee31ba5db8c1..9c4d8531d8d1 100644
--- a/dev-python/oct2py/oct2py-3.6.0.ebuild
+++ b/dev-python/oct2py/oct2py-3.6.0.ebuild
@@ -9,14 +9,14 @@ inherit distutils-r1
DESCRIPTION="Python to GNU Octave bridge"
HOMEPAGE="
- https://pypi.org/project/oct2py
+ https://pypi.org/project/oct2py/
http://pythonhosted.org/oct2py/
https://github.com/blink1073/oct2py"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
RDEPEND="
diff --git a/dev-python/odfpy/odfpy-1.3.2.ebuild b/dev-python/odfpy/odfpy-1.3.2.ebuild
index aff677fdae50..dbf7843a186a 100644
--- a/dev-python/odfpy/odfpy-1.3.2.ebuild
+++ b/dev-python/odfpy/odfpy-1.3.2.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Python API and tools to manipulate OpenDocument files"
-HOMEPAGE="https://github.com/eea/odfpy https://pypi.org/project/odfpy"
+HOMEPAGE="https://github.com/eea/odfpy https://pypi.org/project/odfpy/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
diff --git a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild
index b2b6039a2fc6..c7fabb9fae34 100644
--- a/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild
+++ b/dev-python/onkyo-eiscp/onkyo-eiscp-1.2.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Control Onkyo A/V receivers over the network"
-HOMEPAGE="https://github.com/miracle2k/onkyo-eiscp https://pypi.org/project/onkyo-eiscp"
+HOMEPAGE="https://github.com/miracle2k/onkyo-eiscp https://pypi.org/project/onkyo-eiscp/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/optcomplete/optcomplete-1.2-r1.ebuild b/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
index 07c458fce397..4c8787527dee 100644
--- a/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
+++ b/dev-python/optcomplete/optcomplete-1.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Shell completion self-generator for Python"
-HOMEPAGE="http://furius.ca/optcomplete/ https://pypi.org/project/optcomplete"
+HOMEPAGE="http://furius.ca/optcomplete/ https://pypi.org/project/optcomplete/"
SRC_URI="http://furius.ca/downloads/${PN}/releases/${P}.tar.bz2"
LICENSE="BSD"
diff --git a/dev-python/ordereddict/ordereddict-1.1.ebuild b/dev-python/ordereddict/ordereddict-1.1.ebuild
index 62d615f6e8ec..deaab2dc1126 100644
--- a/dev-python/ordereddict/ordereddict-1.1.ebuild
+++ b/dev-python/ordereddict/ordereddict-1.1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
DESCRIPTION="A drop-in substitute for Py2.7's new collections.OrderedDict that
works in Python 2.4-2.6."
-HOMEPAGE="https://pypi.org/project/ordereddict"
+HOMEPAGE="https://pypi.org/project/ordereddict/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/os-testr/os-testr-0.8.0.ebuild b/dev-python/os-testr/os-testr-0.8.0.ebuild
index 09967afaf4b9..2d40ad42d518 100644
--- a/dev-python/os-testr/os-testr-0.8.0.ebuild
+++ b/dev-python/os-testr/os-testr-0.8.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
-HOMEPAGE="https://pypi.org/project/os-testr https://github.com/openstack/os-testr"
+HOMEPAGE="https://pypi.org/project/os-testr/ https://github.com/openstack/os-testr"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/os-testr/os-testr-1.0.0.ebuild b/dev-python/os-testr/os-testr-1.0.0.ebuild
index 7694997f6449..5a0030949c9b 100644
--- a/dev-python/os-testr/os-testr-1.0.0.ebuild
+++ b/dev-python/os-testr/os-testr-1.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
-HOMEPAGE="https://pypi.org/project/os-testr https://github.com/openstack/os-testr"
+HOMEPAGE="https://pypi.org/project/os-testr/ https://github.com/openstack/os-testr"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild
index d3382e4bb3fd..ed5295ed6687 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.21.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
inherit distutils-r1
DESCRIPTION="library for running multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.org/project/oslo.concurrency"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
S="${WORKDIR}/oslo.concurrency-${PV}"
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
index 6fde2da6a5fb..2ad09d4f7f9c 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
inherit distutils-r1
DESCRIPTION="library for running multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.org/project/oslo.concurrency"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
S="${WORKDIR}/oslo.concurrency-${PV}"
diff --git a/dev-python/oslo-context/oslo-context-2.17.1.ebuild b/dev-python/oslo-context/oslo-context-2.17.1.ebuild
index 193fbf54cac1..a15d99081703 100644
--- a/dev-python/oslo-context/oslo-context-2.17.1.ebuild
+++ b/dev-python/oslo-context/oslo-context-2.17.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.org/project/oslo.context"
+HOMEPAGE="https://pypi.org/project/oslo.context/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/oslo-context/oslo-context-2.20.0.ebuild b/dev-python/oslo-context/oslo-context-2.20.0.ebuild
index a7c4af53c851..0f7316ab62a9 100644
--- a/dev-python/oslo-context/oslo-context-2.20.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-2.20.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.org/project/oslo.context"
+HOMEPAGE="https://pypi.org/project/oslo.context/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/oslo-log/oslo-log-3.30.2.ebuild b/dev-python/oslo-log/oslo-log-3.30.2.ebuild
index e8a278784282..4ccdef1ed046 100644
--- a/dev-python/oslo-log/oslo-log-3.30.2.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.30.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
-HOMEPAGE="https://pypi.org/project/oslo.log https://github.com/openstack/oslo.log"
+HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
S="${WORKDIR}/oslo.log-${PV}"
diff --git a/dev-python/oslo-log/oslo-log-3.36.0.ebuild b/dev-python/oslo-log/oslo-log-3.36.0.ebuild
index 5c8b426b2af8..2b4668f8ad2b 100644
--- a/dev-python/oslo-log/oslo-log-3.36.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.36.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
-HOMEPAGE="https://pypi.org/project/oslo.log https://github.com/openstack/oslo.log"
+HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
S="${WORKDIR}/oslo.log-${PV}"
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild
index c1efa56a3f32..62cff0e18125 100644
--- a/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-5.30.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging"
+HOMEPAGE="https://pypi.org/project/oslo.messaging/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
S="${WORKDIR}/oslo.messaging-${PV}"
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild
index 9f7d4630dd3f..07c3ab2359d9 100644
--- a/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging"
+HOMEPAGE="https://pypi.org/project/oslo.messaging/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
S="${WORKDIR}/oslo.messaging-${PV}"
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.30.1.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.30.1.ebuild
index a1b6017540df..5bd3a6a717af 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.30.1.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.30.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.org/project/oslo.middleware"
+HOMEPAGE="https://pypi.org/project/oslo.middleware/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
S="${WORKDIR}/oslo.middleware-${PV}"
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
index f8e9e8d72173..003bfdead91d 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.org/project/oslo.middleware"
+HOMEPAGE="https://pypi.org/project/oslo.middleware/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
S="${WORKDIR}/oslo.middleware-${PV}"
diff --git a/dev-python/oslo-policy/oslo-policy-1.25.2.ebuild b/dev-python/oslo-policy/oslo-policy-1.25.2.ebuild
index 18e95fc1efe1..f85a91c1c899 100644
--- a/dev-python/oslo-policy/oslo-policy-1.25.2.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-1.25.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.policy"
+HOMEPAGE="https://pypi.org/project/oslo.policy/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild b/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild
index 4b4b30ab0089..9fdb94430d8b 100644
--- a/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.policy"
+HOMEPAGE="https://pypi.org/project/oslo.policy/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.22.1-r1.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.22.1-r1.ebuild
index ab6cf4a6404f..c9918f283dba 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.22.1-r1.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.22.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="OpenStack library for privilege separation."
-HOMEPAGE="https://pypi.org/project/oslo.privsep"
+HOMEPAGE="https://pypi.org/project/oslo.privsep/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
S="${WORKDIR}/oslo.privsep-${PV}"
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild
index e0a8d4a46bce..dce004766288 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.27.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="OpenStack library for privilege separation."
-HOMEPAGE="https://pypi.org/project/oslo.privsep"
+HOMEPAGE="https://pypi.org/project/oslo.privsep/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
S="${WORKDIR}/oslo.privsep-${PV}"
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild
index fe399ebe6dbe..ab7a8860c81a 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.13.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.config"
+HOMEPAGE="https://pypi.org/project/oslo.config/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
S="${WORKDIR}/oslo.rootwrap-${PV}"
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.2.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.2.ebuild
index 27c545975fab..4d3a89dac8ee 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.2.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.config"
+HOMEPAGE="https://pypi.org/project/oslo.config/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
S="${WORKDIR}/oslo.rootwrap-${PV}"
diff --git a/dev-python/oslo-service/oslo-service-1.25.1.ebuild b/dev-python/oslo-service/oslo-service-1.25.1.ebuild
index 2d0fab3a202b..05fa5b0841be 100644
--- a/dev-python/oslo-service/oslo-service-1.25.1.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.25.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.service"
+HOMEPAGE="https://pypi.org/project/oslo.service/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
S="${WORKDIR}/oslo.service-${PV}"
diff --git a/dev-python/oslo-service/oslo-service-1.29.0.ebuild b/dev-python/oslo-service/oslo-service-1.29.0.ebuild
index f63f13c05c43..c28e700b488e 100644
--- a/dev-python/oslo-service/oslo-service-1.29.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.29.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.service"
+HOMEPAGE="https://pypi.org/project/oslo.service/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
S="${WORKDIR}/oslo.service-${PV}"
diff --git a/dev-python/oslo-vmware/oslo-vmware-2.23.1.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.23.1.ebuild
index d39ac6819ab1..5046316b91af 100644
--- a/dev-python/oslo-vmware/oslo-vmware-2.23.1.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-2.23.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Oslo VMware library for OpenStack projects"
-HOMEPAGE="https://pypi.org/project/oslo.vmware"
+HOMEPAGE="https://pypi.org/project/oslo.vmware/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
S="${WORKDIR}/oslo.vmware-${PV}"
diff --git a/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild
index 1273309ff7c4..8dbdbd08e3db 100644
--- a/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-2.26.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Oslo VMware library for OpenStack projects"
-HOMEPAGE="https://pypi.org/project/oslo.vmware"
+HOMEPAGE="https://pypi.org/project/oslo.vmware/"
SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
S="${WORKDIR}/oslo.vmware-${PV}"
diff --git a/dev-python/pSQL/metadata.xml b/dev-python/pSQL/metadata.xml
index 6f7676e92615..e24dd86faa2a 100644
--- a/dev-python/pSQL/metadata.xml
+++ b/dev-python/pSQL/metadata.xml
@@ -1,11 +1,7 @@
-
- ercpe@gentoo.org
- Johann Schmitz
-
-
+
python@gentoo.org
Python
diff --git a/dev-python/packaging/packaging-16.8.ebuild b/dev-python/packaging/packaging-16.8.ebuild
index ecc0f3af7c74..08fac28d7652 100644
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="https://github.com/pypa/packaging https://pypi.org/project/packaging"
+HOMEPAGE="https://github.com/pypa/packaging https://pypi.org/project/packaging/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pafy/pafy-0.5.3.1.ebuild b/dev-python/pafy/pafy-0.5.3.1.ebuild
index 4e220e20d419..32ed10be2f0f 100644
--- a/dev-python/pafy/pafy-0.5.3.1.ebuild
+++ b/dev-python/pafy/pafy-0.5.3.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Python library to retrieve YouTube content and metadata"
-HOMEPAGE="http://np1.github.io/pafy/ https://pypi.org/project/pafy"
+HOMEPAGE="http://np1.github.io/pafy/ https://pypi.org/project/pafy/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
diff --git a/dev-python/pafy/pafy-0.5.4.ebuild b/dev-python/pafy/pafy-0.5.4.ebuild
index a869215b7bfa..2d7bf8d2a18f 100644
--- a/dev-python/pafy/pafy-0.5.4.ebuild
+++ b/dev-python/pafy/pafy-0.5.4.ebuild
@@ -14,7 +14,7 @@ else
fi
DESCRIPTION="Python library to retrieve YouTube content and metadata"
-HOMEPAGE="http://np1.github.io/pafy/ https://pypi.org/project/pafy"
+HOMEPAGE="http://np1.github.io/pafy/ https://pypi.org/project/pafy/"
LICENSE="LGPL-3"
SLOT="0"
diff --git a/dev-python/pafy/pafy-9999.ebuild b/dev-python/pafy/pafy-9999.ebuild
index ef6f57f7f74e..b80d154fc81e 100644
--- a/dev-python/pafy/pafy-9999.ebuild
+++ b/dev-python/pafy/pafy-9999.ebuild
@@ -14,7 +14,7 @@ else
fi
DESCRIPTION="Python library to retrieve YouTube content and metadata"
-HOMEPAGE="http://np1.github.io/pafy/ https://pypi.org/project/pafy"
+HOMEPAGE="http://np1.github.io/pafy/ https://pypi.org/project/pafy/"
LICENSE="LGPL-3"
SLOT="0"
diff --git a/dev-python/paisley/paisley-0.3.1-r1.ebuild b/dev-python/paisley/paisley-0.3.1-r1.ebuild
index 7c2f95d563ab..c65280a7e8e3 100644
--- a/dev-python/paisley/paisley-0.3.1-r1.ebuild
+++ b/dev-python/paisley/paisley-0.3.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Paisley is a CouchDB client written in Python to be used within a Twisted application"
-HOMEPAGE="https://launchpad.net/paisley https://pypi.org/project/paisley"
+HOMEPAGE="https://launchpad.net/paisley https://pypi.org/project/paisley/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/parso/parso-0.1.1.ebuild b/dev-python/parso/parso-0.1.1.ebuild
index 591dff1b4af9..336f9f03c9d4 100644
--- a/dev-python/parso/parso-0.1.1.ebuild
+++ b/dev-python/parso/parso-0.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso"
+HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/paste/paste-2.0.3-r1.ebuild b/dev-python/paste/paste-2.0.3-r1.ebuild
index d82596378003..babdf62124f0 100644
--- a/dev-python/paste/paste-2.0.3-r1.ebuild
+++ b/dev-python/paste/paste-2.0.3-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="Paste"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
-HOMEPAGE="https://pypi.org/project/Paste"
+HOMEPAGE="https://pypi.org/project/Paste/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
index a1e80dcc0c4f..f23af57e0f7c 100644
--- a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="PasteDeploy"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.org/project/PasteDeploy"
+HOMEPAGE="https://pypi.org/project/PasteDeploy/"
# pypi tarball does not include tests
SRC_URI="https://bitbucket.org/ianb/pastedeploy/get/${PV}.tar.gz -> ${P}-r1.tar.gz"
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
index 6d6b0695f139..d52292e3ec2c 100644
--- a/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2.ebuild
@@ -10,7 +10,7 @@ MY_PN="PasteDeploy"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.org/project/PasteDeploy"
+HOMEPAGE="https://pypi.org/project/PasteDeploy/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pastescript/pastescript-2.0.2-r1.ebuild b/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
index b13bed551fbb..de7027b53bae 100644
--- a/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
+++ b/dev-python/pastescript/pastescript-2.0.2-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="PasteScript"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A pluggable command-line frontend, including commands to setup package file layouts"
-HOMEPAGE="https://pypi.org/project/PasteScript"
+HOMEPAGE="https://pypi.org/project/PasteScript/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/path-py/path-py-10.3.1.ebuild b/dev-python/path-py/path-py-10.3.1.ebuild
index 1ab2e8b56091..02da0634526c 100644
--- a/dev-python/path-py/path-py-10.3.1.ebuild
+++ b/dev-python/path-py/path-py-10.3.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_P="path.py-${PV}"
DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="https://pypi.org/project/path.py https://github.com/jaraco/path.py"
+HOMEPAGE="https://pypi.org/project/path.py/ https://github.com/jaraco/path.py"
SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
SLOT="0"
diff --git a/dev-python/path-py/path-py-8.1.2.ebuild b/dev-python/path-py/path-py-8.1.2.ebuild
index 6487f6b140d5..a3b8091144cf 100644
--- a/dev-python/path-py/path-py-8.1.2.ebuild
+++ b/dev-python/path-py/path-py-8.1.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_P="path.py-${PV}"
DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="https://pypi.org/project/path.py https://github.com/jaraco/path.py"
+HOMEPAGE="https://pypi.org/project/path.py/ https://github.com/jaraco/path.py"
SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pbkdf2/pbkdf2-1.3.ebuild b/dev-python/pbkdf2/pbkdf2-1.3.ebuild
index 93c9cd914792..687817024c0c 100644
--- a/dev-python/pbkdf2/pbkdf2-1.3.ebuild
+++ b/dev-python/pbkdf2/pbkdf2-1.3.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
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Implementation of the password-based key derivation function, PBKDF2, specified in RSA PKCS#5 v2.0"
-HOMEPAGE="http://www.dlitz.net/software/python-pbkdf2/"
+HOMEPAGE="https://www.dlitz.net/software/python-pbkdf2/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pdoc/pdoc-0.3.2.ebuild b/dev-python/pdoc/pdoc-0.3.2.ebuild
index c10af369fda3..41732eaf5cbe 100644
--- a/dev-python/pdoc/pdoc-0.3.2.ebuild
+++ b/dev-python/pdoc/pdoc-0.3.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Simple program and library to auto generate API documentation for Python modules"
-HOMEPAGE="https://pypi.org/project/pdoc https://github.com/BurntSushi/pdoc"
+HOMEPAGE="https://pypi.org/project/pdoc/ https://github.com/BurntSushi/pdoc"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pecan/pecan-1.0.4.ebuild b/dev-python/pecan/pecan-1.0.4.ebuild
index 2a65e6d84fc3..f249cf867aee 100644
--- a/dev-python/pecan/pecan-1.0.4.ebuild
+++ b/dev-python/pecan/pecan-1.0.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="A WSGI object-dispatching web framework, lean, fast, with few dependencies."
-HOMEPAGE="https://pypi.org/project/pecan"
+HOMEPAGE="https://pypi.org/project/pecan/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pecan/pecan-1.1.2.ebuild b/dev-python/pecan/pecan-1.1.2.ebuild
index e38ee7b80d4a..188513bc2234 100644
--- a/dev-python/pecan/pecan-1.1.2.ebuild
+++ b/dev-python/pecan/pecan-1.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="A WSGI object-dispatching web framework, lean, fast, with few dependencies."
-HOMEPAGE="https://pypi.org/project/pecan"
+HOMEPAGE="https://pypi.org/project/pecan/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pecan/pecan-1.2.1.ebuild b/dev-python/pecan/pecan-1.2.1.ebuild
index 02419b98bbaf..9bb4eac67eff 100644
--- a/dev-python/pecan/pecan-1.2.1.ebuild
+++ b/dev-python/pecan/pecan-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
inherit distutils-r1
DESCRIPTION="A WSGI object-dispatching web framework, lean, fast, with few dependencies."
-HOMEPAGE="https://pypi.org/project/pecan"
+HOMEPAGE="https://pypi.org/project/pecan/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pelican-minify/pelican-minify-0.9.ebuild b/dev-python/pelican-minify/pelican-minify-0.9.ebuild
index 84be22dab757..5cfa1c5bbab6 100644
--- a/dev-python/pelican-minify/pelican-minify-0.9.ebuild
+++ b/dev-python/pelican-minify/pelican-minify-0.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="An HTML minification plugin for Pelican, the static site generator."
-HOMEPAGE="https://pypi.org/project/pelican-minify"
+HOMEPAGE="https://pypi.org/project/pelican-minify/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Unlicense"
diff --git a/dev-python/pep8/pep8-1.5.6.ebuild b/dev-python/pep8/pep8-1.5.6.ebuild
index e9fbbba130d6..82b0b924852a 100644
--- a/dev-python/pep8/pep8-1.5.6.ebuild
+++ b/dev-python/pep8/pep8-1.5.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.org/project/pep8"
+HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.org/project/pep8/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pep8/pep8-1.5.7.ebuild b/dev-python/pep8/pep8-1.5.7.ebuild
index f1bebd1cae34..5eec74d76bb5 100644
--- a/dev-python/pep8/pep8-1.5.7.ebuild
+++ b/dev-python/pep8/pep8-1.5.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.org/project/pep8"
+HOMEPAGE="https://github.com/jcrocholl/pep8 https://pypi.org/project/pep8/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pep8/pep8-1.7.0.ebuild b/dev-python/pep8/pep8-1.7.0.ebuild
index a7e60b7c9fb9..17171746b219 100644
--- a/dev-python/pep8/pep8-1.7.0.ebuild
+++ b/dev-python/pep8/pep8-1.7.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/PyCQA/pep8 https://pypi.org/project/pep8"
+HOMEPAGE="https://github.com/PyCQA/pep8 https://pypi.org/project/pep8/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/peppercorn/peppercorn-0.5.ebuild b/dev-python/peppercorn/peppercorn-0.5.ebuild
index 352e208a8d73..68ca60da1bbb 100644
--- a/dev-python/peppercorn/peppercorn-0.5.ebuild
+++ b/dev-python/peppercorn/peppercorn-0.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="A library for converting a token stream into a data structure for use in web form posts"
-HOMEPAGE="https://github.com/Pylons/peppercorn https://pypi.org/project/peppercorn"
+HOMEPAGE="https://github.com/Pylons/peppercorn https://pypi.org/project/peppercorn/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="repoze"
diff --git a/dev-python/pew/pew-1.1.1.ebuild b/dev-python/pew/pew-1.1.1.ebuild
index 764c8cd917be..6522126be14a 100644
--- a/dev-python/pew/pew-1.1.1.ebuild
+++ b/dev-python/pew/pew-1.1.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="tool to manage multiple virtualenvs written in pure python"
HOMEPAGE="
https://github.com/berdario/pew
- https://pypi.org/project/pew"
+ https://pypi.org/project/pew/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pgpdump/pgpdump-1.5.ebuild b/dev-python/pgpdump/pgpdump-1.5.ebuild
index cfd8127ebc2d..7ef02ee5ea31 100644
--- a/dev-python/pgpdump/pgpdump-1.5.ebuild
+++ b/dev-python/pgpdump/pgpdump-1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="PGP packet parser library"
-HOMEPAGE="https://pypi.org/project/pgpdump https://github.com/toofishes/python-pgpdump"
+HOMEPAGE="https://pypi.org/project/pgpdump/ https://github.com/toofishes/python-pgpdump"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/phonenumbers/metadata.xml b/dev-python/phonenumbers/metadata.xml
index be4f069d2123..a00296d9a77f 100644
--- a/dev-python/phonenumbers/metadata.xml
+++ b/dev-python/phonenumbers/metadata.xml
@@ -1,10 +1,7 @@
-
- ercpe@gentoo.org
- Johann Schmitz (ercpe)
-
+
daviddrysdale/python-phonenumbers
diff --git a/dev-python/pid/pid-2.1.1.ebuild b/dev-python/pid/pid-2.1.1.ebuild
index c25edf5a62ca..0f1bc39f4bec 100644
--- a/dev-python/pid/pid-2.1.1.ebuild
+++ b/dev-python/pid/pid-2.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Pidfile featuring stale detection and file-locking"
-HOMEPAGE="https://pypi.org/project/pid https://github.com/trbs/pid/"
+HOMEPAGE="https://pypi.org/project/pid/ https://github.com/trbs/pid/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pid/pid-2.2.0.ebuild b/dev-python/pid/pid-2.2.0.ebuild
index 1f45823e4466..c8a0972a69eb 100644
--- a/dev-python/pid/pid-2.2.0.ebuild
+++ b/dev-python/pid/pid-2.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Pidfile featuring stale detection and file-locking"
-HOMEPAGE="https://pypi.org/project/pid https://github.com/trbs/pid/"
+HOMEPAGE="https://pypi.org/project/pid/ https://github.com/trbs/pid/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/piexif/piexif-1.0.12.ebuild b/dev-python/piexif/piexif-1.0.12.ebuild
index 810f323b5f63..4f17b0000c92 100644
--- a/dev-python/piexif/piexif-1.0.12.ebuild
+++ b/dev-python/piexif/piexif-1.0.12.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Exif manipulation with pure Python"
HOMEPAGE="https://github.com/hMatoba/Piexif
- https://pypi.org/project/piexif"
+ https://pypi.org/project/piexif/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
diff --git a/dev-python/piexif/piexif-1.0.13.ebuild b/dev-python/piexif/piexif-1.0.13.ebuild
index 22bb6312313a..36b6a197b6b7 100644
--- a/dev-python/piexif/piexif-1.0.13.ebuild
+++ b/dev-python/piexif/piexif-1.0.13.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Exif manipulation with pure Python"
HOMEPAGE="https://github.com/hMatoba/Piexif
- https://pypi.org/project/piexif"
+ https://pypi.org/project/piexif/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
diff --git a/dev-python/piexif/piexif-1.1.0_beta0.ebuild b/dev-python/piexif/piexif-1.1.0_beta0.ebuild
index 0f0edd7ea3eb..054de93221c4 100644
--- a/dev-python/piexif/piexif-1.1.0_beta0.ebuild
+++ b/dev-python/piexif/piexif-1.1.0_beta0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_P=${PN}-${PV/_beta/b}
DESCRIPTION="Exif manipulation with pure Python"
HOMEPAGE="https://github.com/hMatoba/Piexif
- https://pypi.org/project/piexif"
+ https://pypi.org/project/piexif/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
LICENSE="MIT"
diff --git a/dev-python/pillow/pillow-3.4.2-r1.ebuild b/dev-python/pillow/pillow-3.4.2-r1.ebuild
index 7f169f5f119a..e0bec4a91770 100644
--- a/dev-python/pillow/pillow-3.4.2-r1.ebuild
+++ b/dev-python/pillow/pillow-3.4.2-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN=Pillow
MY_P=${MY_PN}-${PV}
DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.org/project/Pillow"
+HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.org/project/Pillow/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="HPND"
diff --git a/dev-python/pipenv/pipenv-9.0.0-r1.ebuild b/dev-python/pipenv/pipenv-9.0.0-r1.ebuild
index d1c68dab1f5f..c712c07422c5 100644
--- a/dev-python/pipenv/pipenv-9.0.0-r1.ebuild
+++ b/dev-python/pipenv/pipenv-9.0.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pipenv/pipenv-9.0.0.ebuild b/dev-python/pipenv/pipenv-9.0.0.ebuild
index af88b67292e5..8dbb87311781 100644
--- a/dev-python/pipenv/pipenv-9.0.0.ebuild
+++ b/dev-python/pipenv/pipenv-9.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pkginfo/pkginfo-1.2.1.ebuild b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
index f8eaa7b03588..fa3f709090a4 100644
--- a/dev-python/pkginfo/pkginfo-1.2.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="https://pypi.org/project/pkginfo"
+HOMEPAGE="https://pypi.org/project/pkginfo/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
IUSE="doc examples"
diff --git a/dev-python/pkginfo/pkginfo-1.4.2.ebuild b/dev-python/pkginfo/pkginfo-1.4.2.ebuild
index e1ba9597b682..cabf02ebdad9 100644
--- a/dev-python/pkginfo/pkginfo-1.4.2.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.4.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="https://pypi.org/project/pkginfo"
+HOMEPAGE="https://pypi.org/project/pkginfo/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pluggy/pluggy-0.5.2.ebuild b/dev-python/pluggy/pluggy-0.5.2.ebuild
index 1424c16e30d0..e8b47647de2a 100644
--- a/dev-python/pluggy/pluggy-0.5.2.ebuild
+++ b/dev-python/pluggy/pluggy-0.5.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy"
+HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pluggy/pluggy-0.6.0.ebuild b/dev-python/pluggy/pluggy-0.6.0.ebuild
index 74ab2b537eef..8a2feccd98dd 100644
--- a/dev-python/pluggy/pluggy-0.6.0.ebuild
+++ b/dev-python/pluggy/pluggy-0.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy"
+HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/ply/ply-3.10.ebuild b/dev-python/ply/ply-3.10.ebuild
index 46a3c2d89f92..8c37d3355255 100644
--- a/dev-python/ply/ply-3.10.ebuild
+++ b/dev-python/ply/ply-3.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
index de22eaf34f61..80f5cbb26b22 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/ply/ply-3.6-r1.ebuild b/dev-python/ply/ply-3.6-r1.ebuild
index 3d508e33a46a..78f274043f99 100644
--- a/dev-python/ply/ply-3.6-r1.ebuild
+++ b/dev-python/ply/ply-3.6-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/ply/ply-3.9.ebuild b/dev-python/ply/ply-3.9.ebuild
index 7b1ea5caa633..80720fd928a5 100644
--- a/dev-python/ply/ply-3.9.ebuild
+++ b/dev-python/ply/ply-3.9.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pockets/pockets-0.3.ebuild b/dev-python/pockets/pockets-0.3.ebuild
index c1ce16a273d5..8c2e94a4f706 100644
--- a/dev-python/pockets/pockets-0.3.ebuild
+++ b/dev-python/pockets/pockets-0.3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
IUSE="test"
DESCRIPTION="A collection of helpful Python tools"
-HOMEPAGE="https://pypi.org/project/pockets"
+HOMEPAGE="https://pypi.org/project/pockets/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pockets/pockets-0.5.1.ebuild b/dev-python/pockets/pockets-0.5.1.ebuild
index 027744cd2906..a46ea7dfc62c 100644
--- a/dev-python/pockets/pockets-0.5.1.ebuild
+++ b/dev-python/pockets/pockets-0.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Collection of helpful Python tools"
-HOMEPAGE="https://pypi.org/project/pockets"
+HOMEPAGE="https://pypi.org/project/pockets/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/portend/portend-2.2.ebuild b/dev-python/portend/portend-2.2.ebuild
index 7f2fbbd27660..00198751fa08 100644
--- a/dev-python/portend/portend-2.2.ebuild
+++ b/dev-python/portend/portend-2.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="TCP port monitoring utilities"
-HOMEPAGE="https://pypi.org/project/portend https://github.com/jaraco/portend"
+HOMEPAGE="https://pypi.org/project/portend/ https://github.com/jaraco/portend"
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index fe1ab019e37a..63e130c33ad5 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
HOMEPAGE="https://python-hyper.org/priority/en/latest/
https://github.com/python-hyper/priority
- https://pypi.org/project/priority"
+ https://pypi.org/project/priority/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/process-tests/process-tests-1.2.0.ebuild b/dev-python/process-tests/process-tests-1.2.0.ebuild
index 2040c4123575..e0b4d4c65d3f 100644
--- a/dev-python/process-tests/process-tests-1.2.0.ebuild
+++ b/dev-python/process-tests/process-tests-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Tools for testing processes"
-HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests"
+HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/processing/processing-0.52-r1.ebuild b/dev-python/processing/processing-0.52-r1.ebuild
index 3f5e362fcc39..1682aa23d70a 100644
--- a/dev-python/processing/processing-0.52-r1.ebuild
+++ b/dev-python/processing/processing-0.52-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Package for using processes, which mimics the threading module API"
-HOMEPAGE="https://pypi.org/project/processing"
+HOMEPAGE="https://pypi.org/project/processing/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="BSD"
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
index 1fbbcd28a319..069f85214218 100644
--- a/dev-python/progress/progress-1.2.ebuild
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit bash-completion-r1 distutils-r1
DESCRIPTION="Easy to use progress bars"
-HOMEPAGE="https://pypi.org/project/progress https://github.com/verigak/progress/"
+HOMEPAGE="https://pypi.org/project/progress/ https://github.com/verigak/progress/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/progress/progress-1.3.ebuild b/dev-python/progress/progress-1.3.ebuild
index 0f54c0162853..0ca6269f7ad5 100644
--- a/dev-python/progress/progress-1.3.ebuild
+++ b/dev-python/progress/progress-1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit bash-completion-r1 distutils-r1
DESCRIPTION="Easy to use progress bars"
-HOMEPAGE="https://pypi.org/project/progress https://github.com/verigak/progress/"
+HOMEPAGE="https://pypi.org/project/progress/ https://github.com/verigak/progress/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/progressbar/progressbar-2.3-r3.ebuild b/dev-python/progressbar/progressbar-2.3-r3.ebuild
index 1882439d8ba0..0ed9a3ba1c95 100644
--- a/dev-python/progressbar/progressbar-2.3-r3.ebuild
+++ b/dev-python/progressbar/progressbar-2.3-r3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3)
inherit distutils-r1
DESCRIPTION="Text progressbar library for python"
-HOMEPAGE="https://pypi.org/project/progressbar"
+HOMEPAGE="https://pypi.org/project/progressbar/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-2.1 BSD )"
diff --git a/dev-python/prometheus_client/prometheus_client-0.1.1.ebuild b/dev-python/prometheus_client/prometheus_client-0.1.1.ebuild
index b1c1d0351c70..23d531c51c0e 100644
--- a/dev-python/prometheus_client/prometheus_client-0.1.1.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client"
+HOMEPAGE="https://pypi.org/project/prometheus_client/"
SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild
index 49e9f09b1ea6..a86c3230d43f 100644
--- a/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.2.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client"
+HOMEPAGE="https://pypi.org/project/prometheus_client/"
SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/promise/promise-0.4.2.ebuild b/dev-python/promise/promise-0.4.2.ebuild
index c525cf2211b8..56bc6a936ddf 100644
--- a/dev-python/promise/promise-0.4.2.ebuild
+++ b/dev-python/promise/promise-0.4.2.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1
DESCRIPTION="Bytecode optimisation using staticness assertions"
-HOMEPAGE="https://github.com/rfk/promise/ https://pypi.org/project/promise"
+HOMEPAGE="https://github.com/rfk/promise/ https://pypi.org/project/promise/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 44f48926c1df..aa6d99043ce0 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,4 +1,3 @@
-DIST protobuf-3.1.0.tar.gz 4051503 BLAKE2B af93f125a6b7b3e0be6f50ff5eaabe0db21f62b01a694d37c0b069956ef5d658df1beef68514b00a22005a36293b4a8a18654b5656f8c614309f0a744039c2fb SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a
DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe6ec0d07f6a6136f5564f0e85306005440ca6f8c4eb834c7c70f909792c9e2457a761f10f95431981263a9acd7a3 SHA512 471e52198fa878a79183dc8fbc39d9c65239be4d9dff799e12281ee9b1af61a427584534b1baae1773bc6e4c86467f89ca2e7911a21effd86bc5f40cc7d94c34
DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch b/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch
deleted file mode 100644
index c0b7aadcd6f5..000000000000
--- a/dev-python/protobuf-python/files/protobuf-python-3.0.0_beta3-link-against-installed-lib.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur python/setup.py python/setup.py
---- python/setup.py 2015-12-30 22:21:46.000000000 +0100
-+++ python/setup.py 2016-04-18 00:51:49.490809789 +0200
-@@ -190,15 +190,27 @@
- extra_compile_args.append('-Werror')
- sys.argv.remove(warnings_as_errors)
-
-+ inclD = ['.', '../src']
-+ libD = []
-+ try:
-+ subprocess.check_call(['pkg-config', '--exists', 'protobuf'])
-+ inclD += subprocess.check_output(['pkg-config','--variable=includedir','protobuf']).decode().split()
-+ libD = subprocess.check_output(['pkg-config','--variable=libdir','protobuf']).decode().split()
-+ except OSError as osex:
-+ if osex.errno == errno.ENOENT:
-+ info('pkg-config not found')
-+ else:
-+ warn("Running pkg-config failed - %s." % osex)
-+ libD = ['../src/.libs']
- # C++ implementation extension
- ext_module_list.extend([
- Extension(
- "google.protobuf.pyext._message",
- glob.glob('google/protobuf/pyext/*.cc'),
-- include_dirs=[".", "../src"],
-+ include_dirs=inclD,
- libraries=libraries,
- extra_objects=extra_objects,
-- library_dirs=['../src/.libs'],
-+ library_dirs=libD,
- extra_compile_args=extra_compile_args,
- ),
- Extension(
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch
new file mode 100644
index 000000000000..d1e1d745ab7c
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-3.5.2-google.protobuf.pyext._message.MessageMeta.patch
@@ -0,0 +1,26 @@
+https://github.com/google/protobuf/pull/4365
+
+--- /python/google/protobuf/pyext/message.cc
++++ /python/google/protobuf/pyext/message.cc
+@@ -402,12 +402,6 @@
+ return result.release();
+ }
+
+-static PyGetSetDef Getters[] = {
+- {"_extensions_by_name", (getter)GetExtensionsByName, NULL},
+- {"_extensions_by_number", (getter)GetExtensionsByNumber, NULL},
+- {NULL}
+-};
+-
+ } // namespace message_meta
+
+ PyTypeObject CMessageClass_Type = {
+@@ -440,7 +434,7 @@
+ 0, // tp_iternext
+ 0, // tp_methods
+ 0, // tp_members
+- message_meta::Getters, // tp_getset
++ 0, // tp_getset
+ 0, // tp_base
+ 0, // tp_dict
+ 0, // tp_descr_get
diff --git a/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild
deleted file mode 100644
index c0b3867674b9..000000000000
--- a/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# pypy fails tests; pypy3 fails even running tests
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/-beta-}
-MY_PV=${MY_PV/_p/.}
-
-DESCRIPTION="Google's Protocol Buffers - official Python bindings"
-HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
-SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/11"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-# Protobuf is only a build-time dep, but depends on the exact same version
-# (excluding revision), since we are using the same tarball.
-# In case of using the (linked) cpp implementation we should be fine with the same subslot.
-RDEPEND="${PYTHON_DEPS}
- !
+
-
- ercpe@gentoo.org
- Johann Schmitz
-
python@gentoo.org
Python
diff --git a/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild b/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild
index 828519807499..b2a85cadc4b2 100644
--- a/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild
+++ b/dev-python/pyacoustid/pyacoustid-1.0.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Python module for Chromaprint acoustic fingerprinting and the Acoustid API"
-HOMEPAGE="https://pypi.org/project/pyacoustid"
+HOMEPAGE="https://pypi.org/project/pyacoustid/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyaes/pyaes-1.6.0.ebuild b/dev-python/pyaes/pyaes-1.6.0.ebuild
index de024d61c62a..903f0ae4facf 100644
--- a/dev-python/pyaes/pyaes-1.6.0.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Pure-Python Implementation of the AES block-cipher and common modes of operation"
-HOMEPAGE="https://pypi.org/project/pyaes"
+HOMEPAGE="https://pypi.org/project/pyaes/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyaes/pyaes-1.6.1.ebuild b/dev-python/pyaes/pyaes-1.6.1.ebuild
index 2525b680205c..a81a67d89df2 100644
--- a/dev-python/pyaes/pyaes-1.6.1.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Pure-Python Implementation of the AES block-cipher and common modes of operation"
-HOMEPAGE="https://pypi.org/project/pyaes"
+HOMEPAGE="https://pypi.org/project/pyaes/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
index e95c9035a7f2..46e93bfe9d2c 100644
--- a/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
+++ b/dev-python/pyalsaaudio/pyalsaaudio-0.7-r2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A Python wrapper for the ALSA API"
HOMEPAGE="https://www.sourceforge.net/projects/pyalsaaudio
- https://pypi.org/project/pyalsaaudio"
+ https://pypi.org/project/pyalsaaudio/"
SRC_URI="mirror://sourceforge/pyalsaaudio/${P}.tar.gz
mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild b/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
index 0291e403e5f5..eb17553e3bdf 100644
--- a/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
+++ b/dev-python/pyalsaaudio/pyalsaaudio-0.8.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 toolchain-funcs
DESCRIPTION="A Python wrapper for the ALSA API"
HOMEPAGE="https://www.sourceforge.net/projects/pyalsaaudio
- https://pypi.org/project/pyalsaaudio"
+ https://pypi.org/project/pyalsaaudio/"
SRC_URI="mirror://sourceforge/pyalsaaudio/${P}.tar.gz
mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pyamf/pyamf-0.8.0.ebuild b/dev-python/pyamf/pyamf-0.8.0.ebuild
index da2aa6f63295..56c1298452e2 100644
--- a/dev-python/pyamf/pyamf-0.8.0.ebuild
+++ b/dev-python/pyamf/pyamf-0.8.0.ebuild
@@ -11,7 +11,7 @@ MY_PN=PyAMF
MY_P=${MY_PN}-${PV}
DESCRIPTION="Action Message Format (AMF) support for Python"
-HOMEPAGE="https://github.com/hydralabs/pyamf https://pypi.org/project/PyAMF"
+HOMEPAGE="https://github.com/hydralabs/pyamf https://pypi.org/project/PyAMF/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
index 4e7f2c7ed6cb..f2c5dd570cf2 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
index 944c5d4f439d..26db30f19615 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
index 0c528264db1b..f6a76a1feb34 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
index 4e7f2c7ed6cb..f2c5dd570cf2 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.1.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
index 9ec368dc9ab3..8a13b03c04ed 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="pyasn1 modules"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1-modules/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pyasn1/pyasn1-0.2.3.ebuild b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
index 1d1badd8803e..6c7aa5e20553 100644
--- a/dev-python/pyasn1/pyasn1-0.2.3.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.2.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1/"
SRC_URI="https://github.com/etingof/pyasn1/archive/${PV}.tar.gz -> ${P}.tar.gz"
# The required doc/source/conf.py file is missing from the pypi:
# https://github.com/etingof/pyasn1/issues/35
diff --git a/dev-python/pyasn1/pyasn1-0.3.7.ebuild b/dev-python/pyasn1/pyasn1-0.3.7.ebuild
index 2c48421a921c..b4757dacd0be 100644
--- a/dev-python/pyasn1/pyasn1-0.3.7.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.3.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.org/project/pyasn1/"
SRC_URI="https://github.com/etingof/pyasn1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
# The required doc/source/conf.py file is missing from the pypi:
# https://github.com/etingof/pyasn1/issues/35
diff --git a/dev-python/pyblake2/pyblake2-1.1.0.ebuild b/dev-python/pyblake2/pyblake2-1.1.0.ebuild
index 22ceaaeb582f..77c6ac290d84 100644
--- a/dev-python/pyblake2/pyblake2-1.1.0.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="BLAKE2 hash function extension module"
-HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.org/project/pyblake2"
+HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.org/project/pyblake2/"
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
# pyblake2 itself allows more licenses but blake2 allows the following three
diff --git a/dev-python/pyblake2/pyblake2-1.1.1.ebuild b/dev-python/pyblake2/pyblake2-1.1.1.ebuild
index 4a10a7e77002..16fc87b33886 100644
--- a/dev-python/pyblake2/pyblake2-1.1.1.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="BLAKE2 hash function extension module"
-HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.org/project/pyblake2"
+HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.org/project/pyblake2/"
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
# pyblake2 itself allows more licenses but blake2 allows the following three
diff --git a/dev-python/pyblake2/pyblake2-1.1.2.ebuild b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
index 4a10a7e77002..16fc87b33886 100644
--- a/dev-python/pyblake2/pyblake2-1.1.2.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="BLAKE2 hash function extension module"
-HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.org/project/pyblake2"
+HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.org/project/pyblake2/"
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
# pyblake2 itself allows more licenses but blake2 allows the following three
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild
index a4fe6bab938c..65443b8ab46a 100644
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.11-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/pybloomfiltermmap"
+HOMEPAGE="https://pypi.org/project/pybloomfiltermmap/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild
index 02f9d92ccac4..3a6a6175ca97 100644
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.14.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/pybloomfiltermmap"
+HOMEPAGE="https://pypi.org/project/pybloomfiltermmap/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
index a97656b4d3b2..9ddb44c2c3be 100644
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A Bloom filter (bloomfilter) for Python built on mmap"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/pybloomfiltermmap"
+HOMEPAGE="https://pypi.org/project/pybloomfiltermmap/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/pycadf/pycadf-2.6.0.ebuild b/dev-python/pycadf/pycadf-2.6.0.ebuild
index 64af85a8b0ad..666ea42076d8 100644
--- a/dev-python/pycadf/pycadf-2.6.0.ebuild
+++ b/dev-python/pycadf/pycadf-2.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.org/project/pycadf"
+HOMEPAGE="https://pypi.org/project/pycadf/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/pycadf/pycadf-2.7.0.ebuild b/dev-python/pycadf/pycadf-2.7.0.ebuild
index 0131e0a94e09..4bd358b75c36 100644
--- a/dev-python/pycadf/pycadf-2.7.0.ebuild
+++ b/dev-python/pycadf/pycadf-2.7.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.org/project/pycadf"
+HOMEPAGE="https://pypi.org/project/pycadf/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/pycdio/pycdio-0.20-r1.ebuild b/dev-python/pycdio/pycdio-0.20-r1.ebuild
index cd240baf212e..3e7c20678893 100644
--- a/dev-python/pycdio/pycdio-0.20-r1.ebuild
+++ b/dev-python/pycdio/pycdio-0.20-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Python OO interface to libcdio (CD Input and Control library)"
-HOMEPAGE="https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio"
+HOMEPAGE="https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pychecker/pychecker-0.8.19-r1.ebuild b/dev-python/pychecker/pychecker-0.8.19-r1.ebuild
index 6f10896a5ffd..9fe47ad621f2 100644
--- a/dev-python/pychecker/pychecker-0.8.19-r1.ebuild
+++ b/dev-python/pychecker/pychecker-0.8.19-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Python source code checking tool"
-HOMEPAGE="http://pychecker.sourceforge.net/ https://pypi.org/project/PyChecker"
+HOMEPAGE="http://pychecker.sourceforge.net/ https://pypi.org/project/PyChecker/"
SRC_URI="mirror://sourceforge/pychecker/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild b/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild
index d5461a3aa6cc..ffdcef0bbb10 100644
--- a/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild
+++ b/dev-python/pyclamav/pyclamav-0.4.1-r2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Python binding for libclamav"
HOMEPAGE="https://xael.org/norman/python/pyclamav/
- https://pypi.org/project/pyclamav"
+ https://pypi.org/project/pyclamav/"
SRC_URI="https://xael.org/norman/python/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pycmd/pycmd-1.2.ebuild b/dev-python/pycmd/pycmd-1.2.ebuild
index 94517d6fbd16..2e4846f7df0a 100644
--- a/dev-python/pycmd/pycmd-1.2.ebuild
+++ b/dev-python/pycmd/pycmd-1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="pycmd: tools for managing/searching Python related files"
-HOMEPAGE="https://pypi.org/project/pycmd"
+HOMEPAGE="https://pypi.org/project/pycmd/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild
index a44cd5d6ae02..875a490fe5ec 100644
--- a/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle"
+HOMEPAGE="https://pypi.org/project/pycodestyle/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pycodestyle/pycodestyle-2.1.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.1.0.ebuild
index a44cd5d6ae02..875a490fe5ec 100644
--- a/dev-python/pycodestyle/pycodestyle-2.1.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle"
+HOMEPAGE="https://pypi.org/project/pycodestyle/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pycodestyle/pycodestyle-2.2.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.2.0.ebuild
index 1b63d179dd12..b4831ef4d106 100644
--- a/dev-python/pycodestyle/pycodestyle-2.2.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle"
+HOMEPAGE="https://pypi.org/project/pycodestyle/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
index d55fb4d14bc9..6f1be99b311c 100644
--- a/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle"
+HOMEPAGE="https://pypi.org/project/pycodestyle/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
index b66290382c7d..33ff67ea4eba 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 flag-o-matic
DESCRIPTION="Python Cryptography Toolkit"
HOMEPAGE="https://www.dlitz.net/software/pycrypto/
- https://pypi.org/project/pycrypto"
+ https://pypi.org/project/pycrypto/"
SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
LICENSE="PSF-2 public-domain"
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
index 1abfce8d237c..7f0578c17ea1 100644
--- a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome"
+HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2 Unlicense"
diff --git a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
index f70d7056d922..eb61b04973c7 100644
--- a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
+++ b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
@@ -11,7 +11,7 @@ MY_P="${P}.${NUM}"
DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
HOMEPAGE="https://tahoe-lafs.org/trac/pycryptopp
- https://pypi.org/project/pycryptopp"
+ https://pypi.org/project/pycryptopp/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild b/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
index adc00405016b..3a4257ebfa77 100644
--- a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
+++ b/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
@@ -11,7 +11,7 @@ MY_P="${P}.${NUM}"
DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
HOMEPAGE="https://tahoe-lafs.org/trac/pycryptopp
- https://pypi.org/project/pycryptopp"
+ https://pypi.org/project/pycryptopp/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pycuda/pycuda-2012.1.ebuild b/dev-python/pycuda/pycuda-2012.1.ebuild
index 62b943dca773..30d96f63d3fd 100644
--- a/dev-python/pycuda/pycuda-2012.1.ebuild
+++ b/dev-python/pycuda/pycuda-2012.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit cuda distutils-r1 multilib
DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pycuda/pycuda-2013.1.1.ebuild b/dev-python/pycuda/pycuda-2013.1.1.ebuild
index 095c58af06a2..ba7813d1236b 100644
--- a/dev-python/pycuda/pycuda-2013.1.1.ebuild
+++ b/dev-python/pycuda/pycuda-2013.1.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit cuda distutils-r1 multilib
DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pycuda/pycuda-2014.1.ebuild b/dev-python/pycuda/pycuda-2014.1.ebuild
index a77e438bb913..01a938b97315 100644
--- a/dev-python/pycuda/pycuda-2014.1.ebuild
+++ b/dev-python/pycuda/pycuda-2014.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 )
inherit cuda distutils-r1 multilib
DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pycuda/pycuda-2016.1.2.ebuild b/dev-python/pycuda/pycuda-2016.1.2.ebuild
index 1c92a093febb..cd62cabbb5cc 100644
--- a/dev-python/pycuda/pycuda-2016.1.2.ebuild
+++ b/dev-python/pycuda/pycuda-2016.1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit cuda distutils-r1
DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pycuda/pycuda-9999.ebuild b/dev-python/pycuda/pycuda-9999.ebuild
index 270394921369..69e43e000380 100644
--- a/dev-python/pycuda/pycuda-9999.ebuild
+++ b/dev-python/pycuda/pycuda-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit cuda distutils-r1 git-r3 multilib
DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda"
+HOMEPAGE="http://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
SRC_URI=""
EGIT_REPO_URI="http://git.tiker.net/trees/pycuda.git"
diff --git a/dev-python/pycurl/pycurl-7.43.0.ebuild b/dev-python/pycurl/pycurl-7.43.0.ebuild
index c7dbf0537b36..171d54abcf8f 100644
--- a/dev-python/pycurl/pycurl-7.43.0.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
DESCRIPTION="python binding for curl/libcurl"
HOMEPAGE="
https://github.com/pycurl/pycurl
- https://pypi.org/project/pycurl
+ https://pypi.org/project/pycurl/
http://pycurl.io/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild b/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
index d851688a0d2a..cab527f304bf 100644
--- a/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
+++ b/dev-python/pydispatcher/pydispatcher-2.0.5.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 vcs-snapshot
MY_PN="PyDispatcher"
DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism"
-HOMEPAGE="http://pydispatcher.sourceforge.net/ https://pypi.org/project/PyDispatcher"
+HOMEPAGE="http://pydispatcher.sourceforge.net/ https://pypi.org/project/PyDispatcher/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild b/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
index b2751b3e56e0..2ebd0863de3b 100644
--- a/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
+++ b/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
MY_P="PyPyDispatcher-${PV}"
DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism"
-HOMEPAGE="https://github.com/scrapy/pypydispatcher https://pypi.org/project/PyPyDispatcher"
+HOMEPAGE="https://github.com/scrapy/pypydispatcher https://pypi.org/project/PyPyDispatcher/"
SRC_URI="mirror://pypi/${MY_P::1}/${MY_P%-*}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pydns/pydns-2.3.6-r1.ebuild b/dev-python/pydns/pydns-2.3.6-r1.ebuild
index aa0c7069d5a9..5299102538ad 100644
--- a/dev-python/pydns/pydns-2.3.6-r1.ebuild
+++ b/dev-python/pydns/pydns-2.3.6-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Python module for DNS (Domain Name Service)"
-HOMEPAGE="http://pydns.sourceforge.net/ https://pypi.org/project/pydns"
+HOMEPAGE="http://pydns.sourceforge.net/ https://pypi.org/project/pydns/"
SRC_URI="http://downloads.sourceforge.net/project/pydns/pydns/${P}/${P}.tar.gz"
LICENSE="CNRI"
diff --git a/dev-python/pydot/pydot-1.0.28-r2.ebuild b/dev-python/pydot/pydot-1.0.28-r2.ebuild
index ba9699da7a99..da31180ccee8 100644
--- a/dev-python/pydot/pydot-1.0.28-r2.ebuild
+++ b/dev-python/pydot/pydot-1.0.28-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="https://pypi.org/project/pydot"
+HOMEPAGE="https://pypi.org/project/pydot/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pydot/pydot-1.2.3.ebuild b/dev-python/pydot/pydot-1.2.3.ebuild
index b392c2fb8ea1..4bfa795fb7a0 100644
--- a/dev-python/pydot/pydot-1.2.3.ebuild
+++ b/dev-python/pydot/pydot-1.2.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="https://github.com/erocarrera/pydot https://pypi.org/project/pydot"
+HOMEPAGE="https://github.com/erocarrera/pydot https://pypi.org/project/pydot/"
# pypi releases don't include tests
SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/pyee/pyee-1.0.2.ebuild b/dev-python/pyee/pyee-1.0.2.ebuild
index efcf88a17a8a..1a5599beb7bb 100644
--- a/dev-python/pyee/pyee-1.0.2.ebuild
+++ b/dev-python/pyee/pyee-1.0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="A port of node.js's EventEmitter to python"
-HOMEPAGE="https://pypi.org/project/pyee https://github.com/jfhbrook/pyee"
+HOMEPAGE="https://pypi.org/project/pyee/ https://github.com/jfhbrook/pyee"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pyelftools/pyelftools-0.24.ebuild b/dev-python/pyelftools/pyelftools-0.24.ebuild
index 635e8d2112a8..55a39ace5b73 100644
--- a/dev-python/pyelftools/pyelftools-0.24.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.24.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
-HOMEPAGE="https://pypi.org/project/pyelftools https://github.com/eliben/pyelftools"
+HOMEPAGE="https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="public-domain"
diff --git a/dev-python/pyenchant/pyenchant-1.6.6.ebuild b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
index 707d7c4c51b8..d1be637659cd 100644
--- a/dev-python/pyenchant/pyenchant-1.6.6.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Python bindings for the Enchant spellchecking system"
-HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.org/project/pyenchant"
+HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.org/project/pyenchant/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/pyenchant/pyenchant-1.6.8.ebuild b/dev-python/pyenchant/pyenchant-1.6.8.ebuild
index e7477a21833c..231416986750 100644
--- a/dev-python/pyenchant/pyenchant-1.6.8.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Python bindings for the Enchant spellchecking system"
-HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.org/project/pyenchant"
+HOMEPAGE="http://pyenchant.sourceforge.net https://pypi.org/project/pyenchant/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/pyfakefs/pyfakefs-3.3.ebuild b/dev-python/pyfakefs/pyfakefs-3.3.ebuild
index a8be46e716c0..90ad50e7d4ec 100644
--- a/dev-python/pyfakefs/pyfakefs-3.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.3.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
inherit distutils-r1
DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild b/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
index 98a68ad0f141..926d69bae8ec 100644
--- a/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.4.1.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
inherit distutils-r1
DESCRIPTION="a fake file system that mocks the Python file system modules"
-HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/pyflakes/pyflakes-0.8.1.ebuild b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
index f73e43967fb9..e746c0fade6a 100644
--- a/dev-python/pyflakes/pyflakes-0.8.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-0.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes"
+HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyflakes/pyflakes-1.0.0.ebuild b/dev-python/pyflakes/pyflakes-1.0.0.ebuild
index d3df3b74dfd0..47702137e1b6 100644
--- a/dev-python/pyflakes/pyflakes-1.0.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes"
+HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyflakes/pyflakes-1.2.3.ebuild b/dev-python/pyflakes/pyflakes-1.2.3.ebuild
index 6394e4df0641..d63fb5820a01 100644
--- a/dev-python/pyflakes/pyflakes-1.2.3.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.2.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes"
+HOMEPAGE="https://launchpad.net/pyflakes https://pypi.org/project/pyflakes/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyflakes/pyflakes-1.6.0.ebuild b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
index 6766f4b76f9e..424eca573114 100644
--- a/dev-python/pyflakes/pyflakes-1.6.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-1.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes"
+HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
index a8ea9ea3ad35..a176fa4b0a4d 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ssl(+)"
inherit distutils-r1
DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib"
+HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
index 1cd92b21b137..785da1a4fb6b 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ssl(+)"
inherit distutils-r1
DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib"
+HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pygit2/pygit2-0.26.3.ebuild b/dev-python/pygit2/pygit2-0.26.3.ebuild
index 46c3dc73ae13..bfbe4773f7f9 100644
--- a/dev-python/pygit2/pygit2-0.26.3.ebuild
+++ b/dev-python/pygit2/pygit2-0.26.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1 eapi7-ver
DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2-with-linking-exception"
diff --git a/dev-python/pygit2/pygit2-0.26.4.ebuild b/dev-python/pygit2/pygit2-0.26.4.ebuild
index 07238b38cf44..aaf291a7b44b 100644
--- a/dev-python/pygit2/pygit2-0.26.4.ebuild
+++ b/dev-python/pygit2/pygit2-0.26.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1 eapi7-ver
DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2-with-linking-exception"
diff --git a/dev-python/pygit2/pygit2-0.27.0.ebuild b/dev-python/pygit2/pygit2-0.27.0.ebuild
index 07238b38cf44..aaf291a7b44b 100644
--- a/dev-python/pygit2/pygit2-0.27.0.ebuild
+++ b/dev-python/pygit2/pygit2-0.27.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1 eapi7-ver
DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2"
+HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.org/project/pygit2/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2-with-linking-exception"
diff --git a/dev-python/pygments/pygments-2.1.1.ebuild b/dev-python/pygments/pygments-2.1.1.ebuild
index 6f298a83d102..2f23f9db6c7e 100644
--- a/dev-python/pygments/pygments-2.1.1.ebuild
+++ b/dev-python/pygments/pygments-2.1.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="Pygments"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments"
+HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pygments/pygments-2.2.0.ebuild b/dev-python/pygments/pygments-2.2.0.ebuild
index 0857df29d0e4..0ea8a1b1dcef 100644
--- a/dev-python/pygments/pygments-2.2.0.ebuild
+++ b/dev-python/pygments/pygments-2.2.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="Pygments"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments"
+HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pygraphviz/pygraphviz-1.2.ebuild b/dev-python/pygraphviz/pygraphviz-1.2.ebuild
index 48a1981f7238..c4a7bc3f7843 100644
--- a/dev-python/pygraphviz/pygraphviz-1.2.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="http://networkx.lanl.gov/pygraphviz/ https://pypi.org/project/pygraphviz"
+HOMEPAGE="http://networkx.lanl.gov/pygraphviz/ https://pypi.org/project/pygraphviz/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild b/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild
index a47c5e797521..eee4ec377aa1 100644
--- a/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild
+++ b/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="PyGTKHelpers is a library to assist the building of PyGTK applications"
HOMEPAGE="https://pythonhosted.org/pygtkhelpers/
- https://pypi.org/project/pygtkhelpers"
+ https://pypi.org/project/pygtkhelpers/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index 357aafd9588b..42b9925a1bc3 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="Python module used for monitoring filesystems events"
-HOMEPAGE="http://trac.dbzteam.org/pyinotify https://pypi.org/project/pyinotify"
+HOMEPAGE="http://trac.dbzteam.org/pyinotify https://pypi.org/project/pyinotify/"
SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyjade/metadata.xml b/dev-python/pyjade/metadata.xml
index b725ea14b866..221dfc297a5b 100644
--- a/dev-python/pyjade/metadata.xml
+++ b/dev-python/pyjade/metadata.xml
@@ -5,10 +5,6 @@
dolsen@gentoo.org
Brian Dolbec
-
- python@gentoo.org
- Python
-
me@syrusakbary.com
diff --git a/dev-python/pykwalify/pykwalify-1.5.2.ebuild b/dev-python/pykwalify/pykwalify-1.5.2.ebuild
index aabec243e324..2efb2326a6ca 100644
--- a/dev-python/pykwalify/pykwalify-1.5.2.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.5.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
-HOMEPAGE="https://pypi.org/project/pykwalify https://github.com/Grokzen/pykwalify"
+HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pykwalify/pykwalify-9999.ebuild b/dev-python/pykwalify/pykwalify-9999.ebuild
index 05eb31b8e253..e0045a19435b 100644
--- a/dev-python/pykwalify/pykwalify-9999.ebuild
+++ b/dev-python/pykwalify/pykwalify-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1 git-r3
DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
-HOMEPAGE="https://pypi.org/project/pykwalify https://github.com/Grokzen/pykwalify"
+HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
SRC_URI=""
EGIT_REPO_URI="https://github.com/Grokzen/pykwalify.git"
diff --git a/dev-python/pyldap/pyldap-2.4.37.ebuild b/dev-python/pyldap/pyldap-2.4.37.ebuild
index afe55af2cc27..477edd8cec1c 100644
--- a/dev-python/pyldap/pyldap-2.4.37.ebuild
+++ b/dev-python/pyldap/pyldap-2.4.37.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1 multilib
DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="https://pypi.org/project/pyldap https://github.com/pyldap/pyldap/"
+HOMEPAGE="https://pypi.org/project/pyldap/ https://github.com/pyldap/pyldap/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
index 4ab4bcc183c1..c8de4c45bbb0 100644
--- a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="POSIX ACLs (Access Control Lists) for Python"
HOMEPAGE="https://pylibacl.k1024.org/
- https://pypi.org/project/pylibacl"
+ https://pypi.org/project/pylibacl/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/pyliblzma/pyliblzma-0.5.3-r1.ebuild b/dev-python/pyliblzma/pyliblzma-0.5.3-r1.ebuild
index 533b6e853817..f03093264c84 100644
--- a/dev-python/pyliblzma/pyliblzma-0.5.3-r1.ebuild
+++ b/dev-python/pyliblzma/pyliblzma-0.5.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Python bindings for liblzma"
-HOMEPAGE="https://launchpad.net/pyliblzma https://pypi.org/project/pyliblzma"
+HOMEPAGE="https://launchpad.net/pyliblzma https://pypi.org/project/pyliblzma/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="LGPL-3"
diff --git a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
index 778269debe97..460d690f011e 100644
--- a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Libmemcached wrapper written as a Python extension"
-HOMEPAGE="http://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc"
+HOMEPAGE="http://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc/"
# One image is missing from the doc at PyPI
# https://github.com/lericson/pylibmc/pull/221
SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/pylint/pylint-1.6.5-r1.ebuild b/dev-python/pylint/pylint-1.6.5-r1.ebuild
index 03f131c67f99..9a2fc5e9254a 100644
--- a/dev-python/pylint/pylint-1.6.5-r1.ebuild
+++ b/dev-python/pylint/pylint-1.6.5-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
DESCRIPTION="Python code static checker"
HOMEPAGE="https://www.logilab.org/project/pylint
- https://pypi.org/project/pylint
+ https://pypi.org/project/pylint/
https://github.com/pycqa/pylint"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pylint/pylint-1.7.2.ebuild b/dev-python/pylint/pylint-1.7.2.ebuild
index 4515ead7fa42..d7751a7352ea 100644
--- a/dev-python/pylint/pylint-1.7.2.ebuild
+++ b/dev-python/pylint/pylint-1.7.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
DESCRIPTION="Python code static checker"
HOMEPAGE="https://www.logilab.org/project/pylint
- https://pypi.org/project/pylint
+ https://pypi.org/project/pylint/
https://github.com/pycqa/pylint"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pylint/pylint-1.7.5.ebuild b/dev-python/pylint/pylint-1.7.5.ebuild
index a7fbc30a2835..1ec792a0eec4 100644
--- a/dev-python/pylint/pylint-1.7.5.ebuild
+++ b/dev-python/pylint/pylint-1.7.5.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
DESCRIPTION="Python code static checker"
HOMEPAGE="https://www.logilab.org/project/pylint
- https://pypi.org/project/pylint
+ https://pypi.org/project/pylint/
https://github.com/pycqa/pylint"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pylint/pylint-1.8.2.ebuild b/dev-python/pylint/pylint-1.8.2.ebuild
index 26c652f6356c..242dfd4a86a7 100644
--- a/dev-python/pylint/pylint-1.8.2.ebuild
+++ b/dev-python/pylint/pylint-1.8.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
DESCRIPTION="Python code static checker"
HOMEPAGE="https://www.logilab.org/project/pylint
- https://pypi.org/project/pylint
+ https://pypi.org/project/pylint/
https://github.com/pycqa/pylint"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pylirc/pylirc-0.0.5-r1.ebuild b/dev-python/pylirc/pylirc-0.0.5-r1.ebuild
index 62571dc4fa27..b7df84c4d91b 100644
--- a/dev-python/pylirc/pylirc-0.0.5-r1.ebuild
+++ b/dev-python/pylirc/pylirc-0.0.5-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="lirc module for Python"
-HOMEPAGE="https://sourceforge.net/projects/pylirc/ https://pypi.org/project/pylirc"
+HOMEPAGE="https://sourceforge.net/projects/pylirc/ https://pypi.org/project/pylirc/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pylzma/pylzma-0.4.9.ebuild b/dev-python/pylzma/pylzma-0.4.9.ebuild
index 9851b2c63ec8..92ad185327ee 100644
--- a/dev-python/pylzma/pylzma-0.4.9.ebuild
+++ b/dev-python/pylzma/pylzma-0.4.9.ebuild
@@ -7,7 +7,7 @@ inherit distutils-r1
DESCRIPTION="Python bindings for the LZMA compression library"
HOMEPAGE="https://www.joachim-bauch.de/projects/pylzma/
- https://pypi.org/project/pylzma"
+ https://pypi.org/project/pylzma/"
# pypi tarball does not include test data
SRC_URI="https://github.com/fancycode/pylzma/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
diff --git a/dev-python/pymdstat/pymdstat-0.4.2.ebuild b/dev-python/pymdstat/pymdstat-0.4.2.ebuild
index 47c196e1d7b3..2306a582fb77 100644
--- a/dev-python/pymdstat/pymdstat-0.4.2.ebuild
+++ b/dev-python/pymdstat/pymdstat-0.4.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Python library to parse Linux /proc/mdstat"
HOMEPAGE="https://github.com/nicolargo/pymdstat
- https://pypi.org/project/pymdstat"
+ https://pypi.org/project/pymdstat/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pymongo/pymongo-2.7.2.ebuild b/dev-python/pymongo/pymongo-2.7.2.ebuild
index 3045f7fedb1e..ac52bfe54a60 100644
--- a/dev-python/pymongo/pymongo-2.7.2.ebuild
+++ b/dev-python/pymongo/pymongo-2.7.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit check-reqs distutils-r1
DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/pymongo/pymongo-2.9.3.ebuild b/dev-python/pymongo/pymongo-2.9.3.ebuild
index f234bb129260..d4962b861386 100644
--- a/dev-python/pymongo/pymongo-2.9.3.ebuild
+++ b/dev-python/pymongo/pymongo-2.9.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit check-reqs distutils-r1
DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/pymongo/pymongo-3.4.0.ebuild b/dev-python/pymongo/pymongo-3.4.0.ebuild
index 14b37ab899c7..597f8d1637a7 100644
--- a/dev-python/pymongo/pymongo-3.4.0.ebuild
+++ b/dev-python/pymongo/pymongo-3.4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit check-reqs distutils-r1
DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/pymongo/pymongo-3.5.1.ebuild b/dev-python/pymongo/pymongo-3.5.1.ebuild
index e28469004b55..775690e07669 100644
--- a/dev-python/pymongo/pymongo-3.5.1.ebuild
+++ b/dev-python/pymongo/pymongo-3.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit check-reqs distutils-r1
DESCRIPTION="Python driver for MongoDB"
-HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/pympler/pympler-0.5.ebuild b/dev-python/pympler/pympler-0.5.ebuild
index c99ffbb0a2b1..37d0a8d9a12d 100644
--- a/dev-python/pympler/pympler-0.5.ebuild
+++ b/dev-python/pympler/pympler-0.5.ebuild
@@ -11,7 +11,7 @@ MY_PN="Pympler"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Memory profiling for Python applications"
-HOMEPAGE="https://pypi.org/project/Pympler https://github.com/pympler/pympler"
+HOMEPAGE="https://pypi.org/project/Pympler/ https://github.com/pympler/pympler"
SRC_URI="https://github.com/pympler/pympler/archive/${PV}.tar.gz -> ${P}.tar.gz"
# The PyPi tarball is missing the documentation
#SRC_URI="mirror://pypi/P/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
index f70c62279edb..ab32f3830d34 100644
--- a/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
+++ b/dev-python/pymssql/pymssql-1.0.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Simple MSSQL python extension module"
-HOMEPAGE="http://www.pymssql.org/en/stable/ https://pypi.org/project/pymssql"
+HOMEPAGE="http://www.pymssql.org/en/stable/ https://pypi.org/project/pymssql/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/pymtp/pymtp-0.0.6.ebuild b/dev-python/pymtp/pymtp-0.0.6.ebuild
index dd99ec53c07b..c35ea061d065 100644
--- a/dev-python/pymtp/pymtp-0.0.6.ebuild
+++ b/dev-python/pymtp/pymtp-0.0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="LibMTP bindings for Python"
-HOMEPAGE="http://packages.debian.org/libmtp http://libmtp.sourceforge.net/ https://pypi.org/project/PyMTP"
+HOMEPAGE="http://packages.debian.org/libmtp http://libmtp.sourceforge.net/ https://pypi.org/project/PyMTP/"
DEB_URI="mirror://debian/pool/main/${PN:0:1}/${PN}"
SRC_URI="${DEB_URI}/${PN}_${PV}.orig.tar.gz"
diff --git a/dev-python/pyopencl/pyopencl-2016.1.ebuild b/dev-python/pyopencl/pyopencl-2016.1.ebuild
index 7ad7d28e65dd..724896f127fa 100644
--- a/dev-python/pyopencl/pyopencl-2016.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2016.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Python wrapper for OpenCL"
HOMEPAGE="https://mathema.tician.de/software/pyopencl
- https://pypi.org/project/pyopencl"
+ https://pypi.org/project/pyopencl/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pyopencl/pyopencl-2017.2.ebuild b/dev-python/pyopencl/pyopencl-2017.2.ebuild
index a0c701fdde53..9949a426bf23 100644
--- a/dev-python/pyopencl/pyopencl-2017.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2017.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Python wrapper for OpenCL"
HOMEPAGE="https://mathema.tician.de/software/pyopencl
- https://pypi.org/project/pyopencl"
+ https://pypi.org/project/pyopencl/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pyopencl/pyopencl-9999.ebuild b/dev-python/pyopencl/pyopencl-9999.ebuild
index f8e1236d30db..59d8f6efced8 100644
--- a/dev-python/pyopencl/pyopencl-9999.ebuild
+++ b/dev-python/pyopencl/pyopencl-9999.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://git.tiker.net/trees/pyopencl.git"
DESCRIPTION="Python wrapper for OpenCL"
HOMEPAGE="https://mathema.tician.de/software/pyopencl
- https://pypi.org/project/pyopencl"
+ https://pypi.org/project/pyopencl/"
SRC_URI=""
LICENSE="GPL-2"
diff --git a/dev-python/pyopengl/pyopengl-3.1.0.ebuild b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
index 52e0ade01f13..578784737d6a 100644
--- a/dev-python/pyopengl/pyopengl-3.1.0.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="PyOpenGL"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python OpenGL bindings"
-HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL"
+HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
# mirror://sourceforge/pyopengl/${MY_P}.tar.gz" # broken mirror for this release
LICENSE="BSD"
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
index dcd1f69c04d3..faadcf7098b2 100644
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Accelerate module for PyOpenGL"
-HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL-accelerate"
+HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL-accelerate/"
MY_PN="PyOpenGL-accelerate"
MY_P="${MY_PN}-${PV}"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
index a6bbdfbd2fce..f66a312dce44 100644
--- a/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Python interface to the OpenSSL library"
HOMEPAGE="
http://pyopenssl.sourceforge.net/
https://launchpad.net/pyopenssl
- https://pypi.org/project/pyOpenSSL
+ https://pypi.org/project/pyOpenSSL/
"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild
index 9d6d0edc7da2..fdade9be5e31 100644
--- a/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Python interface to the OpenSSL library"
HOMEPAGE="
http://pyopenssl.sourceforge.net/
https://launchpad.net/pyopenssl
- https://pypi.org/project/pyOpenSSL
+ https://pypi.org/project/pyOpenSSL/
"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
index 1d3a5bda0d40..9b0988e10f52 100644
--- a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Python interface to the OpenSSL library"
HOMEPAGE="
http://pyopenssl.sourceforge.net/
https://launchpad.net/pyopenssl
- https://pypi.org/project/pyOpenSSL
+ https://pypi.org/project/pyOpenSSL/
"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
index c4c92fb3aeff..1437b723922a 100644
--- a/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Python interface to the OpenSSL library"
HOMEPAGE="
http://pyopenssl.sourceforge.net/
https://launchpad.net/pyopenssl
- https://pypi.org/project/pyOpenSSL
+ https://pypi.org/project/pyOpenSSL/
"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
index 1fea5a5faf26..3ef9a3171db8 100644
--- a/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-17.5.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Python interface to the OpenSSL library"
HOMEPAGE="
http://pyopenssl.sourceforge.net/
https://launchpad.net/pyopenssl
- https://pypi.org/project/pyOpenSSL
+ https://pypi.org/project/pyOpenSSL/
"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyparsing/pyparsing-2.2.0.ebuild b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
index a0f5a2b4736d..02856e79e946 100644
--- a/dev-python/pyparsing/pyparsing-2.2.0.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.2.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.org/project/pyparsing"
+HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.org/project/pyparsing/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pypcap/pypcap-1.2.0.ebuild b/dev-python/pypcap/pypcap-1.2.0.ebuild
index 574e9213f028..7db95f60abe5 100644
--- a/dev-python/pypcap/pypcap-1.2.0.ebuild
+++ b/dev-python/pypcap/pypcap-1.2.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Simplified object-oriented Python extension module for libpcap"
-HOMEPAGE="https://github.com/pynetwork/pypcap https://pypi.org/project/pypcap"
+HOMEPAGE="https://github.com/pynetwork/pypcap https://pypi.org/project/pypcap/"
SRC_URI="https://github.com/pynetwork/pypcap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pypeg2/pypeg2-2.15.2.ebuild b/dev-python/pypeg2/pypeg2-2.15.2.ebuild
index 981f67f8225c..d4956c2fa699 100644
--- a/dev-python/pypeg2/pypeg2-2.15.2.ebuild
+++ b/dev-python/pypeg2/pypeg2-2.15.2.ebuild
@@ -12,7 +12,7 @@ MY_P=${MY_PN}-${PV}
DESCRIPTION="An intrinsic PEG Parser-Interpreter for Python"
HOMEPAGE="https://fdik.org/pyPEG/
https://bitbucket.org/fdik/pypeg/
- https://pypi.org/project/pyPEG2"
+ https://pypi.org/project/pyPEG2/"
SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild b/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild
index 2e35ec9e2ee0..6907d4c1970b 100644
--- a/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild
+++ b/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 flag-o-matic
MY_P="pyPgSQL-${PV}"
DESCRIPTION="Python Interface to PostgreSQL"
-HOMEPAGE="http://pypgsql.sourceforge.net/ https://pypi.org/project/pyPgSQL"
+HOMEPAGE="http://pypgsql.sourceforge.net/ https://pypi.org/project/pyPgSQL/"
SRC_URI="mirror://sourceforge/pypgsql/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pypng/pypng-0.0.18.ebuild b/dev-python/pypng/pypng-0.0.18.ebuild
index 36d6d075efdb..1b1d8bf9d09e 100644
--- a/dev-python/pypng/pypng-0.0.18.ebuild
+++ b/dev-python/pypng/pypng-0.0.18.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6})
inherit distutils-r1
DESCRIPTION="Pure Python PNG image encoder/decoder"
-HOMEPAGE="https://github.com/drj11/pypng https://pypi.org/project/pypng"
+HOMEPAGE="https://github.com/drj11/pypng https://pypi.org/project/pypng/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pypowervm/pypowervm-1.1.10.ebuild b/dev-python/pypowervm/pypowervm-1.1.10.ebuild
index 2a5809471ead..540e18b87abc 100644
--- a/dev-python/pypowervm/pypowervm-1.1.10.ebuild
+++ b/dev-python/pypowervm/pypowervm-1.1.10.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Python binding for the PowerVM REST API"
-HOMEPAGE="https://pypi.org/project/pypowervm"
+HOMEPAGE="https://pypi.org/project/pypowervm/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/pypowervm/pypowervm-1.1.6.ebuild b/dev-python/pypowervm/pypowervm-1.1.6.ebuild
index 827404dedbce..a1cc122c5f1b 100644
--- a/dev-python/pypowervm/pypowervm-1.1.6.ebuild
+++ b/dev-python/pypowervm/pypowervm-1.1.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="Python binding for the PowerVM REST API"
-HOMEPAGE="https://pypi.org/project/pypowervm"
+HOMEPAGE="https://pypi.org/project/pypowervm/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
index 51706c7edc0f..b02638a61800 100644
--- a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
+++ b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="PyProtocols"
MY_P="${MY_PN}-${PV/_pre/a0dev_r}"
DESCRIPTION="Extends the PEP 246 adapt function with a new 'declaration API'"
-HOMEPAGE="http://peak.telecommunity.com/PyProtocols.html https://pypi.org/project/PyProtocols \
+HOMEPAGE="http://peak.telecommunity.com/PyProtocols.html https://pypi.org/project/PyProtocols/ \
http://svn.eby-sarna.com/PyProtocols/"
SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 19934f254fea..a6c073949af4 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -18,6 +18,17 @@ DIST pypy-bin-5.9.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6261405 BLAKE2B 37f44
DIST pypy-bin-5.9.0-x86+bzip2+libressl+ncurses.tar.lz 6262511 BLAKE2B bf70bf73bcfc503ffe7024a0e1df37cf64471de0b7060c49c08e1b339f6357b0f8183de7d035e12fc1e884cd25c5b43a05535274b2843954a459581bb2dfba88 SHA512 376f801dad960b3e36cb401d8221596e93248abbc40b1118e1e2f3f79009a44866612df931c3b91b1b72059f48512bf3a5dd0d58a21733380937577851e5dc92
DIST pypy-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 6269532 BLAKE2B b0ca490135a6b4215a09e5dea24be5c950fba24aceca50bf2e04ad0b3bb5e6a8511b167e567aea9d3ca9b92a53d093c3746b38abd9e5266148621733430767ce SHA512 ee447e8b03733b41f92625a02653ed70a9f4cb3866a27bcbdbaf1383a00551c5f4617540eea227b120a7adab5cf87afddffde663c7cb79abde852e0bbf18d622
DIST pypy-bin-5.9.0-x86+bzip2+ncurses.tar.lz 6261498 BLAKE2B 7d0dace223ae6793ca18b36628f7a43b20d55d6b702c6dd0bad413055261614bedba265f2f1411bdf4543ca64612d32cda93f609c2433a3fc10e3fe44aab3984 SHA512 6151ed379dc3dd4d9eda892718a5cdeea55386251c27230cb4606fd0a16589035de332c549d108d699c506f8ff46bed3cec3edb960155550a9746ae2fc0d2349
+DIST pypy-bin-6.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12940199 BLAKE2B c3790050d17e98a0fc78fa12218267aea62580287fef06559df136b15fbbd791b43ad191f4a91865ceb4e6f0954af40676beb89182a0d6f720644d4aea98f439 SHA512 967a2332439ae349d47713c33518e88f350769c4ba2c8191f63c145b4d036b53308232adcbf08199e0111ba1cf9bb9df78beb16f6933f9b377f617f34af4dee1
+DIST pypy-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 12932560 BLAKE2B 97693b27ce350dd35103cf6176e7113503f790de1fc498810bfd23ed70f324fb148f801ec3d5ffcc1c578d49098ff7c4353da10509c0d56a2f3c6c4dad0a0dfa SHA512 03db8101a5aa288eb59b73d849ca0767a2b6cdffe1bfecb5f4ee5a70ceb7d73c4e1ca9be06424e18e62c2939b07c152bad1c762a9d209faa8bac9b91c48b4317
+DIST pypy-bin-6.0.0-amd64+bzip2+libressl+ncurses.tar.lz 7466895 BLAKE2B e199b8330dd4ac2acfe668fd19b2900843c96de961b3ea2fc418ec71c289c98d9c505cd42581e726179441dc877feb7eb57b89ee63c8ec00895302dacb039fbe SHA512 560886744633197abf14c21fb872f41d3d614427861045d6654c72b940e7b16996af4077ef9d531cfecc28c3e65dc64e2db149fe23c370aa8ee446dd5b0359e8
+DIST pypy-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 7547568 BLAKE2B 713cd16e54cdab7e25c091db931a760f51de990bf53e566b711754c5a705507257f1c54abc5f85aba7b2449f6d3967e820d14f55953a3880e7bac3eb028db203 SHA512 e8efb0af8e8ef89c95e5fe73b177f34b9120a172e0af7e52990e428e498e3b84b31eba3dfaa28bffcb121625b5494eaeec71af2a2fa46d6b888c148ca162836b
+DIST pypy-bin-6.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10268326 BLAKE2B 0f0c9b9f9a586b7dfc1099a9dbe28fe56d49c808ffd2e632f428b8992d39db3db7f70fd4f2fd0fb261d8c85202ab4ec2febc35b1bd4dc86f38ab8fba5715541c SHA512 40986918e0ea94053b3adc5594a21acff34d4f18b0f4827ce9cb2646d3ddcda8fb6b107ac17869c2c44f99f153a2829fc3ae89e8d4caf61ead4c4a4c9b8e963d
+DIST pypy-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9857367 BLAKE2B 48d9271213dfa04991fbefab294cf3ee1a8d69d954315b0b3e543bffaae2134f0ce1e5f3da09e45041b988b0e08359c68b49acaf14c8bf26913cb540ac1928f6 SHA512 deeabbf19d95a6e6e55dea59cb0ff06fdf1ce687d6cd9499ef010d90445e05102056b5c8bfe9f44528cf86f087e4a2b1dee00fb5df1f7526673333cf73d5c8ab
+DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6301309 BLAKE2B 8f8e16bd05da671fbe3e762dff33f32b1c50f3ce866432d3bc039724d025192a7116d6aa2590007e3adb52e5b3dd3ad9eadbc7c8f388bc7e02b049fcd980e3f1 SHA512 e6d32352ecb3a17e614f4ddac600f7dafb0a39fa807ba2fcce506eae881ee5c8f959e2d797f8126bfea74b801b76efbd9a3df86dc03c8521ec320fd06d05659e
+DIST pypy-bin-6.0.0-x86+bzip2+libressl+ncurses.tar.lz 6290475 BLAKE2B e51a49ee9cdf7e2b9194e00ec9480cef3668e7c1fa7e632eaff0b7f1ba415096bdb2a2a4322ae25b611e4ffab28f00d15a4429142bf7a62bf0d32ba4a157ed79 SHA512 258404258f7bb96fc55cf4bd8a086d598e0b583a62b282ed6809af740c09792dd854efe4a3780b85d7b84ff1c8b0169875dae38f271f95db76db494d63f0774b
+DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5979890 BLAKE2B 8f47c34f88b7f4900808dfcc8b22920c8053716dd8f46382d5656a15d742be13d5334e40cfca86dac663695bbd7b6ada58546130ee4936ca87c916713d069614 SHA512 498478f91302312b54cec3f42a03f817ef02b4d3bd66019c9bf9e0398b58a791202bbbdffd25778a20ae5d49bbc34d956f2f5bbd5d132c098e979357f8ca5e59
+DIST pypy-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5941591 BLAKE2B 45a4c150e1403fd5a579c3d452cd09f4954238fff18702c5cafc1b23f12134f07a05c1aa9277b76b5d8c4e1da48d64699a2540feb4000b6bd1c285ab59b6c4a1 SHA512 3a69284917e0c233ac27fd96707b43499a5d9e05da946cad21f89fd605d34483454703887efc1049abeeb1d503800061027794d277123ad874583074203ce3a0
DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379
DIST pypy2-v5.9.0-src.tar.bz2 19175394 BLAKE2B 0d5fa0d013d8cdb9765bf0f535877894d7a3544c19481973f788187251d1bd2ba11f88950430e85c7608ea394cc952ae7dd7275b9843397ab098e153cf96ec7f SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
+DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
diff --git a/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild b/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild
new file mode 100644
index 000000000000..ef34c44ba088
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-6.0.0.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils python-utils-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
+CPY_PATCHSET_VERSION="2.7.14-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="Pre-built version of PyPy"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+ https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
+ amd64? (
+ !libressl? (
+ jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+ !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+ )
+ libressl? (
+ jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
+ !jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
+ )
+ )
+ x86? (
+ !libressl? (
+ cpu_flags_x86_sse2? (
+ jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
+ !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
+ )
+ !cpu_flags_x86_sse2? (
+ !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
+ )
+ )
+ libressl? (
+ cpu_flags_x86_sse2? (
+ jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
+ !jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
+ )
+ !cpu_flags_x86_sse2? (
+ !jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
+ )
+ )
+ )"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND="
+ app-arch/bzip2:0/1
+ dev-libs/expat:0/0
+ dev-libs/libffi:0/0
+ sys-devel/gcc:*
+ sys-libs/glibc
+ sys-libs/ncurses:0/6
+ sys-libs/zlib:0/1
+ gdbm? ( sys-libs/gdbm:0= )
+ !libressl? ( dev-libs/openssl:0/0[-bindist] )
+ libressl? ( dev-libs/libressl:0/44 )
+ sqlite? ( dev-db/sqlite:3= )
+ tk? (
+ dev-lang/tk:0=
+ dev-tcltk/tix:0=
+ )
+ !dev-python/pypy:0"
+DEPEND="${RDEPEND}
+ app-arch/lzip
+ app-arch/xz-utils"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+ usr/lib*/pypy/pypy-c
+ usr/lib*/pypy/libpypy-c.so"
+
+src_prepare() {
+ eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+ eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+ sed -e "s^@EPREFIX@^${EPREFIX}^" \
+ -e "s^@libdir@^$(get_libdir)^" \
+ -i lib-python/2.7/distutils/command/install.py || die
+
+ # apply CPython stdlib patches
+ pushd lib-python/2.7 > /dev/null || die
+ # TODO: cpy turkish locale patch now fixes C code
+ # probably needs better port to pypy, if it is broken there
+ eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+ eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+ popd > /dev/null || die
+
+ eapply_user
+}
+
+src_compile() {
+ # Tadaam! PyPy compiled!
+ mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
+ mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+ # (not installed by pypy)
+ rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+ mv pypy/module/cpyext/include/* include/ || die
+ mv pypy/module/cpyext/parse/*.h include/ || die
+
+ pax-mark m pypy-c libpypy-c.so
+
+ einfo "Generating caches and CFFI modules ..."
+
+ # Generate Grammar and PatternGrammar pickles.
+ ./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+ || die "Generation of Grammar and PatternGrammar pickles failed"
+
+ # Generate cffi modules
+ # Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+# "sqlite3": "_sqlite3_build.py",
+# "audioop": "_audioop_build.py",
+# "tk": "_tkinter/tklib_build.py",
+# "curses": "_curses_build.py" if sys.platform != "win32" else None,
+# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
+# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+# "resource": "_resource_build.py" if sys.platform != "win32" else None,
+ cffi_targets=( audioop curses syslog pwdgrp resource )
+ use gdbm && cffi_targets+=( gdbm )
+ use sqlite && cffi_targets+=( sqlite3 )
+ use tk && cffi_targets+=( tkinter/tklib )
+
+ local t
+ # all modules except tkinter output to .
+ # tkinter outputs to the correct dir ...
+ cd lib_pypy || die
+ for t in "${cffi_targets[@]}"; do
+ # tkinter doesn't work via -m
+ ../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+ done
+
+ # Cleanup temporary objects
+ find -name "_cffi_*.[co]" -delete || die
+ find -type d -empty -delete || die
+}
+
+src_test() {
+ # (unset)
+ local -x PYTHONDONTWRITEBYTECODE
+
+ ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+ local dest=/usr/$(get_libdir)/pypy
+ einfo "Installing PyPy ..."
+ exeinto "${dest}"
+ doexe pypy-c libpypy-c.so
+ pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+ insinto "${dest}"
+ # preserve mtimes to avoid obsoleting caches
+ insopts -p
+ doins -r include lib_pypy lib-python
+ dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+ dodoc README.rst
+
+ if ! use gdbm; then
+ rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+ fi
+ if ! use sqlite; then
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+ "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+ fi
+ if ! use tk; then
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+ "${ED%/}${dest}"/lib_pypy/_tkinter \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+ fi
+
+ local -x PYTHON=${ED%/}${dest}/pypy-c
+ # we can't use eclass function since PyPy is dumb and always gives
+ # paths relative to the interpreter
+ local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+ python_export pypy EPYTHON
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ einfo "Byte-compiling Python standard library..."
+
+ # compile the installed modules
+ python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index f88e142d58de..2557dd1c6be2 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,3 +1,4 @@
DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379
DIST pypy2-v5.9.0-src.tar.bz2 19175394 BLAKE2B 0d5fa0d013d8cdb9765bf0f535877894d7a3544c19481973f788187251d1bd2ba11f88950430e85c7608ea394cc952ae7dd7275b9843397ab098e153cf96ec7f SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
+DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
diff --git a/dev-python/pypy/pypy-6.0.0.ebuild b/dev-python/pypy/pypy-6.0.0.ebuild
new file mode 100644
index 000000000000..286b7be69e1d
--- /dev/null
+++ b/dev-python/pypy/pypy-6.0.0.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
+
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+CPY_PATCHSET_VERSION="2.7.14-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+ https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+ virtual/libffi:0=
+ virtual/libintl:0=
+ dev-libs/expat:0=
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+ bzip2? ( app-arch/bzip2:0= )
+ gdbm? ( sys-libs/gdbm:0= )
+ ncurses? ( sys-libs/ncurses:0= )
+ sqlite? ( dev-db/sqlite:3= )
+ tk? (
+ dev-lang/tk:0=
+ dev-tcltk/tix:0=
+ )
+ !dev-python/pypy-bin:0"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}
+ !low-memory? (
+ || (
+ dev-python/pypy
+ dev-python/pypy-bin
+ (
+ dev-lang/python:2.7
+ dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+ )
+ )
+ )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+check_env() {
+ if use low-memory; then
+ if ! python_is_installed pypy; then
+ eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+ eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+ eerror
+ eerror " $ emerge -1v dev-python/pypy-bin"
+ eerror
+ eerror "before attempting to build dev-python/pypy[low-memory]."
+ die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+ fi
+
+ CHECKREQS_MEMORY="1750M"
+ use amd64 && CHECKREQS_MEMORY="3500M"
+ else
+ CHECKREQS_MEMORY="3G"
+ use amd64 && CHECKREQS_MEMORY="6G"
+ fi
+
+ check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check_env
+
+ if python_is_installed pypy; then
+ if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+ einfo "Using already-installed PyPy to perform the translation."
+ local EPYTHON=pypy
+ else
+ einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+ einfo "recommends using PyPy for that. If you wish to do so, please unset"
+ einfo "the EPYTHON variable."
+ fi
+ fi
+
+ python-any-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+ eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+ eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002
+
+ sed -e "s^@EPREFIX@^${EPREFIX}^" \
+ -e "s^@libdir@^$(get_libdir)^" \
+ -i lib-python/2.7/distutils/command/install.py || die
+
+ # apply CPython stdlib patches
+ pushd lib-python/2.7 > /dev/null || die
+ # TODO: cpy turkish locale patch now fixes C code
+ # probably needs better port to pypy, if it is broken there
+ eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+ eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+ popd > /dev/null || die
+
+ eapply_user
+}
+
+src_configure() {
+ tc-export CC
+
+ local jit_backend
+ if use jit; then
+ jit_backend='--jit-backend='
+
+ # We only need the explicit sse2 switch for x86.
+ # On other arches we can rely on autodetection which uses
+ # compiler macros. Plus, --jit-backend= doesn't accept all
+ # the modern values...
+
+ if use x86; then
+ if use cpu_flags_x86_sse2; then
+ jit_backend+=x86
+ else
+ jit_backend+=x86-without-sse2
+ fi
+ else
+ jit_backend+=auto
+ fi
+ fi
+
+ local args=(
+ --shared
+ $(usex jit -Ojit -O2)
+ $(usex sandbox --sandbox '')
+
+ ${jit_backend}
+
+ pypy/goal/targetpypystandalone
+ )
+
+ # Avoid linking against libraries disabled by use flags
+ local opts=(
+ bzip2:bz2
+ ncurses:_minimal_curses
+ )
+
+ local opt
+ for opt in "${opts[@]}"; do
+ local flag=${opt%:*}
+ local mod=${opt#*:}
+
+ args+=(
+ $(usex ${flag} --withmod --withoutmod)-${mod}
+ )
+ done
+
+ local interp=( "${PYTHON}" )
+ if use low-memory; then
+ interp=( env PYPY_GC_MAX_DELTA=200MB
+ "${PYTHON}" --jit loop_longevity=300 )
+ fi
+
+ # translate into the C sources
+ # we're going to make them ourselves since otherwise pypy does not
+ # free up the unneeded memory before spawning the compiler
+ set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+ echo -e "\033[1m${@}\033[0m"
+ "${@}" || die "translation failed"
+}
+
+src_compile() {
+ emake -C "${T}"/usession*-0/testing_1
+
+ # copy back to make sys.prefix happy
+ cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
+ pax-mark m pypy-c libpypy-c.so
+
+ einfo "Generating caches and CFFI modules ..."
+
+ # Generate Grammar and PatternGrammar pickles.
+ ./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+ || die "Generation of Grammar and PatternGrammar pickles failed"
+
+ # Generate cffi modules
+ # Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+# "sqlite3": "_sqlite3_build.py",
+# "audioop": "_audioop_build.py",
+# "tk": "_tkinter/tklib_build.py",
+# "curses": "_curses_build.py" if sys.platform != "win32" else None,
+# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
+# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+# "resource": "_resource_build.py" if sys.platform != "win32" else None,
+ cffi_targets=( audioop syslog pwdgrp resource )
+ use gdbm && cffi_targets+=( gdbm )
+ use ncurses && cffi_targets+=( curses )
+ use sqlite && cffi_targets+=( sqlite3 )
+ use tk && cffi_targets+=( tkinter/tklib )
+
+ local t
+ # all modules except tkinter output to .
+ # tkinter outputs to the correct dir ...
+ cd lib_pypy || die
+ for t in "${cffi_targets[@]}"; do
+ # tkinter doesn't work via -m
+ ../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+ done
+
+ # Cleanup temporary objects
+ find -name "_cffi_*.[co]" -delete || die
+ find -type d -empty -delete || die
+}
+
+src_test() {
+ # (unset)
+ local -x PYTHONDONTWRITEBYTECODE
+
+ ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+ local dest=/usr/$(get_libdir)/pypy
+ einfo "Installing PyPy ..."
+ exeinto "${dest}"
+ doexe pypy-c libpypy-c.so
+ pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+ insinto "${dest}"
+ # preserve mtimes to avoid obsoleting caches
+ insopts -p
+ doins -r include lib_pypy lib-python
+ dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+ dodoc README.rst
+
+ if ! use gdbm; then
+ rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+ fi
+ if ! use sqlite; then
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+ "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+ fi
+ if ! use tk; then
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+ "${ED%/}${dest}"/lib_pypy/_tkinter \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+ fi
+
+ local -x PYTHON=${ED%/}${dest}/pypy-c
+ # we can't use eclass function since PyPy is dumb and always gives
+ # paths relative to the interpreter
+ local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+ python_export pypy EPYTHON
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ einfo "Byte-compiling Python standard library..."
+
+ # compile the installed modules
+ python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 37a40644c03a..bd6e0e0c2ef6 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -13,6 +13,12 @@ DIST pypy3-bin-5.9.0-amd64+bzip2+ncurses.tar.lz 6589457 BLAKE2B 6b182a6bc25c7839
DIST pypy3-bin-5.9.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8595527 BLAKE2B 67e749a5153d5d75c09d27dfa5ed57bac8e886770e5264a2596c4f9e5cdcb7fcae63b709951a8ad862f1bf658deb3cbdf25ac3d0a3af12aef2dfe40942016329 SHA512 6d118cf2e9a657dcf719ca5e508b5b4bb2ab7f85ec3597840706b748ea2f6d582ed884fc34697a3ec36e343de4a40b113d7c8749683a53f2dda299a9e106a2f8
DIST pypy3-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 5654668 BLAKE2B 964c06920e2d5d69ee9d1f2133d2453e096bc871e63ecdd815370187510f9391738432578b5be49771ad8d24fc735882df266655d88924b2776849a61a943694 SHA512 a378159ca39654fbf117e3bd5a0cdcdb23100a21caf837bba5d764b63bf039a791b27d397a6be918a2539d721fc8564f2b10a163df3bae89a4ddb3991ac33ec8
DIST pypy3-bin-5.9.0-x86+bzip2+ncurses.tar.lz 5640443 BLAKE2B 4aa4a8cdfa536aea52cf6b94813e6c70f071ed62bc1bceac0584b2ab1a0b9d5a60e6d219ffe67f09f418246847ccd1f32f280b38c9bd973eca2c30c002a42856 SHA512 663fae9004eb7f002b849d4697ef67fb72df33faddfba7272a6d795432ecca4c110dc1fab43617909f962584c7519582f085854f55829ccc63dc988654b6add5
+DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 10674209 BLAKE2B f9e00ba0cdc113ebe156212c5497e122a45bc9544cb242ad02273e06210eb691f930aee7faf1d4ed3a7b14080905a9cb6d30b309c38a2c3795f2183750b4469f SHA512 52e615e2b51a43a2c91f9a2a8f0cec16a6090bfd230ef08dda462bb530da9ee66acec9c449e77f299e0b3363d6bcbc7150b14e7adbe9862d36f4738dfc6be1ca
+DIST pypy3-bin-6.0.0-amd64+bzip2+ncurses.tar.lz 6703329 BLAKE2B 64ad2b2ae1580833735dc5ce4b821f79458c98c5f761d7c9834624aff172204ac16e23582e3a776baa85accd221a9fd2225c22099de1de9c319b4f29b5f15071 SHA512 57b2e2f0ddc8d6f78beff6c049adb0a8d316db1d9f7bf5e07e4e593fa363e5ced37d212f549c0a5305459207694ac5a6aac9698a1ca3a4bf56a4437899b7e97b
+DIST pypy3-bin-6.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8268406 BLAKE2B 8200d7cfc5bd813cf3138017c96cace1c07bc031f68d5a9df2f71cb887a5dd3bb979dbc67d395389c965904037935a518bf6c1492b04ce5a9f21a9bb3bb5504a SHA512 4c09c454b25faa51024c5319ba5e91f4b1883bdd25f504694f83011ef1faffe7aa28a51369d3c5c6bb9f0d8eb53d1292d57608343b731c67ceeb99f41736b044
+DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5363942 BLAKE2B d53b89ef73c2d4ee2bc00360a0c4a791fd8b6ac2d28dfeeb7510a465e6302f79c378aacebbaf4993b6ee55dbc6d85876149fe3f5a0d689713f029c928d93a729 SHA512 ce72d84200dd275841e691810dbf402423883b282cacbe8bbdae9285936869d40b3d43d053b0f3d4904c7ced72f35480d1780358180a1c98e8111852fef1f77f
+DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5366917 BLAKE2B 338a9c221048dabc548250edec05256be64dd5d1aeb5b2fff839d7d5e8dda29e7d4e0a03b1fc0c9cd418685c558bb47598c625e2d28cd4caabc45e21eee9f4f8 SHA512 5274535d01564a9087aea486320921c8784cabcc7bde3634c27b9006988fdc745e6e5e5c2fb8e7b0318fd5ca6fda3fce208743cfa079a7474ea44277237ea873
DIST pypy3-v5.10.0-src.tar.bz2 29075971 BLAKE2B 02fb64d514ab292e09ced57e1c206b04d0fb38353ad6ec0e836448344a6d126d0fccfb61cbd278ea3acaa227032640e82f9ffd7efe3b33ade1ca34a18831b3e4 SHA512 69a373c18dbad9dd617f994ad885c8d8975f0c484ba9dd547e6e892c9a3030a43e9e3ee668aee5f4969403883de1311cef97a0a5e5701921172ee6c2119b771b
DIST pypy3-v5.10.1-src.tar.bz2 29071765 BLAKE2B d5c163697d8dd36a9a61e9a355719628902de0c9a4c038d31cd134d9bb26b8058abfdf85b09715208146295c37e343fae5e1e4a3c8d1999306eeea93791e326c SHA512 91b0ed25130bdbb46d5e577136b5fe63d5162917dcc2d0b69f5cac2a283ece9d0bfd3c7c8dc61ff391e0550fa1603326f6edeb2df3159d71617fefe6c07439f5
DIST pypy3-v5.9.0-src.tar.bz2 29055111 BLAKE2B 181d87ebe4a83a3f03b28d891f248f718ad120ed54621f8054f19a65aebbe90b65c69e40ca656612356b2019aa9ac22d5e242e688a80190b046511a8ceb9c040 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd
+DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
diff --git a/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild
new file mode 100644
index 000000000000..89c4fd6f16ac
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-6.0.0.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Test runner needs Python 2.
+PYTHON_COMPAT=( python2_7 pypy )
+inherit pax-utils python-any-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
+MY_P=pypy3-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+ amd64? (
+ jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+ !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+ )
+ x86? (
+ cpu_flags_x86_sse2? (
+ jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
+ !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
+ )
+ !cpu_flags_x86_sse2? (
+ !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
+ )
+ )"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/60"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND="
+ app-arch/bzip2:0/1
+ dev-libs/expat:0/0
+ dev-libs/libffi:0/0
+ sys-devel/gcc:*
+ sys-libs/glibc
+ sys-libs/ncurses:0/6
+ sys-libs/zlib:0/1
+ gdbm? ( sys-libs/gdbm:0= )
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+ sqlite? ( dev-db/sqlite:3= )
+ tk? (
+ dev-lang/tk:0=
+ dev-tcltk/tix:0=
+ )
+ !dev-python/pypy3:0"
+DEPEND="${RDEPEND}
+ app-arch/lzip
+ app-arch/xz-utils
+ test? ( ${PYTHON_DEPS} )"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+ usr/lib*/pypy3/pypy3-c
+ usr/lib*/pypy3/libpypy3-c.so"
+
+src_prepare() {
+ eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+ eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+ sed -e "s^@EPREFIX@^${EPREFIX}^" \
+ -e "s^@libdir@^$(get_libdir)^" \
+ -i lib-python/3/distutils/command/install.py || die
+
+ # apply CPython stdlib patches
+ pushd lib-python/3 > /dev/null || die
+ eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+ eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+ popd > /dev/null || die
+
+ eapply_user
+}
+
+src_compile() {
+ # Tadaam! PyPy compiled!
+ mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
+ mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+ mv pypy/module/cpyext/include/*.h include/ || die
+ mv pypy/module/cpyext/parse/*.h include/ || die
+
+ pax-mark m pypy3-c libpypy3-c.so
+
+ einfo "Generating caches and CFFI modules ..."
+
+ # Generate Grammar and PatternGrammar pickles.
+ ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+ || die "Generation of Grammar and PatternGrammar pickles failed"
+
+ # Generate cffi modules
+ # Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+# "sqlite3": "_sqlite3_build.py",
+# "audioop": "_audioop_build.py",
+# "tk": "_tkinter/tklib_build.py",
+# "curses": "_curses_build.py" if sys.platform != "win32" else None,
+# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+# "_gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
+# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+# "resource": "_resource_build.py" if sys.platform != "win32" else None,
+# "lzma": "_lzma_build.py",
+# "_decimal": "_decimal_build.py",
+# "ssl": "_ssl_build.py",
+ cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
+ use gdbm && cffi_targets+=( gdbm )
+ use sqlite && cffi_targets+=( sqlite3 )
+ use tk && cffi_targets+=( tkinter/tklib )
+
+ local t
+ # all modules except tkinter output to .
+ # tkinter outputs to the correct dir ...
+ cd lib_pypy || die
+ for t in "${cffi_targets[@]}"; do
+ # tkinter doesn't work via -m
+ ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+ done
+
+ # Cleanup temporary objects
+ find -name "_cffi_*.[co]" -delete || die
+ find -type d -empty -delete || die
+}
+
+src_test() {
+ # (unset)
+ local -x PYTHONDONTWRITEBYTECODE
+
+ # Test runner requires Python 2 too. However, it spawns PyPy3
+ # internally so that we end up testing the correct interpreter.
+ "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
+}
+
+src_install() {
+ local dest=/usr/$(get_libdir)/pypy3
+ einfo "Installing PyPy ..."
+ exeinto "${dest}"
+ doexe pypy3-c libpypy3-c.so
+ pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+ insinto "${dest}"
+ # preserve mtimes to avoid obsoleting caches
+ insopts -p
+ doins -r include lib_pypy lib-python
+ dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
+ dodoc README.rst
+
+ if ! use gdbm; then
+ rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+ fi
+ if ! use sqlite; then
+ rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+ "${ED%/}${dest}"/lib_pypy/_sqlite3* \
+ "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
+ fi
+ if ! use tk; then
+ rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+ "${ED%/}${dest}"/lib_pypy/_tkinter \
+ "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+ fi
+
+ einfo "Generating caches and byte-compiling ..."
+
+ local -x PYTHON=${ED%/}${dest}/pypy3-c
+ # we can't use eclass function since PyPy is dumb and always gives
+ # paths relative to the interpreter
+ local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+ python_export pypy3 EPYTHON
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ einfo "Byte-compiling Python standard library..."
+
+ # compile the installed modules
+ python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 79018f786497..9978328ad1bb 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,3 +1,4 @@
DIST pypy3-v5.10.0-src.tar.bz2 29075971 BLAKE2B 02fb64d514ab292e09ced57e1c206b04d0fb38353ad6ec0e836448344a6d126d0fccfb61cbd278ea3acaa227032640e82f9ffd7efe3b33ade1ca34a18831b3e4 SHA512 69a373c18dbad9dd617f994ad885c8d8975f0c484ba9dd547e6e892c9a3030a43e9e3ee668aee5f4969403883de1311cef97a0a5e5701921172ee6c2119b771b
DIST pypy3-v5.10.1-src.tar.bz2 29071765 BLAKE2B d5c163697d8dd36a9a61e9a355719628902de0c9a4c038d31cd134d9bb26b8058abfdf85b09715208146295c37e343fae5e1e4a3c8d1999306eeea93791e326c SHA512 91b0ed25130bdbb46d5e577136b5fe63d5162917dcc2d0b69f5cac2a283ece9d0bfd3c7c8dc61ff391e0550fa1603326f6edeb2df3159d71617fefe6c07439f5
DIST pypy3-v5.9.0-src.tar.bz2 29055111 BLAKE2B 181d87ebe4a83a3f03b28d891f248f718ad120ed54621f8054f19a65aebbe90b65c69e40ca656612356b2019aa9ac22d5e242e688a80190b046511a8ceb9c040 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd
+DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
diff --git a/dev-python/pypy3/pypy3-6.0.0.ebuild b/dev-python/pypy3/pypy3-6.0.0.ebuild
new file mode 100644
index 000000000000..71af571b4767
--- /dev/null
+++ b/dev-python/pypy3/pypy3-6.0.0.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
+
+MY_P=pypy3-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.5) language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/60"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+ virtual/libffi:0=
+ virtual/libintl:0=
+ dev-libs/expat:0=
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+ bzip2? ( app-arch/bzip2:0= )
+ gdbm? ( sys-libs/gdbm:0= )
+ ncurses? ( sys-libs/ncurses:0= )
+ sqlite? ( dev-db/sqlite:3= )
+ tk? (
+ dev-lang/tk:0=
+ dev-tcltk/tix:0=
+ )
+ !dev-python/pypy3-bin:0"
+DEPEND="${RDEPEND}
+ low-memory? ( virtual/pypy )
+ !low-memory? (
+ || (
+ virtual/pypy
+ (
+ dev-lang/python:2.7
+ dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+ )
+ )
+ )"
+
+S="${WORKDIR}/${MY_P}-src"
+
+check_env() {
+ if use low-memory; then
+ CHECKREQS_MEMORY="1750M"
+ use amd64 && CHECKREQS_MEMORY="3500M"
+ else
+ CHECKREQS_MEMORY="3G"
+ use amd64 && CHECKREQS_MEMORY="6G"
+ fi
+
+ check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check_env
+
+ # unset to allow forcing pypy below :)
+ use low-memory && local EPYTHON=
+ if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
+ einfo "Using PyPy to perform the translation."
+ local EPYTHON=pypy
+ else
+ einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+ einfo "recommends using PyPy for that. If you wish to do so, please install"
+ einfo "virtual/pypy and ensure that EPYTHON variable is unset."
+ fi
+
+ python-any-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+ eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+ eapply "${FILESDIR}"/5.9.0-shared-lib.patch # 517002
+
+ sed -e "s^@EPREFIX@^${EPREFIX}^" \
+ -e "s^@libdir@^$(get_libdir)^" \
+ -i lib-python/3/distutils/command/install.py || die
+
+ # apply CPython stdlib patches
+ pushd lib-python/3 > /dev/null || die
+ eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+ eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+ popd > /dev/null || die
+
+ eapply_user
+}
+
+src_configure() {
+ tc-export CC
+
+ local args=(
+ --shared
+ $(usex jit -Ojit -O2)
+ $(usex sandbox --sandbox '')
+
+ --jit-backend=auto
+
+ pypy/goal/targetpypystandalone
+ )
+
+ # Avoid linking against libraries disabled by use flags
+ local opts=(
+ bzip2:bz2
+ ncurses:_minimal_curses
+ )
+
+ local opt
+ for opt in "${opts[@]}"; do
+ local flag=${opt%:*}
+ local mod=${opt#*:}
+
+ args+=(
+ $(usex ${flag} --withmod --withoutmod)-${mod}
+ )
+ done
+
+ local interp=( "${PYTHON}" )
+ if use low-memory; then
+ interp=( env PYPY_GC_MAX_DELTA=200MB
+ "${PYTHON}" --jit loop_longevity=300 )
+ fi
+
+ # translate into the C sources
+ # we're going to make them ourselves since otherwise pypy does not
+ # free up the unneeded memory before spawning the compiler
+ set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+ echo -e "\033[1m${@}\033[0m"
+ "${@}" || die "translation failed"
+}
+
+src_compile() {
+ emake -C "${T}"/usession*-0/testing_1
+
+ # copy back to make sys.prefix happy
+ cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
+ pax-mark m pypy3-c libpypy3-c.so
+
+ einfo "Generating caches and CFFI modules ..."
+
+ # Generate Grammar and PatternGrammar pickles.
+ ./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+ || die "Generation of Grammar and PatternGrammar pickles failed"
+
+ # Generate cffi modules
+ # Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+# "sqlite3": "_sqlite3_build.py",
+# "audioop": "_audioop_build.py",
+# "tk": "_tkinter/tklib_build.py",
+# "curses": "_curses_build.py" if sys.platform != "win32" else None,
+# "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+# "_gdbm": "_gdbm_build.py" if sys.platform != "win32" else None,
+# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+# "resource": "_resource_build.py" if sys.platform != "win32" else None,
+# "lzma": "_lzma_build.py",
+# "_decimal": "_decimal_build.py",
+# "_ssl": "_ssl_build.py",
+ cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
+ use gdbm && cffi_targets+=( gdbm )
+ use ncurses && cffi_targets+=( curses )
+ use sqlite && cffi_targets+=( sqlite3 )
+ use tk && cffi_targets+=( tkinter/tklib )
+
+ local t
+ # all modules except tkinter output to .
+ # tkinter outputs to the correct dir ...
+ cd lib_pypy || die
+ for t in "${cffi_targets[@]}"; do
+ # tkinter doesn't work via -m
+ ../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+ done
+
+ # Cleanup temporary objects
+ find -name "_cffi_*.[co]" -delete || die
+ find -type d -empty -delete || die
+}
+
+src_test() {
+ # (unset)
+ local -x PYTHONDONTWRITEBYTECODE
+
+ # Test runner requires Python 2 too. However, it spawns PyPy3
+ # internally so that we end up testing the correct interpreter.
+ "${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
+}
+
+src_install() {
+ local dest=/usr/$(get_libdir)/pypy3
+ einfo "Installing PyPy ..."
+ exeinto "${dest}"
+ doexe pypy3-c libpypy3-c.so
+ pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+ insinto "${dest}"
+ # preserve mtimes to avoid obsoleting caches
+ insopts -p
+ doins -r include lib_pypy lib-python
+ dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
+ dodoc README.rst
+
+ if ! use gdbm; then
+ rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+ fi
+ if ! use sqlite; then
+ rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+ "${ED%/}${dest}"/lib_pypy/_sqlite3* \
+ "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
+ fi
+ if ! use tk; then
+ rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+ "${ED%/}${dest}"/lib_pypy/_tkinter \
+ "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+ fi
+
+ einfo "Generating caches and byte-compiling ..."
+
+ local -x PYTHON=${ED%/}${dest}/pypy3-c
+ # we can't use eclass function since PyPy is dumb and always gives
+ # paths relative to the interpreter
+ local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+ python_export pypy3 EPYTHON
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ einfo "Byte-compiling Python standard library..."
+
+ # compile the installed modules
+ python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index c3217b6688dc..61b32ea2ad54 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -16,7 +16,7 @@ SRC_URI=""
LICENSE="MIT"
# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/59"
+SLOT="0/60"
KEYWORDS=""
IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 tk"
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
index 3ecf5c048699..766c5a63d61d 100644
--- a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
+++ b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="PyQRCode"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A pure Python QR code generator with SVG, EPS, PNG and terminal output"
-HOMEPAGE="https://github.com/mnooner256/pyqrcode https://pypi.org/project/PyQRCode"
+HOMEPAGE="https://github.com/mnooner256/pyqrcode https://pypi.org/project/PyQRCode/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pyramid/metadata.xml b/dev-python/pyramid/metadata.xml
index 4302a8f965df..84db2104ecb4 100644
--- a/dev-python/pyramid/metadata.xml
+++ b/dev-python/pyramid/metadata.xml
@@ -1,9 +1,9 @@
-
- python@gentoo.org
- Python
+
+ dolsen@gentoo.org
+ Brian Dolbec
pyramid
diff --git a/dev-python/pyro/pyro-3.16-r1.ebuild b/dev-python/pyro/pyro-3.16-r1.ebuild
index 60a84097b527..a8c7feb047dd 100644
--- a/dev-python/pyro/pyro-3.16-r1.ebuild
+++ b/dev-python/pyro/pyro-3.16-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="Pyro"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.org/project/Pyro"
+HOMEPAGE="https://pypi.org/project/Pyro/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyro/pyro-4.41.ebuild b/dev-python/pyro/pyro-4.41.ebuild
index 8f826f99582e..7faaba5bce21 100644
--- a/dev-python/pyro/pyro-4.41.ebuild
+++ b/dev-python/pyro/pyro-4.41.ebuild
@@ -11,7 +11,7 @@ MY_PN="Pyro4"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.org/project/Pyro4
+HOMEPAGE="https://pypi.org/project/Pyro4/
https://github.com/irmen/Pyro4"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyro/pyro-4.56.ebuild b/dev-python/pyro/pyro-4.56.ebuild
index beba0f06ec29..1f10cc373dbd 100644
--- a/dev-python/pyro/pyro-4.56.ebuild
+++ b/dev-python/pyro/pyro-4.56.ebuild
@@ -11,7 +11,7 @@ MY_PN="Pyro4"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Distributed object middleware for Python (RPC)"
-HOMEPAGE="https://pypi.org/project/Pyro4
+HOMEPAGE="https://pypi.org/project/Pyro4/
https://github.com/irmen/Pyro4"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/pyroma/pyroma-1.7.ebuild b/dev-python/pyroma/pyroma-1.7.ebuild
index bd358bfa29fd..aba1a97db3a6 100644
--- a/dev-python/pyroma/pyroma-1.7.ebuild
+++ b/dev-python/pyroma/pyroma-1.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Test project's packaging friendliness"
-HOMEPAGE="https://bitbucket.org/regebro/pyroma https://pypi.org/project/pyroma"
+HOMEPAGE="https://bitbucket.org/regebro/pyroma https://pypi.org/project/pyroma/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
diff --git a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
index e073ae5d87d3..24659e709c51 100644
--- a/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.13.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Persistent/Functional/Immutable data structures"
-HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent"
+HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyrtf/pyrtf-0.45-r2.ebuild b/dev-python/pyrtf/pyrtf-0.45-r2.ebuild
index f99d0374de47..a8cd7f64ebca 100644
--- a/dev-python/pyrtf/pyrtf-0.45-r2.ebuild
+++ b/dev-python/pyrtf/pyrtf-0.45-r2.ebuild
@@ -11,7 +11,7 @@ MY_PN="PyRTF"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python library to produce RTF documents"
-HOMEPAGE="http://pyrtf.sourceforge.net https://pypi.org/project/PyRTF"
+HOMEPAGE="http://pyrtf.sourceforge.net https://pypi.org/project/PyRTF/"
SRC_URI="mirror://sourceforge/$PN/${MY_P}.tar.gz"
LICENSE="|| ( GPL-2 LGPL-2 )"
diff --git a/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
index c90c557d9b66..76c132a1a65a 100644
--- a/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
+++ b/dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
@@ -11,7 +11,7 @@ MY_PN="PyScaffold"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Tool for easily putting up the scaffold of a Python project"
-HOMEPAGE="https://pypi.org/project/PyScaffold http://pyscaffold.readthedocs.org/"
+HOMEPAGE="https://pypi.org/project/PyScaffold/ http://pyscaffold.readthedocs.org/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pyscard/pyscard-1.9.5.ebuild b/dev-python/pyscard/pyscard-1.9.5.ebuild
index 249e911fac15..38dc29b9b670 100644
--- a/dev-python/pyscard/pyscard-1.9.5.ebuild
+++ b/dev-python/pyscard/pyscard-1.9.5.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 eutils
DESCRIPTION="Smart cards support in python"
HOMEPAGE="https://pyscard.sourceforge.io/
https://github.com/LudovicRousseau/pyscard
- https://pypi.org/project/pyscard"
+ https://pypi.org/project/pyscard/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/pyserial/pyserial-3.2.1.ebuild b/dev-python/pyserial/pyserial-3.2.1.ebuild
index fb917e23d479..bcab615ab74a 100644
--- a/dev-python/pyserial/pyserial-3.2.1.ebuild
+++ b/dev-python/pyserial/pyserial-3.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Python Serial Port extension"
-HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.org/project/pyserial"
+HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.org/project/pyserial/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/pyserial/pyserial-3.4.ebuild b/dev-python/pyserial/pyserial-3.4.ebuild
index 9cdf3fdeadbc..8d1e734f73a4 100644
--- a/dev-python/pyserial/pyserial-3.4.ebuild
+++ b/dev-python/pyserial/pyserial-3.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Python Serial Port extension"
-HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.org/project/pyserial"
+HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.org/project/pyserial/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
index 2b854d4665e1..c08cf7330694 100644
--- a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
+++ b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="SHA-3 (Keccak) for Python 2.7 - 3.5"
-HOMEPAGE="https://github.com/tiran/pysha3 https://pypi.org/project/pysha3"
+HOMEPAGE="https://github.com/tiran/pysha3 https://pypi.org/project/pysha3/"
SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="CC0-1.0 PSF-2"
diff --git a/dev-python/pyshark/pyshark-0.3.7.2.ebuild b/dev-python/pyshark/pyshark-0.3.7.2.ebuild
index 12e12622a1fa..de9a9571c2ab 100644
--- a/dev-python/pyshark/pyshark-0.3.7.2.ebuild
+++ b/dev-python/pyshark/pyshark-0.3.7.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1 eutils
DESCRIPTION="A Python wrapper for tshark output parsing"
-HOMEPAGE="https://pypi.org/project/pyshark https://github.com/KimiNewt/pyshark"
+HOMEPAGE="https://pypi.org/project/pyshark/ https://github.com/KimiNewt/pyshark"
# pypi tarball is missing tests
#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SRC_URI="https://github.com/KimiNewt/pyshark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/pysnmp-apps/pysnmp-apps-0.5.2.ebuild b/dev-python/pysnmp-apps/pysnmp-apps-0.5.2.ebuild
index b433bfa00b8b..3ec6496f41e1 100644
--- a/dev-python/pysnmp-apps/pysnmp-apps-0.5.2.ebuild
+++ b/dev-python/pysnmp-apps/pysnmp-apps-0.5.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="PySNMP applications"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-apps"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-apps/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild b/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild
index 55d4ac689cdb..96aa617210e4 100644
--- a/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild
+++ b/dev-python/pysnmp-apps/pysnmp-apps-0.5.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="PySNMP applications"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-apps"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-apps/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
index 2acff3041233..54741cfdb11a 100644
--- a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
+++ b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="SNMP framework in Python - MIBs"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-mibs"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-mibs/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pysnmp/pysnmp-4.3.3.ebuild b/dev-python/pysnmp/pysnmp-4.3.3.ebuild
index 968dc80f9429..fa8551559639 100644
--- a/dev-python/pysnmp/pysnmp-4.3.3.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.3.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.org/project/pysnmp/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pysnmp/pysnmp-4.4.4.ebuild b/dev-python/pysnmp/pysnmp-4.4.4.ebuild
index 68a7e63f93c3..3d1c8021a0c7 100644
--- a/dev-python/pysnmp/pysnmp-4.4.4.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.4.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp"
+HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pyspf/pyspf-2.0.12.ebuild b/dev-python/pyspf/pyspf-2.0.12.ebuild
index bf1883969e60..abad4d2aa821 100644
--- a/dev-python/pyspf/pyspf-2.0.12.ebuild
+++ b/dev-python/pyspf/pyspf-2.0.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ipv6?"
inherit distutils-r1
DESCRIPTION="Python implementation of the Sender Policy Framework (SPF) protocol"
-HOMEPAGE="https://pypi.org/project/pyspf"
+HOMEPAGE="https://pypi.org/project/pyspf/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}t.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/pysrt/pysrt-1.0.1.ebuild b/dev-python/pysrt/pysrt-1.0.1.ebuild
index ffa3cee632ca..c4f45f56d838 100644
--- a/dev-python/pysrt/pysrt-1.0.1.ebuild
+++ b/dev-python/pysrt/pysrt-1.0.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
# pypi tarballs don't include tests https://github.com/byroot/pysrt/issues/42
SRC_URI="https://github.com/byroot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/pysrt/pysrt-1.1.0.ebuild b/dev-python/pysrt/pysrt-1.1.0.ebuild
index 7a6b7a9fec61..1dff10036683 100644
--- a/dev-python/pysrt/pysrt-1.1.0.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/dev-python/pysrt/pysrt-1.1.1.ebuild b/dev-python/pysrt/pysrt-1.1.1.ebuild
index ddc1e6025751..cfcbae9752a0 100644
--- a/dev-python/pysrt/pysrt-1.1.1.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
SRC_URI="https://pypi.python.org/packages/f6/33/16ad65a8973cb8bcb494af09ee1b9ab5ffdd6ff300bce5d3ac7d3cb1f2cc/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index d0567969f497..bda2f23780fd 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1 git-r3
DESCRIPTION="Python library used to edit or create SubRip files"
-HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
LICENSE="GPL-3"
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
index 80375c03dbd5..5645f67c374f 100644
--- a/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
+++ b/dev-python/pytest-cache/pytest-cache-1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="mechanisms for caching across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-cache
+HOMEPAGE="https://pypi.org/project/pytest-cache/
https://bitbucket.org/hpk42/pytest-cache/
https://pythonhosted.org/pytest-cache/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
index a5d7a40ef447..aeb1aa05c166 100644
--- a/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
+++ b/dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="py.test plugin to catch log messages, fork of pytest-capturelog"
-HOMEPAGE="https://pypi.org/project/pytest-catchlog https://github.com/eisensheng/pytest-catchlog"
+HOMEPAGE="https://pypi.org/project/pytest-catchlog/ https://github.com/eisensheng/pytest-catchlog"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
SLOT="0"
diff --git a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
index 54e2586ba7c9..a5b9de699886 100644
--- a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
index 3dc7179e8a4b..8b25c64118ca 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
index 9a605b2a064c..d769afe6c08e 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-django/pytest-django-2.9.1.ebuild b/dev-python/pytest-django/pytest-django-2.9.1.ebuild
index 39543a13cfa0..ecfe25826b50 100644
--- a/dev-python/pytest-django/pytest-django-2.9.1.ebuild
+++ b/dev-python/pytest-django/pytest-django-2.9.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="A Django plugin for py.test"
-HOMEPAGE="https://pypi.org/project/pytest-django https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
+HOMEPAGE="https://pypi.org/project/pytest-django/ https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
index 5a39a0a315f1..83388f2cdc8e 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-fixture-config"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-fixture-config/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.2.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.2.ebuild
index 7d14dbd4c2a8..524b88b962a8 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.2.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-fixture-config"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-fixture-config/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-forked/pytest-forked-0.2.ebuild b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
index 79964ebe9184..ca671b48d93a 100644
--- a/dev-python/pytest-forked/pytest-forked-0.2.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-0.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="run tests in isolated forked subprocesses"
-HOMEPAGE="https://pypi.org/project/pytest-forked https://github.com/pytest-dev/pytest-forked"
+HOMEPAGE="https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
index 871f9d8266f1..14a5b50c54aa 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Easily test your HTTP library against a local copy of httpbin"
HOMEPAGE="https://github.com/kevin1024/pytest-httpbin
- https://pypi.org/project/pytest-httpbin"
+ https://pypi.org/project/pytest-httpbin/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
index 1c44fbbfbf8a..4b309c164f99 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.3.7.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6} pypy)
inherit distutils-r1
DESCRIPTION="Py.test plugin to test server connections locally"
-HOMEPAGE="https://pypi.org/project/pytest-localserver"
+HOMEPAGE="https://pypi.org/project/pytest-localserver/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
index d1f0235a597a..c8561edd55ac 100644
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="pytest plugin to check PEP8 requirements"
-HOMEPAGE="https://pypi.org/project/pytest-pep8"
+HOMEPAGE="https://pypi.org/project/pytest-pep8/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild b/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild
index a3483ca073af..c59196cfe0ca 100644
--- a/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild
+++ b/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="pytest plugin for adding to the PYTHONPATH from command line or configs"
-HOMEPAGE="https://pypi.org/project/pytest-pythonpath https://github.com/bigsassy/pytest-pythonpath"
+HOMEPAGE="https://pypi.org/project/pytest-pythonpath/ https://github.com/bigsassy/pytest-pythonpath"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild b/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild
index af670b1bcf48..068bf8e7c463 100644
--- a/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-2.3.0-r2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_5 )
inherit distutils-r1
DESCRIPTION="pytest plugin for PyQt4 or PyQt5 applications"
-HOMEPAGE="https://pypi.org/project/pytest-qt"
+HOMEPAGE="https://pypi.org/project/pytest-qt/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
index 3ae4ea036b6e..846360f394a6 100644
--- a/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_5 )
inherit distutils-r1
DESCRIPTION="pytest plugin for PyQt4 or PyQt5 applications"
-HOMEPAGE="https://pypi.org/project/pytest-qt"
+HOMEPAGE="https://pypi.org/project/pytest-qt/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
index fa3c9f8cae6d..b1685ba50f2b 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="py.test plugin for relaxed test discovery and organization"
-HOMEPAGE="https://pypi.org/project/pytest-relaxed https://github.com/bitprophet/pytest-relaxed"
+HOMEPAGE="https://pypi.org/project/pytest-relaxed/ https://github.com/bitprophet/pytest-relaxed"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
index e74eacda46f2..836ea380e2a8 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-2.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="py.test plugin to re-run tests to eliminate flaky failures"
-HOMEPAGE="https://pypi.org/project/pytest-rerunfailures"
+HOMEPAGE="https://pypi.org/project/pytest-rerunfailures/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild b/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild
index 6c3e95866e42..498de4a1b938 100644
--- a/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-2.11.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Adds support for tests during installation of setup.py files"
-HOMEPAGE="https://pypi.org/project/pytest-runner https://github.com/pytest-dev/pytest-runner"
+HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/pytest-runner"
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
index 87a5bf0761ae..11237d06ad21 100644
--- a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Adds support for tests during installation of setup.py files"
-HOMEPAGE="https://pypi.org/project/pytest-runner https://github.com/pytest-dev/pytest-runner"
+HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/pytest-runner"
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-runner/pytest-runner-4.0.ebuild b/dev-python/pytest-runner/pytest-runner-4.0.ebuild
index ee3d50583ea0..0b57fc5fc1da 100644
--- a/dev-python/pytest-runner/pytest-runner-4.0.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Adds support for tests during installation of setup.py files"
-HOMEPAGE="https://pypi.org/project/pytest-runner https://github.com/pytest-dev/pytest-runner"
+HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/pytest-runner"
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
index ea715b068194..b32bb9d1ca44 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
index a83383c7ddc1..0b2a9d9edb91 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild
index a83383c7ddc1..0b2a9d9edb91 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-shutil/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
index 1ff4694843d1..2db7247a8c7d 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="py.test plugin to abort hanging tests"
-HOMEPAGE="https://pypi.org/project/pytest-timeout"
+HOMEPAGE="https://pypi.org/project/pytest-timeout/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
index 0fdf2074e7f5..e7a02de3673e 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="py.test plugin to abort hanging tests"
-HOMEPAGE="https://pypi.org/project/pytest-timeout"
+HOMEPAGE="https://pypi.org/project/pytest-timeout/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
index 40a937cca811..5aeb7688c7ef 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-virtualenv"
+HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.org/project/pytest-virtualenv/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
index 9ac23db3a9f6..48686f111781 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist https://github.com/pytest-dev/pytest-xdist"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild
index 3bf471c7d78c..f2e4b6fb85ee 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.20.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist https://github.com/pytest-dev/pytest-xdist"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pytest/pytest-3.0.3.ebuild b/dev-python/pytest/pytest-3.0.3.ebuild
index ca84419e4f1c..f6d776d3e09f 100644
--- a/dev-python/pytest/pytest-3.0.3.ebuild
+++ b/dev-python/pytest/pytest-3.0.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ https://pypi.org/project/pytest"
+HOMEPAGE="http://pytest.org/ https://pypi.org/project/pytest/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/python-daemon/python-daemon-1.6-r1.ebuild b/dev-python/python-daemon/python-daemon-1.6-r1.ebuild
index 89189b37d30f..ab45831357e3 100644
--- a/dev-python/python-daemon/python-daemon-1.6-r1.ebuild
+++ b/dev-python/python-daemon/python-daemon-1.6-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Library to implement a well-behaved Unix daemon process"
-HOMEPAGE="https://pypi.org/project/python-daemon"
+HOMEPAGE="https://pypi.org/project/python-daemon/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/python-daemon/python-daemon-2.1.1.ebuild b/dev-python/python-daemon/python-daemon-2.1.1.ebuild
index f2d67501782a..45620ded0aec 100644
--- a/dev-python/python-daemon/python-daemon-2.1.1.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.1.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Library to implement a well-behaved Unix daemon process"
-HOMEPAGE="https://pypi.org/project/python-daemon"
+HOMEPAGE="https://pypi.org/project/python-daemon/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild b/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
index 666cc8046378..188fffa35f60 100644
--- a/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.6.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Extensions to the standard Python datetime module"
HOMEPAGE="
https://dateutil.readthedocs.org/
- https://pypi.org/project/python-dateutil
+ https://pypi.org/project/python-dateutil/
https://github.com/dateutil/dateutil/
"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild
index 859155cde63d..07cf2a13590a 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Extensions to the standard Python datetime module"
HOMEPAGE="
https://dateutil.readthedocs.org/
- https://pypi.org/project/python-dateutil
+ https://pypi.org/project/python-dateutil/
https://github.com/dateutil/dateutil/
"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/python-dateutil/python-dateutil-2.7.2.ebuild b/dev-python/python-dateutil/python-dateutil-2.7.2.ebuild
index 859155cde63d..07cf2a13590a 100644
--- a/dev-python/python-dateutil/python-dateutil-2.7.2.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.7.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Extensions to the standard Python datetime module"
HOMEPAGE="
https://dateutil.readthedocs.org/
- https://pypi.org/project/python-dateutil
+ https://pypi.org/project/python-dateutil/
https://github.com/dateutil/dateutil/
"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/python-ddp/python-ddp-0.1.5.ebuild b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
index 2436496c6152..8a4ad84ed38e 100644
--- a/dev-python/python-ddp/python-ddp-0.1.5.ebuild
+++ b/dev-python/python-ddp/python-ddp-0.1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="An event driven ddp client"
-HOMEPAGE="https://pypi.org/project/python-ddp https://github.com/hharnisc/python-ddp"
+HOMEPAGE="https://pypi.org/project/python-ddp/ https://github.com/hharnisc/python-ddp"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/python-engineio/python-engineio-1.7.0.ebuild b/dev-python/python-engineio/python-engineio-1.7.0.ebuild
index 6596f563e66c..780c7de65f76 100644
--- a/dev-python/python-engineio/python-engineio-1.7.0.ebuild
+++ b/dev-python/python-engineio/python-engineio-1.7.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
MY_PN=""
DESCRIPTION="Python implementation of the Engine.IO realtime server."
-HOMEPAGE="https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio"
+HOMEPAGE="https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/python-etcd/python-etcd-0.4.5.ebuild b/dev-python/python-etcd/python-etcd-0.4.5.ebuild
index f6982b83604b..fc4fc08eab08 100644
--- a/dev-python/python-etcd/python-etcd-0.4.5.ebuild
+++ b/dev-python/python-etcd/python-etcd-0.4.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="A python client for etcd"
-HOMEPAGE="https://github.com/jplana/python-etcd https://pypi.org/project/python-etcd"
+HOMEPAGE="https://github.com/jplana/python-etcd https://pypi.org/project/python-etcd/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild b/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild
index 3f3f5df16d92..fbd345761cc0 100644
--- a/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild
+++ b/dev-python/python-exconsole/python-exconsole-0.1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Emergency/postmortem Python console"
-HOMEPAGE="https://github.com/Eugeny/exconsole https://pypi.org/project/python-exconsole"
+HOMEPAGE="https://github.com/Eugeny/exconsole https://pypi.org/project/python-exconsole/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild b/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild
index b1ba130dc2dc..eec37629089b 100644
--- a/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild
+++ b/dev-python/python-fastcgi/python-fastcgi-1.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Interface to OpenMarket's FastCGI C Library/SDK"
-HOMEPAGE="https://pypi.org/project/python-fastcgi"
+HOMEPAGE="https://pypi.org/project/python-fastcgi/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/python-hpilo/python-hpilo-4.0.ebuild b/dev-python/python-hpilo/python-hpilo-4.0.ebuild
index 5a7eae062c17..4db36e678224 100644
--- a/dev-python/python-hpilo/python-hpilo-4.0.ebuild
+++ b/dev-python/python-hpilo/python-hpilo-4.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="iLO automation from python or shell"
-HOMEPAGE="https://pypi.org/project/python-hpilo"
+HOMEPAGE="https://pypi.org/project/python-hpilo/"
SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/python-hpilo/python-hpilo-4.1.ebuild b/dev-python/python-hpilo/python-hpilo-4.1.ebuild
index 5a7eae062c17..4db36e678224 100644
--- a/dev-python/python-hpilo/python-hpilo-4.1.ebuild
+++ b/dev-python/python-hpilo/python-hpilo-4.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="iLO automation from python or shell"
-HOMEPAGE="https://pypi.org/project/python-hpilo"
+HOMEPAGE="https://pypi.org/project/python-hpilo/"
SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
index 786bc61b3779..f727a2ec88fc 100644
--- a/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.19-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 multilib
DESCRIPTION="Various LDAP-related Python modules"
HOMEPAGE="https://www.python-ldap.org/en/latest/
- https://pypi.org/project/python-ldap"
+ https://pypi.org/project/python-ldap/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/python-ldap/python-ldap-2.4.32.ebuild b/dev-python/python-ldap/python-ldap-2.4.32.ebuild
index 68ea896be8be..c43b6bc092ca 100644
--- a/dev-python/python-ldap/python-ldap-2.4.32.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.32.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 multilib
DESCRIPTION="Various LDAP-related Python modules"
HOMEPAGE="https://www.python-ldap.org/en/latest/
- https://pypi.org/project/python-ldap"
+ https://pypi.org/project/python-ldap/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index d12a73027175..468171efb88c 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1 git-2 multilib
DESCRIPTION="Various LDAP-related Python modules"
HOMEPAGE="https://www.python-ldap.org/en/latest/
- https://pypi.org/project/python-ldap"
+ https://pypi.org/project/python-ldap/"
EGIT_REPO_URI="https://github.com/xmw/python-ldap.git"
LICENSE="PSF-2"
diff --git a/dev-python/python-ly/python-ly-0.9.4.ebuild b/dev-python/python-ly/python-ly-0.9.4.ebuild
index 91adc501e5fe..85786df53c1e 100644
--- a/dev-python/python-ly/python-ly-0.9.4.ebuild
+++ b/dev-python/python-ly/python-ly-0.9.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Tool and library for manipulating LilyPond files"
-HOMEPAGE="https://github.com/wbsoft/python-ly http://pypi.org/project/python-ly"
+HOMEPAGE="https://github.com/wbsoft/python-ly http://pypi.org/project/python-ly/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
diff --git a/dev-python/python-ly/python-ly-0.9.5.ebuild b/dev-python/python-ly/python-ly-0.9.5.ebuild
index 32e69b1081cd..8b2a0b736d56 100644
--- a/dev-python/python-ly/python-ly-0.9.5.ebuild
+++ b/dev-python/python-ly/python-ly-0.9.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Tool and library for manipulating LilyPond files"
-HOMEPAGE="https://github.com/wbsoft/python-ly http://pypi.org/project/python-ly"
+HOMEPAGE="https://github.com/wbsoft/python-ly http://pypi.org/project/python-ly/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
diff --git a/dev-python/python-memcached/python-memcached-1.53-r1.ebuild b/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
index b5a371070cc4..2a091a9ae4c7 100644
--- a/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.53-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Pure python memcached client"
HOMEPAGE="https://www.tummy.com/Community/software/python-memcached/
- https://pypi.org/project/python-memcached"
+ https://pypi.org/project/python-memcached/"
SRC_URI="ftp://ftp.tummy.com/pub/python-memcached/old-releases/${P}.tar.gz"
LICENSE="OSL-2.0"
diff --git a/dev-python/python-memcached/python-memcached-1.58.ebuild b/dev-python/python-memcached/python-memcached-1.58.ebuild
index 88753f63880f..84e590112e70 100644
--- a/dev-python/python-memcached/python-memcached-1.58.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.58.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Pure python memcached client"
HOMEPAGE="
https://www.tummy.com/Community/software/python-memcached/
- https://pypi.org/project/python-memcached"
+ https://pypi.org/project/python-memcached/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="OSL-2.0"
diff --git a/dev-python/python-meteor/python-meteor-0.1.6.ebuild b/dev-python/python-meteor/python-meteor-0.1.6.ebuild
index de6ddcb6157b..dfcb8d5d4061 100644
--- a/dev-python/python-meteor/python-meteor-0.1.6.ebuild
+++ b/dev-python/python-meteor/python-meteor-0.1.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="An event driven meteor client"
-HOMEPAGE="https://pypi.org/project/python-meteor https://github.com/hharnisc/python-meteor"
+HOMEPAGE="https://pypi.org/project/python-meteor/ https://github.com/hharnisc/python-meteor"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index de464872cf84..d47932ae79b5 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,3 +1,4 @@
DIST python-novaclient-6.0.1.tar.gz 288613 BLAKE2B b31b8a6b0ca136db396318513bd9fe6ba6c85517935c1f74654145cdc1a4a4b93cbae289126444ed1fd8ac0afb41b1952da20b7ebc5b55d73dc64c8a1567d8bd SHA512 20bbd40bed2328c6bceba6e0057b541e949d1ea1f7c37190d2ef07bed164a2cf20927b2e7a1b26c349038fca625873e189dad150b4a3e801f9211388ab3996c7
DIST python-novaclient-7.1.2.tar.gz 284152 BLAKE2B d632444db1393d69c9e87c2f487babe8931492c339e2838d4f024e01d78a2d1b2958feb0c9f22637311dbc5a6c51e052b241798a7507914f56ec10c3962ff27b SHA512 6b7e4bc80e07b09756f61624d2cf7b81dccd1d102f22cb9609b7e1de6f091061c513691095467e293b742c40a62c8cabc2d3ff8cbc5492d07763655de4d6c516
DIST python-novaclient-9.1.1.tar.gz 277784 BLAKE2B f05186c4ea6a539987b828386232eb20526e869e0933679ec530b1001edf78e72b6567dd600bdeeb8e0cc7986ff68daf4f1690c6e7e21721c9c21d65eba2be3a SHA512 ceb60a1e88c6ef7b9cc9fba9a192bd781b4404e4cc500b902cc2b4a8cf2f8917f1066df5349d2e421dfaa9fd6b791452872a30440cdec604bad3bee85cd6cd82
+DIST python-novaclient-9.1.2.tar.gz 279803 BLAKE2B a26e80085200de4eb1da97a37feeb3da0a70fdfc4adcd837ce0e18a275ed819457e140aa94e74e7d07003d2607a245aa0a263bed954c7252f4f28092cc7b74c0 SHA512 d71008a32b022d452b43babef6b600f5ee2b2ad3a4e1a473731966f08132c5de813d9387982e4111c055d0266be6527cca3da5d58ec8b7bda8d628bb8189ca1b
diff --git a/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild b/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild
new file mode 100644
index 000000000000..e95c2a4e8fda
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-9.1.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ test? (
+ >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+ !~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+ >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+ >=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+ >=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+ )"
+RDEPEND="
+ >=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+ >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+ =dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+ >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+ >=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+ # built in...
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ testr init
+ testr run --parallel || die "testsuite failed under python2.7"
+}
diff --git a/dev-python/python-oembed/python-oembed-0.2.4.ebuild b/dev-python/python-oembed/python-oembed-0.2.4.ebuild
index 474d5968685b..8947e78934db 100644
--- a/dev-python/python-oembed/python-oembed-0.2.4.ebuild
+++ b/dev-python/python-oembed/python-oembed-0.2.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="A Python library that implements an OEmbed consumer"
-HOMEPAGE="https://pypi.org/project/python-oembed"
+HOMEPAGE="https://pypi.org/project/python-oembed/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
index 5aa4a84fce63..20929ce8d3ab 100644
--- a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
+++ b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="OpenID support for servers and consumers"
-HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/ https://pypi.org/project/python-openid"
+HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/ https://pypi.org/project/python-openid/"
# Downloaded from https://github.com/openid/python-openid/downloads
SRC_URI="mirror://gentoo/${P}.tar.gz"
diff --git a/dev-python/python-otrs/python-otrs-0.3.0.ebuild b/dev-python/python-otrs/python-otrs-0.3.0.ebuild
index 5fb7582a0647..1c812f2ec198 100644
--- a/dev-python/python-otrs/python-otrs-0.3.0.ebuild
+++ b/dev-python/python-otrs/python-otrs-0.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="A programmatic interface to OTRS SOAP API"
-HOMEPAGE="https://pypi.org/project/python-otrs"
+HOMEPAGE="https://pypi.org/project/python-otrs/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="GPL-3"
diff --git a/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild b/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
index 4e84d53870df..ad81c63ba1ff 100644
--- a/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
+++ b/dev-python/python-ptrace/python-ptrace-0.8.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
inherit distutils-r1
DESCRIPTION="A debugger using ptrace (Linux, BSD and Darwin system call to trace processes)"
-HOMEPAGE="https://github.com/haypo/python-ptrace/ https://pypi.org/project/python-ptrace"
+HOMEPAGE="https://github.com/haypo/python-ptrace/ https://pypi.org/project/python-ptrace/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/python-rethinkdb/metadata.xml b/dev-python/python-rethinkdb/metadata.xml
index 952a3adeafa4..072edc1ad4e1 100644
--- a/dev-python/python-rethinkdb/metadata.xml
+++ b/dev-python/python-rethinkdb/metadata.xml
@@ -1,10 +1,6 @@
-
- python@gentoo.org
- Python
-
ultrabug@gentoo.org
Ultrabug
diff --git a/dev-python/python-socketio/python-socketio-1.7.4.ebuild b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
index 9ef5a2eae166..f6a4243e10a1 100644
--- a/dev-python/python-socketio/python-socketio-1.7.4.ebuild
+++ b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python implementation of the Socket.IO realtime server."
-HOMEPAGE="https://python-socketio.readthedocs.org/ https://github.com/miguelgrinberg/python-socketio/ https://pypi.org/project/python-socketio"
+HOMEPAGE="https://python-socketio.readthedocs.org/ https://github.com/miguelgrinberg/python-socketio/ https://pypi.org/project/python-socketio/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/python-stdnum/python-stdnum-1.7.ebuild b/dev-python/python-stdnum/python-stdnum-1.7.ebuild
index 6bb1b062dfbf..db1d8fe5bd10 100644
--- a/dev-python/python-stdnum/python-stdnum-1.7.ebuild
+++ b/dev-python/python-stdnum/python-stdnum-1.7.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="A module to handle standardized numbers and codes"
-HOMEPAGE="http://arthurdejong.org/python-stdnum/"
+HOMEPAGE="https://arthurdejong.org/python-stdnum/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/python-stdnum/python-stdnum-1.8.1.ebuild b/dev-python/python-stdnum/python-stdnum-1.8.1.ebuild
index 9bd98db12525..8d73d4288ed8 100644
--- a/dev-python/python-stdnum/python-stdnum-1.8.1.ebuild
+++ b/dev-python/python-stdnum/python-stdnum-1.8.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="A module to handle standardized numbers and codes"
-HOMEPAGE="http://arthurdejong.org/python-stdnum/"
+HOMEPAGE="https://arthurdejong.org/python-stdnum/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/python3-openid/python3-openid-3.1.0.ebuild b/dev-python/python3-openid/python3-openid-3.1.0.ebuild
index 67a74b7a0aa6..c584951cc4a9 100644
--- a/dev-python/python3-openid/python3-openid-3.1.0.ebuild
+++ b/dev-python/python3-openid/python3-openid-3.1.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Python 3 port of the python-openid library"
-HOMEPAGE="https://github.com/necaris/python3-openid https://pypi.org/project/python3-openid"
+HOMEPAGE="https://github.com/necaris/python3-openid https://pypi.org/project/python3-openid/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
index 2090ec26c492..a3b1330fdccf 100644
--- a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.org/project/python2-pythondialog"
+HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.org/project/python2-pythondialog/"
SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
LICENSE="LGPL-2"
diff --git a/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
index 8bf81f43dc5d..961a39728139 100644
--- a/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.4.0-r200.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
-HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.org/project/python2-pythondialog"
+HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.org/project/python2-pythondialog/"
SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
LICENSE="LGPL-2"
diff --git a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
index 003b6c310842..8927d11a1015 100644
--- a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
+++ b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Manage python installations in your system, berdario's shallow fork"
HOMEPAGE="
https://github.com/berdario/pythonz/tree/bd
- https://pypi.org/project/pythonz-bd"
+ https://pypi.org/project/pythonz-bd/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pytrie/pytrie-0.3.ebuild b/dev-python/pytrie/pytrie-0.3.ebuild
index 6d6e86093c4f..71235e45939f 100644
--- a/dev-python/pytrie/pytrie-0.3.ebuild
+++ b/dev-python/pytrie/pytrie-0.3.ebuild
@@ -10,7 +10,7 @@ MY_PN="PyTrie"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A pure Python implementation of the trie data structure."
-HOMEPAGE="https://github.com/gsakkis/pytrie/ https://pypi.org/project/PyTrie"
+HOMEPAGE="https://github.com/gsakkis/pytrie/ https://pypi.org/project/PyTrie/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/pyusb/pyusb-1.0.2.ebuild b/dev-python/pyusb/pyusb-1.0.2.ebuild
index 0a660307d2e6..ac5eea3c5d85 100644
--- a/dev-python/pyusb/pyusb-1.0.2.ebuild
+++ b/dev-python/pyusb/pyusb-1.0.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="USB support for Python"
-HOMEPAGE="https://walac.github.io/pyusb/ https://pypi.org/project/pyusb"
+HOMEPAGE="https://walac.github.io/pyusb/ https://pypi.org/project/pyusb/"
SRC_URI="https://github.com/walac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
# pypi releases don't include tests
#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pyutil/pyutil-2.0.0.ebuild b/dev-python/pyutil/pyutil-2.0.0.ebuild
index 421007cfd5c0..64fccd9672e4 100644
--- a/dev-python/pyutil/pyutil-2.0.0.ebuild
+++ b/dev-python/pyutil/pyutil-2.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="A collection of utilities for Python programmers"
-HOMEPAGE="https://tahoe-lafs.org/trac/pyutil https://pypi.org/project/pyutil"
+HOMEPAGE="https://tahoe-lafs.org/trac/pyutil https://pypi.org/project/pyutil/"
SRC_URI="mirror://pypi/p/pyutil/pyutil-${PV}.tar.gz"
LICENSE="GPL-2+"
diff --git a/dev-python/pyutmp/pyutmp-0.2.1.ebuild b/dev-python/pyutmp/pyutmp-0.2.1.ebuild
index b0eb9dbdf5fc..adcbb754f2c6 100644
--- a/dev-python/pyutmp/pyutmp-0.2.1.ebuild
+++ b/dev-python/pyutmp/pyutmp-0.2.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Python UTMP wrapper for Un*x systems"
-HOMEPAGE="https://pypi.org/project/pyutmp https://bmc.github.com/pyutmp/"
+HOMEPAGE="https://pypi.org/project/pyutmp/ https://bmc.github.com/pyutmp/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild b/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild
index 3cbf82b1b76b..ac2511bd0e0a 100644
--- a/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild
+++ b/dev-python/pywebdav/pywebdav-0.9.8-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_P=${P/pywebdav/PyWebDAV}
DESCRIPTION="WebDAV server written in Python"
-HOMEPAGE="https://pypi.org/project/PyWebDAV"
+HOMEPAGE="https://pypi.org/project/PyWebDAV/"
SRC_URI="https://pywebdav.googlecode.com/files/${MY_P}.tar.gz"
LICENSE="LGPL-2"
diff --git a/dev-python/pyyaml/pyyaml-3.12.ebuild b/dev-python/pyyaml/pyyaml-3.12.ebuild
index f9117d89a828..47a7cf1510a8 100644
--- a/dev-python/pyyaml/pyyaml-3.12.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.12.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_P="PyYAML-${PV}"
DESCRIPTION="YAML parser and emitter for Python"
-HOMEPAGE="http://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML"
+HOMEPAGE="http://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/"
SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyzmq/pyzmq-16.0.2.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
index 03602c639ce2..6f7275ec29f2 100644
--- a/dev-python/pyzmq/pyzmq-16.0.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit flag-o-matic distutils-r1 toolchain-funcs
DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="http://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq"
+HOMEPAGE="http://www.zeromq.org/bindings:python https://pypi.org/project/pyzmq/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
diff --git a/dev-python/qrcode/qrcode-5.1-r1.ebuild b/dev-python/qrcode/qrcode-5.1-r1.ebuild
index cb22e1659edb..144590d77c3b 100644
--- a/dev-python/qrcode/qrcode-5.1-r1.ebuild
+++ b/dev-python/qrcode/qrcode-5.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="QR Code generator on top of PIL"
-HOMEPAGE="https://pypi.org/project/qrcode"
+HOMEPAGE="https://pypi.org/project/qrcode/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/rdflib/rdflib-4.2.1.ebuild b/dev-python/rdflib/rdflib-4.2.1.ebuild
index 023eb06cfad9..58fbcff35e9c 100644
--- a/dev-python/rdflib/rdflib-4.2.1.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.1.ebuild
@@ -12,7 +12,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
inherit distutils-r1
DESCRIPTION="RDF library containing a triple store and parser/serializer"
-HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib"
+HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
index d3d78846c85a..6b87710d7d53 100644
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2.ebuild
@@ -12,7 +12,7 @@ DISTUTILS_IN_SOURCE_BUILD=1
inherit distutils-r1
DESCRIPTION="RDF library containing a triple store and parser/serializer"
-HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib"
+HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/readlike/readlike-0.1.2.ebuild b/dev-python/readlike/readlike-0.1.2.ebuild
index 33f9f55308c6..9caaa01de03c 100644
--- a/dev-python/readlike/readlike-0.1.2.ebuild
+++ b/dev-python/readlike/readlike-0.1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64"
DESCRIPTION="a python library similar to readline"
-HOMEPAGE="https://pypi.org/project/readlike"
+HOMEPAGE="https://pypi.org/project/readlike/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/readme/readme-0.6.0.ebuild b/dev-python/readme/readme-0.6.0.ebuild
index 8e3ce5ae38bc..48ed84787a47 100644
--- a/dev-python/readme/readme-0.6.0.ebuild
+++ b/dev-python/readme/readme-0.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme https://pypi.org/project/readme"
+HOMEPAGE="https://github.com/pypa/readme https://pypi.org/project/readme/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/readme_renderer/readme_renderer-17.2.ebuild b/dev-python/readme_renderer/readme_renderer-17.2.ebuild
index b52ee1c631f1..41cebe2f3acb 100644
--- a/dev-python/readme_renderer/readme_renderer-17.2.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-17.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer"
+HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/rebulk/rebulk-0.9.0.ebuild b/dev-python/rebulk/rebulk-0.9.0.ebuild
index 818a38117f8b..a70a1966a254 100644
--- a/dev-python/rebulk/rebulk-0.9.0.ebuild
+++ b/dev-python/rebulk/rebulk-0.9.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Python library that performs advanced searches in strings"
-HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk"
+HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT Apache-2.0"
diff --git a/dev-python/rebulk/rebulk-9999.ebuild b/dev-python/rebulk/rebulk-9999.ebuild
index f77f95ef8443..60c1e5b4b0df 100644
--- a/dev-python/rebulk/rebulk-9999.ebuild
+++ b/dev-python/rebulk/rebulk-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1 git-r3
DESCRIPTION="Python library that performs advanced searches in strings"
-HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk"
+HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/"
EGIT_REPO_URI="https://github.com/Toilal/${PN}.git"
LICENSE="MIT Apache-2.0"
diff --git a/dev-python/redlock-py/redlock-py-1.0.8.ebuild b/dev-python/redlock-py/redlock-py-1.0.8.ebuild
index 04560841c84b..2f3061822c58 100644
--- a/dev-python/redlock-py/redlock-py-1.0.8.ebuild
+++ b/dev-python/redlock-py/redlock-py-1.0.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy{,3} python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Redis distributed locks in Python"
-HOMEPAGE="https://github.com/SPSCommerce/redlock-py https://pypi.org/project/redlock-py"
+HOMEPAGE="https://github.com/SPSCommerce/redlock-py https://pypi.org/project/redlock-py/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/regendoc/regendoc-0.5.ebuild b/dev-python/regendoc/regendoc-0.5.ebuild
index e568e1f9f4e7..450ca696df50 100644
--- a/dev-python/regendoc/regendoc-0.5.ebuild
+++ b/dev-python/regendoc/regendoc-0.5.ebuild
@@ -11,7 +11,7 @@ MY_PN="RegenDoc"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Check/update simple file/shell examples in documentation"
-HOMEPAGE="https://pypi.org/project/RegenDoc
+HOMEPAGE="https://pypi.org/project/RegenDoc/
https://bitbucket.org/pytest-dev/regendoc/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
diff --git a/dev-python/regendoc/regendoc-0.6.1.ebuild b/dev-python/regendoc/regendoc-0.6.1.ebuild
index f95a68332bdc..659a55490fbe 100644
--- a/dev-python/regendoc/regendoc-0.6.1.ebuild
+++ b/dev-python/regendoc/regendoc-0.6.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="RegenDoc"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Check/update simple file/shell examples in documentation"
-HOMEPAGE="https://pypi.org/project/RegenDoc
+HOMEPAGE="https://pypi.org/project/RegenDoc/
https://bitbucket.org/pytest-dev/regendoc/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
diff --git a/dev-python/reno/reno-2.2.1.ebuild b/dev-python/reno/reno-2.2.1.ebuild
index 977f33011649..ffde3f5bd9ff 100644
--- a/dev-python/reno/reno-2.2.1.ebuild
+++ b/dev-python/reno/reno-2.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
-HOMEPAGE="https://pypi.org/project/reno"
+HOMEPAGE="https://pypi.org/project/reno/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/reno/reno-2.5.0.ebuild b/dev-python/reno/reno-2.5.0.ebuild
index dd5335f2ff76..edb09f9a72d3 100644
--- a/dev-python/reno/reno-2.5.0.ebuild
+++ b/dev-python/reno/reno-2.5.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
-HOMEPAGE="https://pypi.org/project/reno"
+HOMEPAGE="https://pypi.org/project/reno/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/reno/reno-2.7.0.ebuild b/dev-python/reno/reno-2.7.0.ebuild
index 303e0644e3c7..02bf525efe8e 100644
--- a/dev-python/reno/reno-2.7.0.ebuild
+++ b/dev-python/reno/reno-2.7.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
-HOMEPAGE="https://pypi.org/project/reno"
+HOMEPAGE="https://pypi.org/project/reno/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/requests-cache/requests-cache-0.4.12.ebuild b/dev-python/requests-cache/requests-cache-0.4.12.ebuild
index c2058835cf57..4955a22abf45 100644
--- a/dev-python/requests-cache/requests-cache-0.4.12.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.4.12.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
inherit distutils-r1
-HOMEPAGE="https://pypi.org/project/requests-cache"
+HOMEPAGE="https://pypi.org/project/requests-cache/"
DESCRIPTION="Persistent cache for requests library"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
index 6c824be1ff0c..9332922ab6b1 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
inherit distutils-r1
-HOMEPAGE="https://pypi.org/project/requests-kerberos"
+HOMEPAGE="https://pypi.org/project/requests-kerberos/"
DESCRIPTION="A Kerberos authentication handler for python-requests"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/requests-oauthlib/metadata.xml b/dev-python/requests-oauthlib/metadata.xml
index b57ad8fe5089..58c53b538b89 100644
--- a/dev-python/requests-oauthlib/metadata.xml
+++ b/dev-python/requests-oauthlib/metadata.xml
@@ -1,10 +1,6 @@
-
- ercpe@gentoo.org
- Johann Schmitz
-
python@gentoo.org
Python
diff --git a/dev-python/requests/requests-2.11.1.ebuild b/dev-python/requests/requests-2.11.1.ebuild
index 55056cd2cdac..d4d0a9ff54b2 100644
--- a/dev-python/requests/requests-2.11.1.ebuild
+++ b/dev-python/requests/requests-2.11.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.org/project/requests"
+HOMEPAGE="http://python-requests.org/ https://pypi.org/project/requests/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/requests/requests-2.12.5.ebuild b/dev-python/requests/requests-2.12.5.ebuild
index b5cd1b302473..c528fbc166da 100644
--- a/dev-python/requests/requests-2.12.5.ebuild
+++ b/dev-python/requests/requests-2.12.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.org/project/requests"
+HOMEPAGE="http://python-requests.org/ https://pypi.org/project/requests/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/requests/requests-2.14.2.ebuild b/dev-python/requests/requests-2.14.2.ebuild
index d218464dfe06..f344c8e9fa8a 100644
--- a/dev-python/requests/requests-2.14.2.ebuild
+++ b/dev-python/requests/requests-2.14.2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="http://python-requests.org/ https://pypi.org/project/requests"
+HOMEPAGE="http://python-requests.org/ https://pypi.org/project/requests/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
index f7809fc2f4f2..4eb519e9d892 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Created out of frustration, it sucks to find out your reST is invalid after uploading it."
-HOMEPAGE="https://pypi.org/project/restructuredtext_lint"
+HOMEPAGE="https://pypi.org/project/restructuredtext_lint/"
MY_P="restructuredtext_lint"
SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}/${MY_P}-${PV}.tar.gz"
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
index a9aec5df9d26..333e56934ec1 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1
DESCRIPTION="Created out of frustration, it sucks to find out your reST is invalid after uploading it."
-HOMEPAGE="https://pypi.org/project/restructuredtext_lint"
+HOMEPAGE="https://pypi.org/project/restructuredtext_lint/"
MY_P="restructuredtext_lint"
SRC_URI="mirror://pypi/${PN:0:1}/${MY_P}/${MY_P}-${PV}.tar.gz"
diff --git a/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild b/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
index 47adf6288b7a..617f40f04bba 100644
--- a/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
+++ b/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Small library to fetch files over HTTP and resuming their download"
HOMEPAGE="
https://github.com/berdario/resumable-urlretrieve
- https://pypi.org/project/resumable-urlretrieve"
+ https://pypi.org/project/resumable-urlretrieve/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/reverend/reverend-0.4-r1.ebuild b/dev-python/reverend/reverend-0.4-r1.ebuild
index d0ae61028044..71de1b03a8f0 100644
--- a/dev-python/reverend/reverend-0.4-r1.ebuild
+++ b/dev-python/reverend/reverend-0.4-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="Reverend"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Reverend - Simple Bayesian classifier"
-HOMEPAGE="https://pypi.org/project/Reverend"
+HOMEPAGE="https://pypi.org/project/Reverend/"
SRC_URI="mirror://sourceforge/reverend/${MY_P}.tar.gz mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/rfc3987/rfc3987-1.3.7.ebuild b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
index c57d90dff95a..1a78ecb2298b 100644
--- a/dev-python/rfc3987/rfc3987-1.3.7.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)"
-HOMEPAGE="https://github.com/dgerber/rfc3987 https://pypi.org/project/rfc3987"
+HOMEPAGE="https://github.com/dgerber/rfc3987 https://pypi.org/project/rfc3987/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/dev-python/riak-python-client/riak-python-client-2.7.0.ebuild b/dev-python/riak-python-client/riak-python-client-2.7.0.ebuild
deleted file mode 100644
index dd9e09f6080e..000000000000
--- a/dev-python/riak-python-client/riak-python-client-2.7.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="The Riak client for Python."
-HOMEPAGE="https://github.com/basho/riak-python-client/"
-MY_PN=${PN%%-*}
-MY_P=${MY_PN}-${PV}
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/basho-erlastic[${PYTHON_USEDEP}]
- dev-libs/protobuf[${PYTHON_USEDEP}]
- >=dev-python/six-1.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
- # delete protobuf requirements that only work for pip
- sed '17,22d' -i setup.py || die
- sed -e "s:'\\\\n\\\\027:b\\0:" -i riak/pb/*.py || die
-}
-
-python_test() {
- esetup.py test || die
-}
diff --git a/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild b/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild
index 3b165c4a1f5c..0da38cd4fe94 100644
--- a/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild
+++ b/dev-python/rlcompleter2/rlcompleter2-0.98-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Python command line completion"
-HOMEPAGE="http://codespeak.net/rlcompleter2/ https://pypi.org/project/rlcompleter2"
+HOMEPAGE="http://codespeak.net/rlcompleter2/ https://pypi.org/project/rlcompleter2/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/ropeide/ropeide-1.5.1-r2.ebuild b/dev-python/ropeide/ropeide-1.5.1-r2.ebuild
index 5daae3e04246..691c560be705 100644
--- a/dev-python/ropeide/ropeide-1.5.1-r2.ebuild
+++ b/dev-python/ropeide/ropeide-1.5.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
PYTHON_REQ_USE="tk"
DESCRIPTION="Python refactoring IDE"
-HOMEPAGE="http://freecode.com/projects/ropeide https://pypi.org/project/ropeide"
+HOMEPAGE="http://freecode.com/projects/ropeide https://pypi.org/project/ropeide/"
SRC_URI="mirror://sourceforge/rope/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/ropemacs/ropemacs-0.8.ebuild b/dev-python/ropemacs/ropemacs-0.8.ebuild
index d01170ff77ea..ae8bdf6d90a1 100644
--- a/dev-python/ropemacs/ropemacs-0.8.ebuild
+++ b/dev-python/ropemacs/ropemacs-0.8.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 eutils readme.gentoo
DESCRIPTION="Rope in Emacs"
HOMEPAGE="https://github.com/python-rope/ropemacs
- https://pypi.org/project/ropemacs"
+ https://pypi.org/project/ropemacs/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-1+" # GPL without version
diff --git a/dev-python/ropemode/ropemode-0.2-r1.ebuild b/dev-python/ropemode/ropemode-0.2-r1.ebuild
index 5672c38e6578..41d6fd513241 100644
--- a/dev-python/ropemode/ropemode-0.2-r1.ebuild
+++ b/dev-python/ropemode/ropemode-0.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_P="${P/_rc/-rc}"
DESCRIPTION="A helper for using rope refactoring library in IDEs"
-HOMEPAGE="https://pypi.org/project/ropemode"
+HOMEPAGE="https://pypi.org/project/ropemode/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/ropemode/ropemode-0.4.ebuild b/dev-python/ropemode/ropemode-0.4.ebuild
index 4ac6c4b88eb5..84df74cf9e4f 100644
--- a/dev-python/ropemode/ropemode-0.4.ebuild
+++ b/dev-python/ropemode/ropemode-0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="A helper for using rope refactoring library in IDEs"
-HOMEPAGE="https://github.com/python-rope/ropemode https://pypi.org/project/ropemode"
+HOMEPAGE="https://github.com/python-rope/ropemode https://pypi.org/project/ropemode/"
SRC_URI="https://github.com/python-rope/ropemode/archive/${PV}.tar.gz -> ${P}.tar.gz"
# pypi releases don't include tests
#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/routes/routes-2.4.1.ebuild b/dev-python/routes/routes-2.4.1.ebuild
index b04b2a8e70c8..6626129c16b7 100644
--- a/dev-python/routes/routes-2.4.1.ebuild
+++ b/dev-python/routes/routes-2.4.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="Routes"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A re-implementation of Rails routes system, mapping URLs to Controllers/Actions"
-HOMEPAGE="http://routes.groovie.org https://pypi.org/project/Routes"
+HOMEPAGE="http://routes.groovie.org https://pypi.org/project/Routes/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/rpy/rpy-2.6.2.ebuild b/dev-python/rpy/rpy-2.6.2.ebuild
index e02c8d713521..fd21854dc537 100644
--- a/dev-python/rpy/rpy-2.6.2.ebuild
+++ b/dev-python/rpy/rpy-2.6.2.ebuild
@@ -14,7 +14,7 @@ MY_P=${MY_PN}-${PV}
DESCRIPTION="Python interface to the R Programming Language"
HOMEPAGE="https://rpy.sourceforge.net/
- https://pypi.org/project/rpy2"
+ https://pypi.org/project/rpy2/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
diff --git a/dev-python/rpy/rpy-2.9.0.ebuild b/dev-python/rpy/rpy-2.9.0.ebuild
index f5674d5f4b79..1c5b0ecc9c3b 100644
--- a/dev-python/rpy/rpy-2.9.0.ebuild
+++ b/dev-python/rpy/rpy-2.9.0.ebuild
@@ -14,7 +14,7 @@ MY_P=${MY_PN}-${PV}
DESCRIPTION="Python interface to the R Programming Language"
HOMEPAGE="https://rpy.sourceforge.net/
- https://pypi.org/project/rpy2"
+ https://pypi.org/project/rpy2/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
diff --git a/dev-python/rsa/rsa-3.2.3-r1.ebuild b/dev-python/rsa/rsa-3.2.3-r1.ebuild
index efb9ae14b634..01d4935db649 100644
--- a/dev-python/rsa/rsa-3.2.3-r1.ebuild
+++ b/dev-python/rsa/rsa-3.2.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Pure-Python RSA implementation"
-HOMEPAGE="https://stuvel.eu/rsa https://pypi.org/project/rsa"
+HOMEPAGE="https://stuvel.eu/rsa https://pypi.org/project/rsa/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/rsa/rsa-3.4.2.ebuild b/dev-python/rsa/rsa-3.4.2.ebuild
index 49f2c05e0fbb..06b84e4231d8 100644
--- a/dev-python/rsa/rsa-3.4.2.ebuild
+++ b/dev-python/rsa/rsa-3.4.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Pure-Python RSA implementation"
-HOMEPAGE="https://stuvel.eu/rsa https://pypi.org/project/rsa"
+HOMEPAGE="https://stuvel.eu/rsa https://pypi.org/project/rsa/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild b/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild
index 620890e92139..e448b3e24628 100644
--- a/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild
+++ b/dev-python/rst2pdf/rst2pdf-0.93-r3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Tool for transforming reStructuredText to PDF using ReportLab"
-HOMEPAGE="http://rst2pdf.ralsina.me/ https://pypi.org/project/rst2pdf"
+HOMEPAGE="http://rst2pdf.ralsina.me/ https://pypi.org/project/rst2pdf/"
SRC_URI="https://github.com/rst2pdf/rst2pdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
index 726f535d9dd3..c55575431e4f 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
inherit distutils-r1 vcs-snapshot
DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
-HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib https://bitbucket.org/ruamel/std.pathlib"
+HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://bitbucket.org/ruamel/std.pathlib"
MY_PN="${PN//-/.}"
SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
index 90d6c41f9f83..96e776c7d2fd 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.15.35.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
inherit distutils-r1 vcs-snapshot
DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="https://pypi.org/project/ruamel.yaml https://bitbucket.org/ruamel/yaml"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml/ https://bitbucket.org/ruamel/yaml"
MY_PN="${PN//-/.}"
SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/schema/schema-0.6.6.ebuild b/dev-python/schema/schema-0.6.6.ebuild
index e63c6a01d3e3..a478507455d8 100644
--- a/dev-python/schema/schema-0.6.6.ebuild
+++ b/dev-python/schema/schema-0.6.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Library for validating Python data structures"
-HOMEPAGE="https://pypi.org/project/schema https://github.com/keleshev/schema"
+HOMEPAGE="https://pypi.org/project/schema/ https://github.com/keleshev/schema"
SRC_URI="
mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
https://github.com/keleshev/schema/archive/v${PV}.zip -> ${P}.tar.gz
diff --git a/dev-python/scimath/scimath-4.1.2-r1.ebuild b/dev-python/scimath/scimath-4.1.2-r1.ebuild
index d74b9fe5a69e..c67376ac54e2 100644
--- a/dev-python/scimath/scimath-4.1.2-r1.ebuild
+++ b/dev-python/scimath/scimath-4.1.2-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
DESCRIPTION="Enthought Tool Suite: Scientific and mathematical tools"
HOMEPAGE="http://docs.enthought.com/scimath/
https://github.com/enthought/scimath
- https://pypi.org/project/scimath"
+ https://pypi.org/project/scimath/"
SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/scoop/scoop-0.7.0-r1.ebuild b/dev-python/scoop/scoop-0.7.0-r1.ebuild
index 3f0bc955ce89..c5344709ea9c 100644
--- a/dev-python/scoop/scoop-0.7.0-r1.ebuild
+++ b/dev-python/scoop/scoop-0.7.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Distributed Evolutionary Algorithms in Python"
-HOMEPAGE="https://code.google.com/p/scoop/ https://pypi.org/project/scoop"
+HOMEPAGE="https://code.google.com/p/scoop/ https://pypi.org/project/scoop/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.release.tar.gz"
LICENSE="LGPL-3"
diff --git a/dev-python/scripttest/scripttest-1.2-r1.ebuild b/dev-python/scripttest/scripttest-1.2-r1.ebuild
index e0c7d04c9e01..6d1cdd5d8eac 100644
--- a/dev-python/scripttest/scripttest-1.2-r1.ebuild
+++ b/dev-python/scripttest/scripttest-1.2-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="ScriptTest"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.org/project/ScriptTest
+HOMEPAGE="https://pypi.org/project/ScriptTest/
https://github.com/pypa/scripttest"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild
index 34f4f018bf5e..293588dbb381 100644
--- a/dev-python/scripttest/scripttest-1.3.0.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.org/project/ScriptTest
+HOMEPAGE="https://pypi.org/project/ScriptTest/
https://github.com/pypa/scripttest"
# pypi tarball lacks tests
SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/sdnotify/sdnotify-0.3.1.ebuild b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
index 45d69f841668..79c0597d5972 100644
--- a/dev-python/sdnotify/sdnotify-0.3.1.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Python implementation of systemd's service notification protocol (sd_notify)"
HOMEPAGE="
https://github.com/bb4242/sdnotify
- https://pypi.org/project/sdnotify"
+ https://pypi.org/project/sdnotify/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sdnotify/sdnotify-0.3.2.ebuild b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
index 51e805f368ad..d7fb6dddc070 100644
--- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Python implementation of systemd's service notification protocol (sd_notify)"
HOMEPAGE="https://github.com/bb4242/sdnotify
- https://pypi.org/project/sdnotify"
+ https://pypi.org/project/sdnotify/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/secretstorage/secretstorage-2.3.1.ebuild b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
index af7186241889..82a0f03b90cf 100644
--- a/dev-python/secretstorage/secretstorage-2.3.1.ebuild
+++ b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_PN="SecretStorage"
DESCRIPTION="Python bindings to FreeDesktop.org Secret Service API."
-HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage"
+HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/"
SRC_URI="mirror://pypi/S/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild b/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild
index b6ad84b5df25..0fffcfe0367d 100644
--- a/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.6.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
inherit distutils-r1
DESCRIPTION="Python library providing a few tools handling SemVer in Python"
-HOMEPAGE="https://pypi.org/project/semantic_version"
+HOMEPAGE="https://pypi.org/project/semantic_version/"
SRC_URI="https://github.com/rbarrois/python-semanticversion/archive/v${PV}.tar.gz -> ${P}-1.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/semantic_version/semantic_version-2.6.0.ebuild b/dev-python/semantic_version/semantic_version-2.6.0.ebuild
index 74e89c964db4..9a1deffc8807 100644
--- a/dev-python/semantic_version/semantic_version-2.6.0.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
inherit distutils-r1
DESCRIPTION="Python library providing a few tools handling SemVer in Python."
-HOMEPAGE="https://pypi.org/project/semantic_version"
+HOMEPAGE="https://pypi.org/project/semantic_version/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/send2trash/send2trash-1.3.0.ebuild b/dev-python/send2trash/send2trash-1.3.0.ebuild
index 27e43be5791d..8359172d151c 100644
--- a/dev-python/send2trash/send2trash-1.3.0.ebuild
+++ b/dev-python/send2trash/send2trash-1.3.0.ebuild
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="Sends files to the Trash (or Recycle Bin)"
HOMEPAGE="
http://hg.hardcoded.net/send2trash
- https://pypi.org/project/Send2Trash
+ https://pypi.org/project/Send2Trash/
https://github.com/hsoft/send2trash"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/serpent/serpent-1.19.ebuild b/dev-python/serpent/serpent-1.19.ebuild
index 048cca75672f..3f421d934eea 100644
--- a/dev-python/serpent/serpent-1.19.ebuild
+++ b/dev-python/serpent/serpent-1.19.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="A simple serialization library based on ast.literal_eval"
-HOMEPAGE="https://pypi.org/project/serpent https://github.com/irmen/Serpent"
+HOMEPAGE="https://pypi.org/project/serpent/ https://github.com/irmen/Serpent"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
index 81f6f11be110..aed688a9b3ba 100644
--- a/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
+++ b/dev-python/setuptools/setuptools-34.0.2-r1.ebuild
@@ -16,7 +16,7 @@ else
fi
DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/setuptools/setuptools-36.0.1.ebuild b/dev-python/setuptools/setuptools-36.0.1.ebuild
index 5f04cd2f6e21..056fb01ec0da 100644
--- a/dev-python/setuptools/setuptools-36.0.1.ebuild
+++ b/dev-python/setuptools/setuptools-36.0.1.ebuild
@@ -16,7 +16,7 @@ else
fi
DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/setuptools/setuptools-36.7.2.ebuild b/dev-python/setuptools/setuptools-36.7.2.ebuild
index 8b95c57220a6..3ae5b3a4d8a5 100644
--- a/dev-python/setuptools/setuptools-36.7.2.ebuild
+++ b/dev-python/setuptools/setuptools-36.7.2.ebuild
@@ -16,7 +16,7 @@ else
fi
DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/setuptools/setuptools-38.5.1.ebuild b/dev-python/setuptools/setuptools-38.5.1.ebuild
index 305f19ad6127..ecd7810e4134 100644
--- a/dev-python/setuptools/setuptools-38.5.1.ebuild
+++ b/dev-python/setuptools/setuptools-38.5.1.ebuild
@@ -16,7 +16,7 @@ else
fi
DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild
index 80812cd5756b..28829b6f5f08 100644
--- a/dev-python/setuptools/setuptools-9999.ebuild
+++ b/dev-python/setuptools/setuptools-9999.ebuild
@@ -16,7 +16,7 @@ else
fi
DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild b/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
index 8494a28990cd..93b071323470 100644
--- a/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
+++ b/dev-python/setuptools_hg/setuptools_hg-0.4-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Setuptools/distribute plugin for finding files under Mercurial version control"
-HOMEPAGE="https://pypi.org/project/setuptools_hg https://bitbucket.org/jezdez/setuptools_hg/"
+HOMEPAGE="https://pypi.org/project/setuptools_hg/ https://bitbucket.org/jezdez/setuptools_hg/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
index 5f53436b59a1..77cabd9b84f0 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
index 9ac01501c7fc..5a3751d298b8 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
index 6730eb74c478..927078b4b012 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.16.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.org/project/setuptools_scm/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild b/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
index 70b5c9743212..60b918a705a7 100644
--- a/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
+++ b/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Setuptools plugin that makes unit tests execute with trial instead of pyunit"
-HOMEPAGE="https://github.com/rutsky/setuptools-trial https://pypi.org/project/setuptools_trial"
+HOMEPAGE="https://github.com/rutsky/setuptools-trial https://pypi.org/project/setuptools_trial/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/shortuuid/metadata.xml b/dev-python/shortuuid/metadata.xml
index 31825f366c26..3c92e94f4a85 100644
--- a/dev-python/shortuuid/metadata.xml
+++ b/dev-python/shortuuid/metadata.xml
@@ -1,10 +1,7 @@
-
- ercpe@gentoo.org
- Johann Schmitz (ercpe)
-
+
A library that generates short, pretty, unambiguous unique IDs by using an extensive, case-sensitive alphabet and omitting similar-looking letters and numbers.
shortuuid
diff --git a/dev-python/shortuuid/shortuuid-0.4.3.ebuild b/dev-python/shortuuid/shortuuid-0.4.3.ebuild
index 446a454a7139..96c28acd7b8b 100644
--- a/dev-python/shortuuid/shortuuid-0.4.3.ebuild
+++ b/dev-python/shortuuid/shortuuid-0.4.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="A generator library for concise, unambiguous and URL-safe UUIDs"
-HOMEPAGE="https://pypi.org/project/shortuuid"
+HOMEPAGE="https://pypi.org/project/shortuuid/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
index 3bcbdaeef955..fbad293f2c08 100644
--- a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
+++ b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="A copy & paste backport of Python 3.3's shutil.which function"
-HOMEPAGE="https://pypi.org/project/shutilwhich https://github.com/mbr/shutilwhich"
+HOMEPAGE="https://pypi.org/project/shutilwhich/ https://github.com/mbr/shutilwhich"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index 852adda5564d..44f8201b6974 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Simple generic functions for Python"
-HOMEPAGE="https://pypi.org/project/simplegeneric"
+HOMEPAGE="https://pypi.org/project/simplegeneric/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="ZPL"
diff --git a/dev-python/simplejson/simplejson-3.10.0.ebuild b/dev-python/simplejson/simplejson-3.10.0.ebuild
index 29ce65c4173c..3b39e75a647d 100644
--- a/dev-python/simplejson/simplejson-3.10.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.10.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="http://undefined.org/python/#simplejson https://pypi.org/project/simplejson"
+HOMEPAGE="http://undefined.org/python/#simplejson https://pypi.org/project/simplejson/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( MIT AFL-2.1 )"
diff --git a/dev-python/simplejson/simplejson-3.13.2.ebuild b/dev-python/simplejson/simplejson-3.13.2.ebuild
index 48c94c432d5f..bae56fbc5a52 100644
--- a/dev-python/simplejson/simplejson-3.13.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.13.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1 flag-o-matic
DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson"
+HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( MIT AFL-2.1 )"
diff --git a/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild b/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild
index 6df2a1d72018..da6b0bc495b4 100644
--- a/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild
+++ b/dev-python/simpleparse/simpleparse-2.1.1-r1.ebuild
@@ -9,7 +9,7 @@ MY_PN="SimpleParse"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A Parser Generator for mxTextTools"
-HOMEPAGE="http://simpleparse.sourceforge.net https://pypi.org/project/SimpleParse"
+HOMEPAGE="http://simpleparse.sourceforge.net https://pypi.org/project/SimpleParse/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="eGenixPublic-1.1 HPND"
diff --git a/dev-python/simplesettings/simplesettings-0.5-r1.ebuild b/dev-python/simplesettings/simplesettings-0.5-r1.ebuild
index 7328689638b6..a439a23563c9 100644
--- a/dev-python/simplesettings/simplesettings-0.5-r1.ebuild
+++ b/dev-python/simplesettings/simplesettings-0.5-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Simple settings initialization"
-HOMEPAGE="https://pypi.org/project/simplesettings"
+HOMEPAGE="https://pypi.org/project/simplesettings/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index 075db224501e..8399fe544180 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/six/six-1.11.0.ebuild b/dev-python/six/six-1.11.0.ebuild
index 8e49f3a6a729..7965dfe23b2d 100644
--- a/dev-python/six/six-1.11.0.ebuild
+++ b/dev-python/six/six-1.11.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six"
+HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/smmap/smmap-0.9.0.ebuild b/dev-python/smmap/smmap-0.9.0.ebuild
index fa6717598e2c..f83353b0cc7a 100644
--- a/dev-python/smmap/smmap-0.9.0.ebuild
+++ b/dev-python/smmap/smmap-0.9.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A pure git implementation of a sliding window memory map manager"
HOMEPAGE="
- https://pypi.org/project/smmap
+ https://pypi.org/project/smmap/
https://github.com/Byron/smmap"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/smmap2/smmap2-2.0.3.ebuild b/dev-python/smmap2/smmap2-2.0.3.ebuild
index 65ee1c7cf435..8b7821abb4b0 100644
--- a/dev-python/smmap2/smmap2-2.0.3.ebuild
+++ b/dev-python/smmap2/smmap2-2.0.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A pure python implementation of a sliding window memory map manager"
HOMEPAGE="
- https://pypi.org/project/smmap2
+ https://pypi.org/project/smmap2/
https://github.com/gitpython-developers/smmap"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/snappy/snappy-0.5-r2.ebuild b/dev-python/snappy/snappy-0.5-r2.ebuild
index a258b1e038dd..4474ba5db992 100644
--- a/dev-python/snappy/snappy-0.5-r2.ebuild
+++ b/dev-python/snappy/snappy-0.5-r2.ebuild
@@ -11,7 +11,7 @@ MY_PN=python-${PN}
MY_P=${MY_PN}-${PV}
DESCRIPTION="Python library for the snappy compression library from Google"
-HOMEPAGE="https://pypi.org/project/python-snappy"
+HOMEPAGE="https://pypi.org/project/python-snappy/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/snappy/snappy-0.5.1.ebuild b/dev-python/snappy/snappy-0.5.1.ebuild
index d207cdd918af..bba3cfdcc55d 100644
--- a/dev-python/snappy/snappy-0.5.1.ebuild
+++ b/dev-python/snappy/snappy-0.5.1.ebuild
@@ -11,7 +11,7 @@ MY_PN=python-${PN}
MY_P=${MY_PN}-${PV}
DESCRIPTION="Python library for the snappy compression library from Google"
-HOMEPAGE="https://pypi.org/project/python-snappy"
+HOMEPAGE="https://pypi.org/project/python-snappy/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/soappy/soappy-0.12.22.ebuild b/dev-python/soappy/soappy-0.12.22.ebuild
index eccad2cb531b..b1148ee7d182 100644
--- a/dev-python/soappy/soappy-0.12.22.ebuild
+++ b/dev-python/soappy/soappy-0.12.22.ebuild
@@ -12,7 +12,7 @@ MY_PN="SOAPpy"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="SOAP Services for Python"
-HOMEPAGE="http://pywebsvcs.sourceforge.net/ https://pypi.org/project/SOAPpy"
+HOMEPAGE="http://pywebsvcs.sourceforge.net/ https://pypi.org/project/SOAPpy/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="BSD"
diff --git a/dev-python/socketio-client/socketio-client-0.6.6.ebuild b/dev-python/socketio-client/socketio-client-0.6.6.ebuild
index 84667bd74c10..4ddc8b6e4e17 100644
--- a/dev-python/socketio-client/socketio-client-0.6.6.ebuild
+++ b/dev-python/socketio-client/socketio-client-0.6.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_PN="socketIO-client"
REPO_PN="socketIO_client"
DESCRIPTION="A socket.io client library for Python"
-HOMEPAGE="https://github.com/invisibleroads/socketIO-client/ https://pypi.org/project/socketIO-client"
+HOMEPAGE="https://github.com/invisibleroads/socketIO-client/ https://pypi.org/project/socketIO-client/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${REPO_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/soya/soya-0.15_rc1-r1.ebuild b/dev-python/soya/soya-0.15_rc1-r1.ebuild
index 92086fd2bd4f..37ff57f4f1fa 100644
--- a/dev-python/soya/soya-0.15_rc1-r1.ebuild
+++ b/dev-python/soya/soya-0.15_rc1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc examples"
RDEPEND=">=dev-games/ode-0.14[-double-precision]
diff --git a/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild b/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild
index 26f211b00834..ad73577d59eb 100644
--- a/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild
+++ b/dev-python/spark-parser/spark-parser-1.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_PN="spark_parser"
DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
-HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser/"
SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/spark-parser/spark-parser-1.6.0.ebuild b/dev-python/spark-parser/spark-parser-1.6.0.ebuild
index 684b69f92cca..4bb3cdb68826 100644
--- a/dev-python/spark-parser/spark-parser-1.6.0.ebuild
+++ b/dev-python/spark-parser/spark-parser-1.6.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_PN="spark_parser"
DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
-HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser/"
SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/spark-parser/spark-parser-1.6.1.ebuild b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
index 684b69f92cca..4bb3cdb68826 100644
--- a/dev-python/spark-parser/spark-parser-1.6.1.ebuild
+++ b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_PN="spark_parser"
DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
-HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser/"
SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/spark-parser/spark-parser-1.8.5.ebuild b/dev-python/spark-parser/spark-parser-1.8.5.ebuild
index a42fe45c5c07..ae67f99b1235 100644
--- a/dev-python/spark-parser/spark-parser-1.8.5.ebuild
+++ b/dev-python/spark-parser/spark-parser-1.8.5.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_PN="spark_parser"
DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
-HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser/"
SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild
index b5d6afee70ae..f2d39deffcc5 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.7.6.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_PN=SPARQLWrapper
DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.org/project/SPARQLWrapper"
+HOMEPAGE="https://pypi.org/project/SPARQLWrapper/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="W3C"
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
index ad5ff7fa7491..46f9f0ccb6b6 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_PN=SPARQLWrapper
DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.org/project/SPARQLWrapper"
+HOMEPAGE="https://pypi.org/project/SPARQLWrapper/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="W3C"
diff --git a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
index 0993c1cd3e98..5f8494f55f25 100644
--- a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
+++ b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="A nice-looking, customizable theme for Sphinx"
HOMEPAGE="
https://github.com/irskep/sphinx-better-theme
- https://pypi.org/project/sphinx-better-theme"
+ https://pypi.org/project/sphinx-better-theme/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild
index baeca1bdff17..9250f7aea270 100644
--- a/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.1.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
index 3ab3a4cc852f..3805a897d1ec 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="A sphinx extension to include jinja based templates into a sphinx doc"
-HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja"
+HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
index 7c15805d4a40..b2cd33297e40 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="A sphinx extension to include jinja based templates into a sphinx doc"
-HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja"
+HOMEPAGE="https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
index a76eb63f0fd0..68356250c40d 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Enhanced Sphinx theme (based on Python 3 docs)"
-HOMEPAGE="https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.org/project/sphinx-py3doc-enhanced-theme"
+HOMEPAGE="https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.org/project/sphinx-py3doc-enhanced-theme/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/sphinx/sphinx-1.2.2-r1.ebuild b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
index 436eb0b9ce82..d23a387e8cbb 100644
--- a/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN="Sphinx"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
index 5a976a04c6cb..a3f6c9baf00c 100644
--- a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN="Sphinx"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/sphinx/sphinx-1.3.1-r2.ebuild b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
index 6c4f89271b3e..13bb7fcbe9dd 100644
--- a/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
@@ -12,7 +12,7 @@ MY_PN="Sphinx"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/sphinx/sphinx-1.3.5-r1.ebuild b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
index a18db40bd597..e6be7b1317a4 100644
--- a/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN="Sphinx"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild b/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
index 294102d61bb2..c2b0fdc27d22 100644
--- a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
+++ b/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Celery Sphinx Theme and Utilities"
-HOMEPAGE="https://pypi.org/project/sphinx_celery https://github.com/celery/sphinx_celery"
+HOMEPAGE="https://pypi.org/project/sphinx_celery/ https://github.com/celery/sphinx_celery"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild b/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild
index e0cddcafc838..95ac5c5ddf83 100644
--- a/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild
+++ b/dev-python/sphinxcontrib-ditaa/sphinxcontrib-ditaa-0.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Ditaa Sphinx extension"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-ditaa"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-ditaa/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
index b277785d4dc6..1b0023bfb90c 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink https://pythonhosted.org/sphinxcontrib-doxylink/ https://bitbucket.org/birkenfeld/sphinx-contrib"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://bitbucket.org/birkenfeld/sphinx-contrib"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild
index a363ce4d04a5..90af28c6ab1e 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink https://pythonhosted.org/sphinxcontrib-doxylink/ https://bitbucket.org/birkenfeld/sphinx-contrib"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://bitbucket.org/birkenfeld/sphinx-contrib"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild b/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild
index 665a161853f6..145c2615b33b 100644
--- a/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild
+++ b/dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.5.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="Allow a different format in dosctrings for better clarity"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-napoleon"
+HOMEPAGE="https://pypi.org/project/sphinxcontrib-napoleon/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
index bf9969d18b7b..4c1dca143408 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="SQLAlchemy Schema Migration Tools"
-HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate"
+HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild
index 2b20ba92da5a..c146d60a457b 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.7.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="SQLAlchemy Schema Migration Tools"
-HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate"
+HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
index 2ca76e3bd0be..8a7997ff83ca 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.9.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="SQLAlchemy Schema Migration Tools"
-HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate"
+HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
index d24fbee01c3b..0d67a495e750 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.7.10.ebuild
@@ -11,7 +11,7 @@ MY_PN="SQLAlchemy"
MY_P="${MY_PN}-${PV/_}"
DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
index 3774fdd6158a..fedd5aec1c60 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.9.8.ebuild
@@ -11,7 +11,7 @@ MY_PN="SQLAlchemy"
MY_P="${MY_PN}-${PV/_}"
DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
index 82a30a26e462..2b0b4e8ff033 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.17.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
MY_P="${MY_PN}-${PV/_beta/b}"
DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild
index 1ac0d1d90a35..745fddd93b7d 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.19.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
MY_P="${MY_PN}-${PV/_beta/b}"
DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild
index 5cd71d12ee28..cb36bdaa8d60 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.1.12.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
MY_P="${MY_PN}-${PV/_beta/b}"
DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.1.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.1.17.ebuild
index 7c1e7effb734..ef83de162109 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.1.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.1.17.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
MY_P="${MY_PN}-${PV/_beta/b}"
DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.0.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.0.ebuild
index 4ecfc592fedc..b7bf93bf2adb 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.0.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.0.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
MY_P="${MY_PN}-${PV/_beta/b}"
DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild
index 4a260405acab..943d57221d16 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
MY_P="${MY_PN}-${PV/_beta/b}"
DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
index 0e5b3562d436..ef400cab76ab 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.4.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLAlchemy"
MY_P="${MY_PN}-${PV/_beta/b}"
DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/sqlobject/sqlobject-3.4.0.ebuild b/dev-python/sqlobject/sqlobject-3.4.0.ebuild
index 4b043cd9670a..bd5b64529964 100644
--- a/dev-python/sqlobject/sqlobject-3.4.0.ebuild
+++ b/dev-python/sqlobject/sqlobject-3.4.0.ebuild
@@ -12,7 +12,7 @@ MY_PN="SQLObject"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Object-Relational Manager, aka database wrapper"
-HOMEPAGE="http://sqlobject.org/ https://pypi.org/project/SQLObject"
+HOMEPAGE="http://sqlobject.org/ https://pypi.org/project/SQLObject/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/squaremap/squaremap-1.0.4.ebuild b/dev-python/squaremap/squaremap-1.0.4.ebuild
index ff5188278a44..70cb764465fe 100644
--- a/dev-python/squaremap/squaremap-1.0.4.ebuild
+++ b/dev-python/squaremap/squaremap-1.0.4.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Hierarchic data-visualisation control for wxPython"
-HOMEPAGE="https://pypi.org/project/SquareMap"
+HOMEPAGE="https://pypi.org/project/SquareMap/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/statistics/statistics-1.0.3.5.ebuild b/dev-python/statistics/statistics-1.0.3.5.ebuild
index 078b00044ba8..45d4800ffbe4 100644
--- a/dev-python/statistics/statistics-1.0.3.5.ebuild
+++ b/dev-python/statistics/statistics-1.0.3.5.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A Python 2.* port of 3.4 Statistics Module"
HOMEPAGE="https://github.com/digitalemagine/py-statistics
- https://pypi.org/project/statistics"
+ https://pypi.org/project/statistics/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/statistics/statistics-3.4.0_beta3.ebuild b/dev-python/statistics/statistics-3.4.0_beta3.ebuild
index 7bf6d4ac5720..10ab210b6b9c 100644
--- a/dev-python/statistics/statistics-3.4.0_beta3.ebuild
+++ b/dev-python/statistics/statistics-3.4.0_beta3.ebuild
@@ -11,7 +11,7 @@ MY_P=${PN}-${PV/_beta/b}
DESCRIPTION="A Python 2.* port of 3.4 Statistics Module"
HOMEPAGE="https://github.com/digitalemagine/py-statistics
- https://pypi.org/project/statistics"
+ https://pypi.org/project/statistics/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/statsd/statsd-3.2.1.ebuild b/dev-python/statsd/statsd-3.2.1.ebuild
index 7530a98038ee..83977bc87704 100644
--- a/dev-python/statsd/statsd-3.2.1.ebuild
+++ b/dev-python/statsd/statsd-3.2.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="A simple statsd client"
HOMEPAGE="https://github.com/jsocol/pystatsd
- https://pypi.org/project/statsd"
+ https://pypi.org/project/statsd/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/stevedore/stevedore-1.25.1.ebuild b/dev-python/stevedore/stevedore-1.25.1.ebuild
index 8789a7e01e17..f483fe6392c9 100644
--- a/dev-python/stevedore/stevedore-1.25.1.ebuild
+++ b/dev-python/stevedore/stevedore-1.25.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/stevedore/stevedore-1.28.0.ebuild b/dev-python/stevedore/stevedore-1.28.0.ebuild
index 56293210cb32..b0bb405e07a0 100644
--- a/dev-python/stevedore/stevedore-1.28.0.ebuild
+++ b/dev-python/stevedore/stevedore-1.28.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/stomper/stomper-0.3.0.ebuild b/dev-python/stomper/stomper-0.3.0.ebuild
index 9f2f342831f4..726d8d2a319c 100644
--- a/dev-python/stomper/stomper-0.3.0.ebuild
+++ b/dev-python/stomper/stomper-0.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Transport neutral client implementation of the STOMP protocol"
-HOMEPAGE="https://pypi.org/project/stomper"
+HOMEPAGE="https://pypi.org/project/stomper/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/storm/storm-0.20-r1.ebuild b/dev-python/storm/storm-0.20-r1.ebuild
index 65ced2b39afc..5e5fc2e5688d 100644
--- a/dev-python/storm/storm-0.20-r1.ebuild
+++ b/dev-python/storm/storm-0.20-r1.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="sqlite?"
inherit distutils-r1 flag-o-matic
DESCRIPTION="An object-relational mapper for Python developed at Canonical"
-HOMEPAGE="https://storm.canonical.com/ https://pypi.org/project/storm"
+HOMEPAGE="https://storm.canonical.com/ https://pypi.org/project/storm/"
SRC_URI="https://launchpad.net/storm/trunk/${PV}/+download/${P}.tar.bz2"
LICENSE="LGPL-2.1"
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
index d62a84142939..65921721426d 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Strict, simple, lightweight RFC3339 functions"
-HOMEPAGE="https://pypi.org/project/strict-rfc3339 https://github.com/danielrichman/strict-rfc3339"
+HOMEPAGE="https://pypi.org/project/strict-rfc3339/ https://github.com/danielrichman/strict-rfc3339"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
index 28f228fc5572..8bd2ac3c3e0f 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Strict, simple, lightweight RFC3339 functions"
-HOMEPAGE="https://pypi.org/project/strict-rfc3339 https://github.com/danielrichman/strict-rfc3339"
+HOMEPAGE="https://pypi.org/project/strict-rfc3339/ https://github.com/danielrichman/strict-rfc3339"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/stripogram/stripogram-1.5-r1.ebuild b/dev-python/stripogram/stripogram-1.5-r1.ebuild
index cf796d132a08..2186cc5ece30 100644
--- a/dev-python/stripogram/stripogram-1.5-r1.ebuild
+++ b/dev-python/stripogram/stripogram-1.5-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Strip-o-Gram HTML Conversion Library"
-HOMEPAGE="https://pypi.org/project/stripogram"
+HOMEPAGE="https://pypi.org/project/stripogram/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild
index 6920f15aa941..9f3fdafba683 100644
--- a/dev-python/subunit/subunit-1.2.0-r1.ebuild
+++ b/dev-python/subunit/subunit-1.2.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1 eutils multilib-minimal versionator
DESCRIPTION="A streaming protocol for test results"
-HOMEPAGE="https://launchpad.net/subunit https://pypi.org/project/python-subunit"
+HOMEPAGE="https://launchpad.net/subunit https://pypi.org/project/python-subunit/"
SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
LICENSE="Apache-2.0 BSD"
diff --git a/dev-python/subvertpy/subvertpy-0.9.1.ebuild b/dev-python/subvertpy/subvertpy-0.9.1.ebuild
index 98f88dd20caf..979bff9695a2 100644
--- a/dev-python/subvertpy/subvertpy-0.9.1.ebuild
+++ b/dev-python/subvertpy/subvertpy-0.9.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Alternative Python bindings for Subversion"
-HOMEPAGE="https://www.samba.org/~jelmer/subvertpy/ https://pypi.org/project/subvertpy"
+HOMEPAGE="https://www.samba.org/~jelmer/subvertpy/ https://pypi.org/project/subvertpy/"
SRC_URI="https://www.samba.org/~jelmer/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
diff --git a/dev-python/symboltype/symboltype-1.0.ebuild b/dev-python/symboltype/symboltype-1.0.ebuild
index eb5819b246e3..dcaeb2058cb5 100644
--- a/dev-python/symboltype/symboltype-1.0.ebuild
+++ b/dev-python/symboltype/symboltype-1.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_PN="SymbolType"
DESCRIPTION="Gives access to the peak.util.symbols module"
-HOMEPAGE=" http://peak.telecommunity.com/DevCenter/SymbolType https://pypi.org/project/SymbolType"
+HOMEPAGE=" http://peak.telecommunity.com/DevCenter/SymbolType https://pypi.org/project/SymbolType/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip -> ${P}.zip"
KEYWORDS="amd64 x86"
diff --git a/dev-python/tabulate/tabulate-0.8.1.ebuild b/dev-python/tabulate/tabulate-0.8.1.ebuild
index 371143285461..9cb9295d5f81 100644
--- a/dev-python/tabulate/tabulate-0.8.1.ebuild
+++ b/dev-python/tabulate/tabulate-0.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Pretty-print tabular data"
-HOMEPAGE="https://pypi.org/project/tabulate"
+HOMEPAGE="https://pypi.org/project/tabulate/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/tagpy/tagpy-2013.1.ebuild b/dev-python/tagpy/tagpy-2013.1.ebuild
index f68a1aea7f85..22218f877df2 100644
--- a/dev-python/tagpy/tagpy-2013.1.ebuild
+++ b/dev-python/tagpy/tagpy-2013.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Python Bindings for TagLib"
HOMEPAGE="https://mathema.tician.de//software/tagpy
- https://pypi.org/project/tagpy"
+ https://pypi.org/project/tagpy/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild b/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
index c31b2c0b0bb4..34dee3bfdd70 100644
--- a/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
+++ b/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="Functional or integrated test suites for OpenStack projects"
-HOMEPAGE="https://pypi.org/project/tempest-lib https://github.com/openstack/tempest-lib"
+HOMEPAGE="https://pypi.org/project/tempest-lib/ https://github.com/openstack/tempest-lib"
SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/tempita/tempita-0.5.3-r1.ebuild b/dev-python/tempita/tempita-0.5.3-r1.ebuild
index 6da2d93cf5d3..c5d4c238f04c 100644
--- a/dev-python/tempita/tempita-0.5.3-r1.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN="Tempita"
MY_P="${MY_PN}-${PV}dev"
DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.org/project/Tempita"
+HOMEPAGE="https://pypi.org/project/Tempita/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/termcolor/termcolor-1.1.0-r1.ebuild b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
index a3411ba60bc9..df325afa8e37 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="ANSII Color formatting for output in terminal"
-HOMEPAGE="https://pypi.org/project/termcolor"
+HOMEPAGE="https://pypi.org/project/termcolor/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/terminado/terminado-0.5.ebuild b/dev-python/terminado/terminado-0.5.ebuild
index 16f309e2e972..e12b28a08268 100644
--- a/dev-python/terminado/terminado-0.5.ebuild
+++ b/dev-python/terminado/terminado-0.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado https://github.com/jupyter/terminado"
+HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/terminado/terminado-0.6.ebuild b/dev-python/terminado/terminado-0.6.ebuild
index 6ed332680440..484b68ff40ee 100644
--- a/dev-python/terminado/terminado-0.6.ebuild
+++ b/dev-python/terminado/terminado-0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado https://github.com/jupyter/terminado"
+HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/terminado/terminado-0.8.1.ebuild b/dev-python/terminado/terminado-0.8.1.ebuild
index 7bf905f37a81..27d21f3107e7 100644
--- a/dev-python/terminado/terminado-0.8.1.ebuild
+++ b/dev-python/terminado/terminado-0.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado https://github.com/jupyter/terminado"
+HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/testtools/testtools-0.9.36.ebuild b/dev-python/testtools/testtools-0.9.36.ebuild
index 542c7d45555a..3c816291c9e1 100644
--- a/dev-python/testtools/testtools-0.9.36.ebuild
+++ b/dev-python/testtools/testtools-0.9.36.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1 versionator
SERIES="trunk"
DESCRIPTION="Extensions to the Python unittest library"
-HOMEPAGE="https://launchpad.net/testtools https://pypi.org/project/testtools"
+HOMEPAGE="https://launchpad.net/testtools https://pypi.org/project/testtools/"
SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/textx/textx-1.4.ebuild b/dev-python/textx/textx-1.4.ebuild
index 6116c0f43616..4050d8fe6590 100644
--- a/dev-python/textx/textx-1.4.ebuild
+++ b/dev-python/textx/textx-1.4.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_PN=textX
MY_P=${MY_PN}-${PV}
DESCRIPTION="Meta-language for DSL implementation inspired by Xtext"
-HOMEPAGE="https://pypi.org/project/textX https://github.com/igordejanovic/textX"
+HOMEPAGE="https://pypi.org/project/textX/ https://github.com/igordejanovic/textX"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
# pypi tarball omits tests
RESTRICT="test"
diff --git a/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild b/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild
index e6af0a674caf..4685623156d3 100644
--- a/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild
+++ b/dev-python/tgmochikit/tgmochikit-1.4.2-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="tgMochiKit"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="MochiKit packaged as TurboGears widgets"
-HOMEPAGE="https://pypi.org/project/tgMochiKit"
+HOMEPAGE="https://pypi.org/project/tgMochiKit/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="|| ( AFL-2.1 MIT )"
diff --git a/dev-python/timelib/timelib-0.2.4-r1.ebuild b/dev-python/timelib/timelib-0.2.4-r1.ebuild
index 94c65983a926..a269e77685a4 100644
--- a/dev-python/timelib/timelib-0.2.4-r1.ebuild
+++ b/dev-python/timelib/timelib-0.2.4-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="parse english textual date descriptions"
-HOMEPAGE="https://github.com/pediapress/timelib https://pypi.org/project/timelib"
+HOMEPAGE="https://github.com/pediapress/timelib https://pypi.org/project/timelib/"
# pypi zipball lacks tests; also it's .zip
SRC_URI="https://github.com/pediapress/timelib/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/tinydb/tinydb-3.1.3.ebuild b/dev-python/tinydb/tinydb-3.1.3.ebuild
index 196096821adf..ef74e94745e8 100644
--- a/dev-python/tinydb/tinydb-3.1.3.ebuild
+++ b/dev-python/tinydb/tinydb-3.1.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Tiny document-oriented database"
HOMEPAGE="https://github.com/msiemens/tinydb
- https://pypi.org/project/tinydb"
+ https://pypi.org/project/tinydb/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
diff --git a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
index 57c6627afe3b..f2f52b8240ed 100644
--- a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
+++ b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1 eutils
DESCRIPTION="TLS Lite is a free python library that implements SSL 3.0 and TLS 1.0/1.1"
-HOMEPAGE="http://trevp.net/tlslite/ https://pypi.org/project/tlslite https://github.com/trevp/tlslite"
+HOMEPAGE="http://trevp.net/tlslite/ https://pypi.org/project/tlslite/ https://github.com/trevp/tlslite"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD public-domain"
diff --git a/dev-python/tmdb3/tmdb3-0.6.17.ebuild b/dev-python/tmdb3/tmdb3-0.6.17.ebuild
index b1c3753757a9..b13b1ab193ca 100644
--- a/dev-python/tmdb3/tmdb3-0.6.17.ebuild
+++ b/dev-python/tmdb3/tmdb3-0.6.17.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="TheMovieDB.org APIv3 interface"
-HOMEPAGE="https://github.com/wagnerrp/pytmdb3 https://pypi.org/project/tmdb3"
+HOMEPAGE="https://github.com/wagnerrp/pytmdb3 https://pypi.org/project/tmdb3/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="GPL-2"
diff --git a/dev-python/tmdb3/tmdb3-0.7.2.ebuild b/dev-python/tmdb3/tmdb3-0.7.2.ebuild
index f952a3f87b4e..8bbf9e7064c2 100644
--- a/dev-python/tmdb3/tmdb3-0.7.2.ebuild
+++ b/dev-python/tmdb3/tmdb3-0.7.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="TheMovieDB.org APIv3 interface"
-HOMEPAGE="https://github.com/wagnerrp/pytmdb3 https://pypi.org/project/tmdb3"
+HOMEPAGE="https://github.com/wagnerrp/pytmdb3 https://pypi.org/project/tmdb3/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/toolz/toolz-0.8.0.ebuild b/dev-python/toolz/toolz-0.8.0.ebuild
index 79d2875905a8..b9f104a5a863 100644
--- a/dev-python/toolz/toolz-0.8.0.ebuild
+++ b/dev-python/toolz/toolz-0.8.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="List processing tools and functional utilities"
-HOMEPAGE="https://pypi.org/project/toolz"
+HOMEPAGE="https://pypi.org/project/toolz/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/toolz/toolz-0.8.2.ebuild b/dev-python/toolz/toolz-0.8.2.ebuild
index 8eeafa6be453..b97012cf4853 100644
--- a/dev-python/toolz/toolz-0.8.2.ebuild
+++ b/dev-python/toolz/toolz-0.8.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="List processing tools and functional utilities"
-HOMEPAGE="https://pypi.org/project/toolz"
+HOMEPAGE="https://pypi.org/project/toolz/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/tox/tox-2.9.1.ebuild b/dev-python/tox/tox-2.9.1.ebuild
index d4b941bc7a77..9a3650e727ee 100644
--- a/dev-python/tox/tox-2.9.1.ebuild
+++ b/dev-python/tox/tox-2.9.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
inherit distutils-r1
DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/traits/traits-4.5.0.ebuild b/dev-python/traits/traits-4.5.0.ebuild
index 051b3a510a1e..aa0e34305e32 100644
--- a/dev-python/traits/traits-4.5.0.ebuild
+++ b/dev-python/traits/traits-4.5.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
DESCRIPTION="Enthought Tool Suite: Explicitly typed attributes for Python"
HOMEPAGE="http://docs.enthought.com/traits/
https://github.com/enthought/traits
- https://pypi.org/project/traits"
+ https://pypi.org/project/traits/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/traits/traits-4.6.0.ebuild b/dev-python/traits/traits-4.6.0.ebuild
index 7b550cd3e564..2c80cfeca796 100644
--- a/dev-python/traits/traits-4.6.0.ebuild
+++ b/dev-python/traits/traits-4.6.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 virtualx
DESCRIPTION="Enthought Tool Suite: Explicitly typed attributes for Python"
HOMEPAGE="http://docs.enthought.com/traits/
https://github.com/enthought/traits
- https://pypi.org/project/traits"
+ https://pypi.org/project/traits/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/translationstring/translationstring-1.3.ebuild b/dev-python/translationstring/translationstring-1.3.ebuild
index cca434c5cdd6..00cecce5d262 100644
--- a/dev-python/translationstring/translationstring-1.3.ebuild
+++ b/dev-python/translationstring/translationstring-1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Utility library for i18n relied on by various Repoze packages"
-HOMEPAGE="https://github.com/Pylons/translationstring https://pypi.org/project/translationstring"
+HOMEPAGE="https://github.com/Pylons/translationstring https://pypi.org/project/translationstring/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="repoze"
diff --git a/dev-python/treq/treq-16.12.0.ebuild b/dev-python/treq/treq-16.12.0.ebuild
index b2d78b7fc28c..53062a932441 100644
--- a/dev-python/treq/treq-16.12.0.ebuild
+++ b/dev-python/treq/treq-16.12.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
inherit distutils-r1
DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq"
+HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/treq/treq-17.3.1.ebuild b/dev-python/treq/treq-17.3.1.ebuild
index d85aa8895237..699114716957 100644
--- a/dev-python/treq/treq-17.3.1.ebuild
+++ b/dev-python/treq/treq-17.3.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq"
+HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/treq/treq-17.8.0.ebuild b/dev-python/treq/treq-17.8.0.ebuild
index af54d95cb329..3a707df96e41 100644
--- a/dev-python/treq/treq-17.8.0.ebuild
+++ b/dev-python/treq/treq-17.8.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq"
+HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild b/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
index 2c0914d7b913..6542cd8c44d9 100644
--- a/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
+++ b/dev-python/ttfquery/ttfquery-1.0.5-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="TTFQuery"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Font metadata and glyph outline extraction utility library"
-HOMEPAGE="http://ttfquery.sourceforge.net/ https://pypi.org/project/TTFQuery"
+HOMEPAGE="http://ttfquery.sourceforge.net/ https://pypi.org/project/TTFQuery/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild b/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild
index 32698632fe77..cd6ed286b06a 100644
--- a/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild
+++ b/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild
@@ -12,7 +12,7 @@ MY_PN="TurboCheetah"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="TurboGears plugin to support use of Cheetah templates"
-HOMEPAGE="http://docs.turbogears.org/TurboCheetah https://pypi.org/project/TurboCheetah"
+HOMEPAGE="http://docs.turbogears.org/TurboCheetah https://pypi.org/project/TurboCheetah/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/turbojson/turbojson-1.3.2-r1.ebuild b/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
index bdc187dbb63c..6dccc8843721 100644
--- a/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
+++ b/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="TurboJson"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="TurboGears JSON file format support plugin"
-HOMEPAGE="https://pypi.org/project/TurboJson"
+HOMEPAGE="https://pypi.org/project/TurboJson/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/turbokid/turbokid-1.0.5-r1.ebuild b/dev-python/turbokid/turbokid-1.0.5-r1.ebuild
index 080f97713f37..7a632c3c26ed 100644
--- a/dev-python/turbokid/turbokid-1.0.5-r1.ebuild
+++ b/dev-python/turbokid/turbokid-1.0.5-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="TurboKid"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python template plugin that supports Kid templates"
-HOMEPAGE="https://pypi.org/project/TurboKid"
+HOMEPAGE="https://pypi.org/project/TurboKid/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/twilio/metadata.xml b/dev-python/twilio/metadata.xml
index e9db8961caa0..5676c411dfe5 100644
--- a/dev-python/twilio/metadata.xml
+++ b/dev-python/twilio/metadata.xml
@@ -1,10 +1,7 @@
-
- ercpe@gentoo.org
- Johann Schmitz (ercpe)
-
+
twilio/twilio-python
diff --git a/dev-python/twine/twine-1.11.0.ebuild b/dev-python/twine/twine-1.11.0.ebuild
index e6bb6970b0a7..e6d38d0e0f19 100644
--- a/dev-python/twine/twine-1.11.0.ebuild
+++ b/dev-python/twine/twine-1.11.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Collection of utilities for publishing packages on PyPI"
-HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
# pypi tarballs don't contain test data
#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/twython/metadata.xml b/dev-python/twython/metadata.xml
index 9f83021a921d..2c06c1edaa41 100644
--- a/dev-python/twython/metadata.xml
+++ b/dev-python/twython/metadata.xml
@@ -1,10 +1,6 @@
-
- ercpe@gentoo.org
- Johann Schmitz
-
python@gentoo.org
Python
diff --git a/dev-python/txaio/txaio-2.7.1.ebuild b/dev-python/txaio/txaio-2.7.1.ebuild
index 8a0ac6ece886..0d6b45adb066 100644
--- a/dev-python/txaio/txaio-2.7.1.ebuild
+++ b/dev-python/txaio/txaio-2.7.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/txaio/txaio-2.8.2.ebuild b/dev-python/txaio/txaio-2.8.2.ebuild
index 84dc9aed8c7c..d75f1ebb10f8 100644
--- a/dev-python/txaio/txaio-2.8.2.ebuild
+++ b/dev-python/txaio/txaio-2.8.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index 9a30541e6013..62ffde7501e8 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
index 9e9fd96de6a0..16ae57afc476 100644
--- a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
+++ b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6})
inherit eutils distutils-r1
DESCRIPTION="GitHub API client implemented using Twisted"
-HOMEPAGE="https://github.com/tomprince/txgithub https://pypi.org/project/txgithub"
+HOMEPAGE="https://github.com/tomprince/txgithub https://pypi.org/project/txgithub/"
SRC_URI="https://github.com/tomprince/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
index e129ff226605..fe3c461f25a4 100644
--- a/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
+++ b/dev-python/txtorcon/txtorcon-0.19.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Twisted-based Tor controller client, with state-tracking and config abstractions"
-HOMEPAGE="https://github.com/meejah/txtorcon https://pypi.org/project/txtorcon https://txtorcon.readthedocs.org"
+HOMEPAGE="https://github.com/meejah/txtorcon https://pypi.org/project/txtorcon/ https://txtorcon.readthedocs.org"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/typing/typing-3.6.2.ebuild b/dev-python/typing/typing-3.6.2.ebuild
index 56fdc74468fe..f5951c2f1576 100644
--- a/dev-python/typing/typing-3.6.2.ebuild
+++ b/dev-python/typing/typing-3.6.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Type Hints for Python"
-HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing"
+HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/typing/typing-3.6.4.ebuild b/dev-python/typing/typing-3.6.4.ebuild
index 1849d703abf1..dceb00a348da 100644
--- a/dev-python/typing/typing-3.6.4.ebuild
+++ b/dev-python/typing/typing-3.6.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
inherit distutils-r1
DESCRIPTION="Type Hints for Python"
-HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing"
+HOMEPAGE="https://docs.python.org/3/library/typing.html https://pypi.org/project/typing/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
diff --git a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
index d6284d42c6e6..017dc2c9ec3d 100644
--- a/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
+++ b/dev-python/u-msgpack/u-msgpack-2.4.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="${PN}-python"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A portable, lightweight MessagePack serializer and deserializer"
-HOMEPAGE="https://github.com/vsergeev/u-msgpack-python https://pypi.org/project/u-msgpack-python"
+HOMEPAGE="https://github.com/vsergeev/u-msgpack-python https://pypi.org/project/u-msgpack-python/"
SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
index dc76597b8737..d3614a79bf28 100644
--- a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
+++ b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
inherit distutils-r1
DESCRIPTION="Python cross-version byte-code deparser"
-HOMEPAGE="https://github.com/rocky/python-uncompyle6/ https://pypi.org/project/uncompyle6"
+HOMEPAGE="https://github.com/rocky/python-uncompyle6/ https://pypi.org/project/uncompyle6/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
index e0b1b60c7f0f..924fdbc18bac 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode"
-HOMEPAGE="https://pypi.org/project/unicodecsv https://github.com/jdunck/python-unicodecsv"
+HOMEPAGE="https://pypi.org/project/unicodecsv/ https://github.com/jdunck/python-unicodecsv"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/unidecode/unidecode-0.04.20.ebuild b/dev-python/unidecode/unidecode-0.04.20.ebuild
index cabc6ca3c861..64d293775304 100644
--- a/dev-python/unidecode/unidecode-0.04.20.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.20.ebuild
@@ -11,7 +11,7 @@ MY_P=${MY_PN}-${PV}
inherit distutils-r1
DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode"
+HOMEPAGE="https://pypi.org/project/Unidecode/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/unidecode/unidecode-0.04.21.ebuild b/dev-python/unidecode/unidecode-0.04.21.ebuild
index 98d638a06ebf..bc2cc4335f89 100644
--- a/dev-python/unidecode/unidecode-0.04.21.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.21.ebuild
@@ -11,7 +11,7 @@ MY_P=${MY_PN}-${PV}
inherit distutils-r1
DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode"
+HOMEPAGE="https://pypi.org/project/Unidecode/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/unidecode/unidecode-1.0.22.ebuild b/dev-python/unidecode/unidecode-1.0.22.ebuild
index 69c5af080053..3f9b667ff5a4 100644
--- a/dev-python/unidecode/unidecode-1.0.22.ebuild
+++ b/dev-python/unidecode/unidecode-1.0.22.ebuild
@@ -11,7 +11,7 @@ MY_P=${MY_PN}-${PV}
inherit distutils-r1
DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode"
+HOMEPAGE="https://pypi.org/project/Unidecode/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
index 01a4b4704fe8..4c14ce2ddda1 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="A set of mixin classes and other helpers for unittest test case classes"
-HOMEPAGE="https://github.com/nedbat/unittest-mixins https://pypi.org/project/unittest-mixins"
+HOMEPAGE="https://github.com/nedbat/unittest-mixins https://pypi.org/project/unittest-mixins/"
SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
index 3aedc436ab9d..1d0d4fcf1d3a 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="The new features in unittest backported to Python 2.4+"
-HOMEPAGE="https://pypi.org/project/unittest2 https://github.com/testing-cabal/unittest-ext"
+HOMEPAGE="https://pypi.org/project/unittest2/ https://github.com/testing-cabal/unittest-ext"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/uritemplate/uritemplate-0.6.ebuild b/dev-python/uritemplate/uritemplate-0.6.ebuild
index cda0e6878cb4..2dc4ec8d8c14 100644
--- a/dev-python/uritemplate/uritemplate-0.6.ebuild
+++ b/dev-python/uritemplate/uritemplate-0.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python implementation of RFC6570, URI Template"
-HOMEPAGE="https://pypi.org/project/uritemplate"
+HOMEPAGE="https://pypi.org/project/uritemplate/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/uritemplate/uritemplate-3.0.0.ebuild b/dev-python/uritemplate/uritemplate-3.0.0.ebuild
index 18e2d4005a9a..52c980c86e9e 100644
--- a/dev-python/uritemplate/uritemplate-3.0.0.ebuild
+++ b/dev-python/uritemplate/uritemplate-3.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python implementation of RFC6570, URI Template"
-HOMEPAGE="https://pypi.org/project/uritemplate"
+HOMEPAGE="https://pypi.org/project/uritemplate/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild b/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild
index c3598e5d4176..fb2e9fee3e0b 100644
--- a/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild
+++ b/dev-python/urlgrabber/urlgrabber-3.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE=""
DEPEND="dev-python/pycurl[${PYTHON_USEDEP}]"
diff --git a/dev-python/utmp/utmp-0.4.ebuild b/dev-python/utmp/utmp-0.4.ebuild
index c6de2802110a..c8f4837b8b79 100644
--- a/dev-python/utmp/utmp-0.4.ebuild
+++ b/dev-python/utmp/utmp-0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_4,3_5} )
inherit distutils-r1
DESCRIPTION="utmp/wtmp reader"
-HOMEPAGE="https://pypi.org/project/utmp https://srcco.de/"
+HOMEPAGE="https://pypi.org/project/utmp/ https://srcco.de/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
index 4b4f64943619..415122d4455a 100644
--- a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Use version control tags to discover version numbers"
-HOMEPAGE="https://github.com/habnabit/vcversioner https://pypi.org/project/vcversioner"
+HOMEPAGE="https://github.com/habnabit/vcversioner https://pypi.org/project/vcversioner/"
SRC_URI="mirror://pypi/v/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/verboselogs/verboselogs-1.6.ebuild b/dev-python/verboselogs/verboselogs-1.6.ebuild
index f3b0f87a47bd..54082c8d876b 100644
--- a/dev-python/verboselogs/verboselogs-1.6.ebuild
+++ b/dev-python/verboselogs/verboselogs-1.6.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Verbose logging for Python's logging module"
-HOMEPAGE="https://pypi.org/project/verboselogs"
+HOMEPAGE="https://pypi.org/project/verboselogs/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/versioneer/versioneer-0.16.ebuild b/dev-python/versioneer/versioneer-0.16.ebuild
index 193955102c3b..27ee36ea5c3f 100644
--- a/dev-python/versioneer/versioneer-0.16.ebuild
+++ b/dev-python/versioneer/versioneer-0.16.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="https://pypi.org/project/versioneer https://github.com/warner/python-versioneer"
+HOMEPAGE="https://pypi.org/project/versioneer/ https://github.com/warner/python-versioneer"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/vertex/vertex-0.3.0-r1.ebuild b/dev-python/vertex/vertex-0.3.0-r1.ebuild
index 1fbcd4af6057..1cee997855be 100644
--- a/dev-python/vertex/vertex-0.3.0-r1.ebuild
+++ b/dev-python/vertex/vertex-0.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit twisted-r1
DESCRIPTION="An implementation of the Q2Q protocol"
-HOMEPAGE="https://github.com/twisted/vertex https://pypi.org/project/Vertex"
+HOMEPAGE="https://github.com/twisted/vertex https://pypi.org/project/Vertex/"
SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
KEYWORDS="amd64 x86"
diff --git a/dev-python/vertex/vertex-0.3.1-r1.ebuild b/dev-python/vertex/vertex-0.3.1-r1.ebuild
index a59fdf12cc98..96cb433a368a 100644
--- a/dev-python/vertex/vertex-0.3.1-r1.ebuild
+++ b/dev-python/vertex/vertex-0.3.1-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit twisted-r1
DESCRIPTION="An implementation of the Q2Q protocol"
-HOMEPAGE="https://github.com/twisted/vertex https://pypi.org/project/Vertex"
+HOMEPAGE="https://github.com/twisted/vertex https://pypi.org/project/Vertex/"
SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/vine/vine-1.1.3.ebuild b/dev-python/vine/vine-1.1.3.ebuild
index 5e16a009d1b5..3773ef04b599 100644
--- a/dev-python/vine/vine-1.1.3.ebuild
+++ b/dev-python/vine/vine-1.1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Python Promises"
-HOMEPAGE="https://pypi.org/project/vine https://github.com/celery/vine"
+HOMEPAGE="https://pypi.org/project/vine/ https://github.com/celery/vine"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/virtualenv/virtualenv-15.1.0.ebuild b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
index 9aeb33a63026..d6f1fca73824 100644
--- a/dev-python/virtualenv/virtualenv-15.1.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-15.1.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="Virtual Python Environment builder"
HOMEPAGE="
https://virtualenv.pypa.io/en/stable/
- https://pypi.org/project/virtualenv
+ https://pypi.org/project/virtualenv/
https://github.com/pypa/virtualenv/
"
SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
index 9aba1b303652..80767cc021b4 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.7.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
HOMEPAGE="http://www.doughellmann.com/projects/virtualenvwrapper
- https://pypi.org/project/virtualenvwrapper"
+ https://pypi.org/project/virtualenvwrapper/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
index f91c0cde9160..32ffca254a26 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
HOMEPAGE="https://bitbucket.org/dhellmann/virtualenvwrapper
- https://pypi.org/project/virtualenvwrapper"
+ https://pypi.org/project/virtualenvwrapper/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/vobject/vobject-0.9.3.ebuild b/dev-python/vobject/vobject-0.9.3.ebuild
index fef87b7c6b14..dfd4eca22564 100644
--- a/dev-python/vobject/vobject-0.9.3.ebuild
+++ b/dev-python/vobject/vobject-0.9.3.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
HOMEPAGE="http://eventable.github.io/vobject/
- https://pypi.org/project/vobject
+ https://pypi.org/project/vobject/
https://github.com/eventable/vobject"
SRC_URI="https://github.com/eventable/vobject/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/vobject/vobject-0.9.5.ebuild b/dev-python/vobject/vobject-0.9.5.ebuild
index 0ea2d2e849f8..99539b059e84 100644
--- a/dev-python/vobject/vobject-0.9.5.ebuild
+++ b/dev-python/vobject/vobject-0.9.5.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
HOMEPAGE="http://eventable.github.io/vobject/
- https://pypi.org/project/vobject
+ https://pypi.org/project/vobject/
https://github.com/eventable/vobject"
SRC_URI="https://github.com/eventable/vobject/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/vulture/vulture-0.10.ebuild b/dev-python/vulture/vulture-0.10.ebuild
index 33d0bca79046..22fd752ae5a9 100644
--- a/dev-python/vulture/vulture-0.10.ebuild
+++ b/dev-python/vulture/vulture-0.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="find unused classes, functions and variables in your code"
-HOMEPAGE="https://bitbucket.org/jendrikseipp/vulture https://pypi.org/project/vulture"
+HOMEPAGE="https://bitbucket.org/jendrikseipp/vulture https://pypi.org/project/vulture/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
diff --git a/dev-python/webcolors/webcolors-1.5.ebuild b/dev-python/webcolors/webcolors-1.5.ebuild
index 08e99284930e..db9046a829c2 100644
--- a/dev-python/webcolors/webcolors-1.5.ebuild
+++ b/dev-python/webcolors/webcolors-1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Color names and value formats defined by the HTML and CSS specifications"
-HOMEPAGE="https://pypi.org/project/webcolors https://github.com/ubernostrum/webcolors"
+HOMEPAGE="https://pypi.org/project/webcolors/ https://github.com/ubernostrum/webcolors"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-python/webencodings/webencodings-0.5.1.ebuild b/dev-python/webencodings/webencodings-0.5.1.ebuild
index 2cd5dc35c670..5e2a78280d15 100644
--- a/dev-python/webencodings/webencodings-0.5.1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Character encoding aliases for legacy web content"
-HOMEPAGE="https://github.com/SimonSapin/python-webencodings https://pypi.org/project/webencodings"
+HOMEPAGE="https://github.com/SimonSapin/python-webencodings https://pypi.org/project/webencodings/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/weberror/weberror-0.13.1.ebuild b/dev-python/weberror/weberror-0.13.1.ebuild
index 66d03a364389..42505277f3c6 100644
--- a/dev-python/weberror/weberror-0.13.1.ebuild
+++ b/dev-python/weberror/weberror-0.13.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="WebError"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Web Error handling and exception catching"
-HOMEPAGE="https://pypi.org/project/WebError"
+HOMEPAGE="https://pypi.org/project/WebError/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
index aa60ee750ae2..1c36380eac3b 100644
--- a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
+++ b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild
@@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="Web Helpers"
HOMEPAGE="https://docs.pylonsproject.org/projects/webhelpers/en/latest/
- https://pypi.org/project/WebHelpers"
+ https://pypi.org/project/WebHelpers/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/webob/webob-1.7.3.ebuild b/dev-python/webob/webob-1.7.3.ebuild
index a5ca5a16d818..f1357fa7af0c 100644
--- a/dev-python/webob/webob-1.7.3.ebuild
+++ b/dev-python/webob/webob-1.7.3.ebuild
@@ -11,7 +11,7 @@ MY_PN=WebOb
MY_P=${MY_PN}-${PV}
DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/ https://pypi.org/project/WebOb"
+HOMEPAGE="https://webob.org/ https://pypi.org/project/WebOb/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/webob/webob-1.7.4.ebuild b/dev-python/webob/webob-1.7.4.ebuild
index a5ca5a16d818..f1357fa7af0c 100644
--- a/dev-python/webob/webob-1.7.4.ebuild
+++ b/dev-python/webob/webob-1.7.4.ebuild
@@ -11,7 +11,7 @@ MY_PN=WebOb
MY_P=${MY_PN}-${PV}
DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/ https://pypi.org/project/WebOb"
+HOMEPAGE="https://webob.org/ https://pypi.org/project/WebOb/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/webpy/webpy-0.37-r1.ebuild b/dev-python/webpy/webpy-0.37-r1.ebuild
index 3bf4f527e20a..c59c79bb397c 100644
--- a/dev-python/webpy/webpy-0.37-r1.ebuild
+++ b/dev-python/webpy/webpy-0.37-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
MY_PN="web.py"
DESCRIPTION="A small and simple web framework for Python"
-HOMEPAGE="http://www.webpy.org https://pypi.org/project/web.py"
+HOMEPAGE="http://www.webpy.org https://pypi.org/project/web.py/"
SRC_URI="http://www.webpy.org/static/${MY_PN}-${PV}.tar.gz"
LICENSE="public-domain"
diff --git a/dev-python/webpy/webpy-0.38.ebuild b/dev-python/webpy/webpy-0.38.ebuild
index bc64092e163b..28895eb899d5 100644
--- a/dev-python/webpy/webpy-0.38.ebuild
+++ b/dev-python/webpy/webpy-0.38.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_PN="web.py"
DESCRIPTION="A small and simple web framework for Python"
-HOMEPAGE="http://www.webpy.org https://pypi.org/project/web.py"
+HOMEPAGE="http://www.webpy.org https://pypi.org/project/web.py/"
SRC_URI="http://www.webpy.org/static/${MY_PN}-${PV}.tar.gz"
LICENSE="public-domain"
diff --git a/dev-python/webtest/webtest-2.0.21.ebuild b/dev-python/webtest/webtest-2.0.21.ebuild
index 9cde0cc47c47..9f5bd8741ddc 100644
--- a/dev-python/webtest/webtest-2.0.21.ebuild
+++ b/dev-python/webtest/webtest-2.0.21.ebuild
@@ -11,7 +11,7 @@ MY_PN="WebTest"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="https://pypi.org/project/WebTest"
+HOMEPAGE="https://pypi.org/project/WebTest/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/webtest/webtest-2.0.29.ebuild b/dev-python/webtest/webtest-2.0.29.ebuild
index 033f5ca88406..f7981a6395b9 100644
--- a/dev-python/webtest/webtest-2.0.29.ebuild
+++ b/dev-python/webtest/webtest-2.0.29.ebuild
@@ -11,7 +11,7 @@ MY_PN="WebTest"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="https://pypi.org/project/WebTest"
+HOMEPAGE="https://pypi.org/project/WebTest/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/werkzeug/werkzeug-0.12.2.ebuild b/dev-python/werkzeug/werkzeug-0.12.2.ebuild
index 549e7115bfee..44459f66def9 100644
--- a/dev-python/werkzeug/werkzeug-0.12.2.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.12.2.ebuild
@@ -11,7 +11,7 @@ MY_PN="Werkzeug"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug https://github.com/pallets/werkzeug"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/wheel/wheel-0.29.0.ebuild b/dev-python/wheel/wheel-0.29.0.ebuild
index d910d2ba4955..789635764e3b 100644
--- a/dev-python/wheel/wheel-0.29.0.ebuild
+++ b/dev-python/wheel/wheel-0.29.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1 eutils
DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.org/project/wheel"
+HOMEPAGE="https://pypi.org/project/wheel/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/wheel/wheel-0.30.0.ebuild b/dev-python/wheel/wheel-0.30.0.ebuild
index 079b89ceada2..cc90e685010d 100644
--- a/dev-python/wheel/wheel-0.30.0.ebuild
+++ b/dev-python/wheel/wheel-0.30.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
inherit distutils-r1 eutils
DESCRIPTION="A built-package format for Python"
-HOMEPAGE="https://pypi.org/project/wheel"
+HOMEPAGE="https://pypi.org/project/wheel/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/whelk/whelk-2.7.1.ebuild b/dev-python/whelk/whelk-2.7.1.ebuild
index bf4cadcfdeb4..d14b8cb5d15d 100644
--- a/dev-python/whelk/whelk-2.7.1.ebuild
+++ b/dev-python/whelk/whelk-2.7.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Pretending python is a shell"
-HOMEPAGE="https://pypi.org/project/whelk"
+HOMEPAGE="https://pypi.org/project/whelk/"
SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
index 0a46f32f3e09..4e82dd4d563f 100644
--- a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Accelerator for ws4py, autobahn and tornado"
-HOMEPAGE="https://pypi.org/project/wsaccel https://github.com/methane/wsaccel"
+HOMEPAGE="https://pypi.org/project/wsaccel/ https://github.com/methane/wsaccel"
SRC_URI="https://github.com/methane/wsaccel/archive/${COMMIT}.zip -> ${P}.zip"
SLOT="0"
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
index 5014d130572f..45b230044208 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_PN="WSGIProxy2"
DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.org/project/WSGIProxy2"
+HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
LICENSE="MIT"
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
index 8559e8f5dd4f..bec0dd5b9907 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.4.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_PN="WSGIProxy2"
DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.org/project/WSGIProxy2"
+HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/wstools/wstools-0.4.3.ebuild b/dev-python/wstools/wstools-0.4.3.ebuild
index a692f0bd919b..5ac5a62e06dc 100644
--- a/dev-python/wstools/wstools-0.4.3.ebuild
+++ b/dev-python/wstools/wstools-0.4.3.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml(+)"
inherit distutils-r1
DESCRIPTION="WSDL parsing services package for Web Services for Python"
-HOMEPAGE="https://github.com/kiorky/wstools https://pypi.org/project/wstools"
+HOMEPAGE="https://github.com/kiorky/wstools https://pypi.org/project/wstools/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/wstools/wstools-0.4.5-r1.ebuild b/dev-python/wstools/wstools-0.4.5-r1.ebuild
index 9f3b8161e26d..49a98d2bfdf2 100644
--- a/dev-python/wstools/wstools-0.4.5-r1.ebuild
+++ b/dev-python/wstools/wstools-0.4.5-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml(+)"
inherit distutils-r1
DESCRIPTION="WSDL parsing services package for Web Services for Python"
-HOMEPAGE="https://github.com/kiorky/wstools https://pypi.org/project/wstools"
+HOMEPAGE="https://github.com/kiorky/wstools https://pypi.org/project/wstools/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/wtforms/wtforms-2.1.ebuild b/dev-python/wtforms/wtforms-2.1.ebuild
index 37cdcd1fe759..eefd7368fa20 100644
--- a/dev-python/wtforms/wtforms-2.1.ebuild
+++ b/dev-python/wtforms/wtforms-2.1.ebuild
@@ -11,7 +11,7 @@ MY_PN="WTForms"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Flexible forms validation and rendering library for python web development"
-HOMEPAGE="http://wtforms.simplecodes.com/ https://pypi.org/project/WTForms"
+HOMEPAGE="http://wtforms.simplecodes.com/ https://pypi.org/project/WTForms/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="BSD"
diff --git a/dev-python/xdis/xdis-3.3.1.ebuild b/dev-python/xdis/xdis-3.3.1.ebuild
index 32b82c03252f..569c32177394 100644
--- a/dev-python/xdis/xdis-3.3.1.ebuild
+++ b/dev-python/xdis/xdis-3.3.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
-HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.org/project/xdis"
+HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.org/project/xdis/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/xdis/xdis-3.6.0.ebuild b/dev-python/xdis/xdis-3.6.0.ebuild
index 17a0964cc0c7..dd2731ef97c4 100644
--- a/dev-python/xdis/xdis-3.6.0.ebuild
+++ b/dev-python/xdis/xdis-3.6.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
inherit distutils-r1
DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
-HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.org/project/xdis"
+HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.org/project/xdis/"
# bad pypi source tarball - test failures
#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
SRC_URI="https://github.com/rocky/python-xdis/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
index 9bc8c0b780b7..c78249672e43 100644
--- a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
@@ -11,7 +11,7 @@ MY_PN="XlsxWriter"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://pypi.org/project/XlsxWriter https://github.com/jmcnamara/XlsxWriter"
+HOMEPAGE="https://pypi.org/project/XlsxWriter/ https://github.com/jmcnamara/XlsxWriter"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
SLOT="0"
diff --git a/dev-python/xlutils/xlutils-1.7.1.ebuild b/dev-python/xlutils/xlutils-1.7.1.ebuild
index f655804f89f3..a5280d83e9f4 100644
--- a/dev-python/xlutils/xlutils-1.7.1.ebuild
+++ b/dev-python/xlutils/xlutils-1.7.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="provides a collection of utilities for working with Excel files"
-HOMEPAGE="https://pypi.org/project/xlutils"
+HOMEPAGE="https://pypi.org/project/xlutils/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/xlwt/xlwt-1.0.0.ebuild b/dev-python/xlwt/xlwt-1.0.0.ebuild
index e38e8b65da2e..48d83fc9387d 100644
--- a/dev-python/xlwt/xlwt-1.0.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
inherit distutils-r1
DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
-HOMEPAGE="https://pypi.org/project/xlwt"
+HOMEPAGE="https://pypi.org/project/xlwt/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/xlwt/xlwt-1.2.0.ebuild b/dev-python/xlwt/xlwt-1.2.0.ebuild
index fc93998d388b..d90c80510c9e 100644
--- a/dev-python/xlwt/xlwt-1.2.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.2.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
-HOMEPAGE="https://pypi.org/project/xlwt"
+HOMEPAGE="https://pypi.org/project/xlwt/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/xonsh/xonsh-0.2.6.ebuild b/dev-python/xonsh/xonsh-0.2.6.ebuild
index 689ad36962f3..add7206c04c1 100644
--- a/dev-python/xonsh/xonsh-0.2.6.ebuild
+++ b/dev-python/xonsh/xonsh-0.2.6.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An exotic, usable shell"
HOMEPAGE="
http://xonsh.readthedocs.org/
https://github.com/scopatz/xonsh
- http://pypi.org/project/xonsh"
+ http://pypi.org/project/xonsh/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/xonsh/xonsh-0.4.4.ebuild b/dev-python/xonsh/xonsh-0.4.4.ebuild
index 85b5a963236c..f94222ef70a5 100644
--- a/dev-python/xonsh/xonsh-0.4.4.ebuild
+++ b/dev-python/xonsh/xonsh-0.4.4.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An exotic, usable shell"
HOMEPAGE="
http://xonsh.readthedocs.org/
https://github.com/scopatz/xonsh
- http://pypi.org/project/xonsh"
+ http://pypi.org/project/xonsh/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/xonsh/xonsh-0.4.7.ebuild b/dev-python/xonsh/xonsh-0.4.7.ebuild
index 0c93f172582a..dd336ccde3d8 100644
--- a/dev-python/xonsh/xonsh-0.4.7.ebuild
+++ b/dev-python/xonsh/xonsh-0.4.7.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An exotic, usable shell"
HOMEPAGE="
http://xonsh.readthedocs.org/
https://github.com/scopatz/xonsh
- http://pypi.org/project/xonsh"
+ http://pypi.org/project/xonsh/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
index bc2d03e13896..815e860c8f1c 100644
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.8.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
DESCRIPTION="Python wrapper for running a display inside X virtual framebuffer"
HOMEPAGE="https://github.com/cgoldberg/xvfbwrapper
- https://pypi.org/project/xvfbwrapper"
+ https://pypi.org/project/xvfbwrapper/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild b/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
index 85e461d3f903..24b6f620f061 100644
--- a/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
+++ b/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Gentoo Portage plugin for yolk"
-HOMEPAGE="https://pypi.org/project/yolk-portage"
+HOMEPAGE="https://pypi.org/project/yolk-portage/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/yolk/yolk-0.4.3-r1.ebuild b/dev-python/yolk/yolk-0.4.3-r1.ebuild
index 070cd8fad407..32decd0f6434 100644
--- a/dev-python/yolk/yolk-0.4.3-r1.ebuild
+++ b/dev-python/yolk/yolk-0.4.3-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Tool and library for querying PyPI and locally installed Python packages"
-HOMEPAGE="https://pypi.org/project/yolk"
+HOMEPAGE="https://pypi.org/project/yolk/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/yubiotp/metadata.xml b/dev-python/yubiotp/metadata.xml
index 038a787cd752..a31c338a5c29 100644
--- a/dev-python/yubiotp/metadata.xml
+++ b/dev-python/yubiotp/metadata.xml
@@ -1,10 +1,7 @@
-
- ercpe@gentoo.org
- Johann Schmitz (ercpe)
-
+
YubiOTP
psagers/yubiotp
diff --git a/dev-python/yubiotp/yubiotp-0.2.1.ebuild b/dev-python/yubiotp/yubiotp-0.2.1.ebuild
index b717b151ddd9..e46ba7ac0e46 100644
--- a/dev-python/yubiotp/yubiotp-0.2.1.ebuild
+++ b/dev-python/yubiotp/yubiotp-0.2.1.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
@@ -10,7 +10,7 @@ inherit eutils distutils-r1
MY_PN="YubiOTP"
MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Library for verifying YubiKey OTP tokens, both locally and through a Yubico web service"
+DESCRIPTION="Library verifying YubiKey OTP tokens, locally and using Yubico web service"
HOMEPAGE="https://bitbucket.org/psagers/yubiotp"
SRC_URI="mirror://pypi/Y/${MY_PN}/${MY_P}.tar.gz"
diff --git a/dev-python/zbase32/zbase32-1.1.5.ebuild b/dev-python/zbase32/zbase32-1.1.5.ebuild
index bcf6a9668919..0eaf7ba10da1 100644
--- a/dev-python/zbase32/zbase32-1.1.5.ebuild
+++ b/dev-python/zbase32/zbase32-1.1.5.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="base32 encoder/decoder (not RFC 3548 compliant)"
-HOMEPAGE="https://pypi.org/project/zbase32"
+HOMEPAGE="https://pypi.org/project/zbase32/"
SRC_URI="mirror://pypi/z/zbase32/zbase32-${PV}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild b/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
index c5299f1c73d0..0a2e6c846174 100644
--- a/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
+++ b/dev-python/zc-buildout/zc-buildout-2.5.3-r1.ebuild
@@ -10,7 +10,7 @@ MY_PN="${PN/-/.}"
MY_P=${MY_PN}-${PV}
DESCRIPTION="System for managing development buildouts"
-HOMEPAGE="https://pypi.org/project/zc.buildout"
+HOMEPAGE="https://pypi.org/project/zc.buildout/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
diff --git a/dev-python/zeroconf/zeroconf-0.19.1.ebuild b/dev-python/zeroconf/zeroconf-0.19.1.ebuild
index ea21c5949fb4..f324059391b6 100644
--- a/dev-python/zeroconf/zeroconf-0.19.1.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.19.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="https://github.com/jstasiak/python-zeroconf https://pypi.org/project/zeroconf"
+HOMEPAGE="https://github.com/jstasiak/python-zeroconf https://pypi.org/project/zeroconf/"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
diff --git a/dev-python/zfec/zfec-1.4.24.ebuild b/dev-python/zfec/zfec-1.4.24.ebuild
index e3ecb6cd8473..c123900063fe 100644
--- a/dev-python/zfec/zfec-1.4.24.ebuild
+++ b/dev-python/zfec/zfec-1.4.24.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Fast erasure codec for the command-line, C, Python, or Haskell"
-HOMEPAGE="https://pypi.org/project/zfec"
+HOMEPAGE="https://pypi.org/project/zfec/"
SRC_URI="mirror://pypi/z/zfec/zfec-${PV}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild b/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
index ca5dd7b40dda..f8c4a7304131 100644
--- a/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
+++ b/dev-python/zope-exceptions/zope-exceptions-4.1.0.ebuild
@@ -10,7 +10,7 @@ MY_PN=${PN/-/.}
MY_P=${MY_PN}-${PV}
DESCRIPTION="General purpose exceptions for Zope packages"
-HOMEPAGE="https://pypi.org/project/zope.exceptions https://github.com/zopefoundation/zope.exceptions"
+HOMEPAGE="https://pypi.org/project/zope.exceptions/ https://github.com/zopefoundation/zope.exceptions"
SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
diff --git a/dev-python/zope-interface/zope-interface-4.1.1.ebuild b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
index 667323ec2de1..9d05494b9028 100644
--- a/dev-python/zope-interface/zope-interface-4.1.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.1.1.ebuild
@@ -10,7 +10,7 @@ MY_PN=${PN/-/.}
MY_P=${MY_PN}-${PV}
DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.org/project/zope.interface"
+HOMEPAGE="https://pypi.org/project/zope.interface/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
diff --git a/dev-python/zope-interface/zope-interface-4.3.2.ebuild b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
index 878c1917309f..e348957298f6 100644
--- a/dev-python/zope-interface/zope-interface-4.3.2.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.3.2.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/.}
MY_P=${MY_PN}-${PV}
DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.org/project/zope.interface https://github.com/zopefoundation/zope.interface"
+HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
diff --git a/dev-python/zope-interface/zope-interface-4.4.3.ebuild b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
index b2592e66af7d..da0e81e1c162 100644
--- a/dev-python/zope-interface/zope-interface-4.4.3.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/.}
MY_P=${MY_PN}-${PV}
DESCRIPTION="Interfaces for Python"
-HOMEPAGE="https://pypi.org/project/zope.interface https://github.com/zopefoundation/zope.interface"
+HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
diff --git a/dev-python/zope-testing/zope-testing-4.6.2.ebuild b/dev-python/zope-testing/zope-testing-4.6.2.ebuild
index 5e45a64a247b..9c0b964fd44d 100644
--- a/dev-python/zope-testing/zope-testing-4.6.2.ebuild
+++ b/dev-python/zope-testing/zope-testing-4.6.2.ebuild
@@ -10,7 +10,7 @@ MY_PN=${PN/-/.}
MY_P=${MY_PN}-${PV}
DESCRIPTION="Zope testing helpers"
-HOMEPAGE="https://pypi.org/project/zope.testing https://github.com/zopefoundation/zope.testing"
+HOMEPAGE="https://pypi.org/project/zope.testing/ https://github.com/zopefoundation/zope.testing"
SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="ZPL"
diff --git a/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild b/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
index ddbb9862bbb3..b1fea5b1b556 100644
--- a/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
+++ b/dev-python/zope-testrunner/zope-testrunner-4.7.0.ebuild
@@ -10,7 +10,7 @@ MY_PN=${PN/-/.}
MY_P=${MY_PN}-${PV}
DESCRIPTION="Zope testrunner script"
-HOMEPAGE="https://pypi.org/project/zope.testrunner https://github.com/zopefoundation/zope.testrunner"
+HOMEPAGE="https://pypi.org/project/zope.testrunner/ https://github.com/zopefoundation/zope.testrunner"
SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.zip"
LICENSE="ZPL"
diff --git a/dev-python/zstandard/zstandard-0.8.1.ebuild b/dev-python/zstandard/zstandard-0.8.1.ebuild
index a40eb6cf66bf..990981569c53 100644
--- a/dev-python/zstandard/zstandard-0.8.1.ebuild
+++ b/dev-python/zstandard/zstandard-0.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="https://pypi.org/project/zstandard https://github.com/indygreg/python-zstandard"
+HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index f14391a1467e..1e56b5a5c212 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild
index cb2eede7312f..8a3472702226 100644
--- a/dev-qt/qtgui/qtgui-4.8.7.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.7.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
@@ -53,12 +53,7 @@ RDEPEND="
!=dev-ruby/ffi-1.0.11"
+
+all_ruby_prepare() {
+ # Remove bundler support
+ rm Gemfile || die
+ sed -i -e "/[Bb]undler/d" Rakefile || die
+ sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die
+ sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+ sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb || die
+}
+
+each_ruby_test() {
+ RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec
+}
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index 8cac8a4a92e8..8185e37a3948 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,2 +1 @@
-DIST daemons-1.2.3.gem 24576 BLAKE2B 23cd623c2f9c84ba182b0d1eeb5bdccf9273dc5f0d41cd51377abe7fe1c29e6c7bd342afa9891a54638aefaa4bd1353a3183516bb4355eb93772de633e2db05a SHA512 05acecc07bc3f760472453dd11eb0231b9e7f2e04a783ab44dacecf9c666d01122d27fdb782d9973f475bc378e0e3e51795ad58e221f29b201b1ba5e0de1e277
DIST daemons-1.2.6.tar.gz 27557 BLAKE2B 7c08b637ab37f764309fd260c4ea6c11402b89ea327eb47ea0af3860397ece795467a11c4ae5d8577972f5d8e2c6590f4d8112027f06db941b7181e33c158736 SHA512 8276685a684093252bf136c552a613a5208f4ab34f178be9425c62ea59fe1eebe671a7dd6c57d30744187b9ae58d7a7f1ebf58468e988565a30ca4417f2a90ea
diff --git a/dev-ruby/daemons/daemons-1.2.3.ebuild b/dev-ruby/daemons/daemons-1.2.3.ebuild
deleted file mode 100644
index 38e345251368..000000000000
--- a/dev-ruby/daemons/daemons-1.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="Releases README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
-HOMEPAGE="https://github.com/thuehlinger/daemons"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="examples"
-
-all_ruby_install() {
- all_fakegem_install
-
- use examples || return
-
- insinto /usr/share/doc/${PF}/
- doins -r examples
-}
diff --git a/dev-ruby/daemons/daemons-1.2.6.ebuild b/dev-ruby/daemons/daemons-1.2.6.ebuild
index 0ea5fdbae211..901f0ec74cac 100644
--- a/dev-ruby/daemons/daemons-1.2.6.ebuild
+++ b/dev-ruby/daemons/daemons-1.2.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/thuehlinger/daemons/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples"
all_ruby_prepare() {
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index 13edae559acd..ff63436a8847 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,2 +1,3 @@
DIST dbf-3.1.0.gem 126976 BLAKE2B 1ab65d152d7dfcb84a857c21fccc7162a0e35e51cff50f30972bcc109b9d574479507488538b825aa00e94010435494797a650aaa452ffd2c3fa69150328743f SHA512 d09c2c10a4d16774e8c72a3cb11ddbda6f302ed359b234b9d5698571bac4e10fde73d1200083c1cc7044b632ac196f0c59a94ff60c93e4953359030d74b26e3c
DIST dbf-3.1.1.gem 126976 BLAKE2B 449b70abaa0bdcdf579ee78facbac46d2f97fb99e983b99ef7487c6a78f5d6f8f1c5257e1a490a169b8cb8e9581fb56827d86844d2d2ee9bc0b3326998206f6e SHA512 88aedb43858702ef2f24a2a751ceaeceba7d75ad58a6abdb314219cbb83551165aa7a1973a68e6b4c0da87c9f35c80b2e0650b25f570a76821bbdccb3dbaafb5
+DIST dbf-3.1.2.gem 127488 BLAKE2B c71089220f7b2d57b99ab27881c5f094a753c1a7c5378074f18d4a9fccba26d4ac7e8e563b84c0556aa50db7f39d03697957c10e6528ddaed8bef812cac662f5 SHA512 1e9c809cc03d4ecadaadd5cc754e4fa85961cf675465f950cda1c084e80c32e0a62223494f76b4ba8e26cde61eea8e43414d1b03c95fd36e8994222c3ffcab11
diff --git a/dev-ruby/dbf/dbf-3.1.2.ebuild b/dev-ruby/dbf/dbf-3.1.2.ebuild
new file mode 100644
index 000000000000..228d72d6735d
--- /dev/null
+++ b/dev-ruby/dbf/dbf-3.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
+database files"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/ddmemoize/Manifest b/dev-ruby/ddmemoize/Manifest
new file mode 100644
index 000000000000..8a3577a94069
--- /dev/null
+++ b/dev-ruby/ddmemoize/Manifest
@@ -0,0 +1 @@
+DIST ddmemoize-1.0.0.gem 11776 BLAKE2B 3acf18cc70aed6c35ee98f42e6004ae13c623299abb0e8a3c0dbe7e7908775b9b6e2f81cc2977e4ca04ad584e7b5c43219979187448e3c87e6abc2d78a1c8f15 SHA512 b0a4c825c789f578031d12ff38f204bb5256db769fe71fcda98f1ab23a3d61c9d9d6cc486a2bfa566c1ea1fc8617b2563e97f05eac40b7587f35c618fd495eb2
diff --git a/dev-ruby/ddmemoize/ddmemoize-1.0.0.ebuild b/dev-ruby/ddmemoize/ddmemoize-1.0.0.ebuild
new file mode 100644
index 000000000000..a7cf081b5e5d
--- /dev/null
+++ b/dev-ruby/ddmemoize/ddmemoize-1.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds support for memoizing functions"
+HOMEPAGE="https://github.com/ddfreyne/ddmemoize/"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+ dev-ruby/ddmetrics:1
+ dev-ruby/ref:2
+"
+
+all_ruby_prepare() {
+ sed -i -e '/simplecov/,/^SimpleCov.formatter/ s:^:#:' \
+ -e '/fuubar/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-python/flask-whooshalchemy/metadata.xml b/dev-ruby/ddmemoize/metadata.xml
similarity index 52%
rename from dev-python/flask-whooshalchemy/metadata.xml
rename to dev-ruby/ddmemoize/metadata.xml
index a36129d8ca17..1531b69fc0be 100644
--- a/dev-python/flask-whooshalchemy/metadata.xml
+++ b/dev-ruby/ddmemoize/metadata.xml
@@ -2,11 +2,10 @@
- python@gentoo.org
- Python
+ ruby@gentoo.org
+ Gentoo Ruby Project
- Flask-WhooshAlchemy
- gyllstromk/Flask-WhooshAlchemy
+ ddfreyne/ddmemoize
diff --git a/dev-ruby/eventmachine/Manifest b/dev-ruby/eventmachine/Manifest
index 00927b43ebbe..fa1148deea12 100644
--- a/dev-ruby/eventmachine/Manifest
+++ b/dev-ruby/eventmachine/Manifest
@@ -1,2 +1 @@
-DIST eventmachine-1.0.9.1.gem 235008 BLAKE2B d19fea338daeebf1c7c4ca64de7643ff46e455feb500979c1de96d1806d379c337f70189039d700889eb2ef416b35cd45f298656abe6c5ef79ba2da4dba0ffb8 SHA512 5cbc178c604fe9a21850c298f7a5b6f904573f5e1db9e07fee599c5700841c52ec0311a6e50192eff9c1bb45cf30a9dd81d2150fe9d04cabd24cc7c9c32c5df0
DIST eventmachine-1.2.0.1.gem 241152 BLAKE2B f7df9888ba9f3ef731099124ce7cf2b6b396f57dc948feb828f015f2b33426348c87f2443fc6f678e94550167241c2ae154f3679b13b3b7e1bdb6bcdae6cfaab SHA512 a861a2c5172b7cf2720bdb54f52ea96c311c10efdb2f54970054901674e044a72307a5b32210efbbdb78d0472a9b3fb6e898640e1c0b406bdad8b581970e30aa
diff --git a/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild b/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild
deleted file mode 100644
index 7f0b8880d3c2..000000000000
--- a/dev-ruby/eventmachine/eventmachine-1.0.9.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="docs/*.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs"
-HOMEPAGE="http://rubyeventmachine.com"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="${DEPEND}
- dev-libs/openssl:0"
-RDEPEND="${RDEPEND}
- dev-libs/openssl:0"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
- # Remove package tasks to avoid dependency on rake-compiler.
- rm rakelib/package.rake || die
-
- # fix test issue - upstream b96b736b39261f7d74f013633cc7cd619afa20c4
- sed -i -e 's/DEBUG/BROADCAST/g' tests/test_set_sock_opt.rb || die
- sed -i -e "/omit_/d" tests/test_*.rb || die
- # Remove the resolver tests since they require network access and
- # the localhost test fails with an IPv6 localhost.
- rm tests/test_resolver.rb || die
- # Needs a tty
- rm tests/test_kb.rb || die
- # Avoid tests that require network access
- sed -i -e '/test_bind_connect/,/^ end/ s:^:#:' \
- tests/test_basic.rb || die
- sed -i -e '/test_\(cookie\|http_client\|version_1_0\)/,/^ end/ s:^:#:' \
- tests/test_httpclient.rb || die
- sed -i -e '/test_\(get\|https_get\)/,/^ end/ s:^:#:' \
- tests/test_httpclient2.rb || die
- sed -i -e '/test_connect_timeout/,/^ end/ s:^:#:' \
- tests/test_unbind_reason.rb || die
- sed -i -e '/test_for_real/,/^ end/ s:^:#:' \
- tests/test_pending_connect_timeout.rb || die
- rm -f tests/test_{get_sock_opt,set_sock_opt,idle_connection}.rb || die
-}
-
-each_ruby_configure() {
- for extdir in ext ext/fastfilereader; do
- pushd $extdir
- ${RUBY} extconf.rb || die "extconf.rb failed for ${extdir}"
- popd
- done
-}
-
-each_ruby_compile() {
- for extdir in ext ext/fastfilereader; do
- pushd $extdir
- # both extensions use C++, so use the CXXFLAGS not the CFLAGS
- emake V=1 CFLAGS="${CXXFLAGS} -fPIC" archflag="${LDFLAGS}" || die "emake failed for ${extdir}"
- popd
- cp $extdir/*.so lib/ || die "Unable to copy extensions for ${extdir}"
- done
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib -S testrb tests/test_*.rb || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- insinto /usr/share/doc/${PF}/
- doins -r examples || die "Failed to install examples"
-}
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
index af902ccb1330..600e79ac5697 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://rubyeventmachine.com"
LICENSE="|| ( GPL-2 Ruby )"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="${DEPEND}
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index 91e70fb3b096..1586fdcc2eec 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -3,4 +3,3 @@ DIST fakefs-0.12.0.tar.gz 45573 BLAKE2B 8fabed4ae113da67a3e7b61c6b4c400d1e20509a
DIST fakefs-0.13.0.tar.gz 45866 BLAKE2B 0c31b6672aed70d00b5372a6b43045ebc1037126b81fe8cae8b139c1298fe833b42b09255f3c64148a6073d0205759786e401c6c34cdb5054295a2f654ba2584 SHA512 9df14a3d7ec2cdd92126eedf7663460caf21ad017f5db8a941fe8489ca3e3d16b8dd5fcb41d92b45a2895d18e18c9dd705d70e9b2d7895edb2f4430be7e6a0fa
DIST fakefs-0.13.2.tar.gz 45978 BLAKE2B 7657904f7732f398fbea8eaffc7fed375316be8827d015121215383f93524d683dd2f957b067e796a795b97e3c697b95ed1f317743d3b111e0ae9b6afe1d5740 SHA512 9d1aec7c750a70b8c27543481aa431c42df1436d1cd59af5feb0cde4bdb7491907ed856ffb991d4ca8a8147a521cb35910f8f9de9d80426ee4432a20090003b2
DIST fakefs-0.13.3.tar.gz 46019 BLAKE2B 2ff858106a4d5b4f6859b806cc1aa54a08917ecf2d8794fc20ff372cc94f1817ffac3e070c1c2d96a2f145fd2d471399792b42a45c24ee61c309b5f8d0ee18e1 SHA512 c3cd74fd5914d75a4cd3b0edc661b70398c8970ab100e7103831c2d2b686a9f61036549cb21f53610eeb2416d1a49dc0e0a16e7c439c504d65b41a05c31dfad3
-DIST fakefs-0.9.2.tar.gz 42792 BLAKE2B dc2037960f9aa05f62e09f8fb98f7b115c6f63af56436573ce88bc66fee2cb42f1e362ceb2de7f17b21701b884ad8bc7c6ef5170a7441fcc16fb16977cbb1b4f SHA512 ba68f9d240d54379ba8b16dcb3e375b586c50f78a081a916151d21af2d6d8b61471fdc842ad91d1390e8dcf54b0744e95ba4794a5ebc915858886ec47f9dbb8a
diff --git a/dev-ruby/fakefs/fakefs-0.11.3.ebuild b/dev-ruby/fakefs/fakefs-0.11.3.ebuild
index 49c3323e608c..bf597b109fbb 100644
--- a/dev-ruby/fakefs/fakefs-0.11.3.ebuild
+++ b/dev-ruby/fakefs/fakefs-0.11.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
diff --git a/dev-ruby/fakefs/fakefs-0.9.2.ebuild b/dev-ruby/fakefs/fakefs-0.9.2.ebuild
deleted file mode 100644
index 636d6c0ff4d5..000000000000
--- a/dev-ruby/fakefs/fakefs-0.9.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/rspec-3.1:3
- >=dev-ruby/minitest-5.5
- )"
-
-all_ruby_prepare() {
- # Remove bundler
- rm Gemfile || die
-
- # Avoid unneeded minitest-rg dependency.
- sed -i -e '1igem "minitest", "~>5.5"' \
- -e '/bundler/ s:^:#:' \
- -e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
- RSPEC_VERSION=3 ruby-ng_rspec
- ${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/fakeweb/Manifest b/dev-ruby/fakeweb/Manifest
index 7f863e9e0873..a2fd4256c697 100644
--- a/dev-ruby/fakeweb/Manifest
+++ b/dev-ruby/fakeweb/Manifest
@@ -1 +1,2 @@
DIST fakeweb-1.3.0.20131201.tar.gz 60162 BLAKE2B 856c499041b122d84fde595343e0917a9ac47e81e50560be79a53def2099ea0ad05532bf3a7e3cd5e8dc668235c1ee75989b15465f397f56b7c0edd028bf980c SHA512 f3bd40680b7eefe90d3fee67f5282dbe4c67d46a1f1040d0d0d62c978b69d08987581a53495bb56e32ebcc6679c84f03c2e26c51d2bd98daa80554d3424c6603
+DIST fakeweb-1.3.0.20170806.tar.gz 61449 BLAKE2B f015f95897383e0b65ada5a7833f7bd3fd61ae77f4ab38bf6bb47f2eecef0c778928090302e46157ae4e2fc6c3df4559e9f5c8004a6474ad8852d157aa3af6da SHA512 1871b7c9f2e4f12cd1c434ef4f760828187078a951517fe3f7a6ca5c5d6f08e3056cae2bb012eca1ba556c2f4d369cb2716c637fefee67eb723428195c482edf
diff --git a/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild b/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
new file mode 100644
index 000000000000..8c53e00193b5
--- /dev/null
+++ b/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+COMMIT=2b08c1ff2714ec13a12f3497d67fcefce95c2cbe
+
+inherit ruby-fakegem
+
+DESCRIPTION="Helper for faking web requests in Ruby"
+HOMEPAGE="https://github.com/chrisk/fakeweb"
+SRC_URI="https://github.com/chrisk/fakeweb/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/mocha
+ dev-ruby/test-unit
+ )"
+
+all_ruby_prepare() {
+ # The package bundles samuel and right_http_connection, remove
+ # them
+ rm -r test/vendor || die "failed to remove bundled gems"
+
+ # We don't package sdoc and we don't have the direct template.
+ sed -i -e 's/sdoc/rdoc/' -e '/template/d' Rakefile || die
+
+ # Use the test-unit gem to make jruby compatible with newer mocha.
+ sed -i -e '1igem "test-unit"' \
+ -e '/bundler/I s:^:#:' \
+ -e '/simplecov/ s:^:#:' test/test_helper.rb || die
+
+ # Avoid test dependencies on unmaintained packages that no longer work
+ rm test/test_other_net_http_libraries.rb || die
+
+ sed -i -e '/test:preflight/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index 66e9bc316e30..dfbb039afffe 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,2 +1 @@
-DIST gruff-0.6.0.gem 316416 BLAKE2B 717f46d94b4b0811f2edbe42fac9c79ed389e509aad9a4f166fb068a7bdd4c7fecfaf97059364505fa354755ce9e9f79c87452e55f1eb05dae1efe41b76e1915 SHA512 4771637157d11c85d437d41d63d018915d1214fd09dc7078b883c98f640821aec3ddc64fcd4516ca4bfd06c9523ee5a4b60dc6233903e03d7336ad10989613cb
DIST gruff-0.7.0.gem 318464 BLAKE2B bcc51f524089f53b89778143b444c70d4e168983edda247cdb4c9c84c288450154ce6e5234bbf7a0a8ae7251df611333c8bb411a8fd3765ccc5fe9650c3efc38 SHA512 b9842213ab3da7b4eccf8bd06e18d62aea14a6a15d7c45ebe7e51a76acd456ce140f094a9419d4c0bd1774e7d203bea49f9c39aca36c75d744f2732bcde9f688
diff --git a/dev-ruby/gruff/gruff-0.6.0.ebuild b/dev-ruby/gruff/gruff-0.6.0.ebuild
deleted file mode 100644
index 68b336db8811..000000000000
--- a/dev-ruby/gruff/gruff-0.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful graphs for one or multiple datasets"
-HOMEPAGE="https://github.com/topfunky/gruff"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-macos"
-IUSE=""
-
-RUBY_PATCHES=(
- ${PN}-0.3.6-spider.patch
-)
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_rdepend ">=dev-ruby/rmagick-2.13.4"
-ruby_add_bdepend "
- test? (
- dev-ruby/hoe
- dev-ruby/test-unit
- )"
-
-each_ruby_test() {
- ruby-ng_testrb-2 test/test_*.rb
-}
diff --git a/dev-ruby/gruff/gruff-0.7.0.ebuild b/dev-ruby/gruff/gruff-0.7.0.ebuild
index 419121fabf44..6a6ca07ff84c 100644
--- a/dev-ruby/gruff/gruff-0.7.0.ebuild
+++ b/dev-ruby/gruff/gruff-0.7.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/topfunky/gruff"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-macos"
+KEYWORDS="amd64 x86 ~x86-macos"
IUSE=""
# imagemagick is an indirect dependency through rmagick. However, for
diff --git a/dev-ruby/litc/litc-1.0.3-r1.ebuild b/dev-ruby/litc/litc-1.0.3-r1.ebuild
index f53b726136b4..39dbad172fe4 100644
--- a/dev-ruby/litc/litc-1.0.3-r1.ebuild
+++ b/dev-ruby/litc/litc-1.0.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
RUBY_FAKEGEM_TASK_DOC="rerdoc"
RUBY_FAKEGEM_DOCDIR="rdoc"
diff --git a/dev-ruby/narray/Manifest b/dev-ruby/narray/Manifest
index 444710dc4d55..2cd737d4b671 100644
--- a/dev-ruby/narray/Manifest
+++ b/dev-ruby/narray/Manifest
@@ -1,2 +1 @@
-DIST narray-0.6.1.1.tar.gz 68536 BLAKE2B 07aaa85ed719da6e5d78f1783e93bf5a46574e2fc8461a75f7a20aad56234c973ec3e5267888e94b505baab2401a210368f93bd003db2e57ac41d4ac5f54875f SHA512 1c9983d29c774cb61b7f8ec53290d427c123b648d88407ff4a2e2aef1a289267050d4846adfc00c075629cb228ed5b3d4f9f5ded4cded0b84ec1a5532cbb49ff
DIST narray-0.6.1.2.tar.gz 68621 BLAKE2B c4e48b81fb0d79cc49e32ed8204d9cac3f483eb44e1207f422f5b272bb8891836d81cd83c090f4d643677b1159801c13d15580504e6ca244a2a75d4b6dfb3204 SHA512 51e9bec0b711e79e268b73496ad742b80bb46a6e9ea6aab9a2535a700b6efc8f7ae2e854f5772d434e3d385d81275744dbc796ebec4d3de73f2ec0546bd2339a
diff --git a/dev-ruby/narray/narray-0.6.1.1.ebuild b/dev-ruby/narray/narray-0.6.1.1.ebuild
deleted file mode 100644
index 6ea4f1b4bc13..000000000000
--- a/dev-ruby/narray/narray-0.6.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# jruby → native extension
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md README.ja.md SPEC.en.txt SPEC.ja.txt"
-
-RUBY_FAKEGEM_VERSION="${PV/_p/.}"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Numerical N-dimensional Array class"
-HOMEPAGE="http://www.ir.isas.ac.jp/~masa/ruby/index-e.html"
-SRC_URI="https://github.com/masa16/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc ~ppc64 x86"
-
-IUSE=""
-
-all_ruby_prepare() {
- # the tests aren't really written to be a testsuite, so the
- # failure cases will literally fail; ignore all of those and
- # instead expect that the rest won't fail.
- sed -i -e '/[fF]ollowing will fail/,$ s:^:#:' \
- -e '/next will fail/,$ s:^:#:' \
- test/*.rb || die "sed failed"
-}
-
-each_ruby_configure() {
- ${RUBY} extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
- emake V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
- cp -l ${PN}$(get_modname) ${PN}.h ${PN}_config.h lib/ || die "copy of ${PN}$(get_modname) failed"
-}
-
-each_ruby_test() {
- for unit in test/*; do
- ${RUBY} -Ilib ${unit} || die "test ${unit} failed"
- done
-}
diff --git a/dev-ruby/narray/narray-0.6.1.2.ebuild b/dev-ruby/narray/narray-0.6.1.2.ebuild
index 6fee0ac67b1d..eeb30014535e 100644
--- a/dev-ruby/narray/narray-0.6.1.2.ebuild
+++ b/dev-ruby/narray/narray-0.6.1.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/masa16/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc ~ppc64 ~x86"
+KEYWORDS="amd64 hppa ~mips ppc ~ppc64 x86"
IUSE=""
diff --git a/dev-ruby/net-scp/net-scp-1.2.1.ebuild b/dev-ruby/net-scp/net-scp-1.2.1.ebuild
deleted file mode 100644
index f317b12f2442..000000000000
--- a/dev-ruby/net-scp/net-scp-1.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby implementation of the SCP client protocol"
-HOMEPAGE="https://github.com/net-ssh/net-scp"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
- doc? ( >=dev-ruby/net-ssh-2.6.5:2.6 )
- test? (
- >=dev-ruby/net-ssh-2.9.0:2.6
- dev-ruby/mocha
- )"
-
-ruby_add_rdepend ">=dev-ruby/net-ssh-2.6.5:2.6"
-
-all_ruby_prepare() {
- sed -i -e 's/>= 2.0.0/~> 2.0/' test/common.rb || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib:test test/test_all.rb || die
-}
diff --git a/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.3.0.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.3.0.ebuild
index 9d2a68eac427..4e1440f3800d 100644
--- a/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.3.0.ebuild
+++ b/dev-ruby/net-ssh-gateway/net-ssh-gateway-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index e454c180b185..e3df249ae1d4 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,4 +1,3 @@
-DIST pg-0.17.1.gem 142848 BLAKE2B 26715943ffc56d5377613d3dd56bc994696a812ccedf6415233781d6685ac34ddf25321f2f194880dd9df6715d43efef7eaeb00ed8ac594302c6e2e292b07cc8 SHA512 fb637256d084af3b41ba4130f866924df957a63c29d029b99995bf553e545b3d4064e682b00d0604bf495a853a8800b9c8eba34718e96c651c9a697281ae4a62
DIST pg-0.18.4.gem 219648 BLAKE2B f6b957551b0b537dda5551bc8974f5bd2f8a4ee4ecf482a5d3dc3ede0ad610507029693fadbfe9d2e2940f63d82da61e535e802919a82f7e5ea23c1165b81847 SHA512 48e792756c7ee205164b59a9515ace6320150f0ce1907293f8c1a736300c62c0b38c1be49e8ad4f1a50f29abc7f72bb43e742a8e63d9606eff4c7d2191a4fb74
DIST pg-0.21.0.gem 214016 BLAKE2B 9e27646cd85bc97dedfb980f4851b19a1ef2aad17f6a5c60726c1683642af5c4cf87d518b300fb4c894e1580f808f8af6158b57f1ac25971c1fc55818abee6f4 SHA512 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b
DIST pg-1.0.0.gem 213504 BLAKE2B eecaa632c7903f89c503ad92ccff058bbc6c2c80cbf83d656eeb9a5b919b84bb270671ad4e0fa08f55be1bcfc69eb8e13b815c37c601d300de503383f1ba5908 SHA512 1cac025ab8a95b4429534b98377eedeb1e3f8b2c4a859363c4174d477577caf39557b002cde4e745189fa9a29e9181ff9d564d822f15ff5c4f03f7389b0d0398
diff --git a/dev-ruby/pg/pg-0.17.1-r1.ebuild b/dev-ruby/pg/pg-0.17.1-r1.ebuild
deleted file mode 100644
index e79f3407961b..000000000000
--- a/dev-ruby/pg/pg-0.17.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
-HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND}
- dev-db/postgresql:*"
-DEPEND="${DEPEND}
- dev-db/postgresql
- test? ( dev-db/postgresql[server,threads] )"
-
-ruby_add_bdepend "
- doc? (
- dev-ruby/hoe
- || ( >=dev-ruby/yard-0.6.1 dev-ruby/rdoc ) )"
-
-all_ruby_prepare() {
- # hack the Rakefile to make it sure that it doesn't load
- # rake-compiler (so that we don't have to depend on it and it
- # actually works when building with USE=doc).
- sed -i \
- -e '/Rakefile.cross/s:^:#:' \
- -e '/ExtensionTask/,/^end$/ s:^:#:' \
- Rakefile || die
-
- sed -i -e '18i require "socket"' spec/pg/connection_spec.rb || die
-}
-
-each_ruby_configure() {
- ${RUBY} -C ext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
- emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
- cp ext/*$(get_libname) lib || die
-}
-
-each_ruby_test() {
- if [[ "${EUID}" -ne "0" ]]; then
- # Make the rspec call explicit, this way we don't have to depend
- # on rake-compiler (nor rubygems) _and_ we don't have to rebuild
- # the whole extension from scratch.
- ruby-ng_rspec
- else
- ewarn "The userpriv feature must be enabled to run tests."
- eerror "Testsuite will not be run."
- fi
-}
diff --git a/dev-ruby/pg/pg-0.18.4-r1.ebuild b/dev-ruby/pg/pg-0.18.4-r1.ebuild
index 76ca7c11e058..485cd64b28cd 100644
--- a/dev-ruby/pg/pg-0.18.4-r1.ebuild
+++ b/dev-ruby/pg/pg-0.18.4-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
LICENSE="|| ( GPL-2 Ruby )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND+=" dev-db/postgresql:*"
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 5644f98ac4a2..ebb9c69ad0d6 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,6 +1,2 @@
DIST power_assert-0.3.1.gem 14336 BLAKE2B d29f8ffb84c1322610e1bfc819a599828a386abe2a21bf60d8e5a397dafbad52885c20899a78f713d39aedde992ac180138ed7fbd96ebf48d9bad753a51f0097 SHA512 0523c9c2f45ae60e93b491bed8ae3ff3bd83cfdf8c23d784ce19f87a52d90b94095d3e5ca38fbc2e4917a8895309194e06ec519099b69096bef69a4d9466da64
-DIST power_assert-0.4.1.gem 14848 BLAKE2B 8da24ce932c03263cd89eefa9939667cf34afb89d4befb0cb017e1e4016af81bf4233678ec87212a5e9f9c4d7c0d8b92d918b396c06bd09078c58ec37c443eff SHA512 18b55e841499be7827cdfbcca41fe786a4fd7d0ff2aed049c289b917ab4487e035cc4321f39ccab2dcc5967c668df36f0cfb96d8e799793c9cb8dfbf9b3622c9
-DIST power_assert-1.0.1.tar.gz 15376 BLAKE2B 69ae9378bce1ff73727e4eb6f7f5b7685f4949da7c656852ce178dcdf3c6a0b0b7784eef041e3b206c26ae45889910020c809e73ea4463300c63097d3ca85e85 SHA512 69370f69e7289c36a8d16a433e3629d25aa99049eec9b737af56d56c07ed5c4e72692c9fdc544cc76e7008babb2c7fd68c796e27e300268cd75b12cabe1d7403
-DIST power_assert-1.0.2.tar.gz 15381 BLAKE2B 8ee6db646f4d0f9d25b5faa9974dd6d30eefdad09a68d5cfc2c78fbb5df1b891671296357c6ab834813ebcfbe241c28053f458ef31503c90ccc9d0aa9441b4ae SHA512 31e1f0eb0b873b3ce05c72cd467e1928d53b028e1ec30314bd027d7402b5834442ff268d0263100d657cb485e67c64fae93996d08ba74d603b924c4526a7022f
-DIST power_assert-1.1.0.tar.gz 16184 BLAKE2B 49cc48c4ebf8108d4bb78573f298b88fed9622a3bc7e42c0a0d7aafb2d9c004671bc3491d3deac4955c82764cbcb6d7597bc9f7da1aa972f344c4b56f90ccef9 SHA512 271de1c87adb2a1e427329cba4f3e7ab15d17bde9afe4725de7b50f895fb4fd5b89bdd08694c84e1eac1183abbd53ffc56ad55216e0cd7841378e48393c885b0
DIST power_assert-1.1.1.tar.gz 16799 BLAKE2B df5f688d4242373f1a5de95fcbcdd63d23a14314a890a32839ba88494d04a09ad6b9c1dedea23f43d53cb708b3e5eee8d0a2307be16a1c11cf3cbf22ea254344 SHA512 a33429bf918c71a5b75e56940d46dfd05ed3c87f909d6f09ebf2d8b2cd43a3c5c37b5ac13c334383f1b3f52817ecd4ccf68cd649c53bebdfbc464a18c88b702c
diff --git a/dev-ruby/power_assert/power_assert-0.4.1.ebuild b/dev-ruby/power_assert/power_assert-0.4.1.ebuild
deleted file mode 100644
index c51dc1e9f473..000000000000
--- a/dev-ruby/power_assert/power_assert-0.4.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/d' Rakefile || die
- sed -i -e '1igem "test-unit"' test/helper.rb || die
-}
diff --git a/dev-ruby/power_assert/power_assert-1.0.1-r1.ebuild b/dev-ruby/power_assert/power_assert-1.0.1-r1.ebuild
deleted file mode 100644
index feba8d0eb4a3..000000000000
--- a/dev-ruby/power_assert/power_assert-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
- sed -i -e '1igem "test-unit"' \
- -e '/byebug/ s:^:#:' test/test_helper.rb || die
-
- # Avoid circular dependency on byebug when bootstrapping ruby
- sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
- rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
- # Avoid circular dependency on pry when bootstrapping ruby
- sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^ end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/power_assert/power_assert-1.0.2.ebuild b/dev-ruby/power_assert/power_assert-1.0.2.ebuild
deleted file mode 100644
index ad96c7dc4914..000000000000
--- a/dev-ruby/power_assert/power_assert-1.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
- sed -i -e '1igem "test-unit"' \
- -e '/byebug/ s:^:#:' test/test_helper.rb || die
-
- # Avoid circular dependency on byebug when bootstrapping ruby
- sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
- rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
- # Avoid circular dependency on pry when bootstrapping ruby
- sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^ end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/power_assert/power_assert-1.1.0.ebuild b/dev-ruby/power_assert/power_assert-1.1.0.ebuild
deleted file mode 100644
index ad96c7dc4914..000000000000
--- a/dev-ruby/power_assert/power_assert-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
- sed -i -e '1igem "test-unit"' \
- -e '/byebug/ s:^:#:' test/test_helper.rb || die
-
- # Avoid circular dependency on byebug when bootstrapping ruby
- sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
- rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
- # Avoid circular dependency on pry when bootstrapping ruby
- sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^ end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/rack-protection/rack-protection-1.5.3-r1.ebuild b/dev-ruby/rack-protection/rack-protection-1.5.3-r1.ebuild
index 99d1df173c9f..10a511702bf5 100644
--- a/dev-ruby/rack-protection/rack-protection-1.5.3-r1.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-1.5.3-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/rack-test/rack-test-0.8.3-r1.ebuild b/dev-ruby/rack-test/rack-test-0.8.3-r1.ebuild
index 65c2dd58471c..f8ab6d41fc30 100644
--- a/dev-ruby/rack-test/rack-test-0.8.3-r1.ebuild
+++ b/dev-ruby/rack-test/rack-test-0.8.3-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/rack/rack-1.6.7.ebuild b/dev-ruby/rack/rack-1.6.7.ebuild
index 74a13913f372..bb358d7038c6 100644
--- a/dev-ruby/rack/rack-1.6.7.ebuild
+++ b/dev-ruby/rack/rack-1.6.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_EXTRADOC="HISTORY.md KNOWN-ISSUES README.rdoc SPEC"
diff --git a/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3-r1.ebuild b/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3-r1.ebuild
deleted file mode 100644
index 205a6ff825ae..000000000000
--- a/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Deprecated sanitizer API extracted from Action View"
-HOMEPAGE="https://github.com/rails/rails-deprecated_sanitizer"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2"
-
-ruby_add_bdepend "test? ( >=dev-ruby/actionview-4.2 )"
-
-each_ruby_test() {
- ${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index 6cc7210fa0fd..3a8f796c1c2e 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -1,7 +1,5 @@
DIST rake-10.5.0.gem 130560 BLAKE2B 05ae87d68641d5afbdc16c36d33c5cef626c8290abe5131f93f84e85861f0175f0b72a62f1b42076dd42a546a08c6efaa9400cf46707a2d4adca6bbff407b769 SHA512 0c95921e00af8dbc51edf9fdb8a8d8b0cc68295894fd310b3c4e5aafef1d5d6f9819a9e8a9b4c854f54835115123411278992f6223e0fb18e2efa7fa58ab6fcf
DIST rake-11.3.0.tar.gz 134863 BLAKE2B 0c4bccabdf98bd90c9121af20d892243ae283e8f15b6798cb0525d2c8a60d0cb796b94d7d673c4780b1f83f209fde136021b78b413ca670bba1b6744092ae47e SHA512 705c4b1979bdf8042acdc6cea403b2886ac9c589ed0eba7c258d0ce5c46104b7d6556415e82a26b5cd9559954ee53a0bd9f4e0373fd2601bb3b3338a426b3e5c
-DIST rake-12.0.0.tar.gz 117571 BLAKE2B 529dae3997b033aab8c117f02d41d2cd19df253b4b6dec391940e28b2849823976c3b0d5b302a3941c892354b14bebf10031c7eb63a05f0865bf928c8c0ca41b SHA512 2c8a0442b8c2f7755d8740f89d0772c646c87f64c04377955760c42a37ac25334628044ea37c09cd21e7372cab9e8f3d04b0076f0c34466eb4ea328c0bdcb01c
-DIST rake-12.1.0.tar.gz 118891 BLAKE2B 122aeaac6e5e5dc78ff5098a5f5001a747e72237286ecd3f9de5225139d9e7515ce1ac1cdb499d6acf6c6521af466811a6023b9c886b18131ac2dcf4346d7e56 SHA512 931161e9c220bb18b913c7a2aeff5bb4711cb6a4ff5ab1850aae307e6ab38ac0dd9d0aaaaba4510c27006def6734a8debf8e500a5de8d6f827c3c954832ff136
DIST rake-12.2.1.tar.gz 119660 BLAKE2B 8807cb9c085cc61df6f6a88d4dcc2e3f21764aa9269d9667ea21baec7fa0f4331695fe985264fa08eadb5a7277a1d88ac9e18d8c319f141bfacf775031d80cbd SHA512 930e2d82f0b5a3250cc0e8357bad60a7ad5f01fed06884e746b72cab60065a326c84d78410943836a698ee8cac1b291d162350d8304a4abcb7e8c930c026af4f
DIST rake-12.3.0.tar.gz 119742 BLAKE2B e8850fa4afe1c27f3502ec32738258823295bae992a7e6ee2d88fa53d13c9213509db48736874cc30f0610285272ace33c91a147a1891774f2f26b6b022dbbbd SHA512 a4768530d484dd2a1abd19c1d89b33ae31da54d59a8719f7559c586abb1c4eb7f6dc3cd05f85ad136137ad3395f57a121ebcc693da2d35e4cc1d70c1f64b666f
DIST rake-12.3.1.tar.gz 120170 BLAKE2B c0d087911f33ccd5256462501d175e1f92fa104a3c89b62a5bc434836d5abb277a61fb12269778d0a6e3b9b831e78c0a94d9d1cd885906980fdb55e0402e398b SHA512 49736059713d609b0786d4ea89866fd5d58076977aabeda3eeee0440f10edad708cc10ba91b5224f59a8ab87ee2ab8e2674e9115f90f035c16e1fa8cba3f7649
diff --git a/dev-ruby/rake/rake-12.0.0.ebuild b/dev-ruby/rake/rake-12.0.0.ebuild
deleted file mode 100644
index 2f9723c2fd52..000000000000
--- a/dev-ruby/rake/rake-12.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/ruby/rake"
-SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )"
-
-all_ruby_compile() {
- if use doc; then
- rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
- fi
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
- ruby_fakegem_binwrapper rake
-
- if use doc; then
- pushd html
- dohtml -r *
- popd
- fi
-
- doman doc/rake.1
-
- newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rake/rake-12.1.0.ebuild b/dev-ruby/rake/rake-12.1.0.ebuild
deleted file mode 100644
index 712e7522cf9e..000000000000
--- a/dev-ruby/rake/rake-12.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/ruby/rake"
-SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
- doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
- sed -i -e '/coverall/I s:^:#:' test/helper.rb || die
-}
-
-all_ruby_compile() {
- if use doc; then
- rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
- fi
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
- ruby_fakegem_binwrapper rake
-
- if use doc; then
- pushd html
- dodoc -r *
- popd
- fi
-
- doman doc/rake.1
-
- newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rdoc/rdoc-4.3.0.ebuild b/dev-ruby/rdoc/rdoc-4.3.0.ebuild
index ffdfb6f6e4e3..88259c168764 100644
--- a/dev-ruby/rdoc/rdoc-4.3.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-4.3.0.ebuild
@@ -77,7 +77,7 @@ all_ruby_install() {
for bin in rdoc ri; do
ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
- for version in 22 23; do
+ for version in 23; do
if use ruby_targets_ruby${version}; then
ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
sed -i -e "1s/env ruby/ruby${version}/" \
diff --git a/dev-ruby/rdoc/rdoc-5.1.0.ebuild b/dev-ruby/rdoc/rdoc-5.1.0.ebuild
index f72e6914d377..b701fb53afb1 100644
--- a/dev-ruby/rdoc/rdoc-5.1.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-5.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/rdoc/rdoc-6.0.1.ebuild b/dev-ruby/rdoc/rdoc-6.0.1.ebuild
index 985257f279b4..ddbea7785806 100644
--- a/dev-ruby/rdoc/rdoc-6.0.1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/redcloth/redcloth-4.3.2.ebuild b/dev-ruby/redcloth/redcloth-4.3.2.ebuild
index d10c52cbb740..6312493835c1 100644
--- a/dev-ruby/redcloth/redcloth-4.3.2.ebuild
+++ b/dev-ruby/redcloth/redcloth-4.3.2.ebuild
@@ -3,7 +3,8 @@
EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+# ruby25: not compatible
+USE_RUBY="ruby22 ruby23 ruby24"
RUBY_FAKEGEM_NAME="RedCloth"
diff --git a/dev-ruby/ref/ref-2.0.0.ebuild b/dev-ruby/ref/ref-2.0.0.ebuild
index e98a2397cd02..0afa9f998373 100644
--- a/dev-ruby/ref/ref-2.0.0.ebuild
+++ b/dev-ruby/ref/ref-2.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/rex-java/Manifest b/dev-ruby/rex-java/Manifest
index a8b5c44a63da..7e099aa15fc4 100644
--- a/dev-ruby/rex-java/Manifest
+++ b/dev-ruby/rex-java/Manifest
@@ -1 +1,2 @@
DIST rex-java-0.1.2.gem 22016 BLAKE2B 44b326c3f016c1280b28e6653b402feb22f752b34240e1c4c4296188a5d6bf5b721247fb9d3721d68755c842204d3fbcc6eabbecfc30e77a9b509d68abec555d SHA512 a6676f5a0fd1df23419a0d20046a9ec1aebbbf7c10f5a8acca99e49a2586ec8f8e4414b7033454ff830f9c924aa0e805ed0f93770e0d6148e7a8c1d099875743
+DIST rex-java-0.1.5.gem 23040 BLAKE2B 27789a55c6922770211285ef665221c9619a956ea874534f029a450760fca8c5034a715d9aaf91864e624363efe5d9f966be7b00c5c7133284b0eb591034b36d SHA512 990f989a19cdb5c6f87ac5b57e500fa1bd7031dd867e43c6b451f538c1b581b57ee9908b40d8a37727c45883ba17f466272e739913ccc2406b69c1e818de5c7b
diff --git a/dev-ruby/rex-java/rex-java-0.1.5.ebuild b/dev-ruby/rex-java/rex-java-0.1.5.ebuild
new file mode 100644
index 000000000000..5c4ad983f3fa
--- /dev/null
+++ b/dev-ruby/rex-java/rex-java-0.1.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Exploitation(Rex) library for parsing Java serialized streams"
+HOMEPAGE="https://rubygems.org/gems/rex-java"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/rex-ole/Manifest b/dev-ruby/rex-ole/Manifest
index c6eedc586753..a69d76062cc5 100644
--- a/dev-ruby/rex-ole/Manifest
+++ b/dev-ruby/rex-ole/Manifest
@@ -1 +1,2 @@
DIST rex-ole-0.1.2.gem 26112 BLAKE2B 5147b52535211309cc46e0d364328416838ea9c403bcec2422c1f01c55189ea1d8f683c54203367dd5e7fae5f1d150cd5852ef3e74b972fb46386be959d041aa SHA512 efb8c5977d71e32e6e78edff42f6ef0bb1a7179b3309ad2a33f50958ba039c919967ce6b7161a3959088705e17ed6560aab8434ea593de39b41c5a30e04b6dbb
+DIST rex-ole-0.1.6.gem 26112 BLAKE2B 1812b3f3c9b0b4f115efd66d1fa29cb39370e58e780695127390987dbb4b87647f2e0744b88ba4ee7b9ed7857155c8f1d32dbe6d090a7d3166ae5928d18686e5 SHA512 5fae70ec85058e3dca08fdedd595fb27b46de263aa727fd291606d4f8f226bc0d9a2f135bf4673a8e389d6a2e932e7514eb97954f765c1ce9401233ac2cd7da1
diff --git a/dev-ruby/rex-ole/rex-ole-0.1.6.ebuild b/dev-ruby/rex-ole/rex-ole-0.1.6.ebuild
new file mode 100644
index 000000000000..a0814d9c4bc3
--- /dev/null
+++ b/dev-ruby/rex-ole/rex-ole-0.1.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Exploitation(Rex) library gem for reading/writing OLE files and streams"
+HOMEPAGE="https://rubygems.org/gems/rex-ole"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-powershell/Manifest b/dev-ruby/rex-powershell/Manifest
index 819a68bcf9d0..ffffff273fae 100644
--- a/dev-ruby/rex-powershell/Manifest
+++ b/dev-ruby/rex-powershell/Manifest
@@ -1,3 +1,2 @@
-DIST rex-powershell-0.1.1.gem 25088 BLAKE2B e9deb53f4dcdcc134de8738e25b6edaaf0e3ebdc3e1d4e88317c4abf17aa31fdf65020f0929b4d1155c299c9d93b20b96d906096a75bbdde377ae03d04d6f2f1 SHA512 f259acda2012da8f2d5e990786818997326c6cfdec2c388a340aa34cc0ca0233ba18e88a6efefd4ff735d5986011a12b06374ebee5324d0f89b2407a18574908
-DIST rex-powershell-0.1.64.gem 25088 BLAKE2B 6c1997d1cea8f60cd3766fd21695ac108ad4d9b3e11536862e40e8a2d87161a00f510e462ad1ec30ddad380d2d3a8efe9a5f26863d7bc361b93692398c2f8918 SHA512 669095c77637254dee109c0451bf547b3d3fca878c5b89c8eb7e6cd5ec6d43a8d842544ae9e5f9fec2af0aa1dba9ad20d059898a9457fdc34171a1d2e3d16cd1
DIST rex-powershell-0.1.65.gem 27136 BLAKE2B d2488c42a29baba800cfc8c555195f4d9e3fa4ed376edd062134cb82f4f6b5cf1002734bf59905ac3337f741480f429bb48d0061b83c9b5205b61b105f5fee1e SHA512 7760137e074f319d0ccca827824a481b00f5a2b945f60638956f16d1b8a74f92479b7ac7fb5595cf297a3a394905bd7a8af62b9480b1835949843b2cf122dda6
+DIST rex-powershell-0.1.77.gem 28160 BLAKE2B d1fb9f6e9f66e6b55b09bdda329037ea7da135b9eaec9f1437ca374f3be5da1b5ee63f7c92d56447c88964a4c1a4bef68b2d6b64a4e507b7c2a7010f1ff09d40 SHA512 99e3a8394c580b07580f8c230f049b15fd80b02db4b940208a1086e1c3d679ab1b757fee56356d6b25a6876ccb21c50d1037b7bbadc486a7c38b10b9b81a09d3
diff --git a/dev-ruby/rex-powershell/rex-powershell-0.1.1-r1.ebuild b/dev-ruby/rex-powershell/rex-powershell-0.1.1-r1.ebuild
deleted file mode 100644
index d9e7d3ab6f87..000000000000
--- a/dev-ruby/rex-powershell/rex-powershell-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts"
-HOMEPAGE="https://rubygems.org/gems/rex-powershell"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# doesn't seem to actually run any tests
-RESTRICT=test
-
-ruby_add_bdepend "dev-ruby/rex-random_identifier
- dev-ruby/rex-text"
diff --git a/dev-ruby/rex-powershell/rex-powershell-0.1.64.ebuild b/dev-ruby/rex-powershell/rex-powershell-0.1.77.ebuild
similarity index 67%
rename from dev-ruby/rex-powershell/rex-powershell-0.1.64.ebuild
rename to dev-ruby/rex-powershell/rex-powershell-0.1.77.ebuild
index d42851954958..d44f1014de16 100644
--- a/dev-ruby/rex-powershell/rex-powershell-0.1.64.ebuild
+++ b/dev-ruby/rex-powershell/rex-powershell-0.1.77.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24 ruby25"
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_TEST="none"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_BINWRAP=""
@@ -20,8 +20,5 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
-# Specs are not packaged in the gem and source is not tagged upstream.
-RESTRICT="test"
-
ruby_add_bdepend "dev-ruby/rex-random_identifier
dev-ruby/rex-text"
diff --git a/dev-ruby/rex-random_identifier/Manifest b/dev-ruby/rex-random_identifier/Manifest
index 82fb4b949d1f..427bdf5cc686 100644
--- a/dev-ruby/rex-random_identifier/Manifest
+++ b/dev-ruby/rex-random_identifier/Manifest
@@ -1 +1,2 @@
DIST rex-random_identifier-0.1.0.gem 15872 BLAKE2B f8afe34e9a33e08e04c7ebe5df47ce50a2cfea42359e517ab44ab3a8f96227f4ccbc532e0c0b284bcba2291ad9ed6f85064435522b58c17a98d78cbd6d75cdc4 SHA512 79439b80ad06c6c5c7854933eaa4129ff0b176144bebf68fdfe7250ab3242904bcae4a439d610f4710b6d48ee5405b0d5f79539c861511072fb628ee68afd21f
+DIST rex-random_identifier-0.1.4.gem 16896 BLAKE2B 37c1011b91dd16a82c0ee8ff1c96b0263c4842503826bae327d3a6d3b61dac77620cbd28cba350c0cf56bc5fc480bc37663a78674d0c7c8d8d6bb95e046e9559 SHA512 8e302a511a0540f826ddfa6e51c5b29da0c42ef6bd3dc433d6624688efba245c1df3903dbf37aacaecdd39b53f721e3d6b4fa8247f8cd31e7679ff96293094f7
diff --git a/dev-ruby/rex-random_identifier/rex-random_identifier-0.1.4.ebuild b/dev-ruby/rex-random_identifier/rex-random_identifier-0.1.4.ebuild
new file mode 100644
index 000000000000..2f06cc7c2317
--- /dev/null
+++ b/dev-ruby/rex-random_identifier/rex-random_identifier-0.1.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Upstream has specs but they are not released and upstream is not tagged
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby Exploitation(Rex) library for generating Random identifier strings"
+HOMEPAGE="https://rubygems.org/gems/rex-random_identifier"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-registry/Manifest b/dev-ruby/rex-registry/Manifest
index 8f706f121c13..f47eab7d0be5 100644
--- a/dev-ruby/rex-registry/Manifest
+++ b/dev-ruby/rex-registry/Manifest
@@ -1 +1,2 @@
DIST rex-registry-0.1.0.gem 16384 BLAKE2B 2974147178d757412f9912d5c19eea9532fc5da8e80063320f432a8f4f33f38833be147d761ca052f93e1a5f94d7bf76ebd6f564f21791cdfd9f2514d18363cd SHA512 341846551e0db7caa1259e6ae7931eedc063e4ec824b129ad4f53d82dead30f375f771cc81fc280d5d3a54685f96ca37ef4456fe04b70df1b9163b4556566cbb
+DIST rex-registry-0.1.3.gem 16384 BLAKE2B 9db5f9674b8d341797ea797f5c5a1e43900f6f4c4e563658fbe55fcf43ba1126067d0e822df3cf21695143bd70309d7499d708cf48b80e6c903e06e7d0e8acfc SHA512 cde5350945e8aa7cfa0dc01c78e7a375d1aa7174c2954b658ffeba39c81d638b1d614866cbd0f8f8f417f1831281cd43126cde158944903e36c8dc5ce79773e6
diff --git a/dev-ruby/rex-registry/rex-registry-0.1.3.ebuild b/dev-ruby/rex-registry/rex-registry-0.1.3.ebuild
new file mode 100644
index 000000000000..67eb86064708
--- /dev/null
+++ b/dev-ruby/rex-registry/rex-registry-0.1.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# Upstream has specs but they are not packaged and upstream is not tagged
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rex library for parsing offline registry files from a Windows machine"
+HOMEPAGE="https://rubygems.org/gems/rex-registry"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/rex-zip/Manifest b/dev-ruby/rex-zip/Manifest
index 0ce005eb81b9..b1abe3ba67fc 100644
--- a/dev-ruby/rex-zip/Manifest
+++ b/dev-ruby/rex-zip/Manifest
@@ -1,3 +1 @@
-DIST rex-zip-0.1.0.gem 23040 BLAKE2B 104ec3b735fb7c9b5982657cfc7527afe965707760778435c8bcbe5b30c9bb3fee5080f9e56abdeed1374f2ec62354451dd709903ef93d5daba60d9683a22e50 SHA512 402c16a814b497cf920b9d9637c77066dc30bbc5807e84edb939e8cbc034e5554a49e94ef86f93169872a4679e8118e785e037f5e820eae02c5921763947918a
-DIST rex-zip-0.1.1.gem 23040 BLAKE2B 23c26861b297c89fb2c68687b1b30a078f7b8bcd7699bdee1759e4b0dba389be20735db3d8d8a051e6a84141966ee8e1638158de9ed97d8a2f9ecf9c3e07c95a SHA512 720d148b4be55632a49755dfba58e840c6d03b4abc3ec7f2df64b677a78898c867e07f43be246f1dd2f8bbb861aacadcfd1b11c9848aec65233074f7a10cf402
DIST rex-zip-0.1.3.gem 23040 BLAKE2B bc823e7d53c8a7245d568ee2cec013e7bf8b7c508409a0668481e323ea5343230c5bc64a7173f48a7ff966d6af5a9e50e3a0e2d64dec06a699923dc3182a89a1 SHA512 f92d64779ddf943ca4855c5b9c567a0d995ebb6ace93ac8da12a7f1dc3ea350d492d3d229d3950ffec32bbba29fcd226c27a5be81e3f45d6f0edaa35ebc70047
diff --git a/dev-ruby/rex-zip/rex-zip-0.1.0-r1.ebuild b/dev-ruby/rex-zip/rex-zip-0.1.0-r1.ebuild
deleted file mode 100644
index 971132544059..000000000000
--- a/dev-ruby/rex-zip/rex-zip-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for working with zip and related files"
-HOMEPAGE="https://rubygems.org/gems/rex-zip"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# doesn't seem to actually run any tests
-RESTRICT=test
-
-ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-zip/rex-zip-0.1.1.ebuild b/dev-ruby/rex-zip/rex-zip-0.1.1.ebuild
deleted file mode 100644
index 1f0be44812db..000000000000
--- a/dev-ruby/rex-zip/rex-zip-0.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for working with zip and related files"
-HOMEPAGE="https://rubygems.org/gems/rex-zip"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# doesn't seem to actually run any tests
-RESTRICT=test
-
-ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild b/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild
index 0fec4e5d74ee..467f89a32453 100644
--- a/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild
+++ b/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild
@@ -3,7 +3,7 @@
EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
# Upstream has specs but they are not included in the gem or tagged upstream
RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index b4a805979994..419197558a23 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,2 +1 @@
-DIST rmagick-2.15.4.gem 1545216 BLAKE2B d2924a7b928626eff30f0deff075fe8d668bd226b8fae9c9761a366c0a2047644d3b0b0701738824985123bc4f1b235856e8e31aeab192a9709b4eafa8da1ce8 SHA512 9cb43632e510e3592e3a643117d61020d6cbec932acecc19c1e977cca001ccc04bae46669895fa2f5f0e8d43c09f1c2c429595a9358a4a74cbdbb4ecd8957b80
DIST rmagick-2.16.0.gem 1545728 BLAKE2B 2f5396b5d5c6a60fabf7f67d104e68443c038a8e9431fbc8252a3ca915b4fb353d6a0740f00fbaac91cf3bbaff84c0dfb45d4adca6a81622fc1d2e395ed04cac SHA512 e37fdd9c1e45d7ef7000602f495c3951ee2abcae83a87f68702a51a2183edb6fd8e576ca1a5ac8b64e05ae0287141137b505bf27fddc579e753f9310cb4d653c
diff --git a/dev-ruby/rmagick/rmagick-2.15.4.ebuild b/dev-ruby/rmagick/rmagick-2.15.4.ebuild
deleted file mode 100644
index 444a98a96ccd..000000000000
--- a/dev-ruby/rmagick/rmagick-2.15.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.textile"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/gemhome/rmagick"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-macos"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6*"
-DEPEND+=" >=media-gfx/imagemagick-6.4.9:=[jpeg] =media-gfx/imagemagick-6*"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
- # Avoid unused dependency on rake-compiler. This also avoids an
- # extra compile during tests.
- sed -i -e '/extensiontask/ s:^:#:' \
- -e '/ExtensionTask/,/end/ s:^:#:' \
- -e '/compile/ s:^:#:' Rakefile || die
-
- # Avoid simplecov dependency
- sed -i -e '/simplecov/ s:^:#:' Rakefile test/test_all_basic.rb || die
-
- # Squelch harmless warning about imagemagick installation.
- sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
- # Avoid some tests that seem to be very dependent on specific
- # imagemagick versions. color defs?
- sed -i -e '/test_gray/,/^ end/ s:^:#:' test/Image2.rb || die
- sed -i -e '/test_\(delete_if\|reject\)/,/^ end/ s:^:#:' test/ImageList1.rb || die
- sed -i -e '/test_optimize_layers/,/^ end/ s:^:#:' test/ImageList2.rb || die
- sed -i -e '/test_\(background\|border\)_color/,/^ end/ s:^:#:' test/Image_attributes.rb || die
-}
-
-each_ruby_configure() {
- ${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
- emake -Cext/RMagick V=1
- cp ext/RMagick/RMagick2$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
- ${RUBY} -S rake test || die
- RSPEC_VERSION=3 ruby-ng_rspec spec || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- docinto examples
- dodoc examples/*
-
- if use doc ; then
- dohtml -r doc
- fi
-}
diff --git a/dev-ruby/rmagick/rmagick-2.16.0.ebuild b/dev-ruby/rmagick/rmagick-2.16.0.ebuild
index b2278ca41038..1f4f12eba14e 100644
--- a/dev-ruby/rmagick/rmagick-2.16.0.ebuild
+++ b/dev-ruby/rmagick/rmagick-2.16.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/gemhome/rmagick"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~x86 ~x86-macos"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-macos"
IUSE="doc"
RDEPEND+=" >=media-gfx/imagemagick-6.4.9:= =media-gfx/imagemagick-6*"
diff --git a/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.3.ebuild b/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.3.ebuild
deleted file mode 100644
index 2eedcfb47297..000000000000
--- a/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-collection_matchers"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rspec-expectations-3.0.0"
-
-ruby_add_bdepend "test? ( >=dev-ruby/activemodel-3.0 )"
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 860b69858817..ceeaff054c48 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,5 +1,4 @@
DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
-DIST rspec-core-3.5.3-git.tgz 368960 BLAKE2B ba4db57ac16dbd98960f7e5bad4ae7382afc5caddfeebeea6e547554d240d030639f9edb00f5c101a843adb18992ed5cd9430a20e5a3d9783557ff62f1def6b2 SHA512 c8f983018e33bd111c75671d7208b38704dd0fddb22cca2b08a59a1e5ceb0939ed56ee4015df758f5d766fbe2390279c1d670f6fff4eef222f44621f48c581ef
DIST rspec-core-3.5.4-git.tgz 369170 BLAKE2B c95fa7740bcc1b586b4e26be1db4cb52bb470cb23c9ef74dc644d0ea7c4ca769ab62e587ecff2a16cd6f656e9f3bbdc81b199765f9397dddbe28a8cdce6a1945 SHA512 c672381e9233b6f8c6e92ed70d084ff7a558edd6ca7d5a09a28fff1554975b952b6fab94483324b5bd6a62ff7aac576e7a216dbb3972749ef0210fe1cd05411d
DIST rspec-core-3.6.0-git.tgz 375590 BLAKE2B e8b4987ea3d5cc3a403eaec98243e4c4be6c9eace798bc97599020543401ecd036c6121a6736995fb716aabd1a2016393506bee1e3076c61b0c49173d991d990 SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1
DIST rspec-core-3.7.0-git.tgz 376565 BLAKE2B 86b0584883047c83e4fddfd09924a5b68828f53e2018d2513cd79484a390d1b7b89e8176b0098b8869d5ed7206c132d77a0d8ef2ffb5447da317460b152e5e23 SHA512 071bd2a5c905d4ce621f2d7255b882a9d34cf42001cb2995fdb05a91387805929198c32e53cf4c2df2a43d179d2c49337214066be87eb50ab044b5f70aba8c54
diff --git a/dev-ruby/rspec-core/rspec-core-3.5.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.5.3.ebuild
deleted file mode 100644
index 1a4b90967844..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.5.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
- =dev-ruby/rspec-support-${SUBVERSION}*
- !!=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
- >=dev-ruby/nokogiri-1.5.2
- >=dev-ruby/coderay-1.0.9
- dev-ruby/syntax
- >=dev-ruby/thread_order-1.1.0
- >=dev-ruby/rspec-expectations-3.3.0:3
- >=dev-ruby/rspec-mocks-2.99.0:3
- )"
-
-all_ruby_prepare() {
- # Don't set up bundler: it doesn't understand our setup.
- sed -i -e '/[Bb]undler/d' Rakefile || die
-
- # Avoid dependency on cucumber since we can't run the features anyway.
- sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
- # Duplicate exe also in bin. We can't change it since internal stuff
- # also depends on this and fixing that is going to be fragile. This
- # way we can at least install proper bin scripts.
- cp -R exe bin || die
-
- # Avoid unneeded dependency on git.
- sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
- # Avoid aruba dependency so that we don't end up in dependency hell.
- sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
- rm spec/integration/{failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb spec/support/aruba_support.rb || die
-
- # Avoid a spec failing due to path issues
- sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
- spec/rspec/core/configuration_spec.rb || die
-
- # Avoid specs for older coderay version which is no longer packaged
- sed -i -e '/highlights the syntax of the provided lines/ s/do/,skip: true do/' \
- -e '/dynamically adjusts to changing color config/ s/do/,skip: true do/' \
- spec/rspec/core/source/syntax_highlighter_spec.rb
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
- # case ${RUBY} in
- # *ruby22)
- # # The rubygems version bundled with ruby 2.2 causes warnings.
- # sed -i -e '/a library that issues no warnings when loaded/,/^ end/ s:^:#:' spec/rspec/core_spec.rb || die
- # ;;
- # esac
-}
-
-all_ruby_compile() {
- if use doc ; then
- yardoc || die
- fi
-}
-
-each_ruby_test() {
- PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
index 12b61a638e7f..2a5ec9157860 100644
--- a/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.6.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="highlight"
SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
index 9d8e78760372..0a4ff52e3b93 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
index b28236a62938..975c97e8e849 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
index 391a4ecc2321..c20a74631574 100644
--- a/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.5.0:3 dev-ruby/thread_order )"
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index e5da0217cf41..b8c55bcde39c 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,4 +1,2 @@
DIST gettext-3.2.2.gem 283648 BLAKE2B d9095e11f3f92ac37f84aad9059e5740af07186caad963b6cbd6081329031122ed2acf402565b5e8bf7c6f51b18d045fab09e6d390effe2f0d7d66981f253efd SHA512 c6806a4f2b9c8519cccdf7651b3482e5938015323648cb1b82acd0632d88ea5c7cdabd925eecb2d4e17d0d396126d4e2ebaac26241c3c7b4f61e187cd4b3133f
-DIST gettext-3.2.3.gem 283648 BLAKE2B b746edbc9effd191a2abcff90f699d7a460845104b76410fab20bfef3294afc51951918441f0912fcadca4f59d810ffde9d5ac16c3de7adde6e5f7508c558bb3 SHA512 a7e6ca4e54a81eba7bd148849823ea480526f6d377d818f89aad28fc4cf79eb7e01dbbbbded441cad143ac806c73241173a1437deddb165ce7f178a9367bc4c5
-DIST gettext-3.2.6.gem 284672 BLAKE2B d431abb3b81e0293eca4b8d3f50fb5840d030aa0c61e2f8f1144680d1e69de4404760f4a0d2b48afbc3a2ca9a6a2a943cd3cf49b9784a33bdde6b0136cbef015 SHA512 8d8a820e9d22aae93de69573b4312f7490d0f494bdd27d6b920c29b5100620297d0622ea6dd693e3f7b0b4e1ebfd867de5e7fcfc04633c211ad2f414d23bb36a
DIST gettext-3.2.9.gem 285696 BLAKE2B a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9284c10a249c59548d0e2ad5fcd56b8855439893d2d31b57e0109bb6a9d5cc2d24075f5e360dc16b9291137 SHA512 21496c38cfc16a2b280f30bb94ff4560007eaa7f02c2341cb26aca2969a663c0863cdb650b4eadfd262d8585111dfb572e2ebc66a7a879045de50bf9da80a501
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.3.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.3.ebuild
deleted file mode 100644
index ed01f2efcb18..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="https://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
- dev-ruby/racc"
-ruby_add_bdepend "test? (
- dev-ruby/test-unit:2
- dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
- # Fix broken racc invocation
- sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
- # Avoid bundler dependency
- sed -i -e '/bundler/,/helper.install/ s:^:#:' \
- -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
- # Avoid dependency on developer-specific tools.
- sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
- # Avoid tests failing due to a missing test file.
- #sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-}
-
-each_ruby_test() {
- # Upstream tries to daisy-chain rake calls but they fail badly
- # with our setup, so run it manually.
- ${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- insinto /usr/share/doc/${PF}
- doins -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.6.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.6.ebuild
deleted file mode 100644
index 50931eb376e1..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="https://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
- dev-ruby/racc"
-ruby_add_bdepend "test? (
- dev-ruby/test-unit:2
- dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
- # Fix broken racc invocation
- sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
- # Avoid bundler dependency
- sed -i -e '/bundler/,/helper.install/ s:^:#:' \
- -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
- # Avoid dependency on developer-specific tools.
- sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
- # Avoid tests failing due to a missing test file.
- #sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-}
-
-each_ruby_test() {
- # Upstream tries to daisy-chain rake calls but they fail badly
- # with our setup, so run it manually.
- ${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- insinto /usr/share/doc/${PF}
- doins -r samples
-}
diff --git a/dev-ruby/ruby-odbc/Manifest b/dev-ruby/ruby-odbc/Manifest
index cd930561fb89..b3fd4b0da776 100644
--- a/dev-ruby/ruby-odbc/Manifest
+++ b/dev-ruby/ruby-odbc/Manifest
@@ -1,3 +1,2 @@
DIST ruby-odbc-0.99997.tar.gz 76708 BLAKE2B d122e7f2cccd305731ba598ca684761daab288903e0f3866735b2672f20a9c6b55ed74d768bd4f79a03e0d743b4dff4704f465e58ed331ce37762ba9f7c1e871 SHA512 15ea850efa9f65467ea829c93f7dc9ecbef9409876b19d0a309d085b20e711da2888b918f77fcd26e6a40096358eab836d6bc3000c534da88f4f3c2b60a8662a
-DIST ruby-odbc-0.99998.tar.gz 76810 BLAKE2B 97422dcd52bafad196fe9ccc7005c1ceae31649231fb62ccb00e45ccecbf46e9c679ff4ef905364b1fa05062aba9054d8c1b89025323b220a0c9893c22fd5fd0 SHA512 c983ca10cd21255d2a927deaac9c4689251f1149cc3c5b0b2a5578d5abdf2eb030a0bd726761eeb07abfb470e611316239de899d4739f4a380a598f4e0881f57
DIST ruby-odbc-0.99999.tar.gz 76934 BLAKE2B 59de5a544b7eefe8e181f2c6a9a61915361743ef5f7554f778667b50ca0dc57fd0c4f71e406ad6f1d00fb2c6a6509030e61ad34dddecff61896f7bfe383d0a9b SHA512 05e3e67a895406e1a57fbea6f8ecd1c087d836794ea3245bd9eec888eb3c46fa2bf2607cc1b8fdc416d7bc531d783d621c03c9fde004db8c2e431fe838c531af
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.99998.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.99998.ebuild
deleted file mode 100644
index 31c808eaa54d..000000000000
--- a/dev-ruby/ruby-odbc/ruby-odbc-0.99998.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RubyODBC - For accessing ODBC data sources from the Ruby language"
-HOMEPAGE="http://www.ch-werner.de/rubyodbc/"
-SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"
-RDEPEND="${RDEPEND} >=dev-db/unixODBC-2.0.6"
-
-# tests require to have an ODBC service enabled, so we can't run them
-# for now :(
-RESTRICT=test
-
-all_ruby_prepare() {
- # Make sure that it doesn't try to use the absolute-local path for
- # the extension as we'd be unable to run it properly otherwise.
- sed -i -e 's:\./odbc:odbc:' test/{,utf8/}test.rb || die
-
- # Since lib should not get installed avoid it entirely…
- mv lib contrib || die
-}
-
-each_ruby_configure() {
- for dir in ext ext/utf8; do
- ${RUBY} -C${dir} extconf.rb --disable-dlopen || die "extconf (${dir}) failed"
- done
-}
-
-each_ruby_compile() {
- for dir in ext ext/utf8; do
- emake V=1 -C${dir} || die "emake (${dir}) failed"
- done
-}
-
-each_ruby_install() {
- each_fakegem_install
-
- ruby_fakegem_newins ext/odbc.so lib/odbc.so
- ruby_fakegem_newins ext/utf8/odbc_utf8.so lib/odbc_utf8.so
-}
-
-all_ruby_install() {
- all_fakegem_install
- dohtml doc/*.html || die
-}
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.12.0.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.12.0.ebuild
index 384a19e946f8..68343b8d5ee0 100644
--- a/dev-ruby/ruby-oembed/ruby-oembed-0.12.0.ebuild
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/rubypants/Manifest b/dev-ruby/rubypants/Manifest
index c8850bd35505..405f5772733f 100644
--- a/dev-ruby/rubypants/Manifest
+++ b/dev-ruby/rubypants/Manifest
@@ -1,5 +1,2 @@
DIST rubypants-0.2.0.gem 11264 BLAKE2B cb5e995a6739ea27c94173fc1fb5c525098d71a17a92d09c924cce6803b156a78097def230c9e935bb17d8dac35e86ccfcbbea0e94349804eec170b3646ae8e7 SHA512 f7efe237860e15b2ce164749973d5ef133dce1a6bc5e9429357703b321fb0af8ef4e849f8ed19ed498b6fff13e29da036bb8d379c1220d939c862aba0138a5d6
-DIST rubypants-0.5.0.gem 12288 BLAKE2B eca6f1f5a478659482a82704ebadd0e2d882c8468175e18c95f5e08dd2a720c3e883cf6053da07ae853c4afe16dd71e4ffcdccb63ddb89b7b34647dfb8870aad SHA512 4815439c085da5b219bb8a9542433a1d22d8678ac7b783aaab826fdf9ea57246d246e1d00a57524cba213d37a975a670612d3b7397f7a72b5d0c7a0c62bac441
-DIST rubypants-0.5.1.gem 13312 BLAKE2B a8e4e5ec2c0482a711c54041c3c8f04452fad5e26d7e1a827b22c567a7be7b01b84b0ccdc1572a3ef049b27dc936eb253d868aa58c59304fc1e616d848c8307a SHA512 50c22710628e0d9dca6b2aa51e17eaa0f63052290327b9e2401fca883300ae823442e7631bd6157c9c6cfa9f2328a97c2166f5595979ee53bd72d21b96d6b149
-DIST rubypants-0.6.0.gem 13824 BLAKE2B f05beb472c22da33462d0dc70b3b6b1038d2c3a2d06db8a62b3bce58091182f15f3f45604db3a25c36513d50d36369dad7cef7047191af9cea3c3f06313578a9 SHA512 5d998bc5b19682be5590ba022eb540ba1350f661120d2916b38523a741ec6aae3f6e20825f4e72b2b1cc8200751f55c69fcf9d6b5f1ee81f214f3fea80236c14
DIST rubypants-0.7.0.gem 13824 BLAKE2B c132b3c60390b712c08ec54b10a14255e21d9622399b9ddba8d2359915411c604052569e5713fdb4b1a3fefcc3416f4d5af16baca19063a0b79203838b8f3066 SHA512 cacd05e0cc87389b5513c83fe085db39202c2789b882b564caaded6b84b1ecb1acbde8232462dadf501c68c1c881ee7b7f4e640feec47c9c0f7a08758b5f5724
diff --git a/dev-ruby/rubypants/rubypants-0.5.0.ebuild b/dev-ruby/rubypants/rubypants-0.5.0.ebuild
deleted file mode 100644
index ef77584a1295..000000000000
--- a/dev-ruby/rubypants/rubypants-0.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby port of the SmartyPants PHP library"
-HOMEPAGE="http://chneukirchen.org/repos/rubypants/README"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-each_ruby_test() {
- ${RUBY} -I. test/rubypants_test.rb || die "tests failed"
-}
diff --git a/dev-ruby/rubypants/rubypants-0.5.1.ebuild b/dev-ruby/rubypants/rubypants-0.5.1.ebuild
deleted file mode 100644
index ef77584a1295..000000000000
--- a/dev-ruby/rubypants/rubypants-0.5.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby port of the SmartyPants PHP library"
-HOMEPAGE="http://chneukirchen.org/repos/rubypants/README"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-each_ruby_test() {
- ${RUBY} -I. test/rubypants_test.rb || die "tests failed"
-}
diff --git a/dev-ruby/rubypants/rubypants-0.6.0.ebuild b/dev-ruby/rubypants/rubypants-0.6.0.ebuild
deleted file mode 100644
index 232e56e44d10..000000000000
--- a/dev-ruby/rubypants/rubypants-0.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby port of the SmartyPants PHP library"
-HOMEPAGE="http://chneukirchen.org/repos/rubypants/README"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
- sed -i -e '/ecov/I s:^:#:' test/helper.rb || die
-}
-
-each_ruby_test() {
- ${RUBY} -I. test/rubypants_test.rb || die "tests failed"
-}
diff --git a/dev-ruby/sdoc/Manifest b/dev-ruby/sdoc/Manifest
index b00ab9849be4..076613d81395 100644
--- a/dev-ruby/sdoc/Manifest
+++ b/dev-ruby/sdoc/Manifest
@@ -1,2 +1 @@
-DIST sdoc-0.4.2.gem 282112 BLAKE2B d3ea14735e35d9da6562e19f6b1b5bb3fad915ec235f64bce460d02d574d0da50d81d1e09a3b3753bbf199da5cde80f78ffff17a66f9a42f9b7925b9b1bc38f2 SHA512 2c3aef526b22fbcae1fc4911daca6499df677b4a22364f9ec5598ff3feb74242d0e00d93a16df741d2e383c297835a89ab4fa8122faef00492d7a97ae7e77b1b
DIST sdoc-1.0.0.gem 268800 BLAKE2B 238b36af9909e7329f6b54e297b4e03f27e8850bee2cb65483c9b912b92c16933639fba5f085ae8c30f808cbd6a94d1b34b5bb45af3f1d9a7fc37a4ea45f32f8 SHA512 cee8be23a2bc53dc3e052e183405ae17546594e2b1b87b7d83c8dc527b2c4bd71a5f642f52ae489f4990ba5d3571c23b590b6a562d677b32597cdeeb08c63a38
diff --git a/dev-ruby/sdoc/sdoc-0.4.2.ebuild b/dev-ruby/sdoc/sdoc-0.4.2.ebuild
deleted file mode 100644
index 162047e3096d..000000000000
--- a/dev-ruby/sdoc/sdoc-0.4.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-DESCRIPTION="rdoc generator html with javascript search index"
-HOMEPAGE="https://rubygems.org/gems/sdoc"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/json-1.7:0
- =dev-ruby/rdoc-4*"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:0 )"
-
-all_ruby_prepare() {
- sed -i -e '/git ls-files/ s:^:#:' sdoc.gemspec || die
-}
diff --git a/dev-ruby/seed-fu/Manifest b/dev-ruby/seed-fu/Manifest
index d7ef9cb0eab1..e77d01ca3422 100644
--- a/dev-ruby/seed-fu/Manifest
+++ b/dev-ruby/seed-fu/Manifest
@@ -1 +1,2 @@
DIST seed-fu-2.3.6.tar.gz 13177 BLAKE2B 8e07c0663789eb1859fb18a59a9105d917e8bfca50498062c0a7d9003f5331599722fe8c23269e2c8c0829062881781c9b3cae6de789d6d3ddf6b91cf23c4f05 SHA512 90affb04a0a9b6917501e4961888cba6a13b0b779ca9d11481bad2267db05666467448cc58df995da71718ad46c744301de3bbbaa3edce6b1eb8884207d54771
+DIST seed-fu-2.3.9.tar.gz 13392 BLAKE2B 7468c54013f6a51bcebf4b6ad1f2401d53ddd2a5f61eddc71d0edc088ea1296acf8012ae885036d5f11c5e9336e7dbf67f2508b3d89830647b36d6f7992d574d SHA512 bf5b7a472a5af6bd40f06f60c404c8893641b222d80469765a434a126e182ae6e7fd5281a0ba9d5d61bd89aa515ee0a3f244238108cd41fb15ced501c917b216
diff --git a/dev-ruby/seed-fu/seed-fu-2.3.9.ebuild b/dev-ruby/seed-fu/seed-fu-2.3.9.ebuild
new file mode 100644
index 000000000000..2340acd5f04f
--- /dev/null
+++ b/dev-ruby/seed-fu/seed-fu-2.3.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Advanced seed data handling for Rails"
+HOMEPAGE="https://github.com/mbleigh/seed-fu"
+SRC_URI="https://github.com/mbleigh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "
+ >=dev-ruby/activerecord-3.1:*
+ >=dev-ruby/activesupport-3.1:*"
+ruby_add_bdepend "test? ( dev-ruby/sqlite3 )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/d' spec/spec_helper.rb || die "sed failed"
+
+ # Avoid failing test that appears not be innocent
+ sed -i -e '/raise an ActiveRecord::RecordNotSaved/,/end/ s:^:#:' spec/seeder_spec.rb || die
+}
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 0ee355c5f3d4..6f61e549c1de 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -2,4 +2,3 @@ DIST selenium-webdriver-2.53.4.gem 897536 BLAKE2B 630b5e8cd5ce53de7a689135ce80e3
DIST selenium-webdriver-3.10.0.gem 841728 BLAKE2B fb36121b835c7750595cd57c3217c234e12d9f78a29131a12148f464955b1bc3f5a9ef96b6bd8f8aaedd0fa9943bcc42c1f83a0d31ec6663664f6c4f0102b5a3 SHA512 ee1ccad5661f06b16c106b2515285f763baf2b66aefe4c20aed0521e602997af8b1b12640b1099ad0a64f18b01bcec7824dcdd20fe36d9176337f177b8417b2b
DIST selenium-webdriver-3.11.0.gem 841728 BLAKE2B b3f069645fb166258aebb0f04c8d3f828413b2a1e2f818b7501118760ba79e812ce7d314b21076076f1e6c30590e0d38f026b32ede63ff08197c8f8fbaaefded SHA512 85488c257772a4628d19bd71e7993a82c2c5a9f6332d591b19507ca5e2a96c03fa5c351714a492915888510728f2e5eca28862c69e1ced43d8b56db128d7705e
DIST selenium-webdriver-3.8.0.gem 840192 BLAKE2B 3f3871afed9734627757e58a211ad894fd45a49b73208b533fd39e0d99172536e7f2abdfbed1e0589c45aac6a26dd0c1ae0cf8f25053d44082957f7d07591d37 SHA512 c00c44786ecee4c02723b88c9ae5921d6a3f2d4c6c3bd043da1f524692c75a69357b752fc183c7881de0d0a6e6d6ddb03ca31e6a983afacdd06978bdd0797957
-DIST selenium-webdriver-3.9.0.gem 841216 BLAKE2B 611a8be3e8759609a792e4f92c73d3e7db6a209a9566fd4f6a7663b4111e5f856e138be83cdce07ceb28dcb23a49ed6d7f403927e96f53751302e73238b701d6 SHA512 5bf2a71322bedfe0e51cae1077886cf520e8cd9213d28dd3643ba78ff457e56649e95df6b09926c82bef98dae7d8c5b6eb676d60939108dd9ead79609cfd2acd
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.53.4-r1.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.53.4-r1.ebuild
index 5614803c6d6e..303687cb407c 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-2.53.4-r1.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-2.53.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24 ruby25"
# NOTE: this package contains precompiled code. It appears that all
# source code can be found at https://code.google.com/p/selenium/ but the
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.10.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.10.0.ebuild
index 67da404fd032..c07650ba818b 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.10.0.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.10.0.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/seleniumhq/selenium"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE=""
ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.11.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.11.0.ebuild
index 67da404fd032..eb794075ddf1 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.11.0.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.11.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
# NOTE: this package contains precompiled code. It appears that all
# source code can be found at https://code.google.com/p/selenium/ but the
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.9.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.9.0.ebuild
deleted file mode 100644
index 67da404fd032..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.9.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at https://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="https://github.com/seleniumhq/selenium"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
- >=dev-ruby/rubyzip-1.2:1"
diff --git a/dev-ruby/sigar/sigar-0.7.3.ebuild b/dev-ruby/sigar/sigar-0.7.3.ebuild
index 116f75eba323..7045ab9949cb 100644
--- a/dev-ruby/sigar/sigar-0.7.3.ebuild
+++ b/dev-ruby/sigar/sigar-0.7.3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_TEST=""
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 96450b23a147..1f77690bb0b3 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,2 +1 @@
-DIST sinatra-1.4.7.gem 369664 BLAKE2B 6b397a440c0ba2016127c38534fc3dde2198d286b2627b8333024d6df10c2a0c28ae0c8b49ead224f0b473699d331fa8993ecaa022b372bb2710e33c4ee9b3db SHA512 f13531390af95e0bb42f7c5cc350e3aee7136c1bb81b487ef71cc194ed6675722a1c23ff6b65ac0e3b2c1a0986bfa733c4a0f24cf9bbe0168a18cd4d18d8a13a
DIST sinatra-1.4.8.gem 369152 BLAKE2B 8a344f85c34dc8736180551690bc55ee615118a243c48421711339f2ef366e6c6facfecf914594f0440a825244e13f98648d11903fd9053054767a58a34aa285 SHA512 e56a5a6d7ceb0be4bc537feb6ada2956f1fd64b452dee347b259837aa02041dfa53d9808531cdd0a02a91093ba92f7c505c39f0dd990dfbc6e872681f40bc5e9
diff --git a/dev-ruby/sinatra/sinatra-1.4.7.ebuild b/dev-ruby/sinatra/sinatra-1.4.7.ebuild
deleted file mode 100644
index 0ac0235cb305..000000000000
--- a/dev-ruby/sinatra/sinatra-1.4.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-# no documentation is generable, it needs hanna, which is broken
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
-HOMEPAGE="http://www.sinatrarb.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/rack-1*:* >=dev-ruby/rack-1.5:*
- >=dev-ruby/rack-protection-1.4:1
- >=dev-ruby/tilt-1.3.4:* =dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder )"
-
-# haml tests are optional and not yet marked for ruby20.
-#USE_RUBY="ruby20" ruby_add_bdepend "test? ( >=dev-ruby/haml-3.0 )"
-
-all_ruby_prepare() {
- # Remove implicit build dependency on git.
- sed -i -e '/\(s.files\|s.test_files\|s.extra_rdoc_files\)/d' sinatra.gemspec || die
-}
diff --git a/dev-ruby/sinatra/sinatra-1.4.8.ebuild b/dev-ruby/sinatra/sinatra-1.4.8.ebuild
index 6a6b7c996db7..0d815fc809b6 100644
--- a/dev-ruby/sinatra/sinatra-1.4.8.ebuild
+++ b/dev-ruby/sinatra/sinatra-1.4.8.ebuild
@@ -2,10 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
# no documentation is generable, it needs hanna, which is broken
RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
diff --git a/dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0.ebuild b/dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0.ebuild
index 9c7b8a34053a..73789766c4f3 100644
--- a/dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0.ebuild
+++ b/dev-ruby/slow_enumerator_tools/slow_enumerator_tools-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
diff --git a/dev-ruby/syntax/Manifest b/dev-ruby/syntax/Manifest
index 8042de4626ba..2e3fec2bbb50 100644
--- a/dev-ruby/syntax/Manifest
+++ b/dev-ruby/syntax/Manifest
@@ -1,3 +1,2 @@
DIST syntax-1.2.0.tar.gz 40797 BLAKE2B e12da53ce9d27b362d70f9074b1ef8f87afb95125f9861169dccc4ea200e5a4a765ec0de867a762eecd2240d773724df25bdac50e27136f35120e182203a34ca SHA512 69804ab94203e2260b4c585aacf68db6ad8e47cf2339ffeb1105ae39da5f1d456b1413eeeef29f1c450bff19780e815b9b1b966b171de3b24595f759b36e6548
-DIST syntax-1.2.1.tar.gz 40994 BLAKE2B f0c748d7ce618fd46a75e97e0c8fc3880e40e7781c9ac61fe4d9c1240a8bb9f2e89fdb4d3b1201a1eb84b11e7b1f169f2305d9532a5177c9a48a001aa1cf2073 SHA512 1b2369a5a71f1818f0074e47e56054707986fbfc14bc799e39925c919d3f00d008e102f11dfc7bbc30ea03c7fab9dddce76e5262bc3e85ce75bcd0550e793f13
DIST syntax-1.2.2.tar.gz 41485 BLAKE2B 09a1fc9a4172ec8e6a748981a966c891038fe43303360a3e5f2302aa0fb370b1098c7fd7b8a1fc2f022365ac8491b3e9f9146f940dffc772fb68fa8be5245986 SHA512 a3be7ac736d6c77833aa532f17485c076d34e66c40426c9c6be2dbbde87b2adb7154c9b3bed3439cc12577dffc01c8148e0870a0d02b3a02ffbf9fb1d651433b
diff --git a/dev-ruby/syntax/syntax-1.2.1.ebuild b/dev-ruby/syntax/syntax-1.2.1.ebuild
deleted file mode 100644
index 41f4003b936c..000000000000
--- a/dev-ruby/syntax/syntax-1.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Syntax highlighting for sourcecode and HTML"
-HOMEPAGE="https://github.com/dblock/syntax"
-SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
- # Remove manual doc since it can not longer be build and it blocks default rdoc recipe.
- rm -rf doc || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib test/ALL-TESTS.rb || die
-}
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 9428c375e546..0b9619b1d27c 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,3 +1,2 @@
-DIST thor-git-0.19.1.tgz 86389 BLAKE2B e5fdadf13639c93cf36d8ce3c0124eed5bdfc738534652df75863728fd91241362dd5bba57d7bbef087b6f28be6e14bcb361b7ecaeea180012140f433ac33e3d SHA512 67aeaa2822b462c59ea9fd1a197222ce997b0edd30eb714b0a303c816acff82f4fb10a650b8a3c508c796426517ba25a462551fbc73ed7b33d4e16207cad8991
DIST thor-git-0.19.4.tgz 88733 BLAKE2B 8be54310cc4bf4a0308e6b103832831b89285003bb22a679986cd02636aaee57a25aa606f3e99bf532961a4e1d3625c46bfdb874a09f66cab85a21e5f7ed22d6 SHA512 a5cc52b23806e6104b12f924324960f2567bcd6c73b72ad47c33da222201b0377e7677b996698774de8adf3eff551926393785323ecf46cb59d72eb0e5b05aa0
DIST thor-git-0.20.0.tgz 91758 BLAKE2B 86e4079a86a9c65852e710e40e49e915afe5522512f061ecc62aed48acc08a5397cc82d45cff7c4b1dd549ec57d8699b9afe7c391ac9ab838d1ba9100f1f058a SHA512 aa5344c94cad7c33dd0582409dbcf9bd109bf97b37131357a4cc8a66317acf8781460e8fe5532b301a74521010be59bb34ac1c68bc01ad3140bfe73fedc2a451
diff --git a/dev-ruby/thor/thor-0.19.1.ebuild b/dev-ruby/thor/thor-0.19.1.ebuild
deleted file mode 100644
index 5c4bcef80a7f..000000000000
--- a/dev-ruby/thor/thor-0.19.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_BINWRAP="thor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A scripting framework that replaces rake and sake"
-HOMEPAGE="http://whatisthor.com/"
-
-SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="doc"
-
-# fakeweb is not compatible with ruby22. Upstream has switched to
-# webmock but leads to circular dependencies via childlabor's
-# dependencies, so skip tests for ruby22 for now.
-USE_RUBY="ruby20 ruby21" ruby_add_bdepend "
- test? (
- >=dev-ruby/fakeweb-1.3
- dev-ruby/childlabor
- )"
-
-all_ruby_prepare() {
- # Remove rspec default options (as we might not have the last
- # rspec).
- rm .rspec || die
-
- # Remove Bundler
- #rm Gemfile || die
- sed -i -e '/[Bb]undler/d' Thorfile || die
-
- # Remove mandatory coverage collection using simplecov which is not
- # packaged.
- sed -i -e '/require .simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-
- # Avoid a spec that requires UTF-8 support, so LANG=C still works,
- # bug 430402
- sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
-}
-
-each_ruby_test() {
- case ${RUBY} in
- *ruby23)
- einfo "Skipping tests due to circular dependencies"
- ;;
- *ruby22)
- einfo "Skipping tests due to circular dependencies"
- ;;
- *)
- ruby-ng_rspec spec || die
- ;;
- esac
-}
diff --git a/dev-ruby/thor/thor-0.19.4.ebuild b/dev-ruby/thor/thor-0.19.4.ebuild
index c1e11304fac7..f548e71b984e 100644
--- a/dev-ruby/thor/thor-0.19.4.ebuild
+++ b/dev-ruby/thor/thor-0.19.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
IUSE="doc"
all_ruby_prepare() {
diff --git a/dev-ruby/tilt/tilt-2.0.8.ebuild b/dev-ruby/tilt/tilt-2.0.8.ebuild
index 6aaa5457b1f9..283dbee57fb1 100644
--- a/dev-ruby/tilt/tilt-2.0.8.ebuild
+++ b/dev-ruby/tilt/tilt-2.0.8.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
diff --git a/dev-ruby/tomlrb/Manifest b/dev-ruby/tomlrb/Manifest
new file mode 100644
index 000000000000..d5f0d32b395e
--- /dev/null
+++ b/dev-ruby/tomlrb/Manifest
@@ -0,0 +1 @@
+DIST tomlrb-1.2.6.tar.gz 15642 BLAKE2B 4f9d19fd66a88a049360f6d3636fcaf6caa7164149a543db5a162ee48c8fb301a4a884dc77d183a9c9f190d6f9e9e92bca66179c250f240d7014791f11f7a600 SHA512 ada1d801ceda014d4ef9d3c973a14b970ad592323c259dfe0e851c00b554551d59010bb65ee64f8acbf5521132d2fdb4de14306c1a2dd6bf5307035bca100fcf
diff --git a/dev-ruby/tomlrb/metadata.xml b/dev-ruby/tomlrb/metadata.xml
new file mode 100644
index 000000000000..069d509f369b
--- /dev/null
+++ b/dev-ruby/tomlrb/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ruby@gentoo.org
+ Gentoo Ruby Project
+
+
+ fbernier/tomlrb
+
+
diff --git a/dev-ruby/tomlrb/tomlrb-1.2.6.ebuild b/dev-ruby/tomlrb/tomlrb-1.2.6.ebuild
new file mode 100644
index 000000000000..62a611d08c6b
--- /dev/null
+++ b/dev-ruby/tomlrb/tomlrb-1.2.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A racc based toml parser"
+HOMEPAGE="https://github.com/fbernier/tomlrb/"
+SRC_URI="https://github.com/fbernier/tomlrb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+ sed -i -e '/reporters/I s:^:#:' test/minitest_helper.rb || die
+}
diff --git a/dev-ruby/tzinfo/tzinfo-0.3.53.ebuild b/dev-ruby/tzinfo/tzinfo-0.3.53.ebuild
index 3e810347f76b..d7c3f12fed46 100644
--- a/dev-ruby/tzinfo/tzinfo-0.3.53.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-0.3.53.ebuild
@@ -4,7 +4,7 @@
EAPI=6
# ruby23 -> fails tests
-USE_RUBY="ruby22"
+USE_RUBY="ruby22 ruby23"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/zentest/zentest-4.11.1.ebuild b/dev-ruby/zentest/zentest-4.11.1.ebuild
index 87f36c10376f..911694231f94 100644
--- a/dev-ruby/zentest/zentest-4.11.1.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::R
HOMEPAGE="https://github.com/seattlerb/zentest"
LICENSE="Ruby"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index fc050a3c2187..f91ca6147d7a 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild b/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
index f0aefb40e8d8..8620f44c5624 100644
--- a/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
+++ b/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RESTRICT="strip"
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index d082ff775ee6..8461f9130333 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/tkXwin/tkXwin-1.0-r3.ebuild b/dev-tcltk/tkXwin/tkXwin-1.0-r4.ebuild
similarity index 90%
rename from dev-tcltk/tkXwin/tkXwin-1.0-r3.ebuild
rename to dev-tcltk/tkXwin/tkXwin-1.0-r4.ebuild
index c6b35a7c21a9..471945156f57 100644
--- a/dev-tcltk/tkXwin/tkXwin-1.0-r3.ebuild
+++ b/dev-tcltk/tkXwin/tkXwin-1.0-r4.ebuild
@@ -14,14 +14,13 @@ SLOT="0"
IUSE="debug static-libs threads"
KEYWORDS="amd64 ppc x86"
-DEPEND="
+RDEPEND="
dev-lang/tk[threads?]
x11-libs/libXScrnSaver
x11-libs/libX11
- x11-libs/libXext
- x11-proto/scrnsaverproto
- x11-proto/xextproto"
-RDEPEND="${DEPEND}"
+ x11-libs/libXext"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
PATCHES=(
"${FILESDIR}"/${PV}-Makefile.in.diff
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e49b1e5369e1..2ec71794e123 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index dff500f36226..59f2a28f842d 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,2 +1,3 @@
DIST android-studio-ide-171.4443003-linux.zip 773670325 BLAKE2B b8cff0b85cf20f9d181b4f5c29dc75385539ca2d8e2677211c6c42fcb115616c4208faa5df8cc8a8210c4e9e869d00ae42e7c9dd212756608ff9d4f47bdc8943 SHA512 ba91309c59e4f258222f5b5978bc9ea048476bab4d0662235c7900590f9d58716dc77e937464fab0e57752ee18353a13c163ee98615474f48d0b99e04dae1d34
DIST android-studio-ide-173.4697961-linux.zip 894046861 BLAKE2B 233fefaed2a0b9c70e6cabc61663dd15d9a2486d1df17a45fc71d9c542ffd9212fc36ef54e22032ffa709a76aae796b2f14b189e31a79e96dfb0736017cacae9 SHA512 787a1cf1ab74f84cd39f663496b7b0e1cfc77130d4a7b8b732d010cf2dd553865f368463e07220144c7e9f7d5c12e20ec149ea05f5ee2f8e291537a99d678ff0
+DIST android-studio-ide-173.4720617-linux.zip 894052929 BLAKE2B cc1ff03b24febf18e8ebd9a78ae0463e9552e20ee4c28e60e5e4f52379e66d6e5c6d91af1cd641b79c72590a081770a22882539612028915cd064834c8bc0ef3 SHA512 121d5eead42743127dfccf37b0b4bc4ceddc0df706bdddbc8c0ae2ec3711b4c8308d945b92ed5e8b3209d380e202dc08fbf8475ef6ad30016ca5cc9acb264d3e
diff --git a/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild b/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild
new file mode 100644
index 000000000000..10d45b8040b7
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils java-pkg-2 versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
+ opt/${PN}/bin/fsnotifier*
+ opt/${PN}/lib/libpty/linux/x86*/libpty.so
+ opt/${PN}/plugins/android/lib/libwebp_jni*.so
+ opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
+ opt/${PN}/plugins/android/resources/perfd/*/perfd
+ opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
+
+if [[ $(get_version_component_count) -eq 6 ]]; then
+ STUDIO_V=$(get_version_component_range 1-4)
+ BUILD_V=$(get_version_component_range 5-6)
+else
+ STUDIO_V=$(get_version_component_range 1-3)
+ BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip
+ dev-java/commons-logging:0
+ dev-java/log4j:0"
+
+# dev-java/guava:18
+RDEPEND=">=virtual/jdk-1.7
+ selinux? ( sec-policy/selinux-android )
+ >=app-arch/bzip2-1.0.6-r4
+ dev-java/commons-logging:0
+ dev-java/log4j:0
+ >=dev-libs/expat-2.1.0-r3
+ >=dev-libs/libffi-3.0.13-r1
+ >=media-libs/fontconfig-2.10.92
+ >=media-libs/freetype-2.5.5
+ >=media-libs/libpng-1.2.51
+ >=media-libs/mesa-10.2.8
+ || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+ >=sys-libs/ncurses-5.9-r3:5/5[tinfo]
+ >=sys-libs/zlib-1.2.8-r1
+ >=x11-libs/libX11-1.6.2
+ >=x11-libs/libXau-1.0.7-r1
+ >=x11-libs/libXdamage-1.1.4-r1
+ >=x11-libs/libXdmcp-1.1.1-r1
+ >=x11-libs/libXext-1.3.2
+ >=x11-libs/libXfixes-5.0.1
+ >=x11-libs/libXrender-0.9.8
+ >=x11-libs/libXxf86vm-1.1.3
+ >=x11-libs/libdrm-2.4.46
+ >=x11-libs/libxcb-1.9.1
+ >=x11-libs/libxshmfence-1.1"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ eapply_user
+ # This is really a bundled jdk not a jre
+ rm -R "${S}/jre" || die "Could not remove bundled jdk"
+
+ # Replace bundled jars with system
+ # has problems with newer jdom:0 not updated to jdom:2
+ cd "${S}/lib" || die
+ local JARS="commons-logging log4j"
+ local j
+ for j in ${JARS}; do
+ rm -v ${j/:*/}*.jar || die
+ java-pkg_jar-from ${j}
+ done
+
+ cd "${S}" || die
+
+ # bug 629404
+ echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
+ echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ local dir="/opt/${PN}"
+
+ insinto "${dir}"
+ # Replaced bundled jre with system vm/jdk
+ # This is really a bundled jdk not a jre
+ doins -r *
+
+ rm -rf "${D}${dir}/jre" || die
+ dosym "/etc/java-config-2/current-system-vm" "${dir}/jre"
+
+ fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
+ chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die
+
+ newicon "bin/studio.png" "${PN}.png"
+ make_wrapper ${PN} ${dir}/bin/studio.sh
+ make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
index 2174fb58cd4e..d81e32504b4d 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
index 5bb7e17a78f2..ea6c131f8ace 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
index 656a9b1f4ab9..23b0c0ae9c77 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
index 656a9b1f4ab9..23b0c0ae9c77 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
index 08cbe25a4443..2da8989d872c 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
index 3844c8ba7fd2..cc4c6a14d1b3 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
index 478993869f40..e30008fccea8 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
index 478993869f40..e30008fccea8 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
index 1e8fdab99c2f..8985c18fefb6 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
index ad35a561a800..31b0738d915f 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
index d846576354af..82c5f2ba229b 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
index d67047d35025..46595012d5d7 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
index 4303187015cf..bb90f9646953 100644
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 readme.gentoo systemd user
DESCRIPTION="BuildBot Slave Daemon"
-HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-slave"
+HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-slave/"
MY_PV="${PV/_p/p}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
index 02f64d7db13c..0f150c29112a 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
index b580a1ed6287..ec80689f3460 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
index 42f348b27429..85e04699e657 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
index 42f348b27429..85e04699e657 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
index faea7b163e54..d78740f72876 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit readme.gentoo-r1 user distutils-r1
DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
MY_V="${PV/_p/p}"
MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
index 445437167665..f1331b427b7a 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit readme.gentoo-r1 user distutils-r1
DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
MY_V="${PV/_p/p}"
MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
index e92ba553318e..dea70dbdd5e7 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit readme.gentoo-r1 user distutils-r1
DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
MY_V="${PV/_p/.post}"
MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
index e92ba553318e..dea70dbdd5e7 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit readme.gentoo-r1 user distutils-r1
DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
MY_V="${PV/_p/.post}"
MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index e92ba553318e..dea70dbdd5e7 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit readme.gentoo-r1 user distutils-r1
DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
MY_V="${PV/_p/.post}"
MY_P="${PN}-${MY_V}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
index cbf202672e24..ebf5cd95ad20 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
index ba9aa2ce56df..79aac997ef77 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
index 5224d8a610be..33206843b81a 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
index 5224d8a610be..33206843b81a 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
index f7163c0a7134..fc596c84bbb9 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
index 30a4693f1376..56bc0409643f 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
index 90a60bd5cd20..8ee469d1634d 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
index 90a60bd5cd20..8ee469d1634d 100644
--- a/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
inherit distutils-r1
DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
diff --git a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
index f432a13be789..dc3c963ebc9c 100644
--- a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
@@ -11,7 +11,7 @@ MY_PV="${PV/_p/p}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
+HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-util/buildbot/buildbot-0.9.12.ebuild b/dev-util/buildbot/buildbot-0.9.12.ebuild
index 9a106389b8ee..7ea786c52840 100644
--- a/dev-util/buildbot/buildbot-0.9.12.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.12.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/p}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-util/buildbot/buildbot-0.9.13.ebuild b/dev-util/buildbot/buildbot-0.9.13.ebuild
index 5c67c37ee763..632833de2f4a 100644
--- a/dev-util/buildbot/buildbot-0.9.13.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.13.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/p}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-util/buildbot/buildbot-0.9.15_p1.ebuild b/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
index 3d1d553779bf..31c121b11d7e 100644
--- a/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-util/buildbot/buildbot-1.1.0.ebuild b/dev-util/buildbot/buildbot-1.1.0.ebuild
index 1a698ff26621..4cdc4a28db20 100644
--- a/dev-util/buildbot/buildbot-1.1.0.ebuild
+++ b/dev-util/buildbot/buildbot-1.1.0.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
SRC_URI="
mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
https://dev.gentoo.org/~dolsen/distfiles/buildbot-1.1.0.docs.tar.xz
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 0ff327306348..f52f1c9e2ed2 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -14,7 +14,7 @@ MY_PV="${PV/_p/.post}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-util/bumpversion/bumpversion-0.5.3.ebuild b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
index 66c64849538e..3109273e0b2d 100644
--- a/dev-util/bumpversion/bumpversion-0.5.3.ebuild
+++ b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
inherit distutils-r1
DESCRIPTION="Version-bump your software with a single command"
-HOMEPAGE="https://pypi.org/project/bumpversion https://github.com/peritus/bumpversion"
+HOMEPAGE="https://pypi.org/project/bumpversion/ https://github.com/peritus/bumpversion"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild
index cd172860d640..38193a3109f8 100644
--- a/dev-util/ccache/ccache-3.3.4-r1.ebuild
+++ b/dev-util/ccache/ccache-3.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
IUSE=""
DEPEND="app-arch/xz-utils
diff --git a/dev-util/cmake/cmake-3.11.0.ebuild b/dev-util/cmake/cmake-3.11.0.ebuild
index 2ceccc1ef951..6bab5d7c8c20 100644
--- a/dev-util/cmake/cmake-3.11.0.ebuild
+++ b/dev-util/cmake/cmake-3.11.0.ebuild
@@ -80,7 +80,8 @@ cmake_src_bootstrap() {
# execinfo.h on Solaris isn't quite what it is on Darwin
if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+ sed -i -e 's/execinfo\.h/blablabla.h/' \
+ Source/kwsys/CMakeLists.txt || die
fi
tc-export CC CXX LD
@@ -123,6 +124,12 @@ cmake_src_test() {
src_prepare() {
cmake-utils_src_prepare
+ # disable Xcode hooks, bug #652134
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+ Source/cmGlobalXCodeGenerator.cxx || die
+ fi
+
# Add gcc libs to the default link paths
sed -i \
-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
diff --git a/dev-util/cmake/cmake-3.11.1.ebuild b/dev-util/cmake/cmake-3.11.1.ebuild
index 2ceccc1ef951..6bab5d7c8c20 100644
--- a/dev-util/cmake/cmake-3.11.1.ebuild
+++ b/dev-util/cmake/cmake-3.11.1.ebuild
@@ -80,7 +80,8 @@ cmake_src_bootstrap() {
# execinfo.h on Solaris isn't quite what it is on Darwin
if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
+ sed -i -e 's/execinfo\.h/blablabla.h/' \
+ Source/kwsys/CMakeLists.txt || die
fi
tc-export CC CXX LD
@@ -123,6 +124,12 @@ cmake_src_test() {
src_prepare() {
cmake-utils_src_prepare
+ # disable Xcode hooks, bug #652134
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+ Source/cmGlobalXCodeGenerator.cxx || die
+ fi
+
# Add gcc libs to the default link paths
sed -i \
-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
diff --git a/dev-util/gertty/gertty-1.3.2.ebuild b/dev-util/gertty/gertty-1.3.2.ebuild
index 7c18ac66c8e3..4ed475d08fb0 100644
--- a/dev-util/gertty/gertty-1.3.2.ebuild
+++ b/dev-util/gertty/gertty-1.3.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.org/project/gertty"
+HOMEPAGE="https://pypi.org/project/gertty/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-util/gertty/gertty-1.4.0.ebuild b/dev-util/gertty/gertty-1.4.0.ebuild
index 7c18ac66c8e3..4ed475d08fb0 100644
--- a/dev-util/gertty/gertty-1.4.0.ebuild
+++ b/dev-util/gertty/gertty-1.4.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.org/project/gertty"
+HOMEPAGE="https://pypi.org/project/gertty/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-util/gertty/gertty-1.5.0.ebuild b/dev-util/gertty/gertty-1.5.0.ebuild
index bd38b77879ee..dabb69045cdd 100644
--- a/dev-util/gertty/gertty-1.5.0.ebuild
+++ b/dev-util/gertty/gertty-1.5.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
-HOMEPAGE="https://pypi.org/project/gertty"
+HOMEPAGE="https://pypi.org/project/gertty/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/dev-util/glade/glade-3.20.4.ebuild b/dev-util/glade/glade-3.20.4.ebuild
index 243a72912856..8a552f034ae9 100644
--- a/dev-util/glade/glade-3.20.4.ebuild
+++ b/dev-util/glade/glade-3.20.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="debug +introspection python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
index 1daef3f26567..296e94b87677 100644
--- a/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
# FIXME: Review licenses at some point
LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="clang +git sysprof vala webkit"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/howdoi/howdoi-1.1.12.ebuild b/dev-util/howdoi/howdoi-1.1.12.ebuild
index 2b8d41ba1bc6..e072ecb0cb11 100644
--- a/dev-util/howdoi/howdoi-1.1.12.ebuild
+++ b/dev-util/howdoi/howdoi-1.1.12.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi"
+HOMEPAGE="https://pypi.org/project/howdoi/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-util/howdoi/howdoi-1.1.9.ebuild b/dev-util/howdoi/howdoi-1.1.9.ebuild
index aa14cb47aad4..66e4cf6fe25e 100644
--- a/dev-util/howdoi/howdoi-1.1.9.ebuild
+++ b/dev-util/howdoi/howdoi-1.1.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi"
+HOMEPAGE="https://pypi.org/project/howdoi/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 57b3c2e2b193..44c429cc6c90 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,2 +1,3 @@
DIST include-what-you-use-4.0.src.tar.gz 437340 BLAKE2B 744f7893169a637636107e23cae356db7f12aa01fefd39626600b3fa3dbd77688503e7332a2dbc673339145692625fd8fa3f10e0d405a77e2d5586e6bfeb0378 SHA512 c96b78ec8f8289bfd7830acaf533aea0077bb36311d3b8bb7f31464c1b3a5b3f353b24e81ffc581811b4083d3b5959e4e947e3a3d16cb7c77de00b05b9972a90
DIST include-what-you-use-5.0.src.tar.gz 439081 BLAKE2B 85246aa5333a073bb195b873d7bfe084a56c343cece92322706717ce699bcd75b737203858277202791ec0eb91f560b06a371e902cb175cdb2858562a4830e74 SHA512 9d4a9717a3a3f6752f8bdd1392b6d7a5e8b8dc277ef46a50f24185a089360380e1da92a61fd150598843f5c24cff03e74bc674e57579960d977acde755e34c52
+DIST include-what-you-use-6.0.src.tar.gz 440406 BLAKE2B 485a61dd4f72c158ad9c798c8121d7af9134d79b94c9c30c14674a62007e9fc05acc7e2341cc3282288611beb9138768bf11cd2d73efed372adab83e90b268db SHA512 2bf2593dba252d870074125f976a237e901e969323969f2c8fb030e8376bb230f1d5c2baecc8cd8fad7099e83589c7666c44cd178d2094f6e883cace1e53ad90
diff --git a/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild
new file mode 100644
index 000000000000..7cfe58259cc7
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils flag-o-matic llvm python-single-r1
+
+DESCRIPTION="Find unused include directives in C/C++ programs"
+HOMEPAGE="https://include-what-you-use.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+LLVM_MAX_SLOT=6
+
+RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
+ sys-devel/clang:${LLVM_MAX_SLOT}
+ ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${PN}-clang_${PV}
+
+pkg_setup() {
+ llvm_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+ python_fix_shebang .
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
+ -DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
+
+ # Note [llvm install path]
+ # Unfortunately all binaries using clang driver
+ # have to reside at the same path depth as
+ # 'clang' binary itself. See bug #625972
+ # Thus as a hack we install it to the same directory
+ # as llvm/clang itself.
+ -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ "${EPYTHON}" run_iwyu_tests.py
+}
diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
index 72a65de61155..2f57aa2a0114 100644
--- a/dev-util/scons/scons-2.5.1.ebuild
+++ b/dev-util/scons/scons-2.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
#PATCHES=( )
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index eb67d97106da..0844c6e56331 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND="app-admin/eselect"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f7b5cd4d9f10..bbe67f2fda51 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild b/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild
index 208c4eb3fd69..13890ea8da56 100644
--- a/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild
+++ b/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild
@@ -14,7 +14,7 @@ fi
inherit distutils-r1 ${GIT_ECLASS}
DESCRIPTION="A script that commits files from a directory to Github Pages"
-HOMEPAGE="https://pypi.org/project/github-pages-publish
+HOMEPAGE="https://pypi.org/project/github-pages-publish/
https://github.com/rafaelmartins/github-pages-publish"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild b/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild
index c0ee4243d734..d35e34623578 100644
--- a/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.10-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git"
+HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-vcs/hg-git/hg-git-0.8.10.ebuild b/dev-vcs/hg-git/hg-git-0.8.10.ebuild
index 545a0324ae31..acf6cae2bdae 100644
--- a/dev-vcs/hg-git/hg-git-0.8.10.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.10.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git"
+HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-vcs/hg-git/hg-git-0.8.8.ebuild b/dev-vcs/hg-git/hg-git-0.8.8.ebuild
index f9ec4148be50..cf1461ddfdee 100644
--- a/dev-vcs/hg-git/hg-git-0.8.8.ebuild
+++ b/dev-vcs/hg-git/hg-git-0.8.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="push to and pull from a Git repository using Mercurial"
-HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git"
+HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
index 01e8b97f9940..a10a7ca95686 100644
--- a/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-1.8.5.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion"
+HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
index 39a19e8b2d62..8f32560f359f 100644
--- a/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion"
+HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-vcs/hgsubversion/hgsubversion-9999.ebuild b/dev-vcs/hgsubversion/hgsubversion-9999.ebuild
index afbf338be78b..c3c40ed2703f 100644
--- a/dev-vcs/hgsubversion/hgsubversion-9999.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 mercurial
DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion"
+HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.org/project/hgsubversion/"
SRC_URI=""
EHG_REPO_URI="https://bitbucket.org/durin42/hgsubversion"
diff --git a/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild b/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild
index 19aa39fd893c..abbb8844768e 100644
--- a/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild
+++ b/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
PYTHON_REQ_USE="xml"
DESCRIPTION="A set of scripts to work locally on Subversion checkouts using Mercurial"
-HOMEPAGE="https://pypi.org/project/hgsvn"
+HOMEPAGE="https://pypi.org/project/hgsvn/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="GPL-3"
diff --git a/dev-vcs/tig/tig-2.3.3.ebuild b/dev-vcs/tig/tig-2.3.3.ebuild
index cb8264633db0..139284ad8542 100644
--- a/dev-vcs/tig/tig-2.3.3.ebuild
+++ b/dev-vcs/tig/tig-2.3.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3 autotools
else
SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
fi
DESCRIPTION="text mode interface for git"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 83c60d9fda5c..543a435dbb46 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 91ff966c8f13..0409c4db17d7 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -97,9 +97,34 @@ for module in ${IUSE_MODULES} ; do
IUSE="${IUSE} apache2_modules_${module}"
done
-for mpm in ${IUSE_MPMS} ; do
- IUSE="${IUSE} apache2_mpms_${mpm}"
-done
+_apache2_set_mpms() {
+ local mpm
+ local ompm
+
+ for mpm in ${IUSE_MPMS} ; do
+ IUSE="${IUSE} apache2_mpms_${mpm}"
+
+ REQUIRED_USE+=" apache2_mpms_${mpm}? ("
+ for ompm in ${IUSE_MPMS} ; do
+ if [[ "${mpm}" != "${ompm}" ]] ; then
+ REQUIRED_USE+=" !apache2_mpms_${ompm}"
+ fi
+ done
+
+ if has ${mpm} ${IUSE_MPMS_FORK} ; then
+ REQUIRED_USE+=" !threads"
+ else
+ REQUIRED_USE+=" threads"
+ fi
+ REQUIRED_USE+=" )"
+ done
+
+ if [[ "${PV}" != 2.2* ]] ; then
+ REQUIRED_USE+=" apache2_mpms_prefork? ( !apache2_modules_http2 )"
+ fi
+}
+_apache2_set_mpms
+unset -f _apache2_set_mpms
DEPEND="${CDEPEND}
dev-lang/perl
@@ -119,6 +144,23 @@ PDEPEND="~app-admin/apache-tools-${PV}"
S="${WORKDIR}/httpd-${PV}"
+# @VARIABLE: MODULE_DEPENDS
+# @DESCRIPTION:
+# This variable needs to be set in the ebuild and contains a space-separated
+# list of dependency tokens each with a module and the module it depends on
+# separated by a colon
+
+# now extend REQUIRED_USE to reflect the module dependencies to portage
+_apache2_set_module_depends() {
+ local dep
+
+ for dep in ${MODULE_DEPENDS} ; do
+ REQUIRED_USE+=" apache2_modules_${dep%:*}? ( apache2_modules_${dep#*:} )"
+ done
+}
+_apache2_set_module_depends
+unset -f _apache2_set_module_depends
+
# ==============================================================================
# INTERNAL FUNCTIONS
# ==============================================================================
@@ -135,16 +177,12 @@ setup_mpm() {
MY_MPM=""
for x in ${IUSE_MPMS} ; do
if use apache2_mpms_${x} ; then
- if [[ -z "${MY_MPM}" ]] ; then
- MY_MPM=${x}
- elog
- elog "Selected MPM: ${MY_MPM}"
- elog
- else
- eerror "You have selected more then one mpm USE-flag."
- eerror "Only one MPM is supported."
- die "more then one mpm was specified"
- fi
+ # there can at most be one MPM selected because of REQUIRED_USE constraints
+ MY_MPM=${x}
+ elog
+ elog "Selected MPM: ${MY_MPM}"
+ elog
+ break
fi
done
@@ -161,20 +199,6 @@ setup_mpm() {
elog
fi
fi
-
- if has ${MY_MPM} ${IUSE_MPMS_THREAD} && ! use threads ; then
- eerror "You have selected a threaded MPM but USE=threads is disabled"
- die "invalid use flag combination"
- fi
-
- if has ${MY_MPM} ${IUSE_MPMS_FORK} && use threads ; then
- eerror "You have selected a non-threaded MPM but USE=threads is enabled"
- die "invalid use flag combination"
- fi
-
- if [[ "${PV}" != 2.2* ]] && [[ "${MY_MPM}" = *prefork* ]] && use apache2_modules_http2 ; then
- die "http2 does not work with prefork MPM."
- fi
}
# @VARIABLE: MODULE_CRITICAL
@@ -207,35 +231,6 @@ check_module_critical() {
fi
}
-# @VARIABLE: MODULE_DEPENDS
-# @DESCRIPTION:
-# This variable needs to be set in the ebuild and contains a space-separated
-# list of dependency tokens each with a module and the module it depends on
-# separated by a colon
-
-# @FUNCTION: check_module_depends
-# @DESCRIPTION:
-# This internal function makes sure that all inter-module dependencies are
-# satisfied with the current module selection
-check_module_depends() {
- local err=0
-
- for m in ${MY_MODS[@]} ; do
- for dep in ${MODULE_DEPENDS} ; do
- if [[ "${m}" == "${dep%:*}" ]] ; then
- if ! use apache2_modules_${dep#*:} ; then
- eerror "Module '${m}' depends on '${dep#*:}'"
- err=1
- fi
- fi
- done
- done
-
- if [[ ${err} -ne 0 ]] ; then
- die "invalid use flag combination"
- fi
-}
-
# @ECLASS-VARIABLE: MY_CONF
# @DESCRIPTION:
# This internal variable contains the econf options for the current module
@@ -316,7 +311,6 @@ setup_modules() {
# sort and uniquify MY_MODS
MY_MODS=( $(echo ${MY_MODS[@]} | tr ' ' '\n' | sort -u) )
- check_module_depends
check_module_critical
}
diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass
index d565f07a0958..990ba3796947 100644
--- a/eclass/php-pear-r1.eclass
+++ b/eclass/php-pear-r1.eclass
@@ -1,6 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# @DEAD
# @ECLASS: php-pear-r1.eclass
# @MAINTAINER:
# Gentoo PHP Team
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 8d6f0082b9e8..22dafb31423a 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -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
# @ECLASS: ruby-ng.eclass
@@ -112,7 +112,7 @@ _ruby_get_all_impls() {
for i in ${USE_RUBY}; do
case ${i} in
# removed implementations
- ruby19|ruby20|ruby21|jruby)
+ ruby19|ruby20|ruby21|ruby22|jruby)
;;
*)
echo ${i};;
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index cd1ad8046370..4d2d2b02f481 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild b/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild
index 64032b99158b..6ed2c64fda21 100644
--- a/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild
+++ b/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
LICENSE="GPL-3+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch b/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch
index ad689e29d739..4fe12672db65 100644
--- a/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/show_bug.cgi?id=308731
---- src/loadpng.c
-+++ src/loadpng.c
+--- a/src/loadpng.c
++++ b/src/loadpng.c
@@ -55,7 +55,7 @@ unsigned char * load_png_file( const cha
}
/* ensure that we opened a PNG file */
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch b/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch
index a83d36fbd911..99c03b0c82af 100644
--- a/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch
@@ -1,5 +1,5 @@
---- src/gettext.h.orig 2008-10-07 12:01:37.000000000 -0400
-+++ src/gettext.h 2008-10-07 12:01:45.000000000 -0400
+--- a/src/gettext.h.orig 2008-10-07 12:01:37.000000000 -0400
++++ b/src/gettext.h 2008-10-07 12:01:45.000000000 -0400
@@ -24,6 +24,7 @@
/* Get declarations of GNU message catalog functions. */
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch b/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
index 3a0a7d360efb..bbbae5c31076 100644
--- a/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
@@ -1,5 +1,5 @@
---- src/loadpng.c.old 2011-09-14 09:58:40.503566961 +0200
-+++ src/loadpng.c 2011-09-14 10:03:39.708531447 +0200
+--- a/src/loadpng.c.old 2011-09-14 09:58:40.503566961 +0200
++++ b/src/loadpng.c 2011-09-14 10:03:39.708531447 +0200
@@ -73,7 +73,7 @@
return NULL;
}
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch b/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch
index c3dfa83cb5e3..4db0b8f10ccf 100644
--- a/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch
+++ b/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch
@@ -1,8 +1,8 @@
the x_libraries variable isnt always defined
http://bugs.gentoo.org/92688
---- configure
-+++ configure
+--- a/configure
++++ b/configure
@@ -4511,3 +4511,5 @@
fi
+if test x"$x_libraries" != x; then
diff --git a/games-arcade/xbubble/xbubble-0.5.8.ebuild b/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild
similarity index 74%
rename from games-arcade/xbubble/xbubble-0.5.8.ebuild
rename to games-arcade/xbubble/xbubble-0.5.8-r1.ebuild
index b884d4631f12..67c8f575299f 100644
--- a/games-arcade/xbubble/xbubble-0.5.8.ebuild
+++ b/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
-DESCRIPTION="a Puzzle Bobble clone similar to Frozen-Bubble"
+DESCRIPTION="A Puzzle Bobble clone similar to Frozen-Bubble"
HOMEPAGE="http://www.nongnu.org/xbubble/"
SRC_URI="http://www.ibiblio.org/pub/mirrors/gnu/ftp/savannah/files/${PN}/${P}.tar.gz"
@@ -13,16 +13,21 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~x86"
IUSE="nls"
-RDEPEND="x11-libs/libX11
+RDEPEND="
+ x11-libs/libX11
x11-libs/libXt
- media-libs/libpng:0
- nls? ( virtual/libintl )"
+ media-libs/libpng:0=
+ nls? ( virtual/libintl )
+"
DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
+ nls? ( sys-devel/gettext )
+"
+
DOCS=( AUTHORS ChangeLog NEWS NetworkProtocol README TODO )
src_prepare() {
- epatch \
+ default
+ eapply \
"${FILESDIR}"/${P}-xpaths.patch \
"${FILESDIR}"/${P}-locale.patch \
"${FILESDIR}"/${P}-libpng14.patch \
@@ -36,12 +41,11 @@ src_prepare() {
}
src_configure() {
- egamesconf $(use_enable nls)
+ econf $(use_enable nls)
}
src_install() {
default
newicon data/themes/fancy/Bubble_black_DEAD_01.png ${PN}.png
make_desktop_entry ${PN} XBubble
- prepgamesdirs
}
diff --git a/games-arcade/xrick/files/xrick-021212-zlib.patch b/games-arcade/xrick/files/xrick-021212-zlib.patch
index da09a46369d6..bd7d6287925f 100644
--- a/games-arcade/xrick/files/xrick-021212-zlib.patch
+++ b/games-arcade/xrick/files/xrick-021212-zlib.patch
@@ -1,5 +1,5 @@
---- include/unzip.h.old 2012-03-24 16:13:16.012854948 +0100
-+++ include/unzip.h 2012-03-24 16:15:42.744346771 +0100
+--- a/include/unzip.h.old 2012-03-24 16:13:16.012854948 +0100
++++ b/include/unzip.h 2012-03-24 16:15:42.744346771 +0100
@@ -49,6 +49,10 @@
#include "zlib.h"
#endif
diff --git a/games-arcade/xrick/xrick-021212-r1.ebuild b/games-arcade/xrick/xrick-021212-r2.ebuild
similarity index 74%
rename from games-arcade/xrick/xrick-021212-r1.ebuild
rename to games-arcade/xrick/xrick-021212-r2.ebuild
index 4feeada9b791..9e95cbe3a4b2 100644
--- a/games-arcade/xrick/xrick-021212-r1.ebuild
+++ b/games-arcade/xrick/xrick-021212-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
DESCRIPTION="Clone of the Rick Dangerous adventure game from the 80's"
HOMEPAGE="http://www.bigorno.net/xrick/"
@@ -24,14 +24,15 @@ src_unpack() {
}
src_prepare() {
- epatch "${FILESDIR}"/${P}*.patch
+ default
+ eapply "${FILESDIR}"/${P}*.patch
sed -i \
-e "/^run from/d" \
- -e "/data.zip/ s:the directory where xrick is:$(games_get_libdir)/${PN}.:" \
+ -e "/data.zip/ s:the directory where xrick is:$(get_libdir)/${PN}.:" \
xrick.6 || die
sed -i \
- -e "s:data.zip:$(games_get_libdir)/${PN}/data.zip:" \
+ -e "s:data.zip:/usr/$(get_libdir)/${PN}/data.zip:" \
src/xrick.c || die
sed -i \
@@ -43,12 +44,11 @@ src_prepare() {
}
src_install() {
- dogamesbin xrick
- insinto "$(games_get_libdir)"/${PN}
+ dobin xrick
+ insinto /usr/"$(get_libdir)"/${PN}
doins data.zip
newicon src/xrickST.ico ${PN}.ico
make_desktop_entry ${PN} ${PN} /usr/share/pixmaps/${PN}.ico
dodoc README KeyCodes
doman xrick.6
- prepgamesdirs
}
diff --git a/games-arcade/xscavenger/xscavenger-1.4.4.ebuild b/games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild
similarity index 71%
rename from games-arcade/xscavenger/xscavenger-1.4.4.ebuild
rename to games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild
index df9546d9b01a..6a578398112d 100644
--- a/games-arcade/xscavenger/xscavenger-1.4.4.ebuild
+++ b/games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils toolchain-funcs games
+EAPI=6
+inherit desktop epatch toolchain-funcs
DESCRIPTION="Lode-Runner-like arcade game"
HOMEPAGE="http://www.xdr.com/dash/scavenger.html"
@@ -15,15 +15,17 @@ IUSE=""
RDEPEND="x11-libs/libXext"
DEPEND="${RDEPEND}
- x11-misc/imake"
+ x11-misc/imake
+"
-S=${WORKDIR}/${P}/src
+S="${WORKDIR}/${P}/src"
src_prepare() {
+ default
epatch "${FILESDIR}/${PV}-gentoo.patch"
sed -i \
- -e "s:GENTOO_DATADIR:${GAMES_DATADIR}:" \
- -e "s:GENTOO_BINDIR:${GAMES_BINDIR}:" \
+ -e "s:GENTOO_DATADIR:/usr/share:" \
+ -e "s:GENTOO_BINDIR:/usr/bin:" \
Imakefile \
|| die
}
@@ -42,5 +44,5 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" install
dodoc ../{CREDITS,DOC,README,TODO,changelog}
- prepgamesdirs
+ make_desktop_entry scavenger "XScavenger"
}
diff --git a/games-arcade/xsfcave/xsfcave-0.5.ebuild b/games-arcade/xsfcave/xsfcave-0.5-r1.ebuild
similarity index 79%
rename from games-arcade/xsfcave/xsfcave-0.5.ebuild
rename to games-arcade/xsfcave/xsfcave-0.5-r1.ebuild
index 57b1fa0cb3be..5d28c027ce64 100644
--- a/games-arcade/xsfcave/xsfcave-0.5.ebuild
+++ b/games-arcade/xsfcave/xsfcave-0.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit games
+EAPI=6
+inherit desktop
DESCRIPTION="A X11 sfcave clone"
HOMEPAGE="http://xsfcave.idios.org"
@@ -19,5 +19,5 @@ RDEPEND="${DEPEND}"
src_install() {
default
- prepgamesdirs
+ make_desktop_entry "${PN}"
}
diff --git a/games-arcade/xtux/files/xtux-20030306-ldflags.patch b/games-arcade/xtux/files/xtux-20030306-ldflags.patch
index d2c798d0795d..4a4877a6d65a 100644
--- a/games-arcade/xtux/files/xtux-20030306-ldflags.patch
+++ b/games-arcade/xtux/files/xtux-20030306-ldflags.patch
@@ -1,5 +1,5 @@
---- src/client/Makefile.old 2010-09-30 18:08:16.000000000 +0200
-+++ src/client/Makefile 2010-09-30 18:08:41.000000000 +0200
+--- a/src/client/Makefile.old 2010-09-30 18:08:16.000000000 +0200
++++ b/src/client/Makefile 2010-09-30 18:08:41.000000000 +0200
@@ -48,7 +48,7 @@
#Apps
@@ -9,8 +9,8 @@
# OBJECTS
.c.o: client.h $*.c
---- src/server/Makefile.old 2010-09-30 18:09:55.000000000 +0200
-+++ src/server/Makefile 2010-09-30 18:10:16.000000000 +0200
+--- a/src/server/Makefile.old 2010-09-30 18:09:55.000000000 +0200
++++ b/src/server/Makefile 2010-09-30 18:10:16.000000000 +0200
@@ -41,7 +41,7 @@
#Apps
diff --git a/games-arcade/xtux/xtux-20030306.ebuild b/games-arcade/xtux/xtux-20030306-r1.ebuild
similarity index 66%
rename from games-arcade/xtux/xtux-20030306.ebuild
rename to games-arcade/xtux/xtux-20030306-r1.ebuild
index 05bed79f0c8f..35368df77f3f 100644
--- a/games-arcade/xtux/xtux-20030306.ebuild
+++ b/games-arcade/xtux/xtux-20030306-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
DESCRIPTION="Multiplayer Gauntlet-style arcade game"
HOMEPAGE="http://xtux.sourceforge.net/"
@@ -14,11 +14,15 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="x11-libs/libXpm"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}
+ media-fonts/font-adobe-75dpi
+"
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
src_prepare() {
+ default
+
find data/ -type d -name .xvpics -exec rm -rf \{\} +
sed -i \
-e "s:-g -Wall -O2:${CFLAGS}:" \
@@ -28,24 +32,24 @@ src_prepare() {
-e "s:./tux_serv:tux_serv:" \
src/client/menu.c \
|| die "sed failed"
- epatch "${FILESDIR}/${P}-particles.patch" \
+
+ eapply "${FILESDIR}/${P}-particles.patch" \
"${FILESDIR}"/${P}-ldflags.patch
}
src_compile() {
# Not parallel-make friendly (bug #247332)
- emake DATADIR="${GAMES_DATADIR}/xtux/data" common
- emake DATADIR="${GAMES_DATADIR}/xtux/data" ggz
- emake DATADIR="${GAMES_DATADIR}/xtux/data" server
- emake DATADIR="${GAMES_DATADIR}/xtux/data" client
+ emake DATADIR="/usr/share/xtux/data" common
+ emake DATADIR="/usr/share/xtux/data" ggz
+ emake DATADIR="/usr/share/xtux/data" server
+ emake DATADIR="/usr/share/xtux/data" client
}
src_install () {
- dogamesbin xtux tux_serv
- insinto "${GAMES_DATADIR}/xtux"
+ dobin xtux tux_serv
+ insinto "/usr/share/xtux"
doins -r data/
dodoc AUTHORS CHANGELOG README README.GGZ doc/*
newicon data/images/icon.xpm ${PN}.xpm
make_desktop_entry xtux "Xtux"
- prepgamesdirs
}
diff --git a/games-arcade/yarsrevenge/files/0.99-math.patch b/games-arcade/yarsrevenge/files/0.99-math.patch
index 5d7d4619d9c5..5e1136972325 100644
--- a/games-arcade/yarsrevenge/files/0.99-math.patch
+++ b/games-arcade/yarsrevenge/files/0.99-math.patch
@@ -1,5 +1,5 @@
---- yar/graphics.cpp.orig 2004-06-02 14:14:38.174071320 -0400
-+++ yar/graphics.cpp 2004-06-02 14:14:50.352219960 -0400
+--- a/yar/graphics.cpp.orig 2004-06-02 14:14:38.174071320 -0400
++++ b/yar/graphics.cpp 2004-06-02 14:14:50.352219960 -0400
@@ -18,2 +18,3 @@
#include "yar.hxx"
+#include
diff --git a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc43.patch b/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc43.patch
index fe32b6c74e6c..511fad0091e1 100644
--- a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc43.patch
+++ b/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc43.patch
@@ -1,5 +1,5 @@
---- yar/sgw.hxx
-+++ yar/sgw.hxx
+--- a/yar/sgw.hxx
++++ b/yar/sgw.hxx
@@ -24,6 +24,7 @@
#include
diff --git a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc44.patch b/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc44.patch
index fca41cfbdf35..29a52125c904 100644
--- a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc44.patch
+++ b/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc44.patch
@@ -1,5 +1,5 @@
---- yar/game.cpp
-+++ yar/game.cpp
+--- a/yar/game.cpp
++++ b/yar/game.cpp
@@ -15,6 +15,7 @@
* *
***************************************************************************/
diff --git a/games-arcade/yarsrevenge/yarsrevenge-0.99.ebuild b/games-arcade/yarsrevenge/yarsrevenge-0.99-r1.ebuild
similarity index 50%
rename from games-arcade/yarsrevenge/yarsrevenge-0.99.ebuild
rename to games-arcade/yarsrevenge/yarsrevenge-0.99-r1.ebuild
index 76607474077f..b6923570b8f4 100644
--- a/games-arcade/yarsrevenge/yarsrevenge-0.99.ebuild
+++ b/games-arcade/yarsrevenge/yarsrevenge-0.99-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
-DESCRIPTION="remake of the Atari 2600 classic Yar's Revenge"
+DESCRIPTION="Remake of the Atari 2600 classic Yar's Revenge"
HOMEPAGE="http://freshmeat.net/projects/yarsrevenge/"
SRC_URI="http://www.autismuk.freeserve.co.uk/yar-${PV}.tar.gz"
@@ -14,18 +14,17 @@ KEYWORDS="~amd64 ~x86 ~x86-fbsd"
IUSE=""
DEPEND="media-libs/libsdl[sound,joystick,video]"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
-S=${WORKDIR}/yar-${PV}
+S="${WORKDIR}/yar-${PV}"
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PV}-math.patch \
- "${FILESDIR}"/${P}-gcc43.patch \
- "${FILESDIR}"/${P}-gcc44.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${PV}-math.patch
+ "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-gcc44.patch
+)
src_install() {
default
- prepgamesdirs
+ make_desktop_entry "${PN}" "Yar's Revenge"
}
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index f6417d0d33d2..2f6ed9f87872 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.3.1-r1.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.3.1-r1.ebuild
index 6c9ac1da5789..aa8f03ef61cc 100644
--- a/games-misc/katawa-shoujo/katawa-shoujo-1.3.1-r1.ebuild
+++ b/games-misc/katawa-shoujo/katawa-shoujo-1.3.1-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=6
inherit eutils gnome2-utils
DESCRIPTION="Bishoujo-style visual novel by Four Leaf Studios"
-HOMEPAGE="http://katawa-shoujo.com/"
-SRC_URI="http://dl.katawa-shoujo.com/gold_1.3.1/%5B4ls%5D_katawa_shoujo_1.3.1-%5Blinux-x86%5D%5B18161880%5D.tar.bz2 -> ${P}.tar.bz2
+HOMEPAGE="https://www.katawa-shoujo.com"
+SRC_URI="https://dl.katawa-shoujo.com/gold_1.3.1/%5B4ls%5D_katawa_shoujo_1.3.1-%5Blinux-x86%5D%5B18161880%5D.tar.bz2 -> ${P}.tar.bz2
https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png
https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png"
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 02742ed41a10..178ddc50bfb3 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild
index b69e99c3e930..8d225bd382fd 100644
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
LICENSE="GPL-3+ FDL-1.1+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index d36504aa6a46..9faa7e4b66be 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild
index f2cb4239c171..3824d26612f3 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
LICENSE="GPL-2+"
SLOT="2"
IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
# g-s-d[policykit] needed for bug #403527
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
index 041c154ffe15..ce672aeecd01 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
smartcard? ( udev )
wayland? ( udev )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
COMMON_DEPEND="
>=dev-libs/glib-2.44.0:2[dbus]
diff --git a/gnome-base/gvfs/gvfs-1.32.2.ebuild b/gnome-base/gvfs/gvfs-1.32.2.ebuild
index d2348f285856..e55ec05b23a5 100644
--- a/gnome-base/gvfs/gvfs-1.32.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.32.2.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
udisks? ( udev )
systemd? ( !elogind udisks )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
RDEPEND="
app-crypt/gcr:=
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 06101528ec9a..4864b9211671 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
index af7ab4aaf737..a932b4e301dc 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild
index a415efd54a68..8c6e1e10e020 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
# We force 'bindist' due to licenses from gnome-boxes-nonfree
IUSE="" #bindist
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
# NOTE: sys-fs/* stuff is called via exec()
# FIXME: ovirt is not available in tree
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild
index 668a0971afed..3c9bd5ca9e13 100644
--- a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild
+++ b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
>=dev-libs/glib-2.35:2
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.24.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.24.0.ebuild
index dc46f614d789..982b541a3d90 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.24.0.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.24.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://frippery.org/extensions/${P}.tgz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/gnome-extra/libgsf/libgsf-1.14.43.ebuild b/gnome-extra/libgsf/libgsf-1.14.43.ebuild
index 77a9583b2c3f..0e41feb1b299 100644
--- a/gnome-extra/libgsf/libgsf-1.14.43.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.43.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 gtk +introspection"
RDEPEND="
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild
index d0c747da9362..52554e8a0baa 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
IUSE="+introspection gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
RDEPEND="
>=app-crypt/libsecret-0.18
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index b32c4e3d7e1a..e1856415e908 100644
Binary files a/gnustep-apps/Manifest.gz and b/gnustep-apps/Manifest.gz differ
diff --git a/gnustep-apps/pikopixel/Manifest b/gnustep-apps/pikopixel/Manifest
index c2e4b10726d2..9768a3da6e8a 100644
--- a/gnustep-apps/pikopixel/Manifest
+++ b/gnustep-apps/pikopixel/Manifest
@@ -1,3 +1,2 @@
-DIST PikoPixel.Sources.1.0-b7.zip 944683 BLAKE2B 18fada4f29b34f22ac4b263de9cc8621e904ee2ebf0da8826e681960c93aa4b85d6841843a6f7f8650fc8147187b7ef30cbfa74375488feb86bf2bda901d8385 SHA512 e1f2d30dc7a07e0dab5e78a88568816475060d2aac1676782a5aed2fd6037b8e3284196050fb496c6d09bfe8f6445bc6c6c1eab1145679616f2cd68ad56b03aa
-DIST PikoPixel.Sources.1.0-b8.tar.gz 538896 BLAKE2B 0ee4a75f62f6e5b20910bebadc856a095f06c6006bfd4cba84b7beb91a3d71a6cd3114647be8f45860b28d5638d611de91293bb969ed694e261fa447d2882620 SHA512 a106dc3443fef8f569633722c837a876b609c9bec7edda8189c5b6a6388fc4edeeb5eedaa9d72e3a89d13a74dd57c86184983cc10d7b8075b7284b8814e96784
DIST PikoPixel.Sources.1.0-b9a.tar.gz 553753 BLAKE2B 18ab3159c29ba46850a7eee3d5bf45e63f0f2a66270b61141a13ff7fbdf8b9e988979388d608995fc9b8fc089ed2beeafe838db82e16756726422b2ce641bb4a SHA512 03cc3d6dccc26986aeac95074b6cac47d9d5c087c5b3e742409ec41297f634649bcfd4f2d76118e49c95499e1b75dab97e81951ae1186449707c8634ab1519fe
+DIST PikoPixel.Sources.1.0-b9b.tar.gz 566094 BLAKE2B 2f79eb77cbfa5508db600f908b25c2b1543c082364d83f734105b49ef5d0502cc89ac49fc8b08686cd1cee29faa4dcd59ed21372be8ec0fc1d100488f42bb918 SHA512 9579a3455ad77f85686bc01819aa2a008277dc2e8d0205dc0fe26743a150f7f5f4c8aed61eb32c9291fef65f3d1f07db2e560c24b084df53f0360fedd2fc5415
diff --git a/gnustep-apps/pikopixel/pikopixel-1.0_beta7.ebuild b/gnustep-apps/pikopixel/pikopixel-1.0_beta7.ebuild
deleted file mode 100644
index 128dac8c4362..000000000000
--- a/gnustep-apps/pikopixel/pikopixel-1.0_beta7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=${PN//p/P}.Sources.${PV/_beta/-b}
-DESCRIPTION="a free application for drawing & editing pixel-art images"
-HOMEPAGE="http://twilightedge.com/mac/pikopixel/"
-# Web hosting wants a proper User-Agent
-#SRC_URI="http://twilightedge.com/downloads/${MY_P}.zip"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/gnustep-back-0.25.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/${PN//p/P}
diff --git a/gnustep-apps/pikopixel/pikopixel-1.0_beta8.ebuild b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r2.ebuild
similarity index 87%
rename from gnustep-apps/pikopixel/pikopixel-1.0_beta8.ebuild
rename to gnustep-apps/pikopixel/pikopixel-1.0_beta9-r2.ebuild
index 4feb595a1d0c..aa1e3d93e1a9 100644
--- a/gnustep-apps/pikopixel/pikopixel-1.0_beta8.ebuild
+++ b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit gnustep-2
-MY_P=${PN//p/P}.Sources.${PV/_beta/-b}
+MY_P=${PN//p/P}.Sources.${PV/_beta/-b}b
DESCRIPTION="a free application for drawing & editing pixel-art images"
HOMEPAGE="http://twilightedge.com/mac/pikopixel/"
# Web hosting wants a proper User-Agent
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 9c8702ea7603..a206d11ff36c 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/latte-dock/latte-dock-0.7.4.ebuild b/kde-misc/latte-dock/latte-dock-0.7.4.ebuild
index 5cc723b5b26c..b50de8f5bdfa 100644
--- a/kde-misc/latte-dock/latte-dock-0.7.4.ebuild
+++ b/kde-misc/latte-dock/latte-dock-0.7.4.ebuild
@@ -7,7 +7,7 @@ inherit kde5
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Elegant dock, based on KDE Frameworks"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 42d658d0a54d..a5fad5c07cb5 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild
index 362371170392..a0ead71962a0 100644
--- a/media-fonts/dejavu/dejavu-2.37.ebuild
+++ b/media-fonts/dejavu/dejavu-2.37.ebuild
@@ -25,7 +25,7 @@ fi
LICENSE="BitstreamVera"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="fontforge"
DEPEND="fontforge? (
diff --git a/media-fonts/liberation-fonts/Manifest b/media-fonts/liberation-fonts/Manifest
index 28e345a83a8a..7d8c88b6d0d3 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -1,6 +1,2 @@
-DIST liberation-fonts-1.07.4.tar.gz 2937949 BLAKE2B 7dc9b12fa24f68d2d5c55f4407bfdf51fdea4ce9b8e0f11c98039ff3c49ca36253c57e1b19a5e71ac8054c21594c9b47b4f38e6e3c41f00ef085ad8e00bb1c49 SHA512 fc5abb4903f79621157d478baed0963600b04997ded1e0b937a9a41aee3b21900430a4c8ac92e09b7bd8b635ac6cd67c9a3c9f3532ff978d235ba965c25a8f68
-DIST liberation-fonts-2.00.0.tar.gz 4835476 BLAKE2B 8488d48a8e21ae51d70f19d4a033283029dc5b106cc405a69c20db96d03e9c06709db094aab4017289a73b206afb5a9a2c628c04b3d59fd6d95fbb0e69537bc2 SHA512 6936e45fc5992ae802cf0b9867759e86d0682ff42f9ab12d16a6913f2e563de3565063f737a739a85ba71545907bceed8ed11da07a5cbc2f3fdef38f455b79f3
DIST liberation-fonts-2.00.1.tar.gz 4842687 BLAKE2B c38635a3bfdddbf5ef3f2ed2a1f78d47ef7e384625606f47f94aacf1b07c805307a0e1fc3dea52b1dee823f66934f6ce767496f830fdd50c9a5efb073802b173 SHA512 8cfc1fa8f36e9f1c622879a822614b851b8339673ed6d2736937c483d85764ef12cc0d8a308f6c50e4877c2ab9b83ca2ea748b1458aa02cc840251e400285362
-DIST liberation-fonts-ttf-1.07.4.tar.gz 1333593 BLAKE2B 9134e05337c418eb3781b07e251a592b7161b8f295be8d617982f1f25ad4395de353a3baf46f0fd1f59c0399a507392a5be52a4629f858b7bbb496b5f293f3ec SHA512 0906151d111fd660c8cb90dfcb39e0a38805aa53cac162def5240ff3a75c40f6195e6876d09a2f7081913bfe732550b670d197f0e10598c463186fe3bc229b9f
-DIST liberation-fonts-ttf-2.00.0.tar.gz 2302736 BLAKE2B 01ee49cfe6759bc0f652874dfbd2b6c8293cde1c64386e0a37c71d67489675d1a8cb35a8018ebf7e466f51e3b44714c132c814055b02268a9aaac84e42c71fde SHA512 d7b801967dbbe643316241883b2f58e658f0ed55e3de6153f23c7110afb8f1f683602362c7e44a66e68c7fb5b4bdb600e4e0a6697bbaa5ec67f64891d1dcec87
DIST liberation-fonts-ttf-2.00.1.tar.gz 2285857 BLAKE2B 5eb3e10dbf1e5867bcbd443b5f68153448956fc73313e60a408fc69985229658951175753ccf694a79dcc91faafdec3edf113f300ee55f2246261f0dd3067054 SHA512 52dce5cf2c35165f81c903f2c7245d7f0e37a37eeb4003a015d8cc2404728f17ff4d723ddc5d4b6a6c03044d7ec97b98cf4eecfbc91607fcfed6e0aaff260739
diff --git a/media-fonts/liberation-fonts/files/2.00.0/60-liberation.conf b/media-fonts/liberation-fonts/files/2.00.0/60-liberation.conf
deleted file mode 100644
index bda888cefd37..000000000000
--- a/media-fonts/liberation-fonts/files/2.00.0/60-liberation.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
- Times New Roman
- Liberation Serif
-
-
- Arial
- Liberation Sans
-
-
- Courier
- Liberation Mono
-
-
-
-
diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.07.4.ebuild b/media-fonts/liberation-fonts/liberation-fonts-1.07.4.ebuild
deleted file mode 100644
index 8a0a8525ccea..000000000000
--- a/media-fonts/liberation-fonts/liberation-fonts-1.07.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
-HOMEPAGE="https://pagure.io/liberation-fonts"
-SRC_URI="!fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}/${PN}-ttf-${PV}.tar.gz )
- fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}/${P}.tar.gz )"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="GPL-2-with-exceptions"
-IUSE="fontforge X"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
-
-DEPEND="fontforge? ( media-gfx/fontforge )"
-RDEPEND=""
-
-pkg_setup() {
- if use fontforge; then
- FONT_S="${S}/${PN}-ttf-${PV}"
- else
- FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
- S="${FONT_S}"
- fi
- font_pkg_setup
-}
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.0-r1.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.0-r1.ebuild
deleted file mode 100644
index c615f3f57e49..000000000000
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit font
-
-DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
-HOMEPAGE="https://pagure.io/liberation-fonts"
-SRC_URI="!fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}/${PN}-ttf-${PV}.tar.gz )
-fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}/${P}.tar.gz )"
-
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-SLOT="0"
-LICENSE="OFL-1.1"
-IUSE="fontforge X"
-
-FONT_SUFFIX="ttf"
-
-FONT_CONF=( "${FILESDIR}/${PV}/60-liberation.conf" )
-
-DEPEND="fontforge? ( media-gfx/fontforge )"
-RDEPEND=""
-
-pkg_setup() {
- if use fontforge; then
- FONT_S="${S}/${PN}-ttf-${PV}"
- else
- FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
- S="${FONT_S}"
- fi
- font_pkg_setup
-}
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r1.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r1.ebuild
deleted file mode 100644
index c7852bc0bbf8..000000000000
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit font python-any-r1
-
-DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
-HOMEPAGE="https://pagure.io/liberation-fonts"
-SRC_URI="!fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}/${PN}-ttf-${PV}.tar.gz )
-fontforge? ( https://releases.pagure.org/liberation-fonts/${PN}/${P}.tar.gz )"
-
-KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris"
-SLOT="0"
-LICENSE="OFL-1.1"
-IUSE="fontforge X"
-
-FONT_SUFFIX="ttf"
-
-FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
-
-DEPEND="fontforge? (
- ${PYTHON_DEPS}
- media-gfx/fontforge
- dev-python/fonttools
- )"
-RDEPEND=""
-
-pkg_setup() {
- if use fontforge; then
- FONT_S="${S}/${PN}-ttf-${PV}"
- python-any-r1_pkg_setup
- else
- FONT_S="${WORKDIR}/${PN}-ttf-${PV}"
- S="${FONT_S}"
- fi
- font_pkg_setup
-}
diff --git a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r2.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild
similarity index 69%
rename from media-fonts/liberation-fonts/liberation-fonts-2.00.1-r2.ebuild
rename to media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild
index 6d4272bace05..78a09b75e220 100644
--- a/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r2.ebuild
+++ b/media-fonts/liberation-fonts/liberation-fonts-2.00.1-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
@@ -9,16 +9,10 @@ inherit font python-any-r1
DESCRIPTION="A Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat"
HOMEPAGE="https://pagure.io/liberation-fonts"
-SRC_URI="
- !fontforge? (
- https://releases.pagure.org/liberation-fonts/${PN}/${PN}-ttf-${PV}.tar.gz
- )
- fontforge? (
- https://releases.pagure.org/liberation-fonts/${PN}/${P}.tar.gz
- )
-"
+SRC_URI="!fontforge? ( https://releases.pagure.org/${PN}/${PN}-ttf-${PV}.tar.gz )
+fontforge? ( https://releases.pagure.org/${PN}/${P}.tar.gz )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris"
SLOT="0"
LICENSE="OFL-1.1"
IUSE="fontforge X"
diff --git a/media-fonts/montecarlo/montecarlo-0.ebuild b/media-fonts/montecarlo/montecarlo-0-r1.ebuild
similarity index 92%
rename from media-fonts/montecarlo/montecarlo-0.ebuild
rename to media-fonts/montecarlo/montecarlo-0-r1.ebuild
index d9573ba07b7b..7f66d5da210a 100644
--- a/media-fonts/montecarlo/montecarlo-0.ebuild
+++ b/media-fonts/montecarlo/montecarlo-0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=6
inherit font
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3904382682c4..3bfbf914c8ca 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
index 311bb30b7b86..3e9405ae1588 100644
--- a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
+++ b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/hugin/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
IUSE=""
S=${WORKDIR}/${PN}-"$(get_version_component_range 1-3)"
diff --git a/media-gfx/enblend/enblend-4.1.3-r1.ebuild b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
index 6de5ae27cfe8..6f9f1fa58337 100644
--- a/media-gfx/enblend/enblend-4.1.3-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.1.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
LICENSE="GPL-2 VIGRA"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
IUSE="debug doc gpu image-cache openmp"
REQUIRED_USE="openmp? ( !image-cache )"
diff --git a/media-gfx/enblend/enblend-4.1.3-r2.ebuild b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
index c1eb5442bbc4..296bc122df57 100644
--- a/media-gfx/enblend/enblend-4.1.3-r2.ebuild
+++ b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
LICENSE="GPL-2 VIGRA"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="debug doc gpu openmp"
RDEPEND="
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
index ae3bfd0176c1..b98dd3a34295 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
LICENSE="GPL-2 VIGRA"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
IUSE="debug doc openmp tcmalloc cpu_flags_x86_sse2"
REQUIRED_USE="tcmalloc? ( !debug )"
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.6-r1.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.6-r1.ebuild
index a0b0057c5589..87ff2256e591 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.16.6-r1.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.16.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+exif map picasa +python"
REQUIRED_USE="
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index a9b1bd775e2b..ff807541c73b 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1 +1,2 @@
DIST exiv2-0.26_p20171104.tar.gz 28368697 BLAKE2B 50013cf0bf30a2a476b02d5db4027fca268a4b38733762eb4c08e5f3bdfaf737038e9a62f7ef471fecb10250d8ae686ef683f9b0ea4ccc5d109440ba534371e4 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474
+DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
similarity index 90%
rename from media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild
rename to media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
index 7553fc67ec9a..09c446bf32e6 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20171104-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
@@ -9,11 +9,11 @@ if [[ ${PV} = *9999 ]]; then
EGIT_BRANCH="0.26"
GIT_ECLASS=git-r3
else
- COMMIT=900d2417dbeb46e14cbf65fc2798ed1d043ab76d
+ COMMIT=876b1314ab892cbfa6672b6b94adbeb90db4211f
SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
fi
-inherit cmake-multilib python-any-r1 vcs-snapshot
+inherit cmake-multilib python-any-r1
DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
HOMEPAGE="http://www.exiv2.org/"
@@ -45,11 +45,15 @@ DEPEND="${RDEPEND}
DOCS=( README doc/ChangeLog doc/cmd.txt )
+S="${WORKDIR}/${PN^}-${PN}-${COMMIT:0:7}"
+
PATCHES=(
+ # master, pending backports for 0.26
+ "${FILESDIR}"/${P}-CVE-2018-4868.patch
+ "${FILESDIR}"/${P}-CVE-2017-18005.patch
# TODO: Take to upstream
"${FILESDIR}"/${PN}-0.26-fix-docs.patch
"${FILESDIR}"/${PN}-0.26-tools-optional.patch
- "${FILESDIR}"/${PN}-0.26-pentaxnikon-crash.patch
)
pkg_setup() {
@@ -87,6 +91,8 @@ src_prepare() {
doxygen &>/dev/null -u config/Doxyfile || die
fi
+ edos2unix samples/exiv2json.cpp # workaround for CVE-2017-18005 patch
+
cmake-utils_src_prepare
}
diff --git a/media-gfx/exiv2/files/exiv2-0.26-pentaxnikon-crash.patch b/media-gfx/exiv2/files/exiv2-0.26-pentaxnikon-crash.patch
deleted file mode 100644
index a66af8d5dc96..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.26-pentaxnikon-crash.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 2dc166b04ca6152d01bff6627a332e89ddef24d1 Mon Sep 17 00:00:00 2001
-From: clanmills
-Date: Tue, 12 Sep 2017 09:14:42 +0100
-Subject: [PATCH 1/2] Fix http://dev.exiv2.org/issues/1305
-
----
- src/pentaxmn.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
-index 4fc38be0..b22cb43b 100644
---- a/src/pentaxmn.cpp
-+++ b/src/pentaxmn.cpp
-@@ -1167,6 +1167,8 @@ namespace Exiv2 {
-
- std::ostream& PentaxMakerNote::printShutterCount(std::ostream& os, const Value& value, const ExifData* metadata)
- {
-+ if ( ! metadata ) return os << "undefined" ;
-+
- ExifData::const_iterator dateIt = metadata->findKey(
- ExifKey("Exif.PentaxDng.Date"));
- if (dateIt == metadata->end()) {
---
-2.13.6
-
-
-From 3bc0b91bcecefdad531129b1a934be1251021c95 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?M=C4=81ris=20Narti=C5=A1s?=
-Date: Mon, 18 Sep 2017 23:37:40 +0300
-Subject: [PATCH 2/2] Fix crash on undefined metadata on some Nikon images.
- Identical to commit:5405d61623e82896e498c5c8342dd6f42e689115
-
----
- src/nikonmn.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
-index 571ab806..34bf601c 100644
---- a/src/nikonmn.cpp
-+++ b/src/nikonmn.cpp
-@@ -299,6 +299,8 @@ namespace Exiv2 {
- const Value& value,
- const ExifData* exifData)
- {
-+ if ( ! exifData ) return os << "undefined" ;
-+
- if ( value.count() >= 9 ) {
- ByteOrder bo = getKeyString("Exif.MakerNote.ByteOrder",exifData) == "MM" ? bigEndian : littleEndian;
- byte p[4];
---
-2.13.6
-
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2017-18005.patch b/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2017-18005.patch
new file mode 100644
index 000000000000..d74ca59e3c01
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2017-18005.patch
@@ -0,0 +1,484 @@
+From 8e31dd8c14fdc83f387f35dda7b1b70fbdbd70db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?=
+Date: Tue, 19 Dec 2017 19:52:41 +0100
+Subject: [PATCH 3/8] Only print items (Params::prValue) when size > 0
+
+---
+ src/actions.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/actions.cpp b/src/actions.cpp
+index 9f850097..3963cb67 100644
+--- a/src/actions.cpp
++++ b/src/actions.cpp
+@@ -713,8 +713,9 @@ namespace Action {
+ << std::setfill(' ') << std::right
+ << md.size();
+ }
+- if (Params::instance().printItems_ & Params::prValue) {
+- if (!first) std::cout << " ";
++ if (Params::instance().printItems_ & Params::prValue && md.size() > 0) {
++ if (!first)
++ std::cout << " ";
+ first = false;
+ if ( Params::instance().binary_
+ && ( md.typeId() == Exiv2::undefined
+--
+2.17.0
+
+
+From 463485e5c1cc716108880f75b9c573715bf402b1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?=
+Date: Tue, 19 Dec 2017 19:54:17 +0100
+Subject: [PATCH 4/8] Move condition in if statement to discard work earlier
+
+---
+ src/actions.cpp | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/actions.cpp b/src/actions.cpp
+index 3963cb67..f51cb488 100644
+--- a/src/actions.cpp
++++ b/src/actions.cpp
+@@ -717,11 +717,10 @@ namespace Action {
+ if (!first)
+ std::cout << " ";
+ first = false;
+- if ( Params::instance().binary_
+- && ( md.typeId() == Exiv2::undefined
++ if (md.size() > 128 && Params::instance().binary_ && (
++ md.typeId() == Exiv2::undefined
+ || md.typeId() == Exiv2::unsignedByte
+- || md.typeId() == Exiv2::signedByte)
+- && md.size() > 128) {
++ || md.typeId() == Exiv2::signedByte)) {
+ std::cout << _("(Binary value suppressed)") << std::endl;
+ return true;
+ }
+--
+2.17.0
+
+
+From 7fe7501c01e5d1eec16a736062dd0c34d6408833 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?=
+Date: Tue, 19 Dec 2017 19:55:50 +0100
+Subject: [PATCH 5/8] Apply clang-format to Print::printMetadatum
+
+---
+ src/actions.cpp | 110 ++++++++++++++++++++++++------------------------
+ 1 file changed, 55 insertions(+), 55 deletions(-)
+
+diff --git a/src/actions.cpp b/src/actions.cpp
+index f51cb488..b31d6ec6 100644
+--- a/src/actions.cpp
++++ b/src/actions.cpp
+@@ -636,91 +636,90 @@ namespace Action {
+
+ bool Print::printMetadatum(const Exiv2::Metadatum& md, const Exiv2::Image* pImage)
+ {
+- if (!grepTag(md.key())) return false;
+- if (!keyTag (md.key())) return false;
++ if (!grepTag(md.key()))
++ return false;
++ if (!keyTag(md.key()))
++ return false;
+
+- if ( Params::instance().unknown_
+- && md.tagName().substr(0, 2) == "0x") {
++ if (Params::instance().unknown_ && md.tagName().substr(0, 2) == "0x") {
+ return false;
+ }
++
+ bool const manyFiles = Params::instance().files_.size() > 1;
+ if (manyFiles) {
+- std::cout << std::setfill(' ') << std::left << std::setw(20)
+- << path_ << " ";
++ std::cout << std::setfill(' ') << std::left << std::setw(20) << path_ << " ";
+ }
++
+ bool first = true;
+ if (Params::instance().printItems_ & Params::prTag) {
+- if (!first) std::cout << " ";
++ if (!first)
++ std::cout << " ";
+ first = false;
+- std::cout << "0x" << std::setw(4) << std::setfill('0')
+- << std::right << std::hex
+- << md.tag();
++ std::cout << "0x" << std::setw(4) << std::setfill('0') << std::right << std::hex << md.tag();
+ }
+ if (Params::instance().printItems_ & Params::prSet) {
+- if (!first) std::cout << " ";
++ if (!first)
++ std::cout << " ";
+ first = false;
+- std::cout << "set" ;
++ std::cout << "set";
+ }
+ if (Params::instance().printItems_ & Params::prGroup) {
+- if (!first) std::cout << " ";
++ if (!first)
++ std::cout << " ";
+ first = false;
+- std::cout << std::setw(12) << std::setfill(' ') << std::left
+- << md.groupName();
++ std::cout << std::setw(12) << std::setfill(' ') << std::left << md.groupName();
+ }
+ if (Params::instance().printItems_ & Params::prKey) {
+- if (!first) std::cout << " ";
++ if (!first)
++ std::cout << " ";
+ first = false;
+- std::cout << std::setfill(' ') << std::left << std::setw(44)
+- << md.key();
++ std::cout << std::setfill(' ') << std::left << std::setw(44) << md.key();
+ }
+ if (Params::instance().printItems_ & Params::prName) {
+- if (!first) std::cout << " ";
++ if (!first)
++ std::cout << " ";
+ first = false;
+- std::cout << std::setw(27) << std::setfill(' ') << std::left
+- << md.tagName();
++ std::cout << std::setw(27) << std::setfill(' ') << std::left << md.tagName();
+ }
+ if (Params::instance().printItems_ & Params::prLabel) {
+- if (!first) std::cout << " ";
++ if (!first)
++ std::cout << " ";
+ first = false;
+- std::cout << std::setw(30) << std::setfill(' ') << std::left
+- << md.tagLabel();
++ std::cout << std::setw(30) << std::setfill(' ') << std::left << md.tagLabel();
+ }
+ if (Params::instance().printItems_ & Params::prType) {
+- if (!first) std::cout << " ";
++ if (!first)
++ std::cout << " ";
+ first = false;
+ std::cout << std::setw(9) << std::setfill(' ') << std::left;
+ const char* tn = md.typeName();
+ if (tn) {
+ std::cout << tn;
+- }
+- else {
++ } else {
+ std::ostringstream os;
+ os << "0x" << std::setw(4) << std::setfill('0') << std::hex << md.typeId();
+ std::cout << os.str();
+ }
+ }
+ if (Params::instance().printItems_ & Params::prCount) {
+- if (!first) std::cout << " ";
++ if (!first)
++ std::cout << " ";
+ first = false;
+- std::cout << std::dec << std::setw(3)
+- << std::setfill(' ') << std::right
+- << md.count();
++ std::cout << std::dec << std::setw(3) << std::setfill(' ') << std::right << md.count();
+ }
+ if (Params::instance().printItems_ & Params::prSize) {
+- if (!first) std::cout << " ";
++ if (!first)
++ std::cout << " ";
+ first = false;
+- std::cout << std::dec << std::setw(3)
+- << std::setfill(' ') << std::right
+- << md.size();
++ std::cout << std::dec << std::setw(3) << std::setfill(' ') << std::right << md.size();
+ }
+ if (Params::instance().printItems_ & Params::prValue && md.size() > 0) {
+ if (!first)
+ std::cout << " ";
+ first = false;
+- if (md.size() > 128 && Params::instance().binary_ && (
+- md.typeId() == Exiv2::undefined
+- || md.typeId() == Exiv2::unsignedByte
+- || md.typeId() == Exiv2::signedByte)) {
++ if (md.size() > 128 && Params::instance().binary_ &&
++ (md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte ||
++ md.typeId() == Exiv2::signedByte)) {
+ std::cout << _("(Binary value suppressed)") << std::endl;
+ return true;
+ }
+@@ -738,22 +737,22 @@ namespace Action {
+ }
+ if (!done) {
+ // #1114 - show negative values for SByte
+- if (md.typeId() != Exiv2::signedByte){
++ if (md.typeId() != Exiv2::signedByte) {
+ std::cout << std::dec << md.value();
+ } else {
+ int value = md.value().toLong();
+- std::cout << std::dec << (value<128?value:value-256);
++ std::cout << std::dec << (value < 128 ? value : value - 256);
+ }
+ }
+ }
+ if (Params::instance().printItems_ & Params::prTrans) {
+- if (!first) std::cout << " ";
++ if (!first)
++ std::cout << " ";
+ first = false;
+- if ( Params::instance().binary_
+- && ( md.typeId() == Exiv2::undefined
+- || md.typeId() == Exiv2::unsignedByte
+- || md.typeId() == Exiv2::signedByte)
+- && md.size() > 128) {
++ if (Params::instance().binary_ &&
++ (md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte ||
++ md.typeId() == Exiv2::signedByte) &&
++ md.size() > 128) {
+ std::cout << _("(Binary value suppressed)") << std::endl;
+ return true;
+ }
+@@ -765,16 +764,17 @@ namespace Action {
+ done = true;
+ }
+ }
+- if (!done) std::cout << std::dec << md.print(&pImage->exifData());
++ if (!done)
++ std::cout << std::dec << md.print(&pImage->exifData());
+ }
+ if (Params::instance().printItems_ & Params::prHex) {
+- if (!first) std::cout << std::endl;
++ if (!first)
++ std::cout << std::endl;
+ first = false;
+- if ( Params::instance().binary_
+- && ( md.typeId() == Exiv2::undefined
+- || md.typeId() == Exiv2::unsignedByte
+- || md.typeId() == Exiv2::signedByte)
+- && md.size() > 128) {
++ if (Params::instance().binary_ &&
++ (md.typeId() == Exiv2::undefined || md.typeId() == Exiv2::unsignedByte ||
++ md.typeId() == Exiv2::signedByte) &&
++ md.size() > 128) {
+ std::cout << _("(Binary value suppressed)") << std::endl;
+ return true;
+ }
+@@ -784,7 +784,7 @@ namespace Action {
+ }
+ std::cout << std::endl;
+ return true;
+- } // Print::printMetadatum
++ } // Print::printMetadatum
+
+ int Print::printComment()
+ {
+--
+2.17.0
+
+
+From 78ddc7a92afaaf58b78d5c49b5c2ad7b60a4e25f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?=
+Date: Thu, 21 Dec 2017 16:39:43 +0100
+Subject: [PATCH 6/8] Do not deference value when it does not exist (Thanks
+ D4N)
+
+---
+ samples/exiv2json.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
+index 505268d9..a81268f0 100644
+--- a/samples/exiv2json.cpp
++++ b/samples/exiv2json.cpp
+@@ -148,6 +148,11 @@ bool isArray(std::string& value)
+ template
+ void push(Jzon::Node& node,const std::string& key,T i)
+ {
++#define ABORT_IF_I_EMTPY \
++ if (i->value().size() == 0) { \
++ return; \
++ }
++
+ std::string value = i->value().toString();
+
+ switch ( i->typeId() ) {
+@@ -179,6 +184,7 @@ void push(Jzon::Node& node,const std::string& key,T i)
+
+ case Exiv2::unsignedRational:
+ case Exiv2::signedRational: {
++ ABORT_IF_I_EMTPY
+ Jzon::Array arr;
+ Exiv2::Rational rat = i->value().toRational();
+ arr.Add(rat.first );
+@@ -187,6 +193,7 @@ void push(Jzon::Node& node,const std::string& key,T i)
+ } break;
+
+ case Exiv2::langAlt: {
++ ABORT_IF_I_EMTPY
+ Jzon::Object l ;
+ const Exiv2::LangAltValue& langs = dynamic_cast(i->value());
+ for ( Exiv2::LangAltValue::ValueType::const_iterator lang = langs.value_.begin()
+--
+2.17.0
+
+
+From 871e6e3ced1cdec7e43bf8cb94e269a7f5c09d92 Mon Sep 17 00:00:00 2001
+From: Robin Mills
+Date: Thu, 15 Mar 2018 10:43:18 +0000
+Subject: [PATCH 8/8] Fix for getopt(), #199. Use src/getopt_win32 code instead
+ of libc/getopt()
+
+---
+ config/config.mk.in | 2 +-
+ src/CMakeLists.txt | 6 ++----
+ src/Makefile | 13 +++++--------
+ src/getopt_win32.c | 9 +++++++++
+ src/getopt_win32.h | 7 +++++++
+ src/utils.cpp | 9 +++------
+ 6 files changed, 27 insertions(+), 19 deletions(-)
+
+diff --git a/config/config.mk.in b/config/config.mk.in
+index 8d920647..4754c722 100644
+--- a/config/config.mk.in
++++ b/config/config.mk.in
+@@ -165,7 +165,7 @@ endif
+ # **********************************************************************
+ # Compilation shortcuts
+ COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
+-COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c
++COMPILE.c = $(CC) $(CFLAGS) -c
+ # LINK.cc does not need $(LIBS), libtool's dark magic takes care of that
+ # when linking a binary with a libtool library.
+ LINK.cc = $(CXX) $(LDFLAGS)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d4dc6375..dceee236 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -218,10 +218,8 @@ IF(NOT HAVE_TIMEGM )
+ SET( PATHTEST_SRC ${PATHTEST_SRC} localtime.c )
+ ENDIF( NOT HAVE_TIMEGM )
+
+-IF( MSVC )
+- SET( EXIV2_SRC ${EXIV2_SRC} getopt_win32.c )
+- SET( LIBEXIV2_SRC ${LIBEXIV2_SRC} getopt_win32.c )
+-ENDIF( MSVC )
++SET( EXIV2_SRC ${EXIV2_SRC} getopt_win32.c )
++SET( LIBEXIV2_SRC ${LIBEXIV2_SRC} getopt_win32.c )
+
+ ##
+ # msvn tuning
+diff --git a/src/Makefile b/src/Makefile
+index 8a8366fe..d046e331 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -131,8 +131,7 @@ CCSRC += asfvideo.cpp \
+ utilsvideo.cpp
+ endif
+
+-# Add library C source files to this list
+-EXIVCSRC =
++# C source files
+ ifndef HAVE_TIMEGM
+ CSRC = localtime.c
+ endif
+@@ -141,9 +140,7 @@ endif
+ EXIV2MAIN = exiv2.cpp
+ EXIV2SRC = actions.cpp \
+ utils.cpp
+-
+-# C source files for the Exiv2 application
+-EXIVCSRC =
++EXIVCSRC = getopt_win32.c
+
+ # ******************************************************************************
+ # Library
+@@ -176,7 +173,7 @@ OBJ = $(CCOBJ) $(COBJ)
+ LOBJ = $(CCLOBJ) $(CLOBJ)
+
+ EXIV2OBJ = $(EXIV2MAIN:.cpp=.o) $(EXIV2SRC:.cpp=.o)
+-EXIV2COBJ = $(EXIVCSRC:.c=.o)
++EXIVCOBJ = $(EXIVCSRC:.c=.o)
+ EXIV2EXE = $(EXIV2MAIN:.cpp=$(EXEEXT))
+
+ ifdef DEP_TRACKING
+@@ -251,9 +248,9 @@ lib: $(OBJ)
+ $(BINARY): %: %.o lib
+ @$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $@.o -rpath $(libdir)
+
+-$(EXIV2EXE): lib $(EXIV2OBJ) $(EXIV2COBJ)
++$(EXIV2EXE): lib $(EXIV2OBJ) $(EXIVCOBJ)
+ mkdir -pv ../bin 2>&1 > /dev/null
+- @$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir)
++ @$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIV2OBJ) $(EXIVCOBJ) -rpath $(libdir)
+
+ install-header:
+ $(INSTALL_DIRS) $(DESTDIR)$(incdir)
+diff --git a/src/getopt_win32.c b/src/getopt_win32.c
+index fca29924..18dfcfbf 100644
+--- a/src/getopt_win32.c
++++ b/src/getopt_win32.c
+@@ -194,6 +194,10 @@ permute_args(panonopt_start, panonopt_end, opt_end, nargv)
+ }
+ }
+
++#ifdef __GETOPT_DEFINE_ARGV__
++char * const *__argv;
++#endif
++
+ /*
+ * getopt_internal --
+ * Parse argc/argv argument vector. Called by user level routines.
+@@ -205,6 +209,11 @@ getopt_internal(nargc, nargv, options)
+ char * const *nargv;
+ const char *options;
+ {
++
++#ifdef __GETOPT_DEFINE_ARGV__
++ __argv=nargv;
++#endif
++
+ char *oli; /* option letter list index */
+ int optchar;
+
+diff --git a/src/getopt_win32.h b/src/getopt_win32.h
+index 6b6f643b..cd5760a3 100644
+--- a/src/getopt_win32.h
++++ b/src/getopt_win32.h
+@@ -38,6 +38,13 @@
+ extern "C" {
+ #endif
+
++#if !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__MINGW__) && !defined(_MSC_VER)
++// the symbol __argv (and __argc and __progname and __env) are defined in Windows environments
++// for *ix environments, __argv is declared here, defined: getopt_win32.c, init'd: getopt_internal()
++#define __GETOPT_DEFINE_ARGV__
++extern char * const *__argv;
++#endif
++
+ extern int opterr; /* if error message should be printed */
+ extern int optind; /* index into parent argv vector */
+ extern int optopt; /* character checked for validity */
+diff --git a/src/utils.cpp b/src/utils.cpp
+index a3d36497..2a092330 100644
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -32,18 +32,15 @@ EXIV2_RCSID("@(#) $Id$")
+ #include "config.h"
+
+ #include "utils.hpp"
+-
+-// + standard includes
+-#if defined(_MSC_VER) || defined(__MINGW__)
+-# include "getopt_win32.h"
+-#endif
++#include "getopt_win32.h"
+
+ #if defined(_MSC_VER)
+ # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+ #endif
+
++// + standard includes
+ #ifdef EXV_HAVE_UNISTD_H
+-# include // for getopt(), stat()
++# include // for stat()
+ #endif
+
+ #include
+--
+2.17.0
+
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2018-4868.patch b/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2018-4868.patch
new file mode 100644
index 000000000000..a594a2bfad13
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26_p20180319-CVE-2018-4868.patch
@@ -0,0 +1,39 @@
+From ce4f575e106697c0e513091e95a7cd12ed6a488b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?=
+Date: Tue, 9 Jan 2018 21:18:36 +0100
+Subject: [PATCH 1/8] Add check for DataBuf.size_ in Jp2Image::readMetadata()
+
+When parsing a subBox that is a ColorHeader, a length is extracted
+from the input file and fed directly into DataBuf() (which calls
+malloc). A crafted input file can provide arbitrarily (up to
+max(uint32_t)-8) large values and result in excessive memory
+allocation.
+
+This commit adds a check for the new size of DataBuf so that it is not
+larger than the remaining size of the file.
+
+This fixes #202 aka CVE-2018-4868
+---
+ src/jp2image.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/jp2image.cpp b/src/jp2image.cpp
+index a308bfd9..3cebc2a8 100644
+--- a/src/jp2image.cpp
++++ b/src/jp2image.cpp
+@@ -272,7 +272,12 @@ namespace Exiv2
+ #endif
+
+ const long pad = 3 ; // 3 padding bytes 2 0 0
+- DataBuf data(Safe::add(subBox.length, static_cast(8)));
++ const size_t data_length = Safe::add(subBox.length, static_cast(8));
++ // data_length makes no sense if it is larger than the rest of the file
++ if (data_length > io_->size() - io_->tell()) {
++ throw Error(58);
++ }
++ DataBuf data(data_length);
+ io_->read(data.pData_,data.size_);
+ const long iccLength = getULong(data.pData_+pad, bigEndian);
+ // subtracting pad from data.size_ is safe:
+--
+2.17.0
diff --git a/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild b/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
index 3e27e6227774..d802c9d1eb7b 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="flickr test upnp-av"
COMMON_DEPEND="
diff --git a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
index 8353fefc1836..fe1384beeae9 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
IUSE="aalib exif ncurses nls readline"
# aalib -> needs libjpeg
diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
index 9cb3a35ed0e6..e9f942dadcd1 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
# OCR tests fail with tesseract[opencl], not fixed by addpredict
# and others on Wayland and the console
diff --git a/media-gfx/hugin/hugin-2016.2.0.ebuild b/media-gfx/hugin/hugin-2016.2.0.ebuild
index a679e5c2f833..6d66c2d74197 100644
--- a/media-gfx/hugin/hugin-2016.2.0.ebuild
+++ b/media-gfx/hugin/hugin-2016.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/hugin/hugin-2017.0.ebuild b/media-gfx/hugin/hugin-2017.0.ebuild
index 36ab6ab525ab..649cba97977b 100644
--- a/media-gfx/hugin/hugin-2017.0.ebuild
+++ b/media-gfx/hugin/hugin-2017.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/hugin/hugin-2018.0.0.ebuild b/media-gfx/hugin/hugin-2018.0.0.ebuild
index 33d44b9ffacf..c3812f206d18 100644
--- a/media-gfx/hugin/hugin-2018.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2018.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.bz2"
LICENSE="GPL-2 SIFT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
IUSE="debug lapack python sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
index 4fc8137e398b..355f6dfdfe7b 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.40.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
index f4f497ecbcb8..8a75621e7d1a 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/pngquant/pngquant-2.11.4.ebuild b/media-gfx/pngquant/pngquant-2.11.4.ebuild
index fb15ab76cb4f..5497e70ac515 100644
--- a/media-gfx/pngquant/pngquant-2.11.4.ebuild
+++ b/media-gfx/pngquant/pngquant-2.11.4.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,8 +6,8 @@ EAPI=6
inherit toolchain-funcs
DESCRIPTION="command-line utility and library for lossy compression of PNG images"
-HOMEPAGE="http://pngquant.org/"
-SRC_URI="http://pngquant.org/${P}-src.tar.gz"
+HOMEPAGE="https://pngquant.org/"
+SRC_URI="https://pngquant.org/${P}-src.tar.gz"
LICENSE="GPL-3 HPND rwpng"
SLOT="0"
diff --git a/media-gfx/pngquant/pngquant-2.11.7.ebuild b/media-gfx/pngquant/pngquant-2.11.7.ebuild
index 2da09ac80e2e..5497e70ac515 100644
--- a/media-gfx/pngquant/pngquant-2.11.7.ebuild
+++ b/media-gfx/pngquant/pngquant-2.11.7.ebuild
@@ -6,8 +6,8 @@ EAPI=6
inherit toolchain-funcs
DESCRIPTION="command-line utility and library for lossy compression of PNG images"
-HOMEPAGE="http://pngquant.org/"
-SRC_URI="http://pngquant.org/${P}-src.tar.gz"
+HOMEPAGE="https://pngquant.org/"
+SRC_URI="https://pngquant.org/${P}-src.tar.gz"
LICENSE="GPL-3 HPND rwpng"
SLOT="0"
diff --git a/media-gfx/qrencode/qrencode-4.0.0.ebuild b/media-gfx/qrencode/qrencode-4.0.0.ebuild
index 313a44bd4d01..e176ad0e92fc 100644
--- a/media-gfx/qrencode/qrencode-4.0.0.ebuild
+++ b/media-gfx/qrencode/qrencode-4.0.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="test"
RDEPEND="media-libs/libpng:0="
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
index 72982170d550..76ad3f8ec0e5 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
@@ -122,7 +122,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
RDEPEND="
sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 1c8a006a4081..9469154b739c 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,14 +1,3 @@
-DIST shotwell-0.24.6.tar.xz 5401300 BLAKE2B 99d013c0703fe15ff3ab99767528f50c4c9a5eef186329bef889f66aff2f654a9e75a3659b2cde87896edf8784d7d6cc4972b1403e55fbac36bc008f21c9d0c7 SHA512 48f4595950700b3d193b7d73d4ff45abda1544de66c6252fcf98e94e58f284a0491b08d11045a96b8581f3370d759346739d3da1ef85311717908c33ab1c25c6
-DIST shotwell-0.25.0.1.tar.xz 5398404 BLAKE2B 8e40b80369b04db44cc1fd6b13703b4d230f82f7367df625491d9e3741f11302317dc09363008d58fec47c2d95dfbc72952ceb78490cd7ae0dbb8994624c00da SHA512 6a071b0b7d84bf78727b84e0ba707d6d7f5408a0b942962771b24a79381c102c58c06b4895eba69527215103279946f4e33b14410a1ce6dd58d3dba3870975df
-DIST shotwell-0.26.0.tar.xz 5583732 BLAKE2B db258833af0803c763e1ebcb71ea34a26cc92c9b43d2372c55d66706b2a1a92b8652d18a8aa56ffa615c132dfc1223912391a7c7a89765a027ebef4918e98704 SHA512 fd25bd24593360ae3d1f4cf5960d8ff2023f965e5d3bb70b80801a4c23103b570ae856e243c08e486b428c746b6f82bf3c3982a21689e72be7d2dfc3aec16ccf
-DIST shotwell-0.26.1.tar.xz 5593092 BLAKE2B 975872593e726922da721700e8ecb664cbc43afcb5d689cf1001046b314457df5db16241b3b788571dc5566ed903108b1354cf4c335354e0045fc59fdb954fbf SHA512 82cc95b3b173fbcd3cbb4f5d42f24fcb951b34039af1fdbd062d3f334aa2c305640833a7279cb79e02f0334da8b3a85cd8aadff45a80161ab0d2fbcd14278cd1
-DIST shotwell-0.26.2.tar.xz 5575388 BLAKE2B 7a3b63d73d614e2aa85fe00710cceedd25c3545be57419ab40ec6532d2eed2f64fadf774bacbeb70b21099baa3d4511763acbd25acde2ce2a46768986bfe8ff7 SHA512 a38681cb1b192372381d67abdc6c088c80fcc1db0d8d328330ee8f1ab78608c742de5e33030ccb1b941f1583a2b7028caadf61ce10ba7f2a93863bd2c3019813
-DIST shotwell-0.26.3.tar.xz 5581204 BLAKE2B 1b28be1bef1b5b9305020d92bca8b535b7a4f2bdbb5d2815e2679e20c6ae7944db2cfc971f8532eaa68a145f735d1b841c7d7a71d2f14d03fde3619db99e2068 SHA512 8d54ffec947b81517840f4f9d223edb6673e6ef66c6cc4333c2353b7c197c0630c10fbf7ae5d3ff5963322f19e5b7adfd6aac5e391262c6edb3b22a01de9a18f
DIST shotwell-0.26.4.tar.xz 5619280 BLAKE2B 0ca9ecf6e96019aa8e9bd4bae09d1b888902fc054633271854e09e1fa9b474774b7b5f2e6e3bcfed60a5b0f3ba30a2d89133d2676a94db5f4da6ee6a0af41102 SHA512 6a0772a40759d636807652ef27814306cbc2217119b071590db36c628b6e9d04f876ae1748c88476fbebc1db0c83e6a108c9f74261b7faa348c6bd37c1da198d
-DIST shotwell-0.27.0.tar.xz 5574988 BLAKE2B 30ab9ebe5fa12f8d7be3775d044b983c644b1b88e6ca4a69522db0c3859f55846b785761ced8e1af8da8c4ec72c4b46925c6a77dd2f995936c12638913856c2c SHA512 e7b5fe153fff96e04507588b4b8a1e71c121787cb6d28b7e14bb31824f1a09ca1948edc4bccfa069b2ffebe1ac753580257c1af4b7aec0ed49af74944ee91fbb
-DIST shotwell-0.27.1.tar.xz 5619824 BLAKE2B 7ba1606b1604ca156aacd71d014bdec507abd2a5447696b60ce4400cf835dd484b39e737ec7659a8744e0a5f72b9e9a561fb297db6f256db7008ca5e4b2ae0d8 SHA512 b26c25b45af305903cf0698e65d5230820dda447b70175c92a66e25148e47d620847b3fa2b3bdb8d70656186d5b30d98edf3eee4138f07db9f8260e81a95a7d6
-DIST shotwell-0.27.2.tar.xz 5619692 BLAKE2B 0a532d6d2f7391f0783cb0fb91fbc15a681e87041d12355ca75581d4b7f4ebe7fe3feeaca7fc12b0fd82710bf2d906c1d3abd382b61a5dfac3041cec482edd38 SHA512 a64fec52ff1ba3bca0e4b07be557ea3b838845998ae64ac7504cd9a8c976380cf0d7aae4aaccf931f1f40b5d247e081ec98472da8e8835363779dd39d9d2f69b
-DIST shotwell-0.27.3.tar.xz 5623408 BLAKE2B 582c0b4bb0636dda4aab7e0a8ca69098b1af455d8c393bd8b5d37337cc85ae38036c6020eb54eeb9fc21f2fe603631305965351bb20f8824b50b5606829a7a47 SHA512 204fd348493f25fd855955735f575da9b6de7209f27e677670b5c016cb668558a6909b71e0b1a50fcda47e29a8ac9edc40619dfff2117f637ffebfe022e12275
-DIST shotwell-0.27.4.tar.xz 5626284 BLAKE2B 2f17546c190dbd04bdf467e12a092c2558ec5bbac1e13a3054c746c391876a1ac4eeddbb4578a575cd0b73f402432ea3763fd90e214a2b0f11a6f281a77a8bac SHA512 9f67893018a750199b51ac42e357c850195a356db8fdb5b1f8836375e01291d716f82257b2b030aa41e9ead59227b442fd38239fad5b5f46bf2701ec968e383f
DIST shotwell-0.28.2.tar.xz 5582276 BLAKE2B 20d35f714543d35bd04fe81617040419664e662664ae504cbfb0b3bb160d97a5469478e1e134b6432b174fc19bb4fc370b5eb38c576c805e876d00999fb7d979 SHA512 dc00f45e55eabadaaf825de5a4152d40db2eb652f966b870a08d36006887a18aacf570b05d232a9fc7ef7df097a468a497778022bf7b86ae2143877c02540cc0
DIST shotwell-0.29.1.tar.xz 2368080 BLAKE2B b706229803528c55486219a4190d1145d98b513ff26a4a3d2989abd57ff3465ffab231b1779014b7babf7ce33cc875fa11905a95bbf108251c57d3692a5156a4 SHA512 25e7e7d303ecbe89ecf4eba219b6f10ad44d23209d2c2724c6d61afae47afc0a6e1a7a7fe99931888f7374419818c5d74e28bb6120383e191c038c967c84ce39
diff --git a/media-gfx/shotwell/shotwell-0.24.6.ebuild b/media-gfx/shotwell/shotwell-0.24.6.ebuild
deleted file mode 100644
index 46c72d688c80..000000000000
--- a/media-gfx/shotwell/shotwell-0.24.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
- >=dev-db/sqlite-3.5.9:3
- >=dev-libs/glib-2.30.0:2
- >=dev-libs/json-glib-0.7.6
- >=dev-libs/libgee-0.8.5:0.8
- >=dev-libs/libxml2-2.6.32:2
- gnome-base/dconf
- >=media-libs/gexiv2-0.4.90
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0
- media-libs/lcms:2
- >=media-libs/libexif-0.6.16:=
- >=media-libs/libgphoto2-2.5:=
- >=media-libs/libraw-0.13.2:=
- media-plugins/gst-plugins-gdkpixbuf:1.0
- >=net-libs/libsoup-2.26.0:2.4
- net-libs/webkit-gtk:4
- virtual/libgudev:=[introspection]
- >=x11-libs/gtk+-3.12.2:3[X]
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- >=sys-devel/gettext-0.19.7
- >=sys-devel/m4-1.4.13
- virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.25.0.1.ebuild b/media-gfx/shotwell/shotwell-0.25.0.1.ebuild
deleted file mode 100644
index c3827990765f..000000000000
--- a/media-gfx/shotwell/shotwell-0.25.0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
- >=app-crypt/gcr-3[gtk]
- >=dev-db/sqlite-3.5.9:3
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/json-glib-0.7.6
- >=dev-libs/libgee-0.8.5:0.8
- >=dev-libs/libxml2-2.6.32:2
- gnome-base/dconf
- >=media-libs/gexiv2-0.10.4
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0
- media-libs/lcms:2
- >=media-libs/libexif-0.6.16:=
- >=media-libs/libgphoto2-2.5:=
- >=media-libs/libraw-0.13.2:=
- media-plugins/gst-plugins-gdkpixbuf:1.0
- >=net-libs/libsoup-2.42.0:2.4
- net-libs/webkit-gtk:4
- virtual/libgudev:=[introspection]
- >=x11-libs/gtk+-3.14.0:3[X]
-
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- >=sys-devel/gettext-0.19.7
- >=sys-devel/m4-1.4.13
- virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.26.0.ebuild b/media-gfx/shotwell/shotwell-0.26.0.ebuild
deleted file mode 100644
index 5d5a82fa7382..000000000000
--- a/media-gfx/shotwell/shotwell-0.26.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
- >=app-crypt/gcr-3[gtk]
- >=dev-db/sqlite-3.5.9:3
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/json-glib-0.7.6
- >=dev-libs/libgee-0.8.5:0.8
- >=dev-libs/libxml2-2.6.32:2
- gnome-base/dconf
- >=media-libs/gexiv2-0.10.4
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0
- media-libs/lcms:2
- >=media-libs/libexif-0.6.16:=
- >=media-libs/libgphoto2-2.5:=
- >=media-libs/libraw-0.13.2:=
- media-plugins/gst-plugins-gdkpixbuf:1.0
- >=net-libs/libsoup-2.42.0:2.4
- net-libs/webkit-gtk:4
- virtual/libgudev:=[introspection]
- >=x11-libs/gtk+-3.14.0:3[X]
-
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- >=sys-devel/gettext-0.19.7
- >=sys-devel/m4-1.4.13
- virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.26.1.ebuild b/media-gfx/shotwell/shotwell-0.26.1.ebuild
deleted file mode 100644
index 5d5a82fa7382..000000000000
--- a/media-gfx/shotwell/shotwell-0.26.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
- >=app-crypt/gcr-3[gtk]
- >=dev-db/sqlite-3.5.9:3
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/json-glib-0.7.6
- >=dev-libs/libgee-0.8.5:0.8
- >=dev-libs/libxml2-2.6.32:2
- gnome-base/dconf
- >=media-libs/gexiv2-0.10.4
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0
- media-libs/lcms:2
- >=media-libs/libexif-0.6.16:=
- >=media-libs/libgphoto2-2.5:=
- >=media-libs/libraw-0.13.2:=
- media-plugins/gst-plugins-gdkpixbuf:1.0
- >=net-libs/libsoup-2.42.0:2.4
- net-libs/webkit-gtk:4
- virtual/libgudev:=[introspection]
- >=x11-libs/gtk+-3.14.0:3[X]
-
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- >=sys-devel/gettext-0.19.7
- >=sys-devel/m4-1.4.13
- virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.26.2.ebuild b/media-gfx/shotwell/shotwell-0.26.2.ebuild
deleted file mode 100644
index 0cafa2080fcf..000000000000
--- a/media-gfx/shotwell/shotwell-0.26.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
- >=app-crypt/gcr-3[gtk]
- >=dev-db/sqlite-3.5.9:3
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/json-glib-0.7.6
- >=dev-libs/libgee-0.8.5:0.8
- >=dev-libs/libxml2-2.6.32:2
- gnome-base/dconf
- >=media-libs/gexiv2-0.10.4
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0
- media-libs/lcms:2
- >=media-libs/libexif-0.6.16:=
- >=media-libs/libgphoto2-2.5:=
- >=media-libs/libraw-0.13.2:=
- media-plugins/gst-plugins-gdkpixbuf:1.0
- >=net-libs/libsoup-2.42.0:2.4
- net-libs/webkit-gtk:4
- virtual/libgudev:=[introspection]
- >=x11-libs/gtk+-3.14.0:3[X]
- dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- >=sys-devel/gettext-0.19.7
- >=sys-devel/m4-1.4.13
- virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.26.3.ebuild b/media-gfx/shotwell/shotwell-0.26.3.ebuild
deleted file mode 100644
index 0cafa2080fcf..000000000000
--- a/media-gfx/shotwell/shotwell-0.26.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
- >=app-crypt/gcr-3[gtk]
- >=dev-db/sqlite-3.5.9:3
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/json-glib-0.7.6
- >=dev-libs/libgee-0.8.5:0.8
- >=dev-libs/libxml2-2.6.32:2
- gnome-base/dconf
- >=media-libs/gexiv2-0.10.4
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0
- media-libs/lcms:2
- >=media-libs/libexif-0.6.16:=
- >=media-libs/libgphoto2-2.5:=
- >=media-libs/libraw-0.13.2:=
- media-plugins/gst-plugins-gdkpixbuf:1.0
- >=net-libs/libsoup-2.42.0:2.4
- net-libs/webkit-gtk:4
- virtual/libgudev:=[introspection]
- >=x11-libs/gtk+-3.14.0:3[X]
- dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- >=sys-devel/gettext-0.19.7
- >=sys-devel/m4-1.4.13
- virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.27.0.ebuild b/media-gfx/shotwell/shotwell-0.27.0.ebuild
deleted file mode 100644
index 0cafa2080fcf..000000000000
--- a/media-gfx/shotwell/shotwell-0.27.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
- >=app-crypt/gcr-3[gtk]
- >=dev-db/sqlite-3.5.9:3
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/json-glib-0.7.6
- >=dev-libs/libgee-0.8.5:0.8
- >=dev-libs/libxml2-2.6.32:2
- gnome-base/dconf
- >=media-libs/gexiv2-0.10.4
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0
- media-libs/lcms:2
- >=media-libs/libexif-0.6.16:=
- >=media-libs/libgphoto2-2.5:=
- >=media-libs/libraw-0.13.2:=
- media-plugins/gst-plugins-gdkpixbuf:1.0
- >=net-libs/libsoup-2.42.0:2.4
- net-libs/webkit-gtk:4
- virtual/libgudev:=[introspection]
- >=x11-libs/gtk+-3.14.0:3[X]
- dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- >=sys-devel/gettext-0.19.7
- >=sys-devel/m4-1.4.13
- virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.27.1.ebuild b/media-gfx/shotwell/shotwell-0.27.1.ebuild
deleted file mode 100644
index 0cafa2080fcf..000000000000
--- a/media-gfx/shotwell/shotwell-0.27.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
- >=app-crypt/gcr-3[gtk]
- >=dev-db/sqlite-3.5.9:3
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/json-glib-0.7.6
- >=dev-libs/libgee-0.8.5:0.8
- >=dev-libs/libxml2-2.6.32:2
- gnome-base/dconf
- >=media-libs/gexiv2-0.10.4
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0
- media-libs/lcms:2
- >=media-libs/libexif-0.6.16:=
- >=media-libs/libgphoto2-2.5:=
- >=media-libs/libraw-0.13.2:=
- media-plugins/gst-plugins-gdkpixbuf:1.0
- >=net-libs/libsoup-2.42.0:2.4
- net-libs/webkit-gtk:4
- virtual/libgudev:=[introspection]
- >=x11-libs/gtk+-3.14.0:3[X]
- dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- >=sys-devel/gettext-0.19.7
- >=sys-devel/m4-1.4.13
- virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.27.2.ebuild b/media-gfx/shotwell/shotwell-0.27.2.ebuild
deleted file mode 100644
index 0cafa2080fcf..000000000000
--- a/media-gfx/shotwell/shotwell-0.27.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
- >=app-crypt/gcr-3[gtk]
- >=dev-db/sqlite-3.5.9:3
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/json-glib-0.7.6
- >=dev-libs/libgee-0.8.5:0.8
- >=dev-libs/libxml2-2.6.32:2
- gnome-base/dconf
- >=media-libs/gexiv2-0.10.4
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0
- media-libs/lcms:2
- >=media-libs/libexif-0.6.16:=
- >=media-libs/libgphoto2-2.5:=
- >=media-libs/libraw-0.13.2:=
- media-plugins/gst-plugins-gdkpixbuf:1.0
- >=net-libs/libsoup-2.42.0:2.4
- net-libs/webkit-gtk:4
- virtual/libgudev:=[introspection]
- >=x11-libs/gtk+-3.14.0:3[X]
- dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- >=sys-devel/gettext-0.19.7
- >=sys-devel/m4-1.4.13
- virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.27.3.ebuild b/media-gfx/shotwell/shotwell-0.27.3.ebuild
deleted file mode 100644
index ed1f73414218..000000000000
--- a/media-gfx/shotwell/shotwell-0.27.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
- >=app-crypt/gcr-3[gtk]
- >=dev-db/sqlite-3.5.9:3
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/json-glib-0.7.6
- >=dev-libs/libgee-0.8.5:0.8
- >=dev-libs/libxml2-2.6.32:2
- gnome-base/dconf
- >=media-libs/gexiv2-0.10.4
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0
- media-libs/lcms:2
- >=media-libs/libexif-0.6.16:=
- >=media-libs/libgphoto2-2.5:=
- >=media-libs/libraw-0.13.2:=
- media-plugins/gst-plugins-gdkpixbuf:1.0
- >=net-libs/libsoup-2.42.0:2.4
- net-libs/webkit-gtk:4
- virtual/libgudev:=[introspection]
- >=x11-libs/gtk+-3.14.0:3[X]
- dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- >=sys-devel/gettext-0.19.7
- >=sys-devel/m4-1.4.13
- virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
diff --git a/media-gfx/shotwell/shotwell-0.27.4.ebuild b/media-gfx/shotwell/shotwell-0.27.4.ebuild
deleted file mode 100644
index ed1f73414218..000000000000
--- a/media-gfx/shotwell/shotwell-0.27.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
- >=app-crypt/gcr-3[gtk]
- >=dev-db/sqlite-3.5.9:3
- >=dev-libs/glib-2.40.0:2
- >=dev-libs/json-glib-0.7.6
- >=dev-libs/libgee-0.8.5:0.8
- >=dev-libs/libxml2-2.6.32:2
- gnome-base/dconf
- >=media-libs/gexiv2-0.10.4
- media-libs/gst-plugins-base:1.0
- media-libs/gst-plugins-good:1.0
- media-libs/gstreamer:1.0
- media-libs/lcms:2
- >=media-libs/libexif-0.6.16:=
- >=media-libs/libgphoto2-2.5:=
- >=media-libs/libraw-0.13.2:=
- media-plugins/gst-plugins-gdkpixbuf:1.0
- >=net-libs/libsoup-2.42.0:2.4
- net-libs/webkit-gtk:4
- virtual/libgudev:=[introspection]
- >=x11-libs/gtk+-3.14.0:3[X]
- dev-libs/libgdata
-
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- >=sys-devel/gettext-0.19.7
- >=sys-devel/m4-1.4.13
- virtual/pkgconfig
-"
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ba2d9d6dc9d8..3868220f04b1 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
index 3083ae005de0..10a0f53f039c 100644
--- a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
+++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/bio2jack/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="static-libs"
RDEPEND="media-libs/libsamplerate
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.26.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.26.ebuild
index 96359bc33783..9458d0f7985a 100644
--- a/media-libs/clutter-gst/clutter-gst-3.0.26.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.26.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="GStreamer integration library for Clutter"
LICENSE="LGPL-2.1+"
SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="X debug examples +introspection udev"
# >=cogl-1.18 provides cogl-2.0-experimental
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 4fa091f67693..ba2ddfe1a614 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -3,17 +3,11 @@
EAPI=6
-SCM=
-[[ "${PV}" = 9999 ]] && SCM="autotools git-r3"
-inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs ${SCM}
-unset SCM
-
-INFINALITY_PATCH="03-infinality-2.6.3-2016.03.26.patch"
+inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
DESCRIPTION="A high-quality and portable font engine"
HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz
- infinality png static-libs utils"
+IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
if [[ "${PV}" != 9999 ]] ; then
SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
@@ -23,7 +17,9 @@ if [[ "${PV}" != 9999 ]] ; then
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
- IUSE+="doc"
+ IUSE+=" doc"
+else
+ inherit autotools git-r3
fi
LICENSE="|| ( FTL GPL-2+ )"
@@ -52,33 +48,37 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
)
-src_fetch() {
+_egit_repo_handler() {
if [[ "${PV}" = 9999 ]] ; then
+ local phase="${1}"
+ case ${phase} in
+ fetch|unpack)
+ :;
+ ;;
+ *)
+ die "Please use this function with either \"fetch\" or \"unpack\""
+ ;;
+ esac
+
local EGIT_REPO_URI
EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2.git"
- git-r3_src_fetch
+ git-r3_src_${phase}
if use utils ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
- git-r3_src_fetch
+ local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
+ git-r3_src_${phase}
fi
else
default
fi
}
+src_fetch() {
+ _egit_repo_handler fetch
+}
+
src_unpack() {
- if [[ "${PV}" = 9999 ]] ; then
- local EGIT_REPO_URI
- EGIT_REPO_URI="http://git.savannah.gnu.org/r/freetype/freetype2.git"
- git-r3_src_unpack
- if use utils ; then
- EGIT_REPO_URI="http://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
- local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
- git-r3_src_unpack
- fi
- else
- default
- fi
+ _egit_repo_handler unpack
}
src_prepare() {
@@ -174,8 +174,7 @@ multilib_src_configure() {
LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
)
- ECONF_SOURCE="${S}" \
- econf "${myeconfargs[@]}"
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
multilib_src_compile() {
@@ -199,7 +198,7 @@ multilib_src_install() {
local ft2demo
for ft2demo in ../ft2demos-${PV}/bin/*; do
./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
- "${ED}"/usr/bin || die
+ "${ED%/}"/usr/bin || die
done
fi
}
@@ -211,8 +210,8 @@ multilib_src_install_all() {
local header
find src/truetype include/freetype/internal -name '*.h' | \
while read header; do
- mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
- cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+ mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+ cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
done
fi
@@ -222,5 +221,5 @@ multilib_src_install_all() {
dodoc -r docs/*
fi
- prune_libtool_files --all
+ find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
}
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
index 81bf676d86a2..5ce9689259ef 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
inherit git-r3 autotools
else
SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
fi
LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 43a17a2ac5c5..f67cf6c560ef 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -2,3 +2,4 @@ DIST libepoxy-1.4.1.tar.gz 309759 BLAKE2B 304bbe395ec184d0b29b0ed256917d78a84d81
DIST libepoxy-1.4.2.tar.gz 309973 BLAKE2B 029948aea64db917e782a57c901f537be796b269bcfdc9f4238db4fae41d3d11f68def2288d73a673b7e2a159e7ed2226761e4ebf603ec4f0fdcaf7f56eb02d1 SHA512 b94e1fe749c63a82f38369ff62b7d0d8cf1c55884159f030dc2919c17daf5811dd71cfd6a663edb38df66ff4ca53120a6a53501568cc8a582f08d4ae82fe9d89
DIST libepoxy-1.4.3.tar.gz 310823 BLAKE2B 6eab12a0ecf68a1bda3484c7cd71c0b3d62391e2bee8efd3c0fe7970ee4c3672f2dd81547d3884b301165accf3a8ce91a7c2a2e9686b1ca43c7f37cd15c5c946 SHA512 41c7a4eea66c89346b0ec71407b2d22bf645ed0ef81ebad560370903f138ed48abb6bc6bcc88c75a3a05497acc6720397db828d61301599c05040263a9f4f7f0
DIST libepoxy-1.5.0.tar.gz 325983 BLAKE2B 13cec792a3f32630765e3bad755bfb8569119351a3bf83a6581c4db3210eca0779ca6681bbb67898847265283a929ed742fd7000d18977fb5f2203968815fe92 SHA512 e522c64d4f407aab031fbd31feaee1a2de4467fdd49b0267327100cfe836c2f5bebccf367449e3bd97e1a457168bbf0ace968eaa45a018020f1c038469343efe
+DIST libepoxy-1.5.1.tar.gz 324985 BLAKE2B 338b558ca3c174c04383dfc1bfe4f444965aef745b3043183d4024df62b37fdfc923c5c1d243a3061201a0f7b6946ce443d4ede3195b85d1022c187f46b08540 SHA512 f839f82e4ffabda42a2bb9c2822ba2e8da6583bdb481daa2e090e62b580fdfb0d11f96af790685769317ff2446d1d8d7cb6374b2049614ee938b84014b604bce
diff --git a/media-libs/libepoxy/libepoxy-1.5.1.ebuild b/media-libs/libepoxy/libepoxy-1.5.1.ebuild
new file mode 100644
index 000000000000..21db4db9f63b
--- /dev/null
+++ b/media-libs/libepoxy/libepoxy-1.5.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+ GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='xml(+)'
+inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
+
+DESCRIPTION="Epoxy is a library for handling OpenGL function pointer management for you"
+HOMEPAGE="https://github.com/anholt/libepoxy"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+ SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test +X"
+
+DEPEND="${PYTHON_DEPS}
+ media-libs/mesa[egl,${MULTILIB_USEDEP}]
+ X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+ >=dev-util/meson-0.44.0"
+RDEPEND=""
+
+src_unpack() {
+ default
+ [[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Degl=yes
+ -Dglx=$(usex X)
+ -Dx11=$(usex X true false)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_test() {
+ meson_src_test
+}
+
+multilib_src_install() {
+ meson_src_install
+}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
index c4110354846e..fa372b2a68d8 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
# FIXME: should we also bump for libgphoto2_port.so soname version?
SLOT="0/6" # libgphoto2.so soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="doc examples exif gd jpeg nls serial"
# By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest
index 60f6dddc9af1..9467a56ff82f 100644
--- a/media-libs/liblastfm/Manifest
+++ b/media-libs/liblastfm/Manifest
@@ -1,2 +1 @@
-DIST liblastfm-1.0.9.tar.gz 119320 BLAKE2B 4c661b703af1e94b42d2bddffd994e0d33360979e47e0079f3824a9febcdba22c3ccedd8599da5c1d4b701a329cb4779bd680181837152cb1d23a231ec6eee73 SHA512 9d2bcf71b26d8a95920a07649c97b3faa071c49a8269268bb08fab01537392774873233d03cada09d3ce3fe2c45b0affdb74cd27c41f69342b973896effe1018
DIST liblastfm-1.1.0_pre20150206.tar.gz 119380 BLAKE2B ec532b7577e60c02f9e8202b06e4e496b052801d60a27795d58204c6fbec62eea24512979ea9e42f643e7cfc01794982e07b808f6411b884893e13c29d9e17b0 SHA512 984d4b6b36a12e019e486425d243fc5be24fc3968b30f7ec746204c976b9c526477d56793205c9a6eed79bff1b33a2b1c7063d1d08fd376c4b89346337d8b166
diff --git a/media-libs/liblastfm/liblastfm-1.0.9-r1.ebuild b/media-libs/liblastfm/liblastfm-1.0.9-r1.ebuild
deleted file mode 100644
index b4aedd844173..000000000000
--- a/media-libs/liblastfm/liblastfm-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multibuild
-
-DESCRIPTION="Collection of libraries to integrate Last.fm services"
-HOMEPAGE="https://github.com/lastfm/liblastfm"
-SRC_URI="https://github.com/lastfm/liblastfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0/0"
-IUSE="fingerprint test +qt4 qt5"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-COMMON_DEPEND="
- qt4? (
- dev-qt/qtcore:4[ssl]
- dev-qt/qtdbus:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtxml:5
- )
- fingerprint? (
- media-libs/libsamplerate
- sci-libs/fftw:3.0
- qt4? ( dev-qt/qtsql:4 )
- qt5? ( dev-qt/qtsql:5 )
- )
-"
-DEPEND="${COMMON_DEPEND}
- test? (
- qt4? ( dev-qt/qttest:4 )
- qt5? ( dev-qt/qttest:5 )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !
-Date: Tue, 20 Sep 2016 15:33:30 +0400
-
----
- tests/JsonCreatorTest.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/JsonCreatorTest.cpp b/tests/JsonCreatorTest.cpp
-index b15b006..feb03d5 100644
---- a/tests/JsonCreatorTest.cpp
-+++ b/tests/JsonCreatorTest.cpp
-@@ -133,7 +133,7 @@ void JsonCreatorTest::testEpisodeActionListToJSON()
-
- output = JsonCreator::episodeActionListToJSON(episodeActions);
- QString outString2 = QString::fromLatin1( output ).replace( QLatin1String(" "), QLatin1String("") );
-- QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\" },{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1998-01-01T00:01:02\"}]" ) );
-+ QString expected2( QLatin1String( "[{\"action\":\"download\",\"device\":\"device1\",\"episode\":\"http://episode.url\",\"podcast\":\"http://podcast.url\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"delete\",\"device\":\"device3\",\"episode\":\"http://episode2.url\",\"podcast\":\"http://podcast2.url\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"new\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1998-01-01T00:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"timestamp\":\"1920-01-01T12:01:02\"},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":123,\"started\":10,\"timestamp\":\"1998-01-01T00:01:02\",\"total\":321},{\"action\":\"play\",\"device\":\"foodev\",\"episode\":\"http://www.podtrac.com\",\"podcast\":\"http://leo.am\",\"position\":10,\"timestamp\":\"1998-01-01T00:01:02\"}]" ) );
-
- QCOMPARE(outString2, expected2 );
- }
---
-2.7.4
-
diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch
similarity index 87%
rename from media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch
rename to media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch
index 2b10ae4d7bd9..77c1c74f42d3 100644
--- a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch
+++ b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0-qt-5.11b3.patch
@@ -1,17 +1,18 @@
-From e5128384620014bca2cd9d1b5f31c405818e1a74 Mon Sep 17 00:00:00 2001
+From 0d76d960727018bddf04c6cc89552af69aaa7e55 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner
Date: Sun, 15 Apr 2018 22:20:34 +0200
-Subject: [PATCH 1/2] Add missing Qt5Network, make BUILD_WITH_QT4 more strict
+Subject: [PATCH 1/2] Add missing Qt5Network, Qt5Test, make BUILD_WITH_QT4 more
+ strict
---
- CMakeLists.txt | 18 +++++++-----------
- 1 file changed, 7 insertions(+), 11 deletions(-)
+ CMakeLists.txt | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2a1f652..85d46fd 100644
+index 2a1f652..eb006d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -5,25 +5,21 @@ project( libmygpo-qt )
+@@ -5,25 +5,25 @@ project( libmygpo-qt )
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" )
@@ -22,13 +23,17 @@ index 2a1f652..85d46fd 100644
- find_package(Qt5Core QUIET)
- if( Qt5Core_DIR )
- set(MYGPO_QT_VERSION_SUFFIX 5)
-+ find_package(Qt5 CONFIG REQUIRED Core Network)
-+ set(MYGPO_QT_VERSION_SUFFIX 5)
-
+-
- macro(qt_wrap_cpp)
- qt5_wrap_cpp(${ARGN})
- endmacro()
-- endif()
++ if( MYGPO_BUILD_TESTS )
++ find_package(Qt5 REQUIRED COMPONENTS Core Network Test CONFIG)
++ else()
++ find_package(Qt5 REQUIRED COMPONENTS Core Network CONFIG)
+ endif()
++ set(MYGPO_QT_VERSION_SUFFIX 5)
++
+ macro(qt_wrap_cpp)
+ qt5_wrap_cpp(${ARGN})
+ endmacro()
@@ -48,7 +53,7 @@ index 2a1f652..85d46fd 100644
2.17.0
-From 1cadc5d15d0de4dd2d7d08069a421337547031d2 Mon Sep 17 00:00:00 2001
+From 1b53767b988b339aac8b353327a1542b2a0c0610 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner
Date: Sun, 15 Apr 2018 22:29:33 +0200
Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
@@ -60,10 +65,10 @@ Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 85d46fd..d6b3a15 100644
+index eb006d9..fa4b0cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -30,9 +30,6 @@ else()
+@@ -34,9 +34,6 @@ else()
set( QT_DONT_USE_QTGUI TRUE )
include( ${QT_USE_FILE} )
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild
deleted file mode 100644
index a276eeb094d1..000000000000
--- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils multibuild
-
-DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice"
-HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+qt4 qt5 test"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-RDEPEND="
- qt4? (
- >=dev-libs/qjson-0.5[qt4(+)]
- dev-qt/qtcore:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? (
- qt4? ( dev-qt/qttest:4 )
- qt5? ( dev-qt/qttest:5 )
- )
-"
-
-DOCS=( AUTHORS README )
-PATCHES=( ${FILESDIR}/${PN}-1.0.8-fix-JsonCreatorTest-failure.patch )
-
-pkg_setup() {
- MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
- if use qt5; then
- ewarn "Please note that Qt5 support is still experimental."
- ewarn "If you find anything to not work with Qt5, please report a bug."
- fi
-}
-
-src_configure() {
- myconfigure() {
- local mycmakeargs=(
- -DMYGPO_BUILD_TESTS=$(usex test)
- )
-
- if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
- mycmakeargs+=(-DBUILD_WITH_QT4=ON)
- fi
-
- if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
- mycmakeargs+=(-DBUILD_WITH_QT4=OFF)
- fi
-
- cmake-utils_src_configure
- }
-
- multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
- multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
- multibuild_foreach_variant cmake-utils_src_test
-}
-
-src_install() {
- multibuild_foreach_variant cmake-utils_src_install
-}
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
similarity index 74%
rename from media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild
rename to media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
index 7f7d18f3bf03..5aae16cca567 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild
@@ -3,8 +3,7 @@
EAPI=6
-COMMIT=b84549b8803033b803f7d4dc14d5dcd7a5c344b7
-inherit cmake-utils vcs-snapshot
+inherit cmake-utils
DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice"
HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"
@@ -13,8 +12,8 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/gpodder/libmygpo-qt.git"
inherit git-r3
else
- SRC_URI="https://github.com/gpodder/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86"
fi
LICENSE="LGPL-2.1"
@@ -40,3 +39,12 @@ src_configure() {
cmake-utils_src_configure
}
+
+src_test() {
+ # bug: 653312
+ local myctestargs=(
+ -E "(JsonCreatorTest-test)"
+ )
+
+ cmake-utils_src_test
+}
diff --git a/media-libs/libpano13/libpano13-2.9.18.ebuild b/media-libs/libpano13/libpano13-2.9.18.ebuild
index c6354fba4fa2..752123e3c714 100644
--- a/media-libs/libpano13/libpano13-2.9.18.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="java static-libs"
DEPEND="media-libs/libpng
diff --git a/media-libs/libpano13/libpano13-2.9.19.ebuild b/media-libs/libpano13/libpano13-2.9.19.ebuild
index e56f77a0ffac..620232069038 100644
--- a/media-libs/libpano13/libpano13-2.9.19.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/3"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="java static-libs"
DEPEND="media-libs/libpng:0=
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index 9720f11d8ee8..32c427520fc0 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng"
SLOT="0/16"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng cpu_flags_x86_sse neon static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index ed3554c1541b..df9dad9938b8 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,9 +1,7 @@
DIST LibRaw-0.18.4.tar.gz 1281104 BLAKE2B dc6c2b594f0897eea509d3122bd7f41bccd89182a5e294b331544ad626631f18637660e1de7ea1c8b5e1c0b59678189d06f9fd12e27016e2ea3ec736cabfbbe4 SHA512 e71db23a70f0cda745ae862f4cb6a0c51c968e4c7399f28e86de8beb894526fa76cd337c1406e2eaee3f287f15e8912d1a0f7217493c6444a491ca3329f63776
-DIST LibRaw-0.18.7.tar.gz 1280935 BLAKE2B 6bc35b05ecca81cb1a8d0e054c2b74eb8f2f4e58e4f6085a1c4886bf96180a547452d4164c6d0f74fa49e6c1b06ee6663b4b9b94aadbaee4c7de890e4e11959e SHA512 5d906e69427d4f9edff8b3bc24eb85896e037dd98578cf07c668b96f6abd82bc8dd9f937ecbca6472d334c4cf8d8cbc8b07c2c84aba748e22ec55cecc6a4ed78
DIST LibRaw-0.18.8.tar.gz 1281773 BLAKE2B 755d17ee4c08e26b04d20cc6284f43e1a87d2bc1b41499d175c6ebfc39684732a4407b990115818553c7b815c66bb04ad451d478ed2c084c443871de8ea221e4 SHA512 48871a5e43c89a17962fae426a962d11a6ce40cb8e7d8abc90e98c899dc42b7e1711398c075901ddbc710fe7e916ba6d507bee7e18975779caa8f5d512b1d580
+DIST LibRaw-0.18.9.tar.gz 1282015 BLAKE2B d94681633e3b187102462be5b849cb4cb3468a74d5c4288e23a07ccf0b66246305f9e75e1d6408e259b3c7777ef77501954d208669c9ddc56b943f13f95c867e SHA512 5becbbf05db091d86f7a3a098402c5a981a5c614e9ac742e80823efec5dccfb3a1336cfd1493aa88c8d1a37fe05896efd3f8f145536d799a9ce19665073cf8ce
DIST LibRaw-demosaic-pack-GPL2-0.18.4.tar.gz 33129 BLAKE2B 724501ae52bf83006dd1e7730f750c65f4a58ca385227a7c9d5c8ab2926ef2fb74a798bd09b78e6f9c1c5cdd39de712ec05a49412087f3b889f3ff76dbb0fbe8 SHA512 05bef76530f9237e1d1bfe08014f30de328b68319f88d126aaffa8baf3b89615d160bac36a6ad2cc38cab0faeb8c4bf86714dd568e7f01cfd1ee2513ac175a5d
-DIST LibRaw-demosaic-pack-GPL2-0.18.7.tar.gz 30659 BLAKE2B 11bb00034838470c9b5762761acde6d6c49c0dfe7e342cc1a6e4f0744b718ba6c5dfb027c5144a0858214c91faf9b726e5c008758cc5c2f9464b7feb4db9eda9 SHA512 1a967eb06807bc5ce2177d4e13d394e8f4afe15e5ef07d9a49c1a2172f0961cd122a3bfa84fa66a203766d50735adacbffd48ba8deead8a202c3c2a1e4a97ffa
DIST LibRaw-demosaic-pack-GPL2-0.18.8.tar.gz 30868 BLAKE2B 30cef85c49e066fa4b1d86ee4d7bfd7bff07897f91edd57aa52428f7ecf2d6e930703e496d4e55e034c6da2f68735f8b20f493a1d7a00d51b0430a4b98e6ee45 SHA512 c34419cec055ea976a348c342f5ec2141e2686b5eb50dd23d7b9fd707eefd86779d331f06b4570dedb1682c33fcd6ac0446b3167ca1f3e3fd2566a0c66c6fd3d
DIST LibRaw-demosaic-pack-GPL3-0.18.4.tar.gz 38622 BLAKE2B 268085234335619487f52bf22739c28f077c24d02990e7a56a0a3e5b9a654227762adb366b0be5b3b0a9a1fe2553a798b4d5b120699c93cae16415f4aaf4ea4a SHA512 158d951d0e1c35f1ebdde8849f0b51e23332c8b5b13a4b0ab0677a3d4a1682afd6e7c5dec4194072b4588699bf49a023591fa1b05d2a8f4c54cd1a44e65e3ad9
-DIST LibRaw-demosaic-pack-GPL3-0.18.7.tar.gz 39229 BLAKE2B d76134c4b53a1285c31e290c088bdde9646ca94a7ecaf4997af5e2da4410ec70671d0e597c1748072266c241b7021b16344a8d8507ebc938ce03ab1f061630a6 SHA512 347a39d8326e4614b83c2721baa09414738416d405d7db516d155a867902dd85cf51d156705d1fd0bc933802cd3a01cfb1c9da43f4cdff15b7a7253674b91c4a
DIST LibRaw-demosaic-pack-GPL3-0.18.8.tar.gz 39002 BLAKE2B 544a1eab61c825c7f2202107d623a56e1f81ad3e5111b419bf12708e2d8a9903f192c23904ab8fb274636d9262d3d89f02fa5e05a0e70d7834782c2df8ec0548 SHA512 10e8cb6694159d04deb813a88e5c3195eed6e2e438f41533db91b17997af1b9d54f286303447ca6e3d1b377922e388f6fcc8a8370254011e11b85612c914d500
diff --git a/media-libs/libraw/libraw-0.18.7.ebuild b/media-libs/libraw/libraw-0.18.9.ebuild
similarity index 87%
rename from media-libs/libraw/libraw-0.18.7.ebuild
rename to media-libs/libraw/libraw-0.18.9.ebuild
index 29deec7e93d7..742725977fa3 100644
--- a/media-libs/libraw/libraw-0.18.7.ebuild
+++ b/media-libs/libraw/libraw-0.18.9.ebuild
@@ -8,13 +8,15 @@ inherit multilib-minimal toolchain-funcs
MY_PN=LibRaw
MY_PV="${PV/_b/-B}"
MY_P="${MY_PN}-${MY_PV}"
+# demosaic package wasn't bumped to 0.18.9 version
+DEMOSAIC_PV="0.18.8"
DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
demosaic? (
- https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
- https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
+ https://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${DEMOSAIC_PV}.tar.gz
+ https://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${DEMOSAIC_PV}.tar.gz
)"
LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
@@ -32,10 +34,6 @@ S="${WORKDIR}/${MY_P}"
DOCS=( Changelog.txt README )
-PATCHES=(
- "${FILESDIR}"/${PN}-0.18.4-glibc-2.27.patch
-)
-
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
diff --git a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
index b0e5df3291cd..40cd411567a5 100644
--- a/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus gles haptic libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
REQUIRED_USE="
diff --git a/media-libs/libvpx/libvpx-1.5.0.ebuild b/media-libs/libvpx/libvpx-1.5.0.ebuild
index 1cfa682061a4..555f65c26ade 100644
--- a/media-libs/libvpx/libvpx-1.5.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.5.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=5
@@ -13,7 +13,7 @@ elif [[ ${PV} == *pre* ]]; then
SRC_URI="mirror://gentoo/${P}.tar.bz2"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
else
- SRC_URI="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2"
+ SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
fi
# generated by: make LIBVPX_TEST_DATA_PATH=libvpx-testdata testdata + tar'ing
@@ -22,7 +22,7 @@ SRC_URI="${SRC_URI}
test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
DESCRIPTION="WebM VP8 Codec SDK"
-HOMEPAGE="http://www.webmproject.org"
+HOMEPAGE="https://www.webmproject.org"
LICENSE="BSD"
SLOT="0/3"
diff --git a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
index 55c20e8d6aa9..3ecde0cc0400 100644
--- a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,8 +7,8 @@ inherit toolchain-funcs multilib-minimal
LIBVPX_TESTDATA_VER=1.6.0
DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="http://www.webmproject.org"
-SRC_URI="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2
+HOMEPAGE="https://www.webmproject.org"
+SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2
test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
LICENSE="BSD"
diff --git a/media-libs/libvpx/libvpx-1.6.1.ebuild b/media-libs/libvpx/libvpx-1.6.1.ebuild
index f556462fb05f..22d33e597c7f 100644
--- a/media-libs/libvpx/libvpx-1.6.1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.1.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
@@ -14,8 +14,8 @@ inherit toolchain-funcs multilib-minimal
LIBVPX_TESTDATA_VER=1.6.1
DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="http://www.webmproject.org"
-SRC_URI="http://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2
+HOMEPAGE="https://www.webmproject.org"
+SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webm/${P}.tar.bz2
test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
LICENSE="BSD"
diff --git a/media-libs/libvpx/libvpx-1.7.0.ebuild b/media-libs/libvpx/libvpx-1.7.0.ebuild
index d391dc81190c..18f70ac5a88d 100644
--- a/media-libs/libvpx/libvpx-1.7.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.7.0.ebuild
@@ -14,7 +14,7 @@ inherit toolchain-funcs multilib-minimal
LIBVPX_TESTDATA_VER=1.7.0
DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="http://www.webmproject.org"
+HOMEPAGE="https://www.webmproject.org"
SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 14dea36b66c7..1cce0cb785f0 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,3 +1,3 @@
DIST libwebp-0.5.2.tar.gz 1221153 BLAKE2B bf8f20c9dd45f70e68dda4eb1104b511be07b4e7bf13850e376c6fff32cf18048f46c718c900fedd6150b010b4a33d96dbcb602e1b0cd693c13dcec7954a2234 SHA512 f0d798e0ef8b58bc159c53214a62b29dff4309ced9efd7c5f0e6f837877906db8318c4c3453f92725ef6f2b069b931ce3e7961ca26db723a31eedc7b52988de2
DIST libwebp-0.6.1.tar.gz 3990217 BLAKE2B 680dcc56bd10797e93d09dc64ed04fd2ffb0b8131aa0c0f1497054c50f5cff73b7ee2aa96df4f7ca760640b636f6f5265ae26e7874a77a86d39d2c74197c93b7 SHA512 fece551d8fabdd8d7ba6807baa54a69a345f8690be4415dd0c0dea54002d78fe893a5d5aacfc13800300edd462b969d596709ac3213f6bc90f8e3698b2490d5f
-DIST libwebp-1.0.0-rc2.tar.gz 4023563 BLAKE2B 003a5241f2a03a9be80379e36f04c1dc4f667721e27d58a92fca6a967ce9ad9c1e176f4e00510314eebfe38a5966c11c626d2f1b12bdb84854ffe173b0de71a9 SHA512 bb5749e4ae79595e195a00e28a3db75c7330ff2eb910a330cf4814b596061da073b5da179a1ca9c02a1c8892f165d2e18689a7677992cdbd0af82532cc83a4ad
+DIST libwebp-1.0.0.tar.gz 4023549 BLAKE2B 10286182ddc1f3561d01edf095ba8921b932b950175c45bbc86400318f9a88237c7623b0bcdd0dfecea6efb085e84e029c82a61396cb784d778d59902353d2b4 SHA512 2af7036957722a3f1533fa2da0da15c76d7eb8ac98ec4ad5cf71dd4262f3d7c9897fb6b50befab83b7de22f0abceeb2c0ff52d60927513d40f8a41aa6a9abd99
diff --git a/media-libs/libwebp/libwebp-1.0.0_rc2.ebuild b/media-libs/libwebp/libwebp-1.0.0.ebuild
similarity index 100%
rename from media-libs/libwebp/libwebp-1.0.0_rc2.ebuild
rename to media-libs/libwebp/libwebp-1.0.0.ebuild
diff --git a/media-libs/mutagen/mutagen-1.35.1.ebuild b/media-libs/mutagen/mutagen-1.35.1.ebuild
index c67b83d227b9..ea192d81db19 100644
--- a/media-libs/mutagen/mutagen-1.35.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.35.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://bitbucket.org/lazka/mutagen https://pypi.org/project/mutagen"
+HOMEPAGE="https://bitbucket.org/lazka/mutagen https://pypi.org/project/mutagen/"
SRC_URI="https://bitbucket.org/lazka/${PN}/downloads/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/media-libs/mutagen/mutagen-1.38.ebuild b/media-libs/mutagen/mutagen-1.38.ebuild
index c582be7c718e..e969b8cc6380 100644
--- a/media-libs/mutagen/mutagen-1.38.ebuild
+++ b/media-libs/mutagen/mutagen-1.38.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/"
SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/media-libs/mutagen/mutagen-1.39.ebuild b/media-libs/mutagen/mutagen-1.39.ebuild
index 02874c5e466c..5555b0fb0019 100644
--- a/media-libs/mutagen/mutagen-1.39.ebuild
+++ b/media-libs/mutagen/mutagen-1.39.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/"
SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/media-libs/mutagen/mutagen-1.40.0.ebuild b/media-libs/mutagen/mutagen-1.40.0.ebuild
index ef45a7517694..26f9b74d4c3f 100644
--- a/media-libs/mutagen/mutagen-1.40.0.ebuild
+++ b/media-libs/mutagen/mutagen-1.40.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
-HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen"
+HOMEPAGE="https://github.com/quodlibet/mutagen https://pypi.org/project/mutagen/"
SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
new file mode 100644
index 000000000000..92cad26c9335
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
@@ -0,0 +1,26 @@
+commit 810a0235837d6f31d8b3c05544f99461df71403e
+Author: Larry Gritz
+Date: Mon Apr 23 15:50:14 2018 -0700
+
+ Changes to allow building against the new ffmpeg 4.0 (#1926)
+
+diff --git a/src/ffmpeg.imageio/ffmpeginput.cpp b/src/ffmpeg.imageio/ffmpeginput.cpp
+index 4e0cb3b9..548ddba4 100644
+--- a/src/ffmpeg.imageio/ffmpeginput.cpp
++++ b/src/ffmpeg.imageio/ffmpeginput.cpp
+@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFrame *picture,
+ }
+ #endif
+
++
++// Changes for ffmpeg 4.0
++#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100))
++
++#if USE_FFMPEG_4_0
++# define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY
++#endif
++
++
+ #include
+
+ #include
diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild
index 1c69cf3c6d6a..22956201293b 100644
--- a/media-libs/openimageio/openimageio-1.8.7.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.7.ebuild
@@ -65,6 +65,10 @@ RDEPEND=">=dev-libs/boost-1.62:=
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[latex] )"
+PATCHES=(
+ "${FILESDIR}/${P}-ffmpeg4.patch"
+)
+
DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
pkg_setup() {
diff --git a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
index db04ae0a17d0..54c070fe7ef7 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
IUSE="build +kernel-helper"
MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
index 7c3e44a5e1b5..566354ca414b 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
# runtime dependency on python:2.7 is required by the vigra-config script
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
index 6fa95e1699aa..c7db801f5f0d 100644
--- a/media-libs/vigra/vigra-1.11.1.ebuild
+++ b/media-libs/vigra/vigra-1.11.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
# runtime dependency on python:2.7 is required by the vigra-config script
diff --git a/media-libs/vigra/vigra-1.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild
index fe2fa6ed8e7f..0252dcd97b64 100644
--- a/media-libs/vigra/vigra-1.9.0.ebuild
+++ b/media-libs/vigra/vigra-1.9.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://hci.iwr.uni-heidelberg.de/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc +fftw +hdf5 +jpeg openexr +png +python test +tiff"
# Pull in dev-lang/python:2.7 for vigra-config which is always installed
diff --git a/media-libs/waffle/waffle-1.5.2.ebuild b/media-libs/waffle/waffle-1.5.2.ebuild
index 140bb05b121d..ec71eacc2bfe 100644
--- a/media-libs/waffle/waffle-1.5.2.ebuild
+++ b/media-libs/waffle/waffle-1.5.2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
- >=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+ >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
doc? (
dev-libs/libxslt
app-text/docbook-xml-dtd:4.2
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index 8d8286cd45ce..23384f2ecadf 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
- >=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+ >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
doc? (
dev-libs/libxslt
app-text/docbook-xml-dtd:4.2
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index bb854f677892..1c00a51e30f8 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/live/live-2017.10.28.ebuild b/media-plugins/live/live-2017.10.28.ebuild
index 6aaa16b4f657..7216e69c3e17 100644
--- a/media-plugins/live/live-2017.10.28.ebuild
+++ b/media-plugins/live/live-2017.10.28.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
mirror://gentoo/${P/-/.}.tar.gz"
LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples static-libs"
DOCS=( "live-shared/README" )
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index d44ed5384e1a..01cf2769c6bc 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/beets/beets-1.4.3-r1.ebuild b/media-sound/beets/beets-1.4.3-r1.ebuild
index d5491b02393d..20b305abb9c1 100644
--- a/media-sound/beets/beets-1.4.3-r1.ebuild
+++ b/media-sound/beets/beets-1.4.3-r1.ebuild
@@ -11,7 +11,7 @@ MY_P=${PN}-${MY_PV}
DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets"
+HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
KEYWORDS="~amd64 ~x86"
SLOT="0"
diff --git a/media-sound/cantata/cantata-2.2.0-r1.ebuild b/media-sound/cantata/cantata-2.2.0-r2.ebuild
similarity index 96%
rename from media-sound/cantata/cantata-2.2.0-r1.ebuild
rename to media-sound/cantata/cantata-2.2.0-r2.ebuild
index 9b255bbabbb8..c9cd47b8623e 100644
--- a/media-sound/cantata/cantata-2.2.0-r1.ebuild
+++ b/media-sound/cantata/cantata-2.2.0-r2.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="
replaygain? ( taglib )
"
-RDEPEND="
+COMMON_DEPEND="
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
@@ -53,7 +53,10 @@ RDEPEND="
udisks? ( sys-fs/udisks:2 )
)
"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+ dev-lang/perl[ithreads]
+"
+DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5
dev-qt/linguist-tools:5
"
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index ab3c9e5fb0c4..4b0aa4198c4e 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1 @@
-DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
diff --git a/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild
deleted file mode 100644
index fe90073e56b5..000000000000
--- a/media-sound/clementine/clementine-1.3.1_p20171113-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=83e860eabd9f4a864c553f110742027cdd01b76f
-EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-inherit cmake-utils flag-o-matic gnome2-utils l10n vcs-snapshot virtualx xdg-utils
-
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
-
-REQUIRED_USE="
- udisks? ( dbus )
- wiimote? ( dbus )
-"
-
-COMMON_DEPEND="
- dev-db/sqlite:=
- dev-libs/crypto++
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/protobuf:=
- dev-libs/qjson
- dev-qt/qtcore:4[ssl]
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- dev-qt/qtsql:4
- media-libs/chromaprint:=
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- >=media-libs/libmygpo-qt-1.0.9[qt4]
- media-libs/taglib[mp4(+)]
- sys-libs/zlib
- virtual/glu
- virtual/opengl
- x11-libs/libX11
- cdda? ( dev-libs/libcdio:= )
- dbus? ( dev-qt/qtdbus:4 )
- ipod? ( >=media-libs/libgpod-0.8.0 )
- lastfm? ( >=media-libs/liblastfm-1[qt4] )
- moodbar? ( sci-libs/fftw:3.0 )
- mtp? ( >=media-libs/libmtp-1.0.0 )
- projectm? (
- media-libs/glew:=
- >=media-libs/libprojectm-1.2.0
- )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
-# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
-# Still possibly essential but not applied yet patches are:
-# 06-fix-numeric-locale.patch
-# 08-stdlib.h-for-rand.patch
-RDEPEND="${COMMON_DEPEND}
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-soup:1.0
- media-plugins/gst-plugins-taglib:1.0
- mms? ( media-plugins/gst-plugins-libmms:1.0 )
- mtp? ( gnome-base/gvfs[mtp] )
- udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-cpp/gtest-1.8.0
- dev-libs/boost
- sys-devel/gettext
- virtual/pkgconfig
- box? ( dev-cpp/sparsehash )
- dropbox? ( dev-cpp/sparsehash )
- googledrive? ( dev-cpp/sparsehash )
- pulseaudio? ( media-sound/pulseaudio )
- seafile? ( dev-cpp/sparsehash )
- skydrive? ( dev-cpp/sparsehash )
- test? (
- dev-qt/qttest:4
- gnome-base/gsettings-desktop-schemas
- )
-"
-
-DOCS=( Changelog README.md )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch )
-
-src_prepare() {
- l10n_find_plocales_changes "src/translations" "" ".po"
-
- cmake-utils_src_prepare
- # some tests fail or hang
- sed -i \
- -e '/add_test_file(translations_test.cpp/d' \
- tests/CMakeLists.txt || die
-
- use test || cmake_comment_add_subdirectory tests
- rm -r 3rdparty/{gmock,google-breakpad,libprojectm,taglib} || die
-}
-
-src_configure() {
- # spotify is not in portage
- local mycmakeargs=(
- -DBUILD_WERROR=OFF
- # force to find crypto++ see bug #548544
- -DCRYPTOPP_LIBRARIES="crypto++"
- -DCRYPTOPP_FOUND=ON
- # avoid automagically enabling of ccache (bug #611010)
- -DCCACHE_EXECUTABLE=OFF
- -DENABLE_BREAKPAD=OFF #< disable crash reporting
- -DENABLE_DEVICEKIT=OFF
- -DENABLE_GIO=ON
- -DENABLE_SPOTIFY_BLOB=OFF
- -DUSE_BUILTIN_TAGLIB=OFF
- -DUSE_SYSTEM_PROJECTM=ON
- -DBUNDLE_PROJECTM_PRESETS=OFF
- -DLINGUAS="$(l10n_get_locales)"
- -DENABLE_BOX="$(usex box)"
- -DENABLE_AUDIOCD="$(usex cdda)"
- -DENABLE_DBUS="$(usex dbus)"
- -DENABLE_DROPBOX="$(usex dropbox)"
- -DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
- -DENABLE_LIBGPOD="$(usex ipod)"
- -DENABLE_LIBLASTFM="$(usex lastfm)"
- -DENABLE_MOODBAR="$(usex moodbar)"
- -DENABLE_LIBMTP="$(usex mtp)"
- -DENABLE_VISUALISATIONS="$(usex projectm)"
- -DENABLE_SEAFILE="$(usex seafile)"
- -DENABLE_SKYDRIVE="$(usex skydrive)"
- -DENABLE_LIBPULSE="$(usex pulseaudio)"
- -DENABLE_UDISKS2="$(usex udisks)"
- -DENABLE_WIIMOTEDEV="$(usex wiimote)"
- )
-
- use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
- use test && mycmakeargs+=( -DUSE_SYSTEM_GMOCK=ON )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${CMAKE_BUILD_DIR}" || die
- virtx emake test
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-
- elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
- elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
- elog "depending on your preferences"
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-sound/clementine/clementine-1.3.1_p20180416.ebuild b/media-sound/clementine/clementine-1.3.1_p20180416.ebuild
index b5c25325577d..0496f8094474 100644
--- a/media-sound/clementine/clementine-1.3.1_p20180416.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20180416.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
else
COMMIT=bd096dcbc3cfa8965ee96245b95c4027278b42a6
SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
unset GIT_ECLASS
@@ -98,6 +98,8 @@ DEPEND="${COMMON_DEPEND}
)
"
+RESTRICT="test"
+
S="${WORKDIR}/${PN^}-${COMMIT}"
DOCS=( Changelog README.md )
diff --git a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
deleted file mode 100644
index 437518695a32..000000000000
--- a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/clementine-player/Clementine/issues/5297
-
---- a/src/core/database.cpp
-+++ b/src/core/database.cpp
-@@ -265,6 +265,16 @@
- StaticInit();
-
- {
-+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
-+ QVariant v = db.driver()->handle();
-+ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
-+ sqlite3* handle = *static_cast(v.data());
-+ if (handle) {
-+ sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
-+ }
-+ }
-+#endif
-+
- QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db);
- set_fts_tokenizer.bindValue(":name", "unicode");
- set_fts_tokenizer.bindValue(
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index be0e55f73cf3..7b5c34a02e43 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -2,3 +2,4 @@ DIST grip-3.4.3.tar.gz 740870 BLAKE2B d6b703d4ba08bf976a53e70772977a6b0fd5cd231f
DIST grip-3.5.2.tar.gz 952153 BLAKE2B e82ccb50636e68ab9862d2004a4dbe59399372b76a835b33350e539a186fed516e7b4961fe930b3beb5168554324a5bebeee5ef03d1cb7731d7f9d7c1fd1feb9 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421
DIST grip-3.6.3.tar.gz 960255 BLAKE2B 9aad33c04e98f60e5f7871e36f2e4bf616a16486482e7363d165ae7d9fc5343a52583e490b9b9757d31b051e6e96165d35931370e2681d727db7abb0854db2d5 SHA512 f94c5dc24a1355a024833992d05a7c05d84367a004607c9d6c7aa6d4bc24dd93b11e0a061689eb521a8abe637472011a1a4c8e968c48ac8447457cffc4d2957d
DIST grip-3.7.0.tar.gz 961006 BLAKE2B 826656477ae4d26aa5d3a43cd08336a20144adf2cc0ad538afb288daea748c94b453f5752e4ace95888294e5d269b20ecfa6fd66d4e4b3316af00140d0d25b4d SHA512 bc2cbfbc1602a3639944009326e485195dbbab83a3ee15ab7291050ccc8b62dc52e052dca50a040335cfb20ff8d244c5315a15e8d940f6a9d89b2808d7876ca1
+DIST grip-3.7.1.tar.gz 961428 BLAKE2B 0c31b549577a1bbde17936e8e243d6fa573c6ac0c6035ea303c983c6ac26a0f7ddef193cea74a4148655f2305db97b3e74476bfe763fcbe77c656e012b4fe07a SHA512 812c6d0715e18da78b8657722697cf7b39b345f2d94c5a3002c6a512ff0482d4e96b58910e0c2fd459ac707a24754c6c491e66eac7692c49ec69bb869079202c
diff --git a/media-sound/grip/grip-3.7.1.ebuild b/media-sound/grip/grip-3.7.1.ebuild
new file mode 100644
index 000000000000..b664cc4ecb4e
--- /dev/null
+++ b/media-sound/grip/grip-3.7.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+RDEPEND="
+ gnome-base/libgnome
+ >=gnome-base/libgnomeui-2.2.0
+ >=media-libs/id3lib-3.8.3
+ media-sound/cdparanoia
+ media-sound/lame
+ net-misc/curl
+ >=x11-libs/gtk+-2.2:2
+ x11-libs/libX11
+ x11-libs/pango
+ x11-libs/vte:0
+ vorbis? ( media-sound/vorbis-tools )
+"
+# gnome-extra/yelp, see bug 416843
+DEPEND="
+ ${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+
+ sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
+}
+
+src_configure() {
+ # Bug #69536
+ [[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
+
+ strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
+
+ econf
+}
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index fc62e1d5e902..5537be3af47d 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,2 +1,3 @@
DIST kid3-3.5.1.tar.gz 1414829 BLAKE2B 42d172a443223979e6afbda3f6dec240a5bde22f102fdd4d6d64f3cbe30dc80a4cb09ed0d28176122801211e311441997ae162025ff0460eb803fc3ed1aec34e SHA512 7f1fbd6d1d576d23f9b57baaaa35101fb2e9ea23dec5b5506e25ec5a94dc8516d25b69b4dddb4a9b4835b2502d0a07087c245380483571a68e5972f98ca8ca58
DIST kid3-3.6.0.tar.gz 1425297 BLAKE2B ff1c8dd8aed2b24c27c458e2215e304587bf658495ad8c8f7ceecd6f9960b010600c25be4ca0c512cf4c5335d48fea7b6267baae0ce2eef2db4dc271442f128c SHA512 ceba8175260d2ef6fad441c7ee5c9b2870b85988515229c09acfccd1a108998b07040dde26ca426de466599b9171fac37f001237991ae977f59742bbbb0cd4f0
+DIST kid3-3.6.1.tar.gz 1428799 BLAKE2B 055743c06bf28188c16e627556e1c23cb724f6a1601975f259a912445063a23f3c6d8101cbb3f582fac66c56bbcbaf243e637132b20930f718f2c5b1056b7dc9 SHA512 026be02c3dea1f05af0f24a26ee9d6b775f7e408db6de8afbb3dda5f66ee465263fb1c3763d4e8ab52b1856a58c1ea21228d24cdb754508e68c04f7d5cccfb77
diff --git a/media-sound/kid3/kid3-3.6.1.ebuild b/media-sound/kid3/kid3-3.6.1.ebuild
new file mode 100644
index 000000000000..17db2bbd586f
--- /dev/null
+++ b/media-sound/kid3/kid3-3.6.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
+inherit kde5
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+COMMON_DEPEND="
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtmultimedia)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ sys-libs/readline:0=
+ acoustid? (
+ media-libs/chromaprint
+ virtual/ffmpeg
+ )
+ flac? (
+ media-libs/flac[cxx]
+ media-libs/libvorbis
+ )
+ kde? (
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ )
+ mp3? ( media-libs/id3lib )
+ mp4? ( media-libs/libmp4v2:0 )
+ taglib? ( >=media-libs/taglib-1.9.1 )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !media-sound/kid3:4
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep linguist-tools)
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.3.2-libdir.patch"
+ "${FILESDIR}/${PN}-3.4.4-deps.patch"
+)
+
+src_prepare() {
+ # overengineered upstream build system
+ # kde5 eclass src_prepare leads to compile failure
+
+ # only enable handbook when required
+ if ! use_if_iuse handbook ; then
+ cmake_comment_add_subdirectory ${KDE_DOC_DIR}
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_PHONON=OFF
+ -DWITH_QT4=OFF
+ -DWITH_QT5=ON
+ -DWITH_CHROMAPRINT=$(usex acoustid)
+ -DWITH_FLAC=$(usex flac)
+ -DWITH_ID3LIB=$(usex mp3)
+ -DWITH_MP4V2=$(usex mp4)
+ -DWITH_TAGLIB=$(usex taglib)
+ -DWITH_VORBIS=$(usex vorbis)
+ )
+
+ if use kde ; then
+ mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+ else
+ mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+ fi
+
+ kde5_src_configure
+}
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
index ad159c9c7952..d4a5c32c82b4 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{3_4,3_5,3_6} )
inherit distutils-r1
DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
index c08548b41d71..2bc7de936ab4 100644
--- a/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-0.2.8.ebuild
@@ -14,7 +14,7 @@ else
fi
DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube/"
LICENSE="GPL-3"
SLOT="0"
diff --git a/media-sound/mps-youtube/mps-youtube-9999.ebuild b/media-sound/mps-youtube/mps-youtube-9999.ebuild
index 85dbd24601ff..196606cc1844 100644
--- a/media-sound/mps-youtube/mps-youtube-9999.ebuild
+++ b/media-sound/mps-youtube/mps-youtube-9999.ebuild
@@ -14,7 +14,7 @@ else
fi
DESCRIPTION="Terminal-based YouTube player and downloader"
-HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.org/project/mps-youtube/"
LICENSE="GPL-3"
SLOT="0"
diff --git a/media-sound/mumble/mumble-1.2.19.ebuild b/media-sound/mumble/mumble-1.2.19.ebuild
index a57aa61a3a66..084e6e7205ca 100644
--- a/media-sound/mumble/mumble-1.2.19.ebuild
+++ b/media-sound/mumble/mumble-1.2.19.ebuild
@@ -38,7 +38,6 @@ RDEPEND=">=dev-libs/boost-1.41.0
dev-qt/qtsql:4[sqlite]
dev-qt/qtsvg:4
dev-qt/qtxmlpatterns:4
- x11-proto/inputproto
alsa? ( media-libs/alsa-lib )
dbus? ( dev-qt/qtdbus:4 )
g15? ( app-misc/g15daemon )
@@ -47,7 +46,9 @@ RDEPEND=">=dev-libs/boost-1.41.0
speech? ( app-accessibility/speech-dispatcher )
zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
DEPEND="${RDEPEND}
- virtual/pkgconfig"
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
PATCHES=(
"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index c7799fea4f9a..e4b464c16525 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -56,7 +56,7 @@ RDEPEND="
DEPEND="${RDEPEND}
>=dev-libs/boost-1.41.0
virtual/pkgconfig
- x11-proto/inputproto
+ x11-base/xorg-proto
"
src_configure() {
diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index 6dcf57b924a2..282a1a2e8611 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -1,2 +1 @@
-DIST qtscrob-0.10.tar.bz2 132507 BLAKE2B 168bc3747bb48e7c5fedbaeb66cf12c4d7230fb240fb9b034b576f739ef55c497cdb6d8383bace8a00ad54890882134598777acc826d8ced195488b932123e92 SHA512 d743976ef26c4f61402187930ac2cfba71bc4d7079e1166bdb34115196c99d3e0093a4df06d4b0eda24ab4f0f6fcce840812fd2d1dff847dc905adc9a74127c5
DIST qtscrobbler-0.11_pre20130123.zip 298519 BLAKE2B 36d3c3fdf59aa7fd9127c0200b03a6427f6fa27cb40e144f10041a25ba977e40fc5f63547596cf93f797d94e741a4a159c5e1aa48f8742d7738d1c113b22aae8 SHA512 24de4a45d4b31fb3c544b963b97b8716b8472a0dfde1bd2fd6bf101785f22ef07ff34fcd9ce7028fe231b215538bb8e4c3248c234feb870a3adeb4c0b259d646
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
deleted file mode 100644
index 0558b72c9bf5..000000000000
--- a/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/cli/Makefile
-+++ src/cli/Makefile
-@@ -1,4 +1,4 @@
--CC = g++
-+CXX ?= g++
- mingw = false
- WINDRES =
- RES =
-@@ -27,7 +27,7 @@
- LINKOBJ = scrobble-cli.o libscrobble.o md5.o ConvertUTF.o mtp.o $(RES)
- endif
-
--CFLAGS = -Wall -O2 -g $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
-
- .PHONY: all all-before all-after clean clean-custom
-
-@@ -37,22 +37,22 @@
- rm -f *.o *~ *.d $(BIN) $(BIN).exe
-
- $(BIN): $(OBJ)
-- $(CC) $(LINKOBJ) -o $(BIN) $(LIBS)
-+ $(CXX) $(LDFLAGS) $(LINKOBJ) -o $(BIN) $(LIBS)
-
- scrobble-cli.o: scrobble-cli.cpp
-- $(CC) -c scrobble-cli.cpp -o scrobble-cli.o $(CFLAGS)
-+ $(CXX) -c scrobble-cli.cpp -o scrobble-cli.o $(CXXFLAGS)
-
- libscrobble.o: ../lib/libscrobble.cpp
-- $(CC) -c ../lib/libscrobble.cpp -o libscrobble.o $(CFLAGS)
-+ $(CXX) -c ../lib/libscrobble.cpp -o libscrobble.o $(CXXFLAGS)
-
- md5.o: ../lib/md5.c
-- $(CC) -c ../lib/md5.c -o md5.o $(CFLAGS)
-+ $(CXX) -c ../lib/md5.c -o md5.o $(CXXFLAGS)
-
- ConvertUTF.o: ../lib/ConvertUTF.c
-- $(CC) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CFLAGS)
-+ $(CXX) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CXXFLAGS)
-
- mtp.o: ../lib/mtp-libmtp.cpp
-- $(CC) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CFLAGS)
-+ $(CXX) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CXXFLAGS)
-
- install:
- install -D -m 755 scrobble-cli -p $(DESTDIR)$(bindir)/scrobble-cli
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch
deleted file mode 100644
index d6802751f0e0..000000000000
--- a/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-g++ -c ../lib/mtp-libmtp.cpp -o mtp.o -Wall -I../lib `curl-config --cflags` `pkg-config --cflags libmtp` -DHAVE_LIBMTP
-../lib/mtp-libmtp.cpp: In member function ‘void Scrobble::mtp_iterate(bool)’:
-../lib/mtp-libmtp.cpp:104:30: error: ‘free’ was not declared in this scope
-
-http://bugs.gentoo.org/405667
-
---- src/lib/mtp-libmtp.cpp
-+++ src/lib/mtp-libmtp.cpp
-@@ -16,6 +16,7 @@
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
- ***************************************************************************/
-
-+#include /* free */
- #include
- #include "libscrobble.h"
-
diff --git a/media-sound/qtscrobbler/metadata.xml b/media-sound/qtscrobbler/metadata.xml
index 2ef2af033cb1..ad4d7db42b1a 100644
--- a/media-sound/qtscrobbler/metadata.xml
+++ b/media-sound/qtscrobbler/metadata.xml
@@ -5,9 +5,6 @@
sound@gentoo.org
Gentoo Sound project
-
qtscrob
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
deleted file mode 100644
index c03b41f39d2b..000000000000
--- a/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils gnome2-utils qt4-r2 toolchain-funcs
-
-MY_PN=qtscrob
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Updates a last.fm profile using information from a supported portable music player"
-HOMEPAGE="http://qtscrob.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli +qt4"
-
-RDEPEND=">=media-libs/libmtp-1.1.0
- net-misc/curl
- dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-Makefile.patch \
- "${FILESDIR}"/${P}-free.patch
-}
-
-src_configure() {
- if use qt4; then
- pushd src/qt >/dev/null
- eqmake4 ${MY_PN}.pro
- popd >/dev/null
- fi
-}
-
-src_compile() {
- if use cli; then
- tc-export CXX
- emake -C src/cli
- fi
-
- if use qt4; then
- emake -C src/qt
- fi
-}
-
-src_install() {
- if use cli; then
- newbin src/cli/scrobble-cli qtscrobbler-cli
- fi
-
- if use qt4; then
- pushd src/qt >/dev/null
- newbin qtscrob qtscrobbler
- insinto /usr/share/icons/hicolor/128x128/apps
- newins resources/icons/128.png qtscrobbler.png
- make_desktop_entry qtscrobbler QtScrobbler
- popd >/dev/null
- fi
-
- dodoc AUTHORS CHANGELOG README
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
index da8847b4c40f..dc4f5ac6824a 100644
--- a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
+++ b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/git/q/qt/${MY_PN}/code.git/${MY_
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/media-sound/quodlibet/quodlibet-3.9.1.ebuild b/media-sound/quodlibet/quodlibet-3.9.1.ebuild
index 1211cda94c3f..0dcb8112816b 100644
--- a/media-sound/quodlibet/quodlibet-3.9.1.ebuild
+++ b/media-sound/quodlibet/quodlibet-3.9.1.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 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
IUSE="+dbus gstreamer ipod +udev"
RDEPEND="dev-libs/keybinder:3[introspection]
diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index afc2eec48c95..7992b9433d4f 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -1,2 +1,2 @@
-DIST teamspeak3-server_linux_amd64-3.1.1.tar.bz2 7798155 BLAKE2B 4962968b33eaaa07043cfaa23d020d3d7dcff19b9e380f797196d382a4d004fb0ca2a56246eedf246f796e1bea8f719e80e715b2eda67e5340b7042dd1111a57 SHA512 8561cbeb16a44889ddaa6ab054b47abaaa6a5c942f39c308f6afd2687110bc9e142a8711afe557fa22fe92d1395b844a0eff8c8043921aee4e8070571bee6e44
-DIST teamspeak3-server_linux_x86-3.1.1.tar.bz2 7658201 BLAKE2B 1625200a625ad7615241341846e992de8567c7fa7f6fbeb5234953ab696d60809591f870157e947b06953cb421019c7d0cf920bd0ba65968c4178284b0154206 SHA512 952e2e5d467f68b6f5f0bfc0e4f5a71917c2c14809aeccc64038679e6fd7a20f0794e0662f7a2fec1827a5a99249d1df3a673fb53e324524b4320c64083608c6
+DIST teamspeak3-server_linux_amd64-3.1.2.tar.bz2 7816668 BLAKE2B 4421a439e07ce6dac2556a95818bae7be91622ceea5c597f1fd02ee13815f760086dea13a3ac11a55c928ccfc4b134bb97c0f3092def85ff765e311d6ef69459 SHA512 42993b4cc881ca2bc7d7deb5eaf4e7a9cc3be462abba0f174d6074f0ca18bf59cbe8607dac5a9750331d28ac1984527a8210f53cf6cf077be86b26d141c7bc78
+DIST teamspeak3-server_linux_x86-3.1.2.tar.bz2 7676301 BLAKE2B a4b7557e215612f11bd4ee892dff199d0017e6af7a24bc3dce83a4ac6ddbe807b3960b66c9948298c4463ad2d08aedf27468487f91b15d197d0e2c01b7771956 SHA512 04dce6831332e44ff0edfdc664f422616522bb342338a2b6bb2cd73aba5cc5965dfa4c77fa7c041c06727a3f50fd842142198fd99568c1db6c9810f07accdb48
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.2.ebuild
similarity index 100%
rename from media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild
rename to media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.2.ebuild
diff --git a/media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild b/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
similarity index 95%
rename from media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild
rename to media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
index 08a23c074a74..30a6bd889148 100644
--- a/media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild
+++ b/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
@@ -28,9 +28,6 @@ RDEPEND="
x11-libs/libXi
x11-libs/libXxf86dga
- x11-proto/xproto
- x11-proto/inputproto
- x11-proto/xf86dgaproto
dev-libs/libxml2:2
media-libs/audiofile:=
@@ -39,6 +36,7 @@ RDEPEND="
media-libs/liblrdf
"
DEPEND="${RDEPEND}
+ x11-base/xorg-proto
app-text/gnome-doc-utils
virtual/pkgconfig
"
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index fd7b3e10c116..0981a7000f9d 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/kodi/kodi-17.3-r1.ebuild b/media-tv/kodi/kodi-17.3-r1.ebuild
index eb3d668f39fb..0cdd592a39a7 100644
--- a/media-tv/kodi/kodi-17.3-r1.ebuild
+++ b/media-tv/kodi/kodi-17.3-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
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz ->
!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-tv/kodi/kodi-17.5-r1.ebuild b/media-tv/kodi/kodi-17.5-r1.ebuild
index b92c08d6fe3a..07177ef2af00 100644
--- a/media-tv/kodi/kodi-17.5-r1.ebuild
+++ b/media-tv/kodi/kodi-17.5-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
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz ->
!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-tv/kodi/kodi-17.6-r1.ebuild b/media-tv/kodi/kodi-17.6-r1.ebuild
index 4d0f122c12cb..2ad92c9b0944 100644
--- a/media-tv/kodi/kodi-17.6-r1.ebuild
+++ b/media-tv/kodi/kodi-17.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=6
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz ->
!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-tv/kodi/kodi-17.6-r2.ebuild b/media-tv/kodi/kodi-17.6-r2.ebuild
index 2cabe7ef521d..bbe0f7a8e452 100644
--- a/media-tv/kodi/kodi-17.6-r2.ebuild
+++ b/media-tv/kodi/kodi-17.6-r2.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
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz ->
!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-tv/kodi/kodi-17.6.ebuild b/media-tv/kodi/kodi-17.6.ebuild
index 1b8733326e66..9768b1c6e34f 100644
--- a/media-tv/kodi/kodi-17.6.ebuild
+++ b/media-tv/kodi/kodi-17.6.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
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz ->
!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index d2a5f46d5f74..dc671f9b1bb2 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -
!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
LICENSE="GPL-2"
SLOT="0"
diff --git a/media-tv/xmltv/xmltv-0.5.70.ebuild b/media-tv/xmltv/xmltv-0.5.70.ebuild
index dd339abb1baa..5f81716d88f5 100644
--- a/media-tv/xmltv/xmltv-0.5.70.ebuild
+++ b/media-tv/xmltv/xmltv-0.5.70.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xmltv/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc x86 ~x86-linux"
IUSE="ar ch_search dk dtvla es_laguiatv eu_dotmedia eu_epg fi fi_sv
fr fr_kazer huro il is it na_dd na_dtv na_tvmedia nl no_gf pt_meo se_swedb
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4af7cc214b74..6780ea7d121c 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/ffmpeg/ffmpeg-4.0.ebuild b/media-video/ffmpeg/ffmpeg-4.0.ebuild
index 0f932551acff..480732eac83b 100644
--- a/media-video/ffmpeg/ffmpeg-4.0.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.0.ebuild
@@ -196,7 +196,6 @@ RDEPEND="
gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
- gnutls? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
iec61883? (
@@ -215,7 +214,6 @@ RDEPEND="
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
@@ -225,7 +223,6 @@ RDEPEND="
openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
- openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
@@ -258,6 +255,19 @@ RDEPEND="
postproc? ( !media-libs/libpostproc )
"
+# Crypto & co provider magic
+# - libressl is a useflag meaning it should always favor libressl over openssl
+# - libressl and openssl provide more features to ffmpeg than gnutls
+#
+# The ordering is thus: libressl > openssl > gnutls
+RDEPEND="${RDEPEND}
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+ !libressl? (
+ openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
+ )
+"
+
DEPEND="${RDEPEND}
>=sys-devel/make-3.81
doc? ( sys-apps/texinfo )
@@ -288,7 +298,7 @@ REQUIRED_USE="
${GPL_REQUIRED_USE}
${CPU_REQUIRED_USE}"
RESTRICT="
- gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+ gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
"
S=${WORKDIR}/${P/_/-}
@@ -349,15 +359,9 @@ multilib_src_configure() {
done
# Incompatible features: openssl or libressl and gnutls
- # openssl and libressl support provides a (strict) superset of gnutls support as of 2017.11.30
- # So, we warn the user and disable gnutls
- if use openssl && use gnutls; then
- ewarn "openssl and gnutls are mutually exclusive in ${PN}, disabling gnutls since openssl provides more features"
- myconf+=( --disable-gnutls )
- fi
-
- if use libressl && use gnutls; then
- ewarn "libressl and gnutls are mutually excluse in ${PN}, disabling gnutls since libressl provides more features"
+ if use libressl ; then
+ myconf+=( --disable-gnutls --disable-openssl )
+ elif use openssl ; then
myconf+=( --disable-gnutls )
fi
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index bc7026c5e250..bd45bac1d298 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -196,7 +196,6 @@ RDEPEND="
gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
- gnutls? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
iec61883? (
@@ -215,7 +214,6 @@ RDEPEND="
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
@@ -225,7 +223,6 @@ RDEPEND="
openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
- openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
@@ -258,6 +255,19 @@ RDEPEND="
postproc? ( !media-libs/libpostproc )
"
+# Crypto & co provider magic
+# - libressl is a useflag meaning it should always favor libressl over openssl
+# - libressl and openssl provide more features to ffmpeg than gnutls
+#
+# The ordering is thus: libressl > openssl > gnutls
+RDEPEND="${RDEPEND}
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+ !libressl? (
+ openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+ !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
+ )
+"
+
DEPEND="${RDEPEND}
>=sys-devel/make-3.81
doc? ( sys-apps/texinfo )
@@ -288,7 +298,7 @@ REQUIRED_USE="
${GPL_REQUIRED_USE}
${CPU_REQUIRED_USE}"
RESTRICT="
- gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+ gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
"
S=${WORKDIR}/${P/_/-}
@@ -313,7 +323,7 @@ multilib_src_configure() {
local myconf=( ${EXTRA_FFMPEG_CONF} )
local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
- use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
+ use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
use samba && myconf+=( --enable-version3 )
# Encoders
@@ -349,18 +359,12 @@ multilib_src_configure() {
done
# Incompatible features: openssl or libressl and gnutls
- # openssl and libressl support provides a (strict) superset of gnutls support as of 2017.11.30
- # So, we warn the user and disable gnutls
- if use openssl && use gnutls; then
- ewarn "openssl and gnutls are mutually exclusive in ${PN}, disabling gnutls since openssl provides more features"
+ if use libressl ; then
+ myconf+=( --disable-gnutls --disable-openssl )
+ elif use openssl ; then
myconf+=( --disable-gnutls )
fi
- if use libressl && use gnutls; then
- ewarn "libressl and gnutls are mutually excluse in ${PN}, disabling gnutls since libressl provides more features"
- myconf+=( --disable-gnutls )
- fi
-
# (temporarily) disable non-multilib deps
if ! multilib_is_native_abi; then
for i in frei0r libzmq ; do
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 204cfe74a023..cafd365840ff 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -1,3 +1,2 @@
-DIST smplayer-17.11.2.tar.bz2 5033433 BLAKE2B 0fa783172c5b3c68314d656a395db6c953de64057cdf9acc78e4bc448807bc39293ff292183fc167a122f9cf295aac786b52c0465e3d9584c506e1dd9cd73614 SHA512 e0a6e6fc29063b5f82303febdc8243c10276feb4500985e96ce418298c8f10796df44363df3136452a6cb3f8156ebdb4fba3e865a37d433f3d258db493343f81
-DIST smplayer-18.2.2.tar.bz2 5037398 BLAKE2B f1f56885307e423488a75ba7a4421d199c060edcb878a3ef421af9cafbbbd3d451885c5209383f6935c4a5393c3985ac894531a139fa76d478414154038c7f13 SHA512 47ce8dd2b59f182e7826c5e7b8193111889441dc7d5145ed8c4df21137625cbe67da7a991d4121d41453127d1413535efbc0d6197d514a03885d652606610275
DIST smplayer-18.3.0.tar.bz2 5037751 BLAKE2B 74f8b2183dc5cbae212f68ac1c07c3ad28a40ee2119cb1716b4c8d893545ab9139df943b2445103cbb776a8f97a8ac1af0730c9fbacb1e1ad178c411e29ac82b SHA512 cb0ff19c240bf8d92b12b096c9bf627b8365b690a0f9af126f6cda5436e4ed42510a511617fee6edee4cf1fbc79fb04bf05377585bbf93755b784d0471d2d6d4
+DIST smplayer-18.4.0.tar.bz2 5051804 BLAKE2B 6aea3eb570e4073d5deeca432c4e453ef6dee8e01c00651434f49bed924d750b8b90fe0cbb4a226f5322c18349f2ea75aff573485d3602af280cbee94d93500d SHA512 17d533465e841adbd94af24410bf0cf03fefcc8f5902577a54d3296bbe60b82cf295879b1b5d5407ef191b1609060e95dfe300f857b5d25bd970941a1be3d111
diff --git a/media-video/smplayer/smplayer-17.11.2.ebuild b/media-video/smplayer/smplayer-17.11.2.ebuild
deleted file mode 100644
index 3610468fd601..000000000000
--- a/media-video/smplayer/smplayer-17.11.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
-he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
-sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit gnome2-utils l10n qmake-utils xdg-utils
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="http://www.smplayer.eu/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris"
-
-COMMON_DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5=
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtscript:5
- dev-qt/qtsingleapplication[X,qt5]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- sys-libs/zlib
- autoshutdown? ( dev-qt/qtdbus:5 )
- mpris? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
-"
-RDEPEND="${COMMON_DEPEND}
- || (
- media-video/mplayer[bidi?,libass,png,X]
- (
- >=media-video/mpv-0.15.0[libass,X]
- >=net-misc/youtube-dl-2014.11.26
- )
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
- "${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
-)
-
-src_prepare() {
- use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
-
- default
-
- # Upstream Makefile sucks
- sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
- -e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
- -e '/\.\/get_svn_revision\.sh/,+2c\
- cd src && $(DEFS) $(MAKE)' \
- Makefile || die
-
- # Turn off online update checker, bug #479902
- sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
- -e 's:DEFINES += CHECK_UPGRADED:#&:' \
- -i src/smplayer.pro || die
-
- # Turn off intrusive share widget
- sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
- -i src/smplayer.pro || die
-
- # Toggle autoshutdown option which pulls in dbus, bug #524392
- if ! use autoshutdown ; then
- sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
- -i src/smplayer.pro || die
- fi
-
- # Turn debug message flooding off
- if ! use debug ; then
- sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
- -i src/smplayer.pro || die
- fi
-
- # MPRIS2 pulls in dbus, bug #553710
- if ! use mpris ; then
- sed -e 's:DEFINES += MPRIS2:#&:' \
- -i src/smplayer.pro || die
- fi
-
- # Commented out because it gives false positives
- #l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
-}
-
-src_configure() {
- cd src || die
- eqmake5
-}
-
-gen_translation() {
- local mydir="$(qt5_get_bindir)"
-
- ebegin "Generating $1 translation"
- "${mydir}"/lrelease ${PN}_${1}.ts
- eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
- default
-
- cd src/translations || die
- l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
- # remove unneeded copies of the GPL
- rm -f Copying* docs/*/gpl.html || die
- # don't install empty dirs
- rmdir --ignore-fail-on-non-empty docs/* || die
-
- default
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/media-video/smplayer/smplayer-18.3.0.ebuild b/media-video/smplayer/smplayer-18.3.0.ebuild
index a4f8c4c5ae08..d8ae8f1fe3c6 100644
--- a/media-video/smplayer/smplayer-18.3.0.ebuild
+++ b/media-video/smplayer/smplayer-18.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux"
IUSE="autoshutdown bidi debug mpris"
COMMON_DEPEND="
diff --git a/media-video/smplayer/smplayer-18.2.2.ebuild b/media-video/smplayer/smplayer-18.4.0.ebuild
similarity index 100%
rename from media-video/smplayer/smplayer-18.2.2.ebuild
rename to media-video/smplayer/smplayer-18.4.0.ebuild
diff --git a/media-video/subliminal/subliminal-2.0.5-r1.ebuild b/media-video/subliminal/subliminal-2.0.5-r1.ebuild
index 4173429f438b..d17857af0c50 100644
--- a/media-video/subliminal/subliminal-2.0.5-r1.ebuild
+++ b/media-video/subliminal/subliminal-2.0.5-r1.ebuild
@@ -10,7 +10,7 @@ COMMIT_ID='dd74383d1cba82829ce720f2e439a65d13ffe7ef'
inherit distutils-r1 vcs-snapshot
DESCRIPTION="Python library to search and download subtitles"
-HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal"
+HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/"
SRC_URI="
https://github.com/Diaoul/${PN}/archive/${COMMIT_ID}.tar.gz -> ${PF}.tar.gz
test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
index 00acf627be88..b79e7028e0d3 100644
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='xml(+)'
inherit distutils-r1 git-r3
DESCRIPTION="Python library to search and download subtitles"
-HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal"
+HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/"
EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
EGIT_BRANCH="develop"
SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )"
diff --git a/media-video/transcode/files/ffmpeg4.patch b/media-video/transcode/files/ffmpeg4.patch
new file mode 100644
index 000000000000..9ad765e1c37d
--- /dev/null
+++ b/media-video/transcode/files/ffmpeg4.patch
@@ -0,0 +1,508 @@
+Index: transcode-1.1.7/encode/encode_lavc.c
+===================================================================
+--- transcode-1.1.7.orig/encode/encode_lavc.c
++++ transcode-1.1.7/encode/encode_lavc.c
+@@ -77,6 +77,13 @@ struct tclavcconfigdata_ {
+ int luma_elim_threshold;
+ int chroma_elim_threshold;
+ int quantizer_noise_shaping;
++ int inter_quant_bias;
++ int intra_quant_bias;
++ int scenechange_factor;
++ int rc_strategy;
++ float rc_initial_cplx;
++ float rc_qsquish;
++ float border_masking;
+
+ /* same as above for flags */
+ struct {
+@@ -684,7 +691,7 @@ static int tc_lavc_init_multipass(TCLavc
+ switch (vob->divxmultipass) {
+ case 1:
+ CAN_DO_MULTIPASS(multipass_flag);
+- pd->ff_vcontext.flags |= CODEC_FLAG_PASS1;
++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS1;
+ pd->stats_file = fopen(vob->divxlogfile, "w");
+ if (pd->stats_file == NULL) {
+ tc_log_error(MOD_NAME, "could not create 2pass log file"
+@@ -694,7 +701,7 @@ static int tc_lavc_init_multipass(TCLavc
+ break;
+ case 2:
+ CAN_DO_MULTIPASS(multipass_flag);
+- pd->ff_vcontext.flags |= CODEC_FLAG_PASS2;
++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_PASS2;
+ pd->stats_file = fopen(vob->divxlogfile, "r");
+ if (pd->stats_file == NULL){
+ tc_log_error(MOD_NAME, "could not open 2pass log file \"%s\""
+@@ -723,7 +730,7 @@ static int tc_lavc_init_multipass(TCLavc
+ break;
+ case 3:
+ /* fixed qscale :p */
+- pd->ff_vcontext.flags |= CODEC_FLAG_QSCALE;
++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_QSCALE;
+ pd->ff_venc_frame.quality = vob->divxbitrate;
+ break;
+ }
+@@ -970,7 +977,7 @@ static void tc_lavc_config_defaults(TCLa
+ pd->confdata.rc_buffer_size = 0;
+ pd->confdata.lmin = 2;
+ pd->confdata.lmax = 31;
+- pd->confdata.me_method = ME_EPZS;
++ pd->confdata.me_method = 0;
+
+ memset(&pd->confdata.flags, 0, sizeof(pd->confdata.flags));
+ pd->confdata.turbo_setup = 0;
+@@ -983,12 +990,12 @@ static void tc_lavc_config_defaults(TCLa
+ pd->ff_vcontext.me_range = 0;
+ pd->ff_vcontext.mb_decision = 0;
+ pd->ff_vcontext.scenechange_threshold = 0;
+- pd->ff_vcontext.scenechange_factor = 1;
++ pd->confdata.scenechange_factor = 1;
+ pd->ff_vcontext.b_frame_strategy = 0;
+ pd->ff_vcontext.b_sensitivity = 40;
+ pd->ff_vcontext.brd_scale = 0;
+ pd->ff_vcontext.bidir_refine = 0;
+- pd->ff_vcontext.rc_strategy = 2;
++ pd->confdata.rc_strategy = 2;
+ pd->ff_vcontext.b_quant_factor = 1.25;
+ pd->ff_vcontext.i_quant_factor = 0.8;
+ pd->ff_vcontext.b_quant_offset = 1.25;
+@@ -996,8 +1003,8 @@ static void tc_lavc_config_defaults(TCLa
+ pd->ff_vcontext.qblur = 0.5;
+ pd->ff_vcontext.qcompress = 0.5;
+ pd->ff_vcontext.mpeg_quant = 0;
+- pd->ff_vcontext.rc_initial_cplx = 0.0;
+- pd->ff_vcontext.rc_qsquish = 1.0;
++ pd->confdata.rc_initial_cplx = 0.0;
++ pd->confdata.rc_qsquish = 1.0;
+ pd->confdata.luma_elim_threshold = 0;
+ pd->confdata.chroma_elim_threshold = 0;
+ pd->ff_vcontext.strict_std_compliance = 0;
+@@ -1008,7 +1015,7 @@ static void tc_lavc_config_defaults(TCLa
+ pd->ff_vcontext.temporal_cplx_masking = 0.0;
+ pd->ff_vcontext.spatial_cplx_masking = 0.0;
+ pd->ff_vcontext.p_masking = 0.0;
+- pd->ff_vcontext.border_masking = 0.0;
++ pd->confdata.border_masking = 0.0;
+ pd->ff_vcontext.me_pre_cmp = 0;
+ pd->ff_vcontext.me_cmp = 0;
+ pd->ff_vcontext.me_sub_cmp = 0;
+@@ -1020,8 +1027,6 @@ static void tc_lavc_config_defaults(TCLa
+ pd->ff_vcontext.pre_me = 1;
+ pd->ff_vcontext.me_subpel_quality = 8;
+ pd->ff_vcontext.refs = 1;
+- pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS;
+- pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS;
+ pd->ff_vcontext.noise_reduction = 0;
+ pd->confdata.quantizer_noise_shaping = 0;
+ pd->ff_vcontext.flags = 0;
+@@ -1044,19 +1049,19 @@ static void tc_lavc_config_defaults(TCLa
+ */
+ static void tc_lavc_dispatch_settings(TCLavcPrivateData *pd)
+ {
++ char buf[1024];
+ /* some translation... */
+ pd->ff_vcontext.bit_rate_tolerance = pd->confdata.vrate_tolerance * 1000;
+ pd->ff_vcontext.rc_min_rate = pd->confdata.rc_min_rate * 1000;
+ pd->ff_vcontext.rc_max_rate = pd->confdata.rc_max_rate * 1000;
+ pd->ff_vcontext.rc_buffer_size = pd->confdata.rc_buffer_size * 1024;
+- pd->ff_vcontext.lmin = (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5);
+- pd->ff_vcontext.lmax = (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5);
+- pd->ff_vcontext.me_method = ME_ZERO + pd->confdata.me_method;
++ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmin + 0.5));
++ av_dict_set(&(pd->ff_opts), "lmin", buf, 0);
++ snprintf(buf, sizeof(buf), "%i", (int)(FF_QP2LAMBDA * pd->confdata.lmax + 0.5));
++ av_dict_set(&(pd->ff_opts), "lmax", buf, 0);
+
+ pd->ff_vcontext.flags = 0;
+- SET_FLAG(pd, mv0);
+ SET_FLAG(pd, qpel);
+- SET_FLAG(pd, naq);
+ SET_FLAG(pd, ilme);
+ SET_FLAG(pd, ildct);
+ SET_FLAG(pd, aic);
+@@ -1077,8 +1082,8 @@ static void tc_lavc_dispatch_settings(TC
+ }
+ if (pd->interlacing.active) {
+ /* enforce interlacing */
+- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT;
+- pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME;
++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_DCT;
++ pd->ff_vcontext.flags |= AV_CODEC_FLAG_INTERLACED_ME;
+ }
+ if (pd->confdata.flags.alt) {
+ av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0);
+@@ -1095,15 +1100,31 @@ static void tc_lavc_dispatch_settings(TC
+ if (pd->confdata.flags.cbp) {
+ av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0);
+ }
++ if (pd->confdata.flags.mv0) {
++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+mv0", 0);
++ }
++ if (pd->confdata.flags.naq) {
++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+naq", 0);
++ }
+
+- char buf[1024];
+ #define set_dict_opt(val, opt) \
+ snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\
+ av_dict_set(&(pd->ff_opts), opt, buf, 0)
++#define set_dict_float_opt(val, opt) \
++ snprintf(buf, sizeof(buf), "%f", pd->confdata.val);\
++ av_dict_set(&(pd->ff_opts), opt, buf, 0)
+
+ set_dict_opt(luma_elim_threshold, "luma_elim_threshold");
+ set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold");
+ set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping");
++ set_dict_opt(inter_quant_bias, "pbias");
++ set_dict_opt(intra_quant_bias, "ibias");
++ set_dict_opt(me_method, "me_method");
++ set_dict_opt(scenechange_factor, "sc_factor");
++ set_dict_opt(rc_strategy, "rc_strategy");
++ set_dict_float_opt(rc_initial_cplx, "rc_init_cplx");
++ set_dict_float_opt(rc_qsquish, "qsquish");
++ set_dict_float_opt(border_masking, "border_mask");
+ }
+
+ #undef SET_FLAG
+@@ -1159,12 +1180,12 @@ static int tc_lavc_read_config(TCLavcPri
+ { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+ { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
+ { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
+- { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES },
++ { "vmax_b_frames", PCTX(max_b_frames), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX },
+ { "vme", PAUX(me_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16, },
+ { "me_range", PCTX(me_range), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000 },
+ { "mbd", PCTX(mb_decision), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
+ { "sc_threshold", PCTX(scenechange_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000 },
+- { "sc_factor", PCTX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
++ { "sc_factor", PAUX(scenechange_factor), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16 },
+ { "vb_strategy", PCTX(b_frame_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
+ { "b_sensitivity", PCTX(b_sensitivity), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 100 },
+ { "brd_scale", PCTX(brd_scale), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 },
+@@ -1175,7 +1196,7 @@ static int tc_lavc_read_config(TCLavcPri
+ { "vrc_maxrate", PAUX(rc_max_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
+ { "vrc_minrate", PAUX(rc_min_rate), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 24000000 },
+ { "vrc_buf_size", PAUX(rc_buffer_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000 },
+- { "vrc_strategy", PCTX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
++ { "vrc_strategy", PAUX(rc_strategy), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2 },
+ { "vb_qfactor", PCTX(b_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
+ { "vi_qfactor", PCTX(i_quant_factor), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0 },
+ { "vb_qoffset", PCTX(b_quant_offset), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0 },
+@@ -1185,9 +1206,9 @@ static int tc_lavc_read_config(TCLavcPri
+ { "mpeg_quant", PCTX(mpeg_quant), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ // { "vrc_eq", }, // not yet supported
+ { "vrc_override", rc_override_buf, TCCONF_TYPE_STRING, 0, 0, 0 },
+- { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
++ { "vrc_init_cplx", PAUX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 },
+ // { "vrc_init_occupancy", }, // not yet supported
+- { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
++ { "vqsquish", PAUX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 },
+ { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+ { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+ { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 },
+@@ -1199,7 +1220,7 @@ static int tc_lavc_read_config(TCLavcPri
+ { "tcplx_mask", PCTX(temporal_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+ { "scplx_mask", PCTX(spatial_cplx_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+ { "p_mask", PCTX(p_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+- { "border_mask", PCTX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
++ { "border_mask", PAUX(border_masking), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0 },
+ { "pred", PCTX(prediction_method), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 4 },
+ { "precmp", PCTX(me_pre_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
+ { "cmp", PCTX(me_cmp), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000 },
+@@ -1212,37 +1233,37 @@ static int tc_lavc_read_config(TCLavcPri
+ { "pre_me", PCTX(pre_me), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+ { "subq", PCTX(me_subpel_quality), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8 },
+ { "refs", PCTX(refs), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 8 },
+- { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+- { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
++ { "ibias", PAUX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
++ { "pbias", PAUX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 },
+ { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+ { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 },
+ { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+ { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 },
+
+- { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 },
++ { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 },
+- { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL },
++ { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL },
+ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 },
+- { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME },
+- { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT },
+- { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP },
++ { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME },
++ { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_DCT },
++ { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC },
+ #else
+- { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED },
++ { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED },
+ #endif
+ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 },
+- { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR },
++ { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR },
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT },
+ #else
+ { "trell", PCTX(trellis), TCCONF_TYPE_FLAG, 0, 0, 1 },
+ #endif
+- { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY },
+- { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV },
+- { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP },
++ { "gray", PAUX(flags.gray), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY },
++ { "v4mv", PAUX(flags.v4mv), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV },
++ { "closedgop", PAUX(flags.closedgop), TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP },
+
+ // { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet supported
+ /* End of the config file */
+Index: transcode-1.1.7/export/export_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/export/export_ffmpeg.c
++++ transcode-1.1.7/export/export_ffmpeg.c
+@@ -831,14 +831,11 @@ MOD_init
+
+ lavc_venc_context->bit_rate = vob->divxbitrate * 1000;
+ lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
+- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5);
+- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5);
+ lavc_venc_context->max_qdiff = lavc_param_vqdiff;
+ lavc_venc_context->qcompress = lavc_param_vqcompress;
+ lavc_venc_context->qblur = lavc_param_vqblur;
+ lavc_venc_context->max_b_frames = lavc_param_vmax_b_frames;
+ lavc_venc_context->b_quant_factor = lavc_param_vb_qfactor;
+- lavc_venc_context->rc_strategy = lavc_param_vrc_strategy;
+ lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy;
+ lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset;
+
+@@ -846,8 +843,23 @@ MOD_init
+ #define set_dict_opt(val, opt) \
+ snprintf(buf, sizeof(buf), "%i", val); \
+ av_dict_set(&lavc_venc_opts, opt, buf, 0)
++#define set_dict_float_opt(val, opt) \
++ snprintf(buf, sizeof(buf), "%f", val); \
++ av_dict_set(&lavc_venc_opts, opt, buf, 0)
+ set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold");
+ set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold");
++ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5), "lmin");
++ set_dict_opt((int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5), "lmax");
++ set_dict_opt(lavc_param_vrc_strategy, "rc_strategy");
++ set_dict_float_opt(lavc_param_rc_qsquish, "qsquish");
++ set_dict_float_opt(lavc_param_rc_qmod_amp, "rc_qmod_amp");
++ set_dict_opt(lavc_param_rc_qmod_freq, "rc_qmod_freq");
++ set_dict_opt(lavc_param_rc_eq, "rc_eq");
++ set_dict_opt(lavc_param_vme, "me_method");
++ set_dict_opt(lavc_param_ibias, "ibias");
++ set_dict_opt(lavc_param_pbias, "pbias");
++ set_dict_float_opt(lavc_param_rc_buffer_aggressivity, "rc_buf_aggressivity");
++ set_dict_float_opt(lavc_param_rc_initial_cplx, "rc_init_cplx");
+ lavc_venc_context->rtp_payload_size = lavc_param_packet_size;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ if (lavc_param_packet_size)
+@@ -856,15 +868,9 @@ MOD_init
+ lavc_venc_context->strict_std_compliance= lavc_param_strict;
+ lavc_venc_context->i_quant_factor = lavc_param_vi_qfactor;
+ lavc_venc_context->i_quant_offset = lavc_param_vi_qoffset;
+- lavc_venc_context->rc_qsquish = lavc_param_rc_qsquish;
+- lavc_venc_context->rc_qmod_amp = lavc_param_rc_qmod_amp;
+- lavc_venc_context->rc_qmod_freq = lavc_param_rc_qmod_freq;
+- lavc_venc_context->rc_eq = lavc_param_rc_eq;
+ lavc_venc_context->rc_max_rate = lavc_param_rc_max_rate * 1000;
+ lavc_venc_context->rc_min_rate = lavc_param_rc_min_rate * 1000;
+ lavc_venc_context->rc_buffer_size = lavc_param_rc_buffer_size * 1024;
+- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity;
+- lavc_venc_context->rc_initial_cplx = lavc_param_rc_initial_cplx;
+ lavc_venc_context->debug = lavc_param_debug;
+ lavc_venc_context->last_predictor_count= lavc_param_last_pred;
+ lavc_venc_context->pre_me = lavc_param_pre_me;
+@@ -872,8 +878,6 @@ MOD_init
+ lavc_venc_context->pre_dia_size = lavc_param_pre_dia_size;
+ lavc_venc_context->me_subpel_quality = lavc_param_me_subpel_quality;
+ lavc_venc_context->me_range = lavc_param_me_range;
+- lavc_venc_context->intra_quant_bias = lavc_param_ibias;
+- lavc_venc_context->inter_quant_bias = lavc_param_pbias;
+ lavc_venc_context->coder_type = lavc_param_coder;
+ lavc_venc_context->context_model = lavc_param_context;
+ lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
+@@ -1079,6 +1083,8 @@ MOD_init
+ lavc_venc_context->flags |= lavc_param_mv0;
+ if(lavc_param_qp_rd)
+ av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
++ if (lavc_param_normalize_aqp)
++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+naq", 0);
+ lavc_venc_context->flags |= lavc_param_ilme;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ lavc_venc_context->flags |= lavc_param_trell;
+@@ -1087,9 +1093,7 @@ MOD_init
+ #endif
+
+ if (lavc_param_gray)
+- lavc_venc_context->flags |= CODEC_FLAG_GRAY;
+- if (lavc_param_normalize_aqp)
+- lavc_venc_context->flags |= CODEC_FLAG_NORMALIZE_AQP;
++ lavc_venc_context->flags |= AV_CODEC_FLAG_GRAY;
+
+ switch(vob->encode_fields) {
+ case TC_ENCODE_FIELDS_TOP_FIRST:
+@@ -1107,9 +1111,9 @@ MOD_init
+ }
+
+ lavc_venc_context->flags |= interlacing_active ?
+- CODEC_FLAG_INTERLACED_DCT : 0;
++ AV_CODEC_FLAG_INTERLACED_DCT : 0;
+ lavc_venc_context->flags |= interlacing_active ?
+- CODEC_FLAG_INTERLACED_ME : 0;
++ AV_CODEC_FLAG_INTERLACED_ME : 0;
+
+ lavc_venc_context->flags |= lavc_param_psnr;
+ do_psnr = lavc_param_psnr;
+@@ -1156,7 +1160,7 @@ MOD_init
+ "encoding.");
+ return TC_EXPORT_ERROR;
+ }
+- lavc_venc_context->flags |= CODEC_FLAG_PASS1;
++ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS1;
+ stats_file = fopen(vob->divxlogfile, "w");
+ if (stats_file == NULL){
+ tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".",
+@@ -1170,7 +1174,7 @@ MOD_init
+ "encoding.");
+ return TC_EXPORT_ERROR;
+ }
+- lavc_venc_context->flags |= CODEC_FLAG_PASS2;
++ lavc_venc_context->flags |= AV_CODEC_FLAG_PASS2;
+ stats_file= fopen(vob->divxlogfile, "r");
+ if (stats_file==NULL){
+ tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for "
+@@ -1201,12 +1205,11 @@ MOD_init
+ break;
+ case 3:
+ /* fixed qscale :p */
+- lavc_venc_context->flags |= CODEC_FLAG_QSCALE;
++ lavc_venc_context->flags |= AV_CODEC_FLAG_QSCALE;
+ lavc_venc_frame->quality = vob->divxbitrate;
+ break;
+ }
+
+- lavc_venc_context->me_method = ME_ZERO + lavc_param_vme;
+
+ /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
+ if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
+Index: transcode-1.1.7/export/ffmpeg_cfg.c
+===================================================================
+--- transcode-1.1.7.orig/export/ffmpeg_cfg.c
++++ transcode-1.1.7/export/ffmpeg_cfg.c
+@@ -93,8 +93,8 @@ int lavc_param_last_pred= 0;
+ int lavc_param_pre_me= 1;
+ int lavc_param_me_subpel_quality= 8;
+ int lavc_param_me_range=0;
+-int lavc_param_ibias=FF_DEFAULT_QUANT_BIAS;
+-int lavc_param_pbias=FF_DEFAULT_QUANT_BIAS;
++int lavc_param_ibias=0;
++int lavc_param_pbias=0;
+ int lavc_param_coder=0;
+ int lavc_param_context=0;
+ char *lavc_param_intra_matrix = NULL;
+@@ -136,7 +136,7 @@ TCConfigEntry lavcopts_conf[]={
+ {"vratetol", &lavc_param_vrate_tolerance, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 4, 24000000},
+ {"vhq", &lavc_param_mb_decision, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"mbd", &lavc_param_mb_decision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9},
+- {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_4MV},
++ {"v4mv", &lavc_param_v4mv, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_4MV},
+ {"vme", &lavc_param_vme, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 5},
+ // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+ // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
+@@ -147,7 +147,7 @@ TCConfigEntry lavcopts_conf[]={
+ {"vqcomp", &lavc_param_vqcompress, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
+ {"vqblur", &lavc_param_vqblur, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 1.0},
+ {"vb_qfactor", &lavc_param_vb_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
+- {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, FF_MAX_B_FRAMES},
++ {"vmax_b_frames", &lavc_param_vmax_b_frames, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, INT_MAX},
+ // {"vpass", &lavc_param_vpass, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
+ {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2},
+ {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
+@@ -158,7 +158,7 @@ TCConfigEntry lavcopts_conf[]={
+ {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
+ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1},
+ // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
+- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY},
++ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_GRAY},
+ {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
+ {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
+@@ -184,7 +184,7 @@ TCConfigEntry lavcopts_conf[]={
+ {"pred", &lavc_param_prediction_method, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 20},
+ {"format", &lavc_param_format, TCCONF_TYPE_STRING, 0, 0, 0},
+ {"debug", &lavc_param_debug, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
+- {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR},
++ {"psnr", &lavc_param_psnr, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_PSNR},
+ {"precmp", &lavc_param_me_pre_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+ {"cmp", &lavc_param_me_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+ {"subcmp", &lavc_param_me_sub_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+@@ -192,9 +192,9 @@ TCConfigEntry lavcopts_conf[]={
+ {"ildctcmp", &lavc_param_ildct_cmp, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2000},
+ {"predia", &lavc_param_pre_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
+ {"dia", &lavc_param_dia_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -2000, 2000},
+- {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL},
++ {"qpel", &lavc_param_qpel, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_QPEL},
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+- {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT},
++ {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRELLIS_QUANT},
+ #else
+ {"trell", &lavc_param_trell, TCCONF_TYPE_FLAG, 0, 0, 1},
+ #endif
+@@ -203,9 +203,9 @@ TCConfigEntry lavcopts_conf[]={
+ {"subq", &lavc_param_me_subpel_quality, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 8},
+ {"me_range", &lavc_param_me_range, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16000},
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC},
++ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_H263P_AIC},
+ #else
+- {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
++ {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_AC_PRED},
+ #endif
+ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
+@@ -215,20 +215,20 @@ TCConfigEntry lavcopts_conf[]={
+ {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+ {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
+ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1},
+- {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0},
++ {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
+ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
+ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
+ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1},
+- {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
++ {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME},
+ {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+ {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
+ {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1},
+- {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC},
+- {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED},
+- {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP},
++ {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, 1},
++ {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_TRUNCATED},
++ {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP},
+ {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16},
+ {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
+ {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
+Index: transcode-1.1.7/import/import_ffmpeg.c
+===================================================================
+--- transcode-1.1.7.orig/import/import_ffmpeg.c
++++ transcode-1.1.7/import/import_ffmpeg.c
+@@ -361,7 +361,7 @@ do_avi:
+ lavc_dec_context->width = x_dim;
+ lavc_dec_context->height = y_dim;
+
+- if (vob->decolor) lavc_dec_context->flags |= CODEC_FLAG_GRAY;
++ if (vob->decolor) lavc_dec_context->flags |= AV_CODEC_FLAG_GRAY;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ lavc_dec_context->error_resilience = 2;
+ #else
diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r3.ebuild
index a5df574512db..f39c9c64c642 100644
--- a/media-video/transcode/transcode-1.1.7-r3.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r3.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
@@ -78,6 +78,10 @@ src_prepare() {
PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-imagemagick7.patch )
fi
+ if has_version '>=media-video/ffmpeg-4' ; then
+ PATCHES+=( "${FILESDIR}/ffmpeg4.patch" )
+ fi
+
default
eautoreconf
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 58c10f2f5d9f..49c0183cb16b 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 63d195d067d3..65e814fe3762 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 25 Apr 2018 05:08:23 +0000
+Fri, 27 Apr 2018 17:08:27 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 63d195d067d3..65e814fe3762 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 25 Apr 2018 05:08:23 +0000
+Fri, 27 Apr 2018 17:08:27 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 766c54630dab..61d9f83286b5 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index a67f9b499c8b..ab5db1e168c6 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/ansible-2.5.2 b/metadata/md5-cache/app-admin/ansible-2.5.2
new file mode 100644
index 000000000000..428b0d4ca0a0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.5.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=6
+HOMEPAGE=https://ansible.com/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible/ansible-2.5.2.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=808bdaa6c07173e7842b65dd78f381c1
diff --git a/metadata/md5-cache/app-admin/certmgr-1.6.0 b/metadata/md5-cache/app-admin/certmgr-1.6.0
new file mode 100644
index 000000000000..a98caeeb1b8b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/certmgr-1.6.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Automated certificate management using a CFSSL CA
+EAPI=6
+HOMEPAGE=https://github.com/cloudflare/certmgr
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/cloudflare/certmgr/archive/v1.6.0.tar.gz -> certmgr-1.6.0.tar.gz
+_eclasses_=golang-base 928887539e385bb489681b292f6b862f golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536
+_md5_=78b15da68325cd1f2f8edbc7fbad766c
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8 b/metadata/md5-cache/app-admin/conky-1.10.8
index 1e70e432235c..4a02c10e445a 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.8
+++ b/metadata/md5-cache/app-admin/conky-1.10.8
@@ -4,10 +4,10 @@ DESCRIPTION=An advanced, highly configurable system monitor for X
EAPI=6
HOMEPAGE=https://github.com/brndnmtthws/conky
IUSE=apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar weather-xoap webserver wifi X xmms2
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-3 BSD LGPL-2.1 MIT
RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
SLOT=0
SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
_eclasses_=cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9d4f937f9133fbcd4588520e7d65986c
+_md5_=330fb397c7c26a5dfdbd58b54dd7092b
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r1 b/metadata/md5-cache/app-admin/conky-1.10.8-r1
new file mode 100644
index 000000000000..566e02383bcb
--- /dev/null
+++ b/metadata/md5-cache/app-admin/conky-1.10.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 app-text/docbook2X sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An advanced, highly configurable system monitor for X
+EAPI=6
+HOMEPAGE=https://github.com/brndnmtthws/conky
+IUSE=apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar weather-xoap webserver wifi X xmms2
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 sparc ~x86
+LICENSE=GPL-3 BSD LGPL-2.1 MIT
+RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+SLOT=0
+SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
+_eclasses_=cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f7b8501360ff3ada644fa8a651865af
diff --git a/metadata/md5-cache/app-admin/conserver-8.1.18 b/metadata/md5-cache/app-admin/conserver-8.1.18
index 3538871f58ab..94341122f499 100644
--- a/metadata/md5-cache/app-admin/conserver-8.1.18
+++ b/metadata/md5-cache/app-admin/conserver-8.1.18
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst prepare
DEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Serial Console Manager
EAPI=4
-HOMEPAGE=http://www.conserver.com/
+HOMEPAGE=https://www.conserver.com/
IUSE=kerberos pam ssl tcpd debug ssl
KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
LICENSE=BSD GPL-2
RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6g ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) pam? ( >=sys-auth/pambase-20080219.1 )
SLOT=0
-SRC_URI=http://www.conserver.com/conserver-8.1.18.tar.gz
+SRC_URI=https://www.conserver.com/conserver-8.1.18.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert b5e85f9a834c71d8bd532de477fe4ce2 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=653a5ffbe477acb40682f474b42c1089
+_md5_=38858115938ddfffb85ec3999367c975
diff --git a/metadata/md5-cache/app-admin/conserver-8.1.18-r1 b/metadata/md5-cache/app-admin/conserver-8.1.18-r1
index 47c78a3ef4a2..96520953a6e0 100644
--- a/metadata/md5-cache/app-admin/conserver-8.1.18-r1
+++ b/metadata/md5-cache/app-admin/conserver-8.1.18-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst prepare
DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Serial Console Manager
EAPI=5
-HOMEPAGE=http://www.conserver.com/
+HOMEPAGE=https://www.conserver.com/
IUSE=kerberos libressl pam ssl tcpd debug ssl
KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86
LICENSE=BSD GPL-2
RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) pam? ( >=sys-auth/pambase-20080219.1 )
SLOT=0
-SRC_URI=http://www.conserver.com/conserver-8.1.18.tar.gz
+SRC_URI=https://www.conserver.com/conserver-8.1.18.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert b5e85f9a834c71d8bd532de477fe4ce2 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=18dc9d3523d100bf0553ad2a67061228
+_md5_=89cdb42927dd147112106c4f69996e4d
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.12 b/metadata/md5-cache/app-admin/eselect-1.4.12
index 157c0a7c8276..2639741cdcf8 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.12
+++ b/metadata/md5-cache/app-admin/eselect-1.4.12
@@ -4,11 +4,11 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
EAPI=5
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
SLOT=0
SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.12.tar.xz
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1bd4ba289935bd41eab931c5a71312ef
+_md5_=5614953a330fd940dff541769571e308
diff --git a/metadata/md5-cache/app-admin/fluentd-1.1.3-r1 b/metadata/md5-cache/app-admin/fluentd-1.1.3-r1
index dae892bc4b63..fc9f3b1586e1 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.1.3-r1
+++ b/metadata/md5-cache/app-admin/fluentd-1.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/msgpack-0.7.0[ruby_targets_ruby23] >=d
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/fluentd-1.1.3.gem
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=21001a14ba5d01467070d44d8910b4a5
diff --git a/metadata/md5-cache/app-admin/go-updater-0.2.0 b/metadata/md5-cache/app-admin/go-updater-0.2.0
new file mode 100644
index 000000000000..404183ee3bc1
--- /dev/null
+++ b/metadata/md5-cache/app-admin/go-updater-0.2.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Checks if Gentoo go packages are compiled with the system's golang version
+EAPI=6
+HOMEPAGE=https://github.com/mrueg/go-updater
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-go/goversion
+SLOT=0
+SRC_URI=https://github.com/mrueg/go-updater/archive/0.2.0.tar.gz -> go-updater-0.2.0.tar.gz
+_md5_=e083ea3b63174d33f086a15ad529a601
diff --git a/metadata/md5-cache/app-admin/helm-2.9.0 b/metadata/md5-cache/app-admin/helm-2.9.0
new file mode 100644
index 000000000000..774045beae61
--- /dev/null
+++ b/metadata/md5-cache/app-admin/helm-2.9.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Kubernetes Package Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/helm https://helm.sh
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/helm/archive/v2.9.0.tar.gz -> helm-2.9.0.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-ansiterm/archive/19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz -> github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz https://github.com/Azure/go-autorest/archive/d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz -> github.com-Azure-go-autorest-d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz -> github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/evanphx/json-patch/archive/944e07253867aacae43c04b2e6a239005443f33a.tar.gz -> github.com-evanphx-json-patch-944e07253867aacae43c04b2e6a239005443f33a.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz -> github.com-go-openapi-spec-1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz https://github.com/go-openapi/swag/archive/f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz -> github.com-go-openapi-swag-f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz -> github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/google/uuid/archive/064e2069ce9c359c118179501254f67d7d37ba24.tar.gz -> github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/6da026c32e2d622cc242d32984259c77237aefe1.tar.gz -> github.com-gophercloud-gophercloud-6da026c32e2d622cc242d32984259c77237aefe1.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/json-iterator/go/archive/13f86432b882000a51c6e610c620974462691a97.tar.gz -> github.com-json-iterator-go-13f86432b882000a51c6e610c620974462691a97.tar.gz https://github.com/mailru/easyjson/archive/2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz -> github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz -> github.com-Masterminds-sprig-6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/mitchellh/go-wordwrap/archive/ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz -> github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/sirupsen/logrus/archive/89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz -> github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz https://github.com/spf13/cobra/archive/f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz -> github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/technosophos/moniker/archive/ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz -> github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz https://github.com/golang/crypto/archive/81e90905daefcd6fd217b62423c0908922eadb30.tar.gz -> github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/time/archive/f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz -> github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz -> github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/square/go-jose/archive/f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz -> github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/c699ec51538f0cfd4afa8bfcfe1e0779cafbe666.tar.gz -> github.com-kubernetes-api-c699ec51538f0cfd4afa8bfcfe1e0779cafbe666.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz -> github.com-kubernetes-apiextensions-apiserver-898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz https://github.com/kubernetes/apimachinery/archive/54101a56dda9a0962bc48751c058eb4c546dcbb9.tar.gz -> github.com-kubernetes-apimachinery-54101a56dda9a0962bc48751c058eb4c546dcbb9.tar.gz https://github.com/kubernetes/apiserver/archive/ea53f8588c655568158b4ff53f5ec6fa4ebfc332.tar.gz -> github.com-kubernetes-apiserver-ea53f8588c655568158b4ff53f5ec6fa4ebfc332.tar.gz https://github.com/kubernetes/client-go/archive/23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz -> github.com-kubernetes-client-go-23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz https://github.com/kubernetes/kube-openapi/archive/50ae88d24ede7b8bad68e23c805b5d3da5c8abaf.tar.gz -> github.com-kubernetes-kube-openapi-50ae88d24ede7b8bad68e23c805b5d3da5c8abaf.tar.gz https://github.com/kubernetes/kubernetes/archive/a22f9fd34871d9dc9e5db2c02c713821d18ab2cd.tar.gz -> github.com-kubernetes-kubernetes-a22f9fd34871d9dc9e5db2c02c713821d18ab2cd.tar.gz https://github.com/kubernetes/utils/archive/aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz -> github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
+_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 golang-base 928887539e385bb489681b292f6b862f golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=47e2ea6ac249445cfb18c375ba8d627e
diff --git a/metadata/md5-cache/app-admin/mcollective-2.11.4 b/metadata/md5-cache/app-admin/mcollective-2.11.4
index cb130d4bab40..d53e2d97e1d7 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.11.4
+++ b/metadata/md5-cache/app-admin/mcollective-2.11.4
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
DESCRIPTION=Framework to build server orchestration or parallel job execution systems
EAPI=6
HOMEPAGE=https://docs.puppet.com/mcollective/
-IUSE=doc +client elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=doc +client elibc_FreeBSD ruby_targets_ruby23
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
-RDEPEND=dev-ruby/stomp ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=dev-ruby/stomp ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 )
SLOT=0
SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.11.4.tar.gz -> mcollective-2.11.4.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=b7db5fb9345721e56bcf25713a693560
diff --git a/metadata/md5-cache/app-admin/mcollective-2.12.0-r1 b/metadata/md5-cache/app-admin/mcollective-2.12.0-r1
index f29a2d340f9f..215e14aed9d4 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.12.0-r1
+++ b/metadata/md5-cache/app-admin/mcollective-2.12.0-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
DESCRIPTION=Framework to build server orchestration or parallel job execution systems
EAPI=6
HOMEPAGE=https://docs.puppet.com/mcollective/
-IUSE=doc +client elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=doc +client elibc_FreeBSD ruby_targets_ruby23
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
-RDEPEND=>=dev-ruby/stomp-1.4.4 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=>=dev-ruby/stomp-1.4.4 ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 )
SLOT=0
SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.12.0.tar.gz -> mcollective-2.12.0.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=0bce301cf306a98dfbe24db19150dae9
diff --git a/metadata/md5-cache/app-admin/mcollective-2.12.1 b/metadata/md5-cache/app-admin/mcollective-2.12.1
index f9aafcae1257..4f5ced788a57 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.12.1
+++ b/metadata/md5-cache/app-admin/mcollective-2.12.1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
DESCRIPTION=Framework to build server orchestration or parallel job execution systems
EAPI=6
HOMEPAGE=https://docs.puppet.com/mcollective/
-IUSE=doc +client elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=doc +client elibc_FreeBSD ruby_targets_ruby23
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
-RDEPEND=>=dev-ruby/stomp-1.4.4 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=>=dev-ruby/stomp-1.4.4 ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 )
SLOT=0
SRC_URI=https://github.com/puppetlabs/marionette-collective/archive/2.12.1.tar.gz -> mcollective-2.12.1.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=3ba442d0a0aad7344c9d9bff4f019ff5
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.10-r1 b/metadata/md5-cache/app-admin/puppet-4.10.10-r1
index 952b460aa3f6..0fc21d18eec7 100644
--- a/metadata/md5-cache/app-admin/puppet-4.10.10-r1
+++ b/metadata/md5-cache/app-admin/puppet-4.10.10-r1
@@ -1,16 +1,16 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A system automation and configuration management software.
EAPI=6
HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
LICENSE=Apache-2.0 GPL-2
PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
RESTRICT=test
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.10.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xemacs-elisp-common 5ad47e1940fe7ffbdeeb002a3912bf79
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xemacs-elisp-common 5ad47e1940fe7ffbdeeb002a3912bf79
_md5_=95126d96c7796fb07785a7878b5dbc6e
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.11 b/metadata/md5-cache/app-admin/puppet-4.10.11
index 7551f6ff5213..0b45122e8a6b 100644
--- a/metadata/md5-cache/app-admin/puppet-4.10.11
+++ b/metadata/md5-cache/app-admin/puppet-4.10.11
@@ -1,16 +1,16 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A system automation and configuration management software.
EAPI=6
HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
LICENSE=Apache-2.0 GPL-2
PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby22? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby22] >=dev-ruby/hiera-2.0[ruby_targets_ruby22] >=dev-ruby/locale-2.1[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby23? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby23] >=dev-ruby/hiera-2.0[ruby_targets_ruby23] >=dev-ruby/locale-2.1[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/gettext-setup-0.10:0[ruby_targets_ruby24] >=dev-ruby/hiera-2.0[ruby_targets_ruby24] >=dev-ruby/locale-2.1[ruby_targets_ruby24] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
RESTRICT=test
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.11.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xemacs-elisp-common 5ad47e1940fe7ffbdeeb002a3912bf79
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xemacs-elisp-common 5ad47e1940fe7ffbdeeb002a3912bf79
_md5_=95126d96c7796fb07785a7878b5dbc6e
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.8 b/metadata/md5-cache/app-admin/puppet-4.10.8
index 74255dccb405..4dcf616174bb 100644
--- a/metadata/md5-cache/app-admin/puppet-4.10.8
+++ b/metadata/md5-cache/app-admin/puppet-4.10.8
@@ -1,16 +1,16 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
DESCRIPTION=A system automation and configuration management software.
EAPI=6
HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby23 doc test test
KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
LICENSE=Apache-2.0 GPL-2
PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] >=dev-ruby/rgen-0.6.5[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 )
RESTRICT=test
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.8.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xemacs-elisp-common 5ad47e1940fe7ffbdeeb002a3912bf79
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xemacs-elisp-common 5ad47e1940fe7ffbdeeb002a3912bf79
_md5_=b51420a6b397f99f2996116f391384de
diff --git a/metadata/md5-cache/app-admin/puppet-5.3.4 b/metadata/md5-cache/app-admin/puppet-5.3.4
index 5555334d1839..3572fd8f961c 100644
--- a/metadata/md5-cache/app-admin/puppet-5.3.4
+++ b/metadata/md5-cache/app-admin/puppet-5.3.4
@@ -1,16 +1,16 @@
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A system automation and configuration management software.
EAPI=6
HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
LICENSE=Apache-2.0 GPL-2
PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
RESTRICT=test
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.3.4.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=e3dd432d242d898bfc3f26a5824ca9c6
diff --git a/metadata/md5-cache/app-admin/puppet-5.3.5 b/metadata/md5-cache/app-admin/puppet-5.3.5
index aeeae66b85fd..d50082f35fe0 100644
--- a/metadata/md5-cache/app-admin/puppet-5.3.5
+++ b/metadata/md5-cache/app-admin/puppet-5.3.5
@@ -1,16 +1,16 @@
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A system automation and configuration management software.
EAPI=6
HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
LICENSE=Apache-2.0 GPL-2
PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
RESTRICT=test
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.3.5.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=e3dd432d242d898bfc3f26a5824ca9c6
diff --git a/metadata/md5-cache/app-admin/puppet-5.4.0-r1 b/metadata/md5-cache/app-admin/puppet-5.4.0-r1
index d4d73f534b41..f7fc4e60f093 100644
--- a/metadata/md5-cache/app-admin/puppet-5.4.0-r1
+++ b/metadata/md5-cache/app-admin/puppet-5.4.0-r1
@@ -1,16 +1,16 @@
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A system automation and configuration management software.
EAPI=6
HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
LICENSE=Apache-2.0 GPL-2
PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
RESTRICT=test
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.4.0.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=766968b0dda8811c6de1450c0a565e37
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.1 b/metadata/md5-cache/app-admin/puppet-5.5.1
index 2ab9cbf4fcd6..47ed0882991e 100644
--- a/metadata/md5-cache/app-admin/puppet-5.5.1
+++ b/metadata/md5-cache/app-admin/puppet-5.5.1
@@ -1,16 +1,16 @@
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A system automation and configuration management software.
EAPI=6
HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
LICENSE=Apache-2.0 GPL-2
PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hiera[ruby_targets_ruby24] dev-ruby/json:=[ruby_targets_ruby24] >=dev-ruby/facter-3.0.0[ruby_targets_ruby24] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby24] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby24] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby24] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby24] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby24] ) virtual/ruby-ssl[ruby_targets_ruby24] dev-ruby/hocon[ruby_targets_ruby24] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
RESTRICT=test
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.5.1.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=766968b0dda8811c6de1450c0a565e37
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.3.3 b/metadata/md5-cache/app-admin/puppet-lint-2.3.3
index e851e9bc2d07..15616a0ba82a 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.3.3
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.3.3
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby22] dev-ruby/rspec-json_expectations[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby24] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby24] dev-ruby/rspec-json_expectations[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby24] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby24] dev-ruby/rspec-json_expectations[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A linter for puppet DSL
EAPI=6
HOMEPAGE=http://puppet-lint.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/puppet-lint-2.3.3.gem
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=64cf3c5c33759c629e42dd9f96c45be2
diff --git a/metadata/md5-cache/app-admin/puppet-lint-2.3.5 b/metadata/md5-cache/app-admin/puppet-lint-2.3.5
index d636ca72aaed..e52fece324e1 100644
--- a/metadata/md5-cache/app-admin/puppet-lint-2.3.5
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.3.5
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby22] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby22] dev-ruby/rspec-json_expectations[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby24] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby24] dev-ruby/rspec-json_expectations[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby23] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby23] dev-ruby/rspec-json_expectations[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby24] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby24] dev-ruby/rspec-json_expectations[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A linter for puppet DSL
EAPI=6
HOMEPAGE=http://puppet-lint.com/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/puppet-lint-2.3.5.gem
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=64cf3c5c33759c629e42dd9f96c45be2
diff --git a/metadata/md5-cache/app-admin/r10k-1.5.1-r2 b/metadata/md5-cache/app-admin/r10k-1.5.1-r2
index a4098445e683..734ecb213fb8 100644
--- a/metadata/md5-cache/app-admin/r10k-1.5.1-r2
+++ b/metadata/md5-cache/app-admin/r10k-1.5.1-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] >=dev-ruby/json-1.8:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.7*[ruby_targets_ruby23] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.7*[ruby_targets_ruby23] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
DESCRIPTION=Puppet environment and module deployment
EAPI=5
HOMEPAGE=https://github.com/puppetlabs/r10k
-IUSE=+git test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=+git test elibc_FreeBSD ruby_targets_ruby23 test test
KEYWORDS=~amd64
LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/colored-1.2[ruby_targets_ruby22] =dev-ruby/cri-2.7*[ruby_targets_ruby22] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby22] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby22] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby22] >=dev-ruby/multi_json-1.10[ruby_targets_ruby22] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby22] >=dev-ruby/json-1.8:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.7*[ruby_targets_ruby23] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] ) git? ( >=dev-vcs/git-1.6.6 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.7*[ruby_targets_ruby23] >=dev-ruby/systemu-2.5.2[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/faraday-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-multi_json-0.0.6[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10[ruby_targets_ruby23] >=dev-ruby/semantic_puppet-0.1.1[ruby_targets_ruby23] >=dev-ruby/json-1.8:0[ruby_targets_ruby23] ) git? ( >=dev-vcs/git-1.6.6 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 )
SLOT=0
SRC_URI=mirror://rubygems/r10k-1.5.1.gem
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=4cee4645656f5e452e283ac5a599db3d
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.23_rc1 b/metadata/md5-cache/app-admin/sudo-1.8.23_rc2
similarity index 92%
rename from metadata/md5-cache/app-admin/sudo-1.8.23_rc1
rename to metadata/md5-cache/app-admin/sudo-1.8.23_rc2
index be7274d94e4c..595654026aed 100644
--- a/metadata/md5-cache/app-admin/sudo-1.8.23_rc1
+++ b/metadata/md5-cache/app-admin/sudo-1.8.23_rc2
@@ -8,6 +8,6 @@ LICENSE=ISC BSD
RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
SLOT=0
-SRC_URI=https://www.sudo.ws/sudo/dist/beta/sudo-1.8.23rc1.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.8.23rc1.tar.gz
+SRC_URI=https://www.sudo.ws/sudo/dist/beta/sudo-1.8.23rc2.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.8.23rc2.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=9b75217213daf89f3b8f98fc0e6e6c05
diff --git a/metadata/md5-cache/app-admin/supervisor-3.1.4 b/metadata/md5-cache/app-admin/supervisor-3.1.4
index d731da64d525..98a2be58e485 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.1.4
+++ b/metadata/md5-cache/app-admin/supervisor-3.1.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=A system for controlling process state under UNIX
EAPI=5
-HOMEPAGE=http://supervisord.org/ https://pypi.org/project/supervisor
+HOMEPAGE=http://supervisord.org/ https://pypi.org/project/supervisor/
IUSE=doc test python_targets_python2_7
KEYWORDS=amd64 x86
LICENSE=repoze ZPL BSD HPND GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/s/supervisor/supervisor-3.1.4.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=806bd9344da454e016b28e5282a538c1
+_md5_=5eea46651bf2bb0755e94b1ffa74456c
diff --git a/metadata/md5-cache/app-admin/supervisor-3.3.3 b/metadata/md5-cache/app-admin/supervisor-3.3.3
index 8f8753f99667..091b937345f4 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.3.3
+++ b/metadata/md5-cache/app-admin/supervisor-3.3.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/meld3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=A system for controlling process state under UNIX
EAPI=6
-HOMEPAGE=http://supervisord.org/ https://pypi.org/project/supervisor
+HOMEPAGE=http://supervisord.org/ https://pypi.org/project/supervisor/
IUSE=doc test python_targets_python2_7
KEYWORDS=~amd64 ~x86
LICENSE=repoze ZPL BSD HPND GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/s/supervisor/supervisor-3.3.3.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=060b750cb47b6feac4c72a5942970aa7
+_md5_=2ac4945cac374960fb4bdafabad8a40a
diff --git a/metadata/md5-cache/app-admin/testdisk-7.0-r3 b/metadata/md5-cache/app-admin/testdisk-7.0-r3
deleted file mode 100644
index 7a1f26c70e72..000000000000
--- a/metadata/md5-cache/app-admin/testdisk-7.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=static? ( sys-apps/util-linux[static-libs] >=sys-libs/ncurses-5.2:0[static-libs] jpeg? ( virtual/jpeg:0[static-libs] ) ntfs? ( sys-fs/ntfs3g[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) >=sys-fs/e2fsprogs-1.35[static-libs] sys-libs/zlib[static-libs] !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) ) ) !static? ( sys-apps/util-linux >=sys-libs/ncurses-5.2:0= jpeg? ( virtual/jpeg:0 ) ntfs? ( sys-fs/ntfs3g ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) >=sys-fs/e2fsprogs-1.35 sys-libs/zlib !arm? ( ewf? ( app-forensics/libewf:= ) ) qt4? ( dev-qt/qtgui:4 ) ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Checks and undeletes partitions + PhotoRec, signature based recovery tool
-EAPI=5
-HOMEPAGE=http://www.cgsecurity.org/wiki/TestDisk
-IUSE=ewf jpeg ntfs reiserfs static qt4
-KEYWORDS=amd64 ~arm ~hppa ppc x86
-LICENSE=GPL-2
-RDEPEND=!static? ( static? ( sys-apps/util-linux[static-libs] >=sys-libs/ncurses-5.2:0[static-libs] jpeg? ( virtual/jpeg:0[static-libs] ) ntfs? ( sys-fs/ntfs3g[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) >=sys-fs/e2fsprogs-1.35[static-libs] sys-libs/zlib[static-libs] !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) ) ) !static? ( sys-apps/util-linux >=sys-libs/ncurses-5.2:0= jpeg? ( virtual/jpeg:0 ) ntfs? ( sys-fs/ntfs3g ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) >=sys-fs/e2fsprogs-1.35 sys-libs/zlib !arm? ( ewf? ( app-forensics/libewf:= ) ) qt4? ( dev-qt/qtgui:4 ) ) )
-REQUIRED_USE=static? ( !qt4 )
-SLOT=0
-SRC_URI=http://www.cgsecurity.org/testdisk-7.0.tar.bz2
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0732c8f7d9edcd19aed2205d3b7b811f
diff --git a/metadata/md5-cache/app-admin/testdisk-7.1_pre20180322 b/metadata/md5-cache/app-admin/testdisk-7.1_pre20180322
index f593649231dc..eae4ac6555e6 100644
--- a/metadata/md5-cache/app-admin/testdisk-7.1_pre20180322
+++ b/metadata/md5-cache/app-admin/testdisk-7.1_pre20180322
@@ -4,11 +4,11 @@ DESCRIPTION=Checks and undeletes partitions + PhotoRec, signature based recovery
EAPI=6
HOMEPAGE=https://www.cgsecurity.org/wiki/TestDisk
IUSE=ewf jpeg ntfs qt5 reiserfs static zlib
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc x86
LICENSE=GPL-2
RDEPEND=!static? ( static? ( sys-apps/util-linux[static-libs] sys-fs/e2fsprogs[static-libs] sys-libs/ncurses:0[static-libs] jpeg? ( virtual/jpeg:0[static-libs] ) ntfs? ( sys-fs/ntfs3g[static-libs] ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] ) zlib? ( sys-libs/zlib[static-libs] ) !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) ) ) !static? ( sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses:0= jpeg? ( virtual/jpeg:0 ) ntfs? ( sys-fs/ntfs3g ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 ) zlib? ( sys-libs/zlib ) !arm? ( ewf? ( app-forensics/libewf:= ) ) ) )
REQUIRED_USE=static? ( !qt5 )
SLOT=0
SRC_URI=https://git.cgsecurity.org/cgit/testdisk/snapshot/testdisk-9eb2aa12ce051d8d3d31e6b440389d5abf5efaf1.tar.gz -> testdisk-7.1_pre20180322.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61335a6df39df937c842e0d60a0735a4
+_md5_=18dac74d56db2017d4a4bfefe300f8ce
diff --git a/metadata/md5-cache/app-admin/vault-0.10.1 b/metadata/md5-cache/app-admin/vault-0.10.1
new file mode 100644
index 000000000000..51be3937ec08
--- /dev/null
+++ b/metadata/md5-cache/app-admin/vault-0.10.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=>=dev-lang/go-1.10:= dev-go/gox filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=A tool for managing secrets
+EAPI=6
+HOMEPAGE=https://vaultproject.io/
+IUSE=+filecaps
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hashicorp/vault/archive/v0.10.1.tar.gz -> vault-0.10.1.tar.gz
+_eclasses_=fcaps e80204189039ecc03f24151c518375f0 golang-base 928887539e385bb489681b292f6b862f golang-vcs-snapshot 913580335becddd3ebecefe852e47536 multilib 97f470f374f2e94ccab04a2fb21d811e systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81
+_md5_=9b28c4fec804b611bac337447aa2bfaf
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index da5a37ccbd06..0ed5f368949c 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/gcab-0.8 b/metadata/md5-cache/app-arch/gcab-0.8
index 52414b9ea2d2..9733c94ee213 100644
--- a/metadata/md5-cache/app-arch/gcab-0.8
+++ b/metadata/md5-cache/app-arch/gcab-0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
EAPI=6
HOMEPAGE=https://wiki.gnome.org/msitools
IUSE=+introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=LGPL-2.1+
RDEPEND=>=dev-libs/glib-2.32:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
REQUIRED_USE=vala? ( introspection )
SLOT=0
SRC_URI=mirror://gnome/sources/gcab/0.8/gcab-0.8.tar.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5cf6e83769b43ba05a91b8e9a33a36d6
+_md5_=abe19bdd568a6aa8809473607ade7ce5
diff --git a/metadata/md5-cache/app-arch/unrar-5.6.3 b/metadata/md5-cache/app-arch/unrar-5.6.3
new file mode 100644
index 000000000000..62ab74757617
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-5.6.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Uncompress rar files
+EAPI=6
+HOMEPAGE=https://www.rarlab.com/rar_add.htm
+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 ~x86-solaris
+LICENSE=unRAR
+RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
+SLOT=0/5
+SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.3.tar.gz -> unrar-5.6.3.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0f9c5668b2efd9a80faa745eb16e6d11
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 69bbd89c06f5..aa95c4fe6206 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/backintime-1.1.24 b/metadata/md5-cache/app-backup/backintime-1.1.24
deleted file mode 100644
index 175e7cd87e7c..000000000000
--- a/metadata/md5-cache/app-backup/backintime-1.1.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/openssh net-misc/rsync[xattr,acl] >=sys-apps/sed-4
-DESCRIPTION=Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4
-EAPI=6
-HOMEPAGE=https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/
-IUSE=qt4 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/openssh net-misc/rsync[xattr,acl] qt4? ( dev-python/PyQt4 )
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/bit-team/backintime/archive/v1.1.24.tar.gz -> backintime-1.1.24.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=59cd5dda497f07434b6cb877922e7bf0
diff --git a/metadata/md5-cache/app-backup/backintime-1.2.0_pre20180221 b/metadata/md5-cache/app-backup/backintime-1.2.0_pre20180221
index f7f7d55e5b6b..3bb1ccc7741b 100644
--- a/metadata/md5-cache/app-backup/backintime-1.2.0_pre20180221
+++ b/metadata/md5-cache/app-backup/backintime-1.2.0_pre20180221
@@ -4,11 +4,11 @@ DESCRIPTION=Backup system inspired by TimeVault and FlyBack
EAPI=6
HOMEPAGE=https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/
IUSE=qt5 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/keyring[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/openssh net-misc/rsync[xattr,acl] qt5? ( dev-python/PyQt5 )
REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/bit-team/backintime/archive/45ec81c185789b2dbafd7348d1af039b5183c9ff.tar.gz -> backintime-1.2.0_pre20180221.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3fa2d62b2d5900d0156ece6d146107df
+_md5_=e7b98f855fc94e558ff729f1f4add7fd
diff --git a/metadata/md5-cache/app-backup/bacula-9.0.6-r3 b/metadata/md5-cache/app-backup/bacula-9.0.6-r3
new file mode 100644
index 000000000000..b0bf83c0d5dd
--- /dev/null
+++ b/metadata/md5-cache/app-backup/bacula-9.0.6-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt5? ( dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=6
+HOMEPAGE=http://www.bacula.org/
+IUSE=acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt5? ( dev-qt/qtsvg:5 x11-libs/qwt:6 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
+SLOT=0
+SRC_URI=mirror://sourceforge/bacula/bacula-9.0.6.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 estack 43ddf5aaffa7a8d0482df54d25a66a1f libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81
+_md5_=629e81b96f275772fdbad9659c5a01ca
diff --git a/metadata/md5-cache/app-backup/borgweb-0.2.0-r2 b/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
index b2328c67eeee..3c7525125552 100644
--- a/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
+++ b/metadata/md5-cache/app-backup/borgweb-0.2.0-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Browser-based user interface for BorgBackup
EAPI=6
-HOMEPAGE=https://pypi.org/project/borgweb
+HOMEPAGE=https://pypi.org/project/borgweb/
IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
SLOT=0
SRC_URI=mirror://pypi/b/borgweb/borgweb-0.2.0.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=65d173e6191d8193f7f38ec8e089f51b
+_md5_=ee133713a142e6b15dd3fda5098941d9
diff --git a/metadata/md5-cache/app-backup/zbackup-1.4.4 b/metadata/md5-cache/app-backup/zbackup-1.4.4
deleted file mode 100644
index 3dd62395ede1..000000000000
--- a/metadata/md5-cache/app-backup/zbackup-1.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lzma dev-libs/lzo:2 =dev-util/cmake-3.9.6
-DESCRIPTION=A versatile deduplicating backup tool
-EAPI=6
-HOMEPAGE=http://zbackup.org/ https://github.com/zbackup/zbackup
-IUSE=libressl tartool
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=app-arch/lzma dev-libs/lzo:2 zbackup-1.4.4.tar.gz
-_eclasses_=cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3af0cdd333d48bee3082daf28d6f6d48
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 9fbe680b69a7..39dde10ea0aa 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.12 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.14
similarity index 87%
rename from metadata/md5-cache/app-benchmarks/sysbench-1.0.12
rename to metadata/md5-cache/app-benchmarks/sysbench-1.0.14
index cdc2b395ab43..b8741a1322ff 100644
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.12
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.14
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
SLOT=0
-SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.12.tar.gz -> sysbench-1.0.12.tar.gz
+SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.14.tar.gz -> sysbench-1.0.14.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cd336847e8a157eebfd4d7ef961c5468
+_md5_=4e28de46a98ce64ec8c334d97efba211
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.7 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.7
deleted file mode 100644
index c25977660ae3..000000000000
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure prepare test
-DEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:= app-editors/vim-core dev-libs/concurrencykit dev-libs/libxslt sys-devel/libtool virtual/pkgconfig test? ( dev-util/cram )
-DESCRIPTION=System performance benchmark
-EAPI=6
-HOMEPAGE=https://github.com/akopytov/sysbench
-IUSE=aio mysql postgres test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) dev-lang/luajit:=
-SLOT=0
-SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.7.tar.gz -> sysbench-1.0.7.tar.gz
-_eclasses_=pax-utils b963274a93e76570a88168c1f1db4cd7
-_md5_=c7fb8543cea5e2966d7a12862fec839f
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index b1f57bea5090..1f51e36de635 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09 b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09
index 41de24cbfcf1..e28929f514f8 100644
--- a/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09
+++ b/metadata/md5-cache/app-cdr/cdrtools-3.02_alpha09
@@ -4,10 +4,10 @@ DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/cdrtools/
IUSE=acl caps nls unicode +filecaps
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
SLOT=0
SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a09.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 fcaps e80204189039ecc03f24151c518375f0 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=131bcfc9c1489410e11c6723f7500984
+_md5_=b855bcc256b57266792741af98aa1434
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 4b5bd72579fe..52293e8c3fef 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/libmd-1.0.0 b/metadata/md5-cache/app-crypt/libmd-1.0.0
index d4095fb314bf..6d30cc788a18 100644
--- a/metadata/md5-cache/app-crypt/libmd-1.0.0
+++ b/metadata/md5-cache/app-crypt/libmd-1.0.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
DESCRIPTION=Message Digest functions from BSD systems
EAPI=6
HOMEPAGE=https://www.hadrons.org/software/libmd/
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=|| ( BSD BSD-2 ISC BEER-WARE public-domain )
SLOT=0
SRC_URI=https://archive.hadrons.org/software/libmd/libmd-1.0.0.tar.xz
-_md5_=a16a5020a0ebba8bf9469c5492347860
+_md5_=cffbbca50ec2a26d6ace708fe4c5e53f
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18.6 b/metadata/md5-cache/app-crypt/libsecret-0.18.6
index c3682b4f3f55..da9aba6ea74b 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18.6
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18.6
@@ -4,7 +4,7 @@ DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
EAPI=5
HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
IUSE=+crypt +introspection test vala debug test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
LICENSE=LGPL-2.1+ Apache-2.0
PDEPEND=>=gnome-base/gnome-keyring-3
RDEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
@@ -12,4 +12,4 @@ REQUIRED_USE=vala? ( introspection )
SLOT=0
SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.6.tar.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fb996aa31f3f75a4ccd82c573d1652a3
+_md5_=c1bcbef97d61819ff6eae6d3024c21e2
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.23.9 b/metadata/md5-cache/app-crypt/p11-kit-0.23.9
index a6cd7a7f1b30..27582ce016f9 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.23.9
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.23.9
@@ -4,11 +4,11 @@ DESCRIPTION=Provides a standard configuration setup for installing PKCS#11
EAPI=6
HOMEPAGE=https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit
IUSE=+asn1 debug +libffi +trust abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=asn1? ( >=dev-libs/libtasn1-3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) trust? ( app-misc/ca-certificates )
REQUIRED_USE=trust? ( asn1 )
SLOT=0
SRC_URI=https://github.com/p11-glue/p11-kit/releases/download/0.23.9/p11-kit-0.23.9.tar.gz
_eclasses_=ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=72f16a0f05f2be3fa46d860137b4f587
+_md5_=3e3d0fdc96e7dcbd53b7c915a424fd5e
diff --git a/metadata/md5-cache/app-crypt/signing-party-2.7 b/metadata/md5-cache/app-crypt/signing-party-2.7
index f1ef3eaf5893..5b59702d876b 100644
--- a/metadata/md5-cache/app-crypt/signing-party-2.7
+++ b/metadata/md5-cache/app-crypt/signing-party-2.7
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl app-crypt/libmd >=app-portage/elt-patches-20170422 !=app-crypt/gnupg-1.3.92 dev-perl/GnuPG-Interface dev-perl/Text-Template dev-perl/MIME-tools net-mail/qprint >=dev-perl/MailTools-1.62 dev-perl/Net-IDN-Encode virtual/mailx virtual/mta || ( dev-perl/libintl-perl dev-perl/Text-Iconv app-text/recode )
SLOT=0
SRC_URI=mirror://debian/pool/main/s/signing-party/signing-party_2.7.orig.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6e9f5a4ccabc1169a3024025bb086565
+_md5_=1ca6d20aecfaa62c9e96156f5e38c406
diff --git a/metadata/md5-cache/app-crypt/xca-1.4.1 b/metadata/md5-cache/app-crypt/xca-1.4.1
index 38dfef49a1c3..455afd0b5f23 100644
--- a/metadata/md5-cache/app-crypt/xca-1.4.1
+++ b/metadata/md5-cache/app-crypt/xca-1.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=A GUI to OpenSSL, RSA public keys, certificates, signing requests et
EAPI=6
HOMEPAGE=http://hohnstaedt.de/xca/
IUSE=bindist doc libressl
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
LICENSE=BSD
RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools )
SLOT=0
SRC_URI=https://github.com/chris2511/xca/releases/download/RELEASE.1.4.1/xca-1.4.1.tar.gz
_eclasses_=xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=515684668f911a8a5d86ac44f3aca44d
+_md5_=da19215389312efbe8c75143ffe8c0b9
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-qt-0.3.2-r1 b/metadata/md5-cache/app-crypt/yubikey-manager-qt-0.3.2-r1
deleted file mode 100644
index 00be30caad08..000000000000
--- a/metadata/md5-cache/app-crypt/yubikey-manager-qt-0.3.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=>=app-crypt/yubikey-manager-0.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyotherside[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtsingleapplication[qt5,X] dev-qt/qtdeclarative:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtwidgets:5
-DESCRIPTION=Cross-platform application for configuring any YubiKey over all USB transports
-EAPI=6
-HOMEPAGE=https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=>=app-crypt/yubikey-manager-0.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyotherside[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-qt/qtsingleapplication[qt5,X] dev-qt/qtdeclarative:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://github.com/Yubico/yubikey-manager-qt/archive/yubikey-manager-qt-0.3.2.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=c8234d4bb8df957757cc731ba0fdfd45
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 1581f1d1f526..8d719878b820 100644
Binary files a/metadata/md5-cache/app-dicts/Manifest.gz and b/metadata/md5-cache/app-dicts/Manifest.gz differ
diff --git a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3 b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
index feb0a5036f27..d77f03c72c1f 100644
--- a/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
+++ b/metadata/md5-cache/app-dicts/prime-dict-1.0.0-r3
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
DESCRIPTION=Dictionary files for PRIME input method
EAPI=5
HOMEPAGE=http://taiyaki.org/prime/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=elibc_FreeBSD ruby_targets_ruby23
KEYWORDS=alpha amd64 hppa ppc ppc64 ~sparc x86
LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 )
SLOT=0
SRC_URI=http://prime.sourceforge.jp/src/prime-dict-1.0.0.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=00dc926d1d7a13e4ce1742a26ba823c2
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 667548cb7287..11414c3637f2 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/diakonos-0.9.4 b/metadata/md5-cache/app-editors/diakonos-0.9.4
index b627022cdb60..33728f4026d6 100644
--- a/metadata/md5-cache/app-editors/diakonos-0.9.4
+++ b/metadata/md5-cache/app-editors/diakonos-0.9.4
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/curses[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/curses[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/curses[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/bacon[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/curses[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/curses[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/bacon[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/bacon[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
DESCRIPTION=A Linux editor for the masses
EAPI=5
HOMEPAGE=http://diakonos.pist0s.ca
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/curses[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/curses[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/curses[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/curses[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/curses[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=http://diakonos.pist0s.ca/archives/diakonos-0.9.4.tar.bz2
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=fa09b4329b6fef4466dfaf1855a33701
diff --git a/metadata/md5-cache/app-editors/editra-0.7.20-r2 b/metadata/md5-cache/app-editors/editra-0.7.20-r2
index ecbbc6f562c5..07177ebe1f98 100644
--- a/metadata/md5-cache/app-editors/editra-0.7.20-r2
+++ b/metadata/md5-cache/app-editors/editra-0.7.20-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare test
DEPEND=dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=Multi-platform text editor supporting over 50 programming languages
EAPI=6
-HOMEPAGE=http://editra.org https://pypi.org/project/Editra
+HOMEPAGE=http://editra.org https://pypi.org/project/Editra/
IUSE=spell python_targets_python2_7
KEYWORDS=amd64 x86
LICENSE=wxWinLL-3.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://editra.org/uploads/src/Editra-0.7.20.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98f0f52d39fb0a6767d5f2da04c63e08
+_md5_=f49f78075f06733e8b530fa4dfb2ab7b
diff --git a/metadata/md5-cache/app-editors/elvis-2.2.0-r4 b/metadata/md5-cache/app-editors/elvis-2.2.0-r6
similarity index 62%
rename from metadata/md5-cache/app-editors/elvis-2.2.0-r4
rename to metadata/md5-cache/app-editors/elvis-2.2.0-r6
index 3c1389f14e3c..8b98a5b89e5b 100644
--- a/metadata/md5-cache/app-editors/elvis-2.2.0-r4
+++ b/metadata/md5-cache/app-editors/elvis-2.2.0-r6
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=sys-libs/ncurses-5.7-r7:0= X? ( >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) app-eselect/eselect-vi virtual/pkgconfig
+DEPEND=>=sys-libs/ncurses-5.7-r7:0= X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) app-eselect/eselect-vi X? ( x11-base/xorg-proto ) virtual/pkgconfig
DESCRIPTION=A vi/ex clone
EAPI=5
HOMEPAGE=ftp://ftp.cs.pdx.edu/pub/elvis/
IUSE=X
KEYWORDS=amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris
LICENSE=Artistic
-RDEPEND=>=sys-libs/ncurses-5.7-r7:0= X? ( >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) app-eselect/eselect-vi
+RDEPEND=>=sys-libs/ncurses-5.7-r7:0= X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) app-eselect/eselect-vi
SLOT=0
SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5730eebda7cea790a1b9a09a70c90ad6
+_md5_=ff2cc91fc4991810ff1f5ea93c09592b
diff --git a/metadata/md5-cache/app-editors/elvis-2.2.0-r5 b/metadata/md5-cache/app-editors/elvis-2.2.0-r7
similarity index 53%
rename from metadata/md5-cache/app-editors/elvis-2.2.0-r5
rename to metadata/md5-cache/app-editors/elvis-2.2.0-r7
index e7f5f10de926..9b1c039fe03f 100644
--- a/metadata/md5-cache/app-editors/elvis-2.2.0-r5
+++ b/metadata/md5-cache/app-editors/elvis-2.2.0-r7
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst postrm
-DEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) virtual/pkgconfig
+DEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) X? ( x11-base/xorg-proto ) virtual/pkgconfig
DESCRIPTION=A vi/ex clone
EAPI=6
HOMEPAGE=http://elvis.the-little-red-haired-girl.org
IUSE=X
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris
LICENSE=Artistic
-RDEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 )
+RDEPEND=sys-libs/ncurses:0= app-eselect/eselect-vi X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 )
SLOT=0
SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=171d459ac3fd38ae07e4ce48dc782471
+_md5_=12a65562c8e99fe728b5f2dbc52d9c3c
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r1 b/metadata/md5-cache/app-editors/emacs-25.3-r1
deleted file mode 100644
index 713ee7dea864..000000000000
--- a/metadata/md5-cache/app-editors/emacs-25.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr )
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) !=sys-apps/sed-4
-DESCRIPTION=A fullscreen and distraction-free word processor
-EAPI=6
-HOMEPAGE=https://gottcode.org/focuswriter/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3 GPL-3
-RDEPEND=app-text/hunspell:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtwidgets:5 sys-libs/zlib
-SLOT=0
-SRC_URI=https://gottcode.org/focuswriter/focuswriter-1.6.7-src.tar.bz2
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fbf5e29eefcfe6255ac8244439db9417
diff --git a/metadata/md5-cache/app-editors/focuswriter-1.6.8 b/metadata/md5-cache/app-editors/focuswriter-1.6.8
deleted file mode 100644
index a6ce6450898e..000000000000
--- a/metadata/md5-cache/app-editors/focuswriter-1.6.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=app-text/hunspell:= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtwidgets:5 sys-libs/zlib dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A fullscreen and distraction-free word processor
-EAPI=6
-HOMEPAGE=https://gottcode.org/focuswriter/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3 GPL-3
-RDEPEND=app-text/hunspell:= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtwidgets:5 sys-libs/zlib
-SLOT=0
-SRC_URI=https://gottcode.org/focuswriter/focuswriter-1.6.8-src.tar.bz2
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27c2be363f7712148b2a5023295da51d
diff --git a/metadata/md5-cache/app-editors/focuswriter-1.6.9-r1 b/metadata/md5-cache/app-editors/focuswriter-1.6.9-r1
deleted file mode 100644
index 9452ae38dc0f..000000000000
--- a/metadata/md5-cache/app-editors/focuswriter-1.6.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=app-text/hunspell:= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 sys-libs/zlib dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A fullscreen and distraction-free word processor
-EAPI=6
-HOMEPAGE=https://gottcode.org/focuswriter/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3 GPL-3
-RDEPEND=app-text/hunspell:= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 sys-libs/zlib
-SLOT=0
-SRC_URI=https://gottcode.org/focuswriter/focuswriter-1.6.9-src.tar.bz2
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fd6c7967edc2c7ce0780a8810b9d697
diff --git a/metadata/md5-cache/app-editors/nano-2.9.4 b/metadata/md5-cache/app-editors/nano-2.9.6
similarity index 93%
rename from metadata/md5-cache/app-editors/nano-2.9.4
rename to metadata/md5-cache/app-editors/nano-2.9.6
index 8fee7ec577a4..251d3c9d38f6 100644
--- a/metadata/md5-cache/app-editors/nano-2.9.4
+++ b/metadata/md5-cache/app-editors/nano-2.9.6
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
LICENSE=GPL-3
RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v2.9/nano-2.9.4.tar.gz
+SRC_URI=https://www.nano-editor.org/dist/v2.9/nano-2.9.6.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e59a972d012fbd1887402e7acbd6abda
+_md5_=3e6d0eca0b59ee64325a0c467dfac466
diff --git a/metadata/md5-cache/app-editors/nano-9999 b/metadata/md5-cache/app-editors/nano-9999
index 5b900da77705..86bb8c5ba70e 100644
--- a/metadata/md5-cache/app-editors/nano-9999
+++ b/metadata/md5-cache/app-editors/nano-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3
RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
SLOT=0
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 25b08efef07cea6bcd45b8c6dcce2782 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=913bd447e5598f78fa69264459dec295
+_md5_=3e6d0eca0b59ee64325a0c467dfac466
diff --git a/metadata/md5-cache/app-editors/xvile-9.8r b/metadata/md5-cache/app-editors/xvile-9.8r-r1
similarity index 85%
rename from metadata/md5-cache/app-editors/xvile-9.8r
rename to metadata/md5-cache/app-editors/xvile-9.8r-r1
index 9a191c3a218c..4630f27695bf 100644
--- a/metadata/md5-cache/app-editors/xvile-9.8r
+++ b/metadata/md5-cache/app-editors/xvile-9.8r-r1
@@ -1,12 +1,12 @@
DEFINED_PHASES=configure install
-DEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8r >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4 sys-devel/flex
+DEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8r >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 x11-base/xorg-proto sys-devel/flex
DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
EAPI=6
HOMEPAGE=https://invisible-island.net/vile/
IUSE=perl
KEYWORDS=alpha amd64 ia64 ppc sparc x86
LICENSE=GPL-2
-RDEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8r >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4
+RDEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8r >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2
SLOT=0
SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8r.tgz
-_md5_=aaedd720c11c8113805f1070c6e5af5e
+_md5_=c98850dad892e5485990f274a900052e
diff --git a/metadata/md5-cache/app-editors/xvile-9.8s b/metadata/md5-cache/app-editors/xvile-9.8s-r1
similarity index 85%
rename from metadata/md5-cache/app-editors/xvile-9.8s
rename to metadata/md5-cache/app-editors/xvile-9.8s-r1
index ba581953fd3d..0e9404d312be 100644
--- a/metadata/md5-cache/app-editors/xvile-9.8s
+++ b/metadata/md5-cache/app-editors/xvile-9.8s-r1
@@ -1,12 +1,12 @@
DEFINED_PHASES=configure install
-DEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8s >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4 sys-devel/flex
+DEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8s >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 x11-base/xorg-proto sys-devel/flex
DESCRIPTION=VI Like Emacs -- yet another full-featured vi clone
EAPI=6
HOMEPAGE=https://invisible-island.net/vile/
IUSE=perl
KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
LICENSE=GPL-2
-RDEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8s >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 >=x11-proto/xproto-7.0.4
+RDEPEND=perl? ( dev-lang/perl ) =app-editors/vile-9.8s >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2
SLOT=0
SRC_URI=ftp://invisible-island.net/vile/current/vile-9.8s.tgz
-_md5_=a3a26f8078863c9fbd1e8cd67c36d738
+_md5_=4b4502cb75d26aef35ea2e1608f23fee
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 0ed18e8a2dd3..40d7a6034fb2 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/bochs-2.6.9 b/metadata/md5-cache/app-emulation/bochs-2.6.9
index d36870a9da41..1d90c458c6da 100644
--- a/metadata/md5-cache/app-emulation/bochs-2.6.9
+++ b/metadata/md5-cache/app-emulation/bochs-2.6.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure prepare
-DEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) readline? ( sys-libs/readline:= ) ncurses? ( sys-libs/ncurses:= ) doc? ( app-text/docbook-sgml-utils ) X? ( x11-proto/xproto ) sys-apps/sed >=app-text/opensp-1.5
+DEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) readline? ( sys-libs/readline:= ) ncurses? ( sys-libs/ncurses:= ) doc? ( app-text/docbook-sgml-utils ) X? ( x11-base/xorg-proto ) sys-apps/sed >=app-text/opensp-1.5
DESCRIPTION=LGPL-ed pc emulator
EAPI=6
HOMEPAGE=http://bochs.sourceforge.net/
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXpm ) sd
REQUIRED_USE=avx? ( x86-64 ) gdb? ( !debugger !smp ) debugger? ( !gdb )
SLOT=0
SRC_URI=mirror://sourceforge/bochs/bochs-2.6.9.tar.gz
-_md5_=6e4400f8dd0c3788c193529bb3e0ae5e
+_md5_=8445723f74bb763bd684e14f37e25e6f
diff --git a/metadata/md5-cache/app-emulation/docker-18.03.0-r1 b/metadata/md5-cache/app-emulation/docker-18.03.1
similarity index 81%
rename from metadata/md5-cache/app-emulation/docker-18.03.0-r1
rename to metadata/md5-cache/app-emulation/docker-18.03.1
index 47ca51743d0f..c74cac0a1e83 100644
--- a/metadata/md5-cache/app-emulation/docker-18.03.0-r1
+++ b/metadata/md5-cache/app-emulation/docker-18.03.1
@@ -6,9 +6,9 @@ HOMEPAGE=https://dockerproject.org
IUSE=apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp
KEYWORDS=~amd64 ~arm
LICENSE=Apache-2.0
-RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.0.2 ~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180314 container-init? ( >=sys-process/tini-0.16.1[static] )
+RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.0.3 ~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180411 container-init? ( >=sys-process/tini-0.16.1[static] )
RESTRICT=installsources strip
SLOT=0
-SRC_URI=https://github.com/docker/docker-ce/archive/v18.03.0-ce.tar.gz -> docker-18.03.0.tar.gz
+SRC_URI=https://github.com/docker/docker-ce/archive/v18.03.1-ce.tar.gz -> docker-18.03.1.tar.gz
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 estack 43ddf5aaffa7a8d0482df54d25a66a1f golang-base 928887539e385bb489681b292f6b862f golang-vcs-snapshot 913580335becddd3ebecefe852e47536 linux-info ca370deef9d44125d829f2eb6ebc83e0 multilib 97f470f374f2e94ccab04a2fb21d811e systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 udev d91cac2c73b94629cad2daea66e0d182 user 8bc2845510e2109af75e3eeac607ec81 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8103c982b63b51470c2401213d12dff3
+_md5_=b67075642d63bbaf7b1dc4ba71857ce1
diff --git a/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411 b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
new file mode 100644
index 000000000000..06adeba7ed4f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-proxy-0.8.0_p20180411
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Docker container networking
+EAPI=6
+HOMEPAGE=https://github.com/docker/libnetwork
+KEYWORDS=~amd64 ~arm ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=! docker-proxy-0.8.0_p20180411.tar.gz
+_eclasses_=golang-base 928887539e385bb489681b292f6b862f golang-vcs-snapshot 913580335becddd3ebecefe852e47536
+_md5_=d8e444003ee756aa0ed3ff451b410d7f
diff --git a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5 b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
index aa805e80230a..3bdf727db295 100644
--- a/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
+++ b/metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXext x11-libs/libXdmcp x11-apps/xset x11-apps/xlsfonts x11-apps/bdftopcf x11-apps/mkfontdir ) svga? ( media-libs/svgalib ) gpm? ( sys-libs/gpm ) alsa? ( media-libs/alsa-lib ) sndfile? ( media-libs/libsndfile ) fluidsynth? ( media-sound/fluidsynth media-sound/fluid-soundfont ) media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-proto/xf86dgaproto ) >=sys-devel/autoconf-2.57 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXext x11-libs/libXdmcp x11-apps/xset x11-apps/xlsfonts x11-apps/bdftopcf x11-apps/mkfontdir ) svga? ( media-libs/svgalib ) gpm? ( sys-libs/gpm ) alsa? ( media-libs/alsa-lib ) sndfile? ( media-libs/libsndfile ) fluidsynth? ( media-sound/fluidsynth media-sound/fluid-soundfont ) media-libs/libsdl >=sys-libs/slang-1.4 X? ( x11-base/xorg-proto ) >=sys-devel/autoconf-2.57 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=DOS Emulator
EAPI=6
HOMEPAGE=http://www.dosemu.org/
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXau x11-libs/libXex
SLOT=0
SRC_URI=mirror://sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz https://sourceforge.net/code-snapshots/git/d/do/dosemu/code.git/dosemu-code-15cfb41ff20a052769d753c3262c57ecb050ad71.zip -> dosemu-1.4.1_pre20130107.zip
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9f8360e17242bae7f0505dddafe64d02
+_md5_=97cbe682647ddf342b101d0acdecf383
diff --git a/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3 b/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
index 92a72eb9a765..d6ce663a945b 100644
--- a/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
+++ b/metadata/md5-cache/app-emulation/e-uae-0.8.29_rc4-r3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare
-DEPEND=X? ( x11-libs/libXt x11-libs/libxkbfile x11-libs/libXext x11-misc/xkeyboard-config dga? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !X? ( sdl? ( media-libs/libsdl ) !sdl? ( sys-libs/ncurses:0= ) ) alsa? ( media-libs/alsa-lib ) !alsa? ( sdl-sound? ( media-libs/sdl-sound ) ) capslib? ( >=games-emulation/caps-20060612 ) sys-libs/zlib virtual/cdrtools X? ( dga? ( x11-proto/xf86vidmodeproto x11-proto/xf86dgaproto ) )
+DEPEND=X? ( x11-libs/libXt x11-libs/libxkbfile x11-libs/libXext x11-misc/xkeyboard-config dga? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !X? ( sdl? ( media-libs/libsdl ) !sdl? ( sys-libs/ncurses:0= ) ) alsa? ( media-libs/alsa-lib ) !alsa? ( sdl-sound? ( media-libs/sdl-sound ) ) capslib? ( >=games-emulation/caps-20060612 ) sys-libs/zlib virtual/cdrtools X? ( dga? ( x11-base/xorg-proto ) )
DESCRIPTION=The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE
EAPI=6
HOMEPAGE=http://www.rcdrummond.net/uae/
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libXt x11-libs/libxkbfile x11-libs/libXext x11-misc/xkeybo
SLOT=0
SRC_URI=http://www.rcdrummond.net/uae/e-uae-0.8.29-WIP4/e-uae-0.8.29-WIP4.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e04a9752b5bae21239d07dafdb962e1d
+_md5_=00be1672c758d81b383a1b75c3338284
diff --git a/metadata/md5-cache/app-emulation/gxemul-0.6.0-r1 b/metadata/md5-cache/app-emulation/gxemul-0.6.0-r1
index bb0fb0ccb2b8..117615747937 100644
--- a/metadata/md5-cache/app-emulation/gxemul-0.6.0-r1
+++ b/metadata/md5-cache/app-emulation/gxemul-0.6.0-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure install prepare
-DEPEND=X? ( x11-libs/libX11 ) X? ( x11-proto/xproto )
+DEPEND=X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto )
DESCRIPTION=A Machine Emulator, Mainly emulates MIPS, but supports other CPU types
EAPI=4
HOMEPAGE=http://gxemul.sourceforge.net/
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libX11 )
SLOT=0
SRC_URI=mirror://sourceforge/project/gxemul/GXemul/0.6.0/gxemul-0.6.0.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=98293d087780a0b2bf630d81739d503d
+_md5_=a959d769e65c58e9114ec243debe6e4d
diff --git a/metadata/md5-cache/app-emulation/lxc-1.0.11 b/metadata/md5-cache/app-emulation/lxc-1.0.11
deleted file mode 100644
index b5066bfa1f0a..000000000000
--- a/metadata/md5-cache/app-emulation/lxc-1.0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=net-libs/gnutls sys-libs/libcap lua? ( >=dev-lang/lua-5.1:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) seccomp? ( sys-libs/libseccomp ) doc? ( app-text/docbook-sgml-utils ) >=sys-kernel/linux-headers-3.2 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=LinuX Containers userspace utilities
-EAPI=5
-HOMEPAGE=https://linuxcontainers.org/
-IUSE=doc examples lua python seccomp python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3
-RDEPEND=net-libs/gnutls sys-libs/libcap lua? ( >=dev-lang/lua-5.1:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) seccomp? ( sys-libs/libseccomp ) sys-apps/util-linux app-misc/pax-utils virtual/awk
-REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-1.0.11.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91a0ed631e6286bcab273881e43efcaf
diff --git a/metadata/md5-cache/app-emulation/lxc-1.0.8 b/metadata/md5-cache/app-emulation/lxc-1.0.8
deleted file mode 100644
index 6fec8e597bf6..000000000000
--- a/metadata/md5-cache/app-emulation/lxc-1.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=net-libs/gnutls sys-libs/libcap lua? ( >=dev-lang/lua-5.1:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) seccomp? ( sys-libs/libseccomp ) doc? ( app-text/docbook-sgml-utils ) >=sys-kernel/linux-headers-3.2 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=LinuX Containers userspace utilities
-EAPI=5
-HOMEPAGE=https://linuxcontainers.org/
-IUSE=doc examples lua python seccomp python_targets_python3_4
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=LGPL-3
-RDEPEND=net-libs/gnutls sys-libs/libcap lua? ( >=dev-lang/lua-5.1:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) seccomp? ( sys-libs/libseccomp ) sys-apps/util-linux app-misc/pax-utils virtual/awk
-REQUIRED_USE=python? ( || ( python_targets_python3_4 ) )
-SLOT=0
-SRC_URI=https://github.com/lxc/lxc/archive/lxc-1.0.8.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0deea22de62b90bfa1debb57f728683c
diff --git a/metadata/md5-cache/app-emulation/lxc-2.0.7 b/metadata/md5-cache/app-emulation/lxc-2.0.7
deleted file mode 100644
index 619f80221052..000000000000
--- a/metadata/md5-cache/app-emulation/lxc-2.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) seccomp? ( sys-libs/libseccomp ) doc? ( app-text/docbook-sgml-utils ) >=sys-kernel/linux-headers-3.2 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=LinuX Containers userspace utilities
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/
-IUSE=cgmanager doc examples lua python seccomp python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm ~arm64
-LICENSE=LGPL-3
-RDEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) seccomp? ( sys-libs/libseccomp ) sys-process/criu sys-apps/util-linux app-misc/pax-utils virtual/awk
-REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 ) )
-SLOT=0
-SRC_URI=https://github.com/lxc/lxc/archive/lxc-2.0.7.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bbefff1c669392af79867e02a8eb6613
diff --git a/metadata/md5-cache/app-emulation/lxc-2.0.9 b/metadata/md5-cache/app-emulation/lxc-2.0.9
deleted file mode 100644
index e35469b5d2e3..000000000000
--- a/metadata/md5-cache/app-emulation/lxc-2.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) app-text/docbook-sgml-utils >=sys-kernel/linux-headers-3.2 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=LinuX Containers userspace utilities
-EAPI=6
-HOMEPAGE=https://linuxcontainers.org/
-IUSE=cgmanager examples lua python seccomp selinux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
-LICENSE=LGPL-3
-RDEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) sys-apps/util-linux app-misc/pax-utils virtual/awk
-REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-2.0.9.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c32b48d34728830b94744e80529c5f77
diff --git a/metadata/md5-cache/app-emulation/lxc-3.0.0 b/metadata/md5-cache/app-emulation/lxc-3.0.0
new file mode 100644
index 000000000000..c9c8915caa03
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxc-3.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=net-libs/gnutls sys-libs/libcap pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) app-text/docbook-sgml-utils >=sys-kernel/linux-headers-3.2 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=LinuX Containers userspace utilities
+EAPI=6
+HOMEPAGE=https://linuxcontainers.org/
+IUSE=examples pam seccomp selinux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RDEPEND=net-libs/gnutls sys-libs/libcap pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) sys-apps/util-linux app-misc/pax-utils virtual/awk
+SLOT=0
+SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-3.0.0.tar.gz
+_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ddedc25edb1fe2d38aaeeffbafa311f0
diff --git a/metadata/md5-cache/app-emulation/q4wine-1.3.5 b/metadata/md5-cache/app-emulation/q4wine-1.3.5
deleted file mode 100644
index 8c7eb42490ae..000000000000
--- a/metadata/md5-cache/app-emulation/q4wine-1.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) ico? ( >=media-gfx/icoutils-0.26.0 ) dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Qt GUI configuration tool for Wine
-EAPI=6
-HOMEPAGE=https://q4wine.brezblock.org.ua/
-IUSE=+dbus debug +ico +iso +wineappdb
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsingleapplication[qt5,X] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) ico? ( >=media-gfx/icoutils-0.26.0 ) app-admin/sudo >=sys-apps/which-2.19 iso? ( sys-fs/fuseiso )
-SLOT=0
-SRC_URI=mirror://sourceforge/q4wine/q4wine-1.3.5.tar.bz2
-_eclasses_=cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=514e3778dfc714967a00ce97179a3a2c
diff --git a/metadata/md5-cache/app-emulation/q4wine-1.3.6-r1 b/metadata/md5-cache/app-emulation/q4wine-1.3.6-r1
index 752b71455cfb..736b3d8d690f 100644
--- a/metadata/md5-cache/app-emulation/q4wine-1.3.6-r1
+++ b/metadata/md5-cache/app-emulation/q4wine-1.3.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Qt GUI configuration tool for Wine
EAPI=6
HOMEPAGE=https://q4wine.brezblock.org.ua/
IUSE=+dbus debug +ico +iso +wineappdb
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtxml:5 dbus? ( dev-qt/qtdbus:5 ) ico? ( >=media-gfx/icoutils-0.26.0 ) app-admin/sudo >=sys-apps/which-2.19 iso? ( sys-fs/fuseiso )
SLOT=0
SRC_URI=mirror://sourceforge/q4wine/q4wine-1.3.6.tar.bz2
_eclasses_=cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b5d56bd16ddc1cec525f2cc514535995
+_md5_=592ee117dd94c867c7992decd1eb7d5a
diff --git a/metadata/md5-cache/app-emulation/spectemu-0.99.3 b/metadata/md5-cache/app-emulation/spectemu-0.99.3
index b789c1000c94..1ac231ce6d89 100644
--- a/metadata/md5-cache/app-emulation/spectemu-0.99.3
+++ b/metadata/md5-cache/app-emulation/spectemu-0.99.3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install unpack
-DEPEND=X? ( >=x11-proto/xf86vidmodeproto-2.2.2 >=x11-proto/xextproto-7.0.2 >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXxf86vm-1.0.0 ) readline? ( sys-libs/readline )
+DEPEND=X? ( x11-base/xorg-proto >=x11-libs/libX11-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXxf86vm-1.0.0 ) readline? ( sys-libs/readline )
DESCRIPTION=48k ZX Spectrum Emulator
EAPI=0
HOMEPAGE=http://kempelen.iit.bme.hu/~mszeredi/spectemu/spectemu.html
@@ -10,4 +10,4 @@ RDEPEND=svga? ( media-libs/svgalib )
SLOT=0
SRC_URI=http://www.inf.bme.hu/~mszeredi/spectemu/spectemu-0.99.3.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b32baae9fe3620313339c9abe855d942
+_md5_=d5812da8c59781752346636a85ae7063
diff --git a/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1 b/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
index e570cffaf18f..3dfdf1586fbf 100644
--- a/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
+++ b/metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure install prepare
-DEPEND=X? ( >=x11-proto/xf86vidmodeproto-2.2.2 >=x11-proto/xextproto-7.0.2 >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXxf86vm-1.0.0 ) readline? ( sys-libs/readline ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=X? ( x11-base/xorg-proto >=x11-libs/libX11-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXxf86vm-1.0.0 ) readline? ( sys-libs/readline ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=48k ZX Spectrum Emulator
EAPI=4
HOMEPAGE=http://kempelen.iit.bme.hu/~mszeredi/spectemu/spectemu.html
IUSE=readline svga +X
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
-RDEPEND=X? ( >=x11-proto/xf86vidmodeproto-2.2.2 >=x11-proto/xextproto-7.0.2 >=x11-proto/xproto-7.0.4 >=x11-libs/libX11-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXxf86vm-1.0.0 ) readline? ( sys-libs/readline ) svga? ( media-libs/svgalib )
+RDEPEND=X? ( x11-base/xorg-proto >=x11-libs/libX11-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXxf86vm-1.0.0 ) readline? ( sys-libs/readline ) svga? ( media-libs/svgalib )
REQUIRED_USE=|| ( svga X )
SLOT=0
SRC_URI=http://www.inf.bme.hu/~mszeredi/spectemu/spectemu-0.99.3.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=daf6c2ff1bfd5cd977e6987fc5617a34
+_md5_=15dd4a6fd9e3c90dcb817142cd404c3c
diff --git a/metadata/md5-cache/app-emulation/spim-8.0-r3 b/metadata/md5-cache/app-emulation/spim-8.0-r3
index 7d6e8b1d92d8..3701b0ff51f6 100644
--- a/metadata/md5-cache/app-emulation/spim-8.0-r3
+++ b/metadata/md5-cache/app-emulation/spim-8.0-r3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=X? ( media-fonts/font-adobe-100dpi x11-libs/libXaw ) X? ( x11-misc/imake x11-proto/xproto ) sys-devel/bison
+DEPEND=X? ( media-fonts/font-adobe-100dpi x11-libs/libXaw ) X? ( x11-base/xorg-proto x11-misc/imake ) sys-devel/bison
DESCRIPTION=MIPS Simulator
EAPI=6
HOMEPAGE=http://spimsimulator.sourceforge.net/
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://www.cs.wisc.edu/~larus/SPIM/spim-8.0.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=457081de4771ac0f1d60274b6f866983
+_md5_=7bb58c5f0a2661c520aaa287d69150b8
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.0.2 b/metadata/md5-cache/app-emulation/vagrant-2.0.2
index 8960de0b2153..658fabe749fe 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.0.2
+++ b/metadata/md5-cache/app-emulation/vagrant-2.0.2
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] =dev-ruby/listen-3.1.5[ruby_targets_ruby22] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby22] =dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby22] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby22] || ( dev-ruby/rest-client:2[ruby_targets_ruby22] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby22] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby22] =dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] =dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] =dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] =dev-ruby/rake-12.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-12.0.0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] =dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] =dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] =dev-ruby/rake-12.0.0[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
DESCRIPTION=A tool for building and distributing development environments
EAPI=6
HOMEPAGE=http://vagrantup.com/
-IUSE=+virtualbox test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=+virtualbox test elibc_FreeBSD ruby_targets_ruby23 test test
KEYWORDS=~amd64
LICENSE=MIT
-RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] =dev-ruby/listen-3.1.5[ruby_targets_ruby22] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby22] =dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby22] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby22] || ( dev-ruby/rest-client:2[ruby_targets_ruby22] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby22] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby22] =dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] =dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] =dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] =dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] =dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] =dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] vagrant-2.0.2.tar.gz
-_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=7f8e9873e717864cb22b81c5d2c90a35
diff --git a/metadata/md5-cache/app-emulation/vagrant-2.0.3 b/metadata/md5-cache/app-emulation/vagrant-2.0.3
index 1d41f7be21c8..d33b641e87b9 100644
--- a/metadata/md5-cache/app-emulation/vagrant-2.0.3
+++ b/metadata/md5-cache/app-emulation/vagrant-2.0.3
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] =dev-ruby/listen-3.1.5[ruby_targets_ruby22] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby22] =dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby22] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby22] || ( dev-ruby/rest-client:2[ruby_targets_ruby22] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby22] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby22] =dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] =dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] =dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] =dev-ruby/rake-12.0.0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rake-12.0.0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] =dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] =dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] =dev-ruby/rake-12.0.0[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
DESCRIPTION=A tool for building and distributing development environments
EAPI=6
HOMEPAGE=http://vagrantup.com/
-IUSE=+virtualbox test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=+virtualbox test elibc_FreeBSD ruby_targets_ruby23 test test
KEYWORDS=~amd64
LICENSE=MIT
-RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) ) ruby_targets_ruby22? ( >=dev-ruby/childprocess-0.6.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] =dev-ruby/listen-3.1.5[ruby_targets_ruby22] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby22] =dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby22] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby22] || ( dev-ruby/rest-client:2[ruby_targets_ruby22] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby22] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby22] =dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] =dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] =dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] =dev-ruby/childprocess-0.6.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] =dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.5[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] =dev-ruby/net-ssh-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.2.0[ruby_targets_ruby23] || ( dev-ruby/rest-client:2[ruby_targets_ruby23] >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.7.1[ruby_targets_ruby23] vagrant-2.0.3.tar.gz
-_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=7f8e9873e717864cb22b81c5d2c90a35
diff --git a/metadata/md5-cache/app-emulation/vice-3.1 b/metadata/md5-cache/app-emulation/vice-3.1
index ff79a4ed2c1e..bce9c0dc02c9 100644
--- a/metadata/md5-cache/app-emulation/vice-3.1
+++ b/metadata/md5-cache/app-emulation/vice-3.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure install prepare
-DEPEND=virtual/jpeg:0 virtual/opengl media-libs/giflib alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) sdlsound? ( media-libs/libsdl[sound] ) ethernet? ( >=net-libs/libpcap-0.9.8 >=net-libs/libnet-1.1.2.1:1.1 ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) lame? ( media-sound/lame ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) zlib? ( sys-libs/zlib:= ) sdl? ( media-libs/libsdl[joystick,video] ) !sdl? ( x11-libs/libX11 x11-libs/libXext sys-libs/readline:0= fullscreen? ( x11-libs/libXrandr x11-libs/libXxf86vm ) !gtk? ( x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-libs/libXv Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) gtk? ( x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/pango x11-libs/cairo vte? ( x11-libs/vte:0 ) ) virtual/pkgconfig x11-apps/bdftopcf x11-apps/mkfontdir x11-proto/xproto x11-proto/xextproto media-libs/fontconfig x11-proto/videoproto nls? ( sys-devel/gettext ) !sdl? ( fullscreen? ( x11-proto/xf86vidmodeproto ) !gtk? ( x11-libs/libICE x11-libs/libSM ) ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=virtual/jpeg:0 virtual/opengl media-libs/giflib alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) sdlsound? ( media-libs/libsdl[sound] ) ethernet? ( >=net-libs/libpcap-0.9.8 >=net-libs/libnet-1.1.2.1:1.1 ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) lame? ( media-sound/lame ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) zlib? ( sys-libs/zlib:= ) sdl? ( media-libs/libsdl[joystick,video] ) !sdl? ( x11-libs/libX11 x11-libs/libXext sys-libs/readline:0= fullscreen? ( x11-libs/libXrandr x11-libs/libXxf86vm ) !gtk? ( x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-libs/libXv Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) gtk? ( x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/pango x11-libs/cairo vte? ( x11-libs/vte:0 ) ) virtual/pkgconfig x11-apps/bdftopcf x11-apps/mkfontdir x11-base/xorg-proto media-libs/fontconfig nls? ( sys-devel/gettext ) !sdl? ( !gtk? ( x11-libs/libICE x11-libs/libSM ) ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=The Versatile Commodore 8-bit Emulator
EAPI=6
HOMEPAGE=http://vice-emu.sourceforge.net/
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( gtk sdl )
SLOT=0
SRC_URI=mirror://sourceforge/vice-emu/releases/vice-3.1.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=faeb9929997fcb2e899163e5f6bc1145
+_md5_=8fe2f0dcf6bcafe0beae99f2388ddead
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.32 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.32
index 256c2fbc8648..b994b293b212 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.32
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.32
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
EAPI=6
HOMEPAGE=https://www.virtualbox.org/
@@ -7,8 +7,8 @@ IUSE=X kernel_linux
KEYWORDS=amd64 x86
LICENSE=GPL-2
PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.32 )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
SLOT=0
SRC_URI=https://download.virtualbox.org/virtualbox/5.1.32/VirtualBox-5.1.32.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod 731711290c6e38e1cf7ddcdca7d445e1 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=382385e761fe6635c54b60e39aaeddc8
+_md5_=065caf200910a92fcdf4fc774f3a67ed
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.34 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.34
index b5635b88f7eb..2ea7ad1857ff 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.34
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.34
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
EAPI=6
HOMEPAGE=https://www.virtualbox.org/
@@ -7,8 +7,8 @@ IUSE=X kernel_linux
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.34 )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
SLOT=0
SRC_URI=https://download.virtualbox.org/virtualbox/5.1.34/VirtualBox-5.1.34.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod 731711290c6e38e1cf7ddcdca7d445e1 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=963f43726bdce9e2176f5549364be21b
+_md5_=1798e3815715f86de668caf1b34e68c4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36
index d12c4d830725..c9810efd6e9a 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.1.36
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox >=dev-util/kbuild-0.1.9998_pre20131130 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
EAPI=6
HOMEPAGE=https://www.virtualbox.org/
@@ -7,8 +7,8 @@ IUSE=X kernel_linux
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
PDEPEND=X? ( ~x11-drivers/xf86-video-virtualbox-5.1.36 )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox kernel_linux? ( virtual/modutils )
SLOT=0
SRC_URI=https://download.virtualbox.org/virtualbox/5.1.36/VirtualBox-5.1.36.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.32-patches-01.tar.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod 731711290c6e38e1cf7ddcdca7d445e1 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=963f43726bdce9e2176f5549364be21b
+_md5_=1798e3815715f86de668caf1b34e68c4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.10 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.10
index 19e28e832278..cac04cbee615 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.10
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.10
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
EAPI=6
HOMEPAGE=https://www.virtualbox.org/
@@ -7,8 +7,8 @@ IUSE=X kernel_linux
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox kernel_linux? ( virtual/modutils )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox kernel_linux? ( virtual/modutils )
SLOT=0
SRC_URI=https://download.virtualbox.org/virtualbox/5.2.10/VirtualBox-5.2.10.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod 731711290c6e38e1cf7ddcdca7d445e1 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a7621df94dfbbfc464d522a43093322c
+_md5_=eba0892a4e461a1cefc70d496c4b7adc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.8 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.8
index 6409aa5b0c10..8273443fc3ec 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.8
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.8
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl X? ( x11-proto/renderproto ) !X? ( x11-proto/xproto ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
EAPI=6
HOMEPAGE=https://www.virtualbox.org/
@@ -7,8 +7,8 @@ IUSE=X kernel_linux
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
-RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE x11-proto/glproto ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox kernel_linux? ( virtual/modutils )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus !!x11-drivers/xf86-input-virtualbox !x11-drivers/xf86-video-virtualbox kernel_linux? ( virtual/modutils )
SLOT=0
SRC_URI=https://download.virtualbox.org/virtualbox/5.2.8/VirtualBox-5.2.8.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.1.30-patches-02.tar.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod 731711290c6e38e1cf7ddcdca7d445e1 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a7621df94dfbbfc464d522a43093322c
+_md5_=eba0892a4e461a1cefc70d496c4b7adc
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.0-r1 b/metadata/md5-cache/app-emulation/wine-any-2.0-r1
index 846b75265999..d2b154971abe 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-any-2.0-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-proto/xineramaproto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, with optional external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.0
SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.0.tar.gz -> wine-staging-2.0.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.0.tar.gz )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=12ab7fece6e5606af970acfa59bd4bb0
+_md5_=ec7e8d04045e41ee5ea7fd586e1d6f61
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.19 b/metadata/md5-cache/app-emulation/wine-any-2.19
index 0340424da398..e0f970aaffb7 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.19
+++ b/metadata/md5-cache/app-emulation/wine-any-2.19
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, with optional external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.19
SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.19.tar.gz -> wine-staging-2.19.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.19.tar.gz )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=567257b3cc4790604795d637bbc93c3f
+_md5_=ee215447d721624875aa54b680d14f84
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.20 b/metadata/md5-cache/app-emulation/wine-any-2.20
index 88f2b7c35015..b115a987a9a1 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.20
+++ b/metadata/md5-cache/app-emulation/wine-any-2.20
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, with optional external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.20
SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.20.tar.gz -> wine-staging-2.20.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.20.tar.gz )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a51aa8d30bb0fc43cb0a723417a4270
+_md5_=55c628a4d0577700ff7d5bcec3a3a959
diff --git a/metadata/md5-cache/app-emulation/wine-any-2.21 b/metadata/md5-cache/app-emulation/wine-any-2.21
index 98900c87a275..41b61f7b5ee0 100644
--- a/metadata/md5-cache/app-emulation/wine-any-2.21
+++ b/metadata/md5-cache/app-emulation/wine-any-2.21
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, with optional external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.21
SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.21.tar.gz -> wine-staging-2.21.tar.gz ) d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.21.tar.gz )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a51aa8d30bb0fc43cb0a723417a4270
+_md5_=55c628a4d0577700ff7d5bcec3a3a959
diff --git a/metadata/md5-cache/app-emulation/wine-any-9999 b/metadata/md5-cache/app-emulation/wine-any-9999
index f021aa3930f9..5f96c1e26e6c 100644
--- a/metadata/md5-cache/app-emulation/wine-any-9999
+++ b/metadata/md5-cache/app-emulation/wine-any-9999
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-proto/xineramaproto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
DESCRIPTION=Free implementation of Windows(tm) on Unix, with optional external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=9999
SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 25b08efef07cea6bcd45b8c6dcce2782 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5e351bd10a2fc9f049b1b2f72fa5d4da
+_md5_=c83fcc7cca091ea098ed087d5d1cb2cd
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1 b/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
index c0fcc301bb94..ce21ba03eaee 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.0-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, with Gallium Nine patchset
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.0
SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.0.tar.gz )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=800b4eb2a10fad7c6f33143147fd39bb
+_md5_=220ffa093c4acc4be3a36472044e3198
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.19 b/metadata/md5-cache/app-emulation/wine-d3d9-2.19
index 8b571bbf7f6e..36acf2dc8d3e 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.19
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.19
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, with Gallium Nine patchset
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.19
SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.19.tar.gz )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c42129c3563b72f8740580625974d21a
+_md5_=84654fa8107d564a26afe51b771b436a
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.20 b/metadata/md5-cache/app-emulation/wine-d3d9-2.20
index 6f3f488af61b..e98f6d57a51c 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.20
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.20
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, with Gallium Nine patchset
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.20
SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.20.tar.gz )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db5aa159fa479e9617c2c7d84e4e4554
+_md5_=8d5a10b2124db984248990f56fa235c3
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-2.21 b/metadata/md5-cache/app-emulation/wine-d3d9-2.21
index 43f8620f4e3a..0cace5a7f2c2 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-2.21
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-2.21
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, with Gallium Nine patchset
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.21
SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-2.21.tar.gz )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db5aa159fa479e9617c2c7d84e4e4554
+_md5_=8d5a10b2124db984248990f56fa235c3
diff --git a/metadata/md5-cache/app-emulation/wine-d3d9-9999 b/metadata/md5-cache/app-emulation/wine-d3d9-9999
index 6dbc7679cfdc..1eaf5828ac6f 100644
--- a/metadata/md5-cache/app-emulation/wine-d3d9-9999
+++ b/metadata/md5-cache/app-emulation/wine-d3d9-9999
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) d3d9? ( media-libs/mesa[d3d9,egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
DESCRIPTION=Free implementation of Windows(tm) on Unix, with Gallium Nine patchset
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=9999
SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 25b08efef07cea6bcd45b8c6dcce2782 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=537f7456d81a31db58471357db3e042c
+_md5_=500a040b582749a16abd7da07d8165a0
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.0-r1 b/metadata/md5-cache/app-emulation/wine-staging-2.0-r1
index b81200a45e37..dd05b393ab54 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.0-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-proto/xineramaproto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.0
SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.0.tar.gz -> wine-staging-2.0.tar.gz )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=76e039f033dcf4726bb088e05a6b9e88
+_md5_=d28fdb3298c6122272b9861157b59c85
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.19 b/metadata/md5-cache/app-emulation/wine-staging-2.19
index 2c8d500699e8..43890e9e9840 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.19
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.19
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.19
SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.19.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.19.tar.gz -> wine-staging-2.19.tar.gz )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4131791a29bccbeb9b8e6f9c348a14f0
+_md5_=47e83ce3742493bacb705d4e21aee4fa
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.20 b/metadata/md5-cache/app-emulation/wine-staging-2.20
index baef288377d8..9fca60463b6b 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.20
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.20
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.20
SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.20.tar.gz -> wine-staging-2.20.tar.gz )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=696163820c27eec59acb421611f34888
+_md5_=e2488a247724d5f95eb8e1cf9ccd58f6
diff --git a/metadata/md5-cache/app-emulation/wine-staging-2.21 b/metadata/md5-cache/app-emulation/wine-staging-2.21
index f3f93cbbc1b9..11f149251416 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-2.21
+++ b/metadata/md5-cache/app-emulation/wine-staging-2.21
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.21
SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-compholio/wine-staging/archive/v2.21.tar.gz -> wine-staging-2.21.tar.gz )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=696163820c27eec59acb421611f34888
+_md5_=e2488a247724d5f95eb8e1cf9ccd58f6
diff --git a/metadata/md5-cache/app-emulation/wine-staging-9999 b/metadata/md5-cache/app-emulation/wine-staging-9999
index 97176b6a8955..b8e309fb3990 100644
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-proto/xineramaproto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=9999
SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 25b08efef07cea6bcd45b8c6dcce2782 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ec592acc9007c9b562e6bb6f8d707de2
+_md5_=32b13e4c3db2a8448bc22e7bf16a7c55
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1
index bf27d3007b3c..337ed00fae18 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.0
SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.tar.bz2 https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=719785e1f03c701ef68aba3a3038f971
+_md5_=b9900761a79dc46de4bd5c3b4cd8623c
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1-r1
index f92542e18cf5..e61194b6ffdf 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1-r1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.1-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.0.1
SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.1.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2ab9c59313d6774bc8f2e48cd1204a28
+_md5_=91c34f0a07e06b580a9d258110a91247
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2-r1 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2-r1
index 91488434031b..e3d3391017e2 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2-r1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.2-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.0.2
SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.2.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2ab9c59313d6774bc8f2e48cd1204a28
+_md5_=91c34f0a07e06b580a9d258110a91247
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.3 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.3
index c8c5a9402b55..ad60e57608c4 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.3
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.0.3
SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.3.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cfa437fc8388b1990dc55ea7d117baac
+_md5_=1be9ca7d24f6e8d0017e7a63022845e6
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.4 b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.4
index 9c19addc4c92..32b1309c6ee2 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.0.4
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.0.4
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.0.4
SRC_URI=https://dl.winehq.org/wine/source/2.0/wine-2.0.4.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d70d621ee4c90dfb4d602ca15a53e41f
+_md5_=a6d6b4f7e7a474059b7b6cba2b4d8bf9
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.20 b/metadata/md5-cache/app-emulation/wine-vanilla-2.20
index d72f55b72362..ca1237c529e5 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.20
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.20
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.20
SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.20.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27aa9af956747ed30b1c0913bc4cab01
+_md5_=797a9dc5dbe0607a12ee5fde0d9f52df
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.21 b/metadata/md5-cache/app-emulation/wine-vanilla-2.21
index 6d08212e9053..7819770f36f5 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.21
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.21
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.21
SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27aa9af956747ed30b1c0913bc4cab01
+_md5_=797a9dc5dbe0607a12ee5fde0d9f52df
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-2.22 b/metadata/md5-cache/app-emulation/wine-vanilla-2.22
index c4fa8014e17d..570842111826 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-2.22
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-2.22
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=2.22
SRC_URI=https://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27aa9af956747ed30b1c0913bc4cab01
+_md5_=797a9dc5dbe0607a12ee5fde0d9f52df
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.0 b/metadata/md5-cache/app-emulation/wine-vanilla-3.0
index 62c03dc903a0..00426cc983d3 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.0
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.0
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=3.0
SRC_URI=https://dl.winehq.org/wine/source/3.0/wine-3.0.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5419b05c4ab24ddbe041e06dbc46a0cd
+_md5_=e76a30cbe37e3ade2e61a5575f892cbc
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.1 b/metadata/md5-cache/app-emulation/wine-vanilla-3.1
index 90e8fda87dc2..7f6f1f36b898 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.1
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=3.1
SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.1.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f8b98a3cda2640d1d7325ca556b1ff9a
+_md5_=c76c7ef9decb12adc9ab7c6834f76a82
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-3.2 b/metadata/md5-cache/app-emulation/wine-vanilla-3.2
index 0a92bbf1cd92..a4004ec1a026 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-3.2
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-3.2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=3.2
SRC_URI=https://dl.winehq.org/wine/source/3.x/wine-3.2.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f8b98a3cda2640d1d7325ca556b1ff9a
+_md5_=c76c7ef9decb12adc9ab7c6834f76a82
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-9999 b/metadata/md5-cache/app-emulation/wine-vanilla-9999
index 85523effcc42..aa05178e6265 100644
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-proto/xineramaproto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( x11-base/xorg-proto ) dev-util/patchbin >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
EAPI=6
HOMEPAGE=https://www.winehq.org/
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=9999
SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 25b08efef07cea6bcd45b8c6dcce2782 gnome2-utils 4d211d7614f303710fca59db6ec12c88 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e8f4a18636de509db3148c0a36e561ab
+_md5_=c51e8ad61845d42378933f2a2af48e6f
diff --git a/metadata/md5-cache/app-emulation/xen-4.9.2 b/metadata/md5-cache/app-emulation/xen-4.9.2
index fb7bc0bb67b2..9d631f6bb17e 100644
--- a/metadata/md5-cache/app-emulation/xen-4.9.2
+++ b/metadata/md5-cache/app-emulation/xen-4.9.2
@@ -4,7 +4,7 @@ DESCRIPTION=The Xen virtual machine monitor
EAPI=6
HOMEPAGE=https://www.xenproject.org
IUSE=custom-cflags debug efi flask
-KEYWORDS=~amd64 ~arm -x86
+KEYWORDS=amd64 ~arm -x86
LICENSE=GPL-2
PDEPEND=~app-emulation/xen-tools-4.9.2
REQUIRED_USE=arm? ( debug )
@@ -12,4 +12,4 @@ RESTRICT=test splitdebug strip
SLOT=0
SRC_URI=https://downloads.xenproject.org/release/xen/4.9.2/xen-4.9.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.9.2-upstream-patches-1.tar.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e mount-boot 1e82d96b7a7dcb483b412497a90bb646 multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 27d7f9da7187d283b7f3eae8390b7b09 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a7cbeef2a8b789298245553ab9dde908
+_md5_=7c3923e478d56606c4a951b0b4910a92
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.9.2 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.9.2
index 753942578860..336108d574db 100644
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.9.2
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest
EAPI=6
HOMEPAGE=https://www.xenproject.org
IUSE=custom-cflags python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-2
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/xen-tools-4.9.2
REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=https://downloads.xenproject.org/release/xen/4.9.2/xen-4.9.2.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=abcb5597279026f8650f8be12ef6c90f
+_md5_=2a00ff29ba5c6f3eed4d3070b10926be
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.10.0 b/metadata/md5-cache/app-emulation/xen-tools-4.10.0
index adffa8d33077..2e22fd1df2bc 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.10.0
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.10.0
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
DESCRIPTION=Xen tools including QEMU and xl
EAPI=6
HOMEPAGE=https://www.xenproject.org
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0/4.10
SRC_URI=https://downloads.xenproject.org/release/xen/4.10.0/xen-4.10.0.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.10.0-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.10.0-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-12.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-12.tar.xz
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a2dfba2bbc75640ad411bcf237ca3947
+_md5_=a832cfc9205f4d17b8195c9ba793e61a
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r1
index c5ed93dd26a6..5796f9cd2617 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r1
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
DESCRIPTION=Xen tools including QEMU and xl
EAPI=6
HOMEPAGE=https://www.xenproject.org
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0/4.9
SRC_URI=https://downloads.xenproject.org/release/xen/4.9.1/xen-4.9.1.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.9.1-upstream-patches-1.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-10.tar.xz
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=249028c1ac8432c1a83e41e4f69811aa
+_md5_=10f81dc7e2039579615ae716bb841a8b
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r2
index c36000793404..4760973facd7 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r2
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
DESCRIPTION=Xen tools including QEMU and xl
EAPI=6
HOMEPAGE=https://www.xenproject.org
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0/4.9
SRC_URI=https://downloads.xenproject.org/release/xen/4.9.1/xen-4.9.1.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.9.1-upstream-patches-2.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-12.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-12.tar.xz
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=cb5a3394c902d00fe6e513dcd0a95f68
+_md5_=dfda34bb5b171e59224e7c397597fa91
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.9.2-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.9.2-r1
index bcfbe517351c..b4c304e92a7a 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.9.2-r1
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.9.2-r1
@@ -1,10 +1,10 @@
DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
DESCRIPTION=Xen tools including QEMU and xl
EAPI=6
HOMEPAGE=https://www.xenproject.org
IUSE=api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2
RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0/4.9
SRC_URI=https://downloads.xenproject.org/release/xen/4.9.2/xen-4.9.2.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.9.2-upstream-patches-2.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-12.tar.xz
_eclasses_=bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2313ed813029bdb9c1bb1325a3ceb02c
+_md5_=a8bc59588d4602a08bcda89a3edb8cda
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 6e16d446963e..b618a84b79d8 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/libpinyin-2.1.0 b/metadata/md5-cache/app-i18n/libpinyin-2.1.0
index 28f8e2d9fe21..dc3a3c48173d 100644
--- a/metadata/md5-cache/app-i18n/libpinyin-2.1.0
+++ b/metadata/md5-cache/app-i18n/libpinyin-2.1.0
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Library to deal with pinyin
EAPI=6
HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/glib:2 sys-libs/db:=
SLOT=0/13
SRC_URI=https://github.com/libpinyin/libpinyin/archive/2.1.0.tar.gz -> libpinyin-2.1.0.tar.gz mirror://sourceforge/libpinyin/models/model14.text.tar.gz -> libpinyin-model14.text.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d914a2201fdc04bd06e007c64a26095c
+_md5_=980bce95eccb23125b2d821e34307ed1
diff --git a/metadata/md5-cache/app-i18n/libpinyin-2.1.91 b/metadata/md5-cache/app-i18n/libpinyin-2.1.91
index cbf67e30fd05..27e965b8df8b 100644
--- a/metadata/md5-cache/app-i18n/libpinyin-2.1.91
+++ b/metadata/md5-cache/app-i18n/libpinyin-2.1.91
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao
EAPI=6
HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/glib:2 sys-libs/db:=
SLOT=0/13
SRC_URI=https://github.com/libpinyin/libpinyin/archive/2.1.91.tar.gz -> libpinyin-2.1.91.tar.gz mirror://sourceforge/libpinyin/models/model15.text.tar.gz -> libpinyin-model15.text.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2748e2d26606fc8aac843d00fa4dd189
+_md5_=8c13e4bce2941a38a4b7e8c0689c64a5
diff --git a/metadata/md5-cache/app-i18n/libpinyin-2.2.0 b/metadata/md5-cache/app-i18n/libpinyin-2.2.0
new file mode 100644
index 000000000000..eeb7cce266cf
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/libpinyin-2.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao
+EAPI=6
+HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 sys-libs/db:=
+SLOT=0/13
+SRC_URI=https://github.com/libpinyin/libpinyin/archive/2.2.0.tar.gz -> libpinyin-2.2.0.tar.gz mirror://sourceforge/libpinyin/models/model15.text.tar.gz -> libpinyin-model15.text.tar.gz
+_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=8c13e4bce2941a38a4b7e8c0689c64a5
diff --git a/metadata/md5-cache/app-i18n/libpinyin-9999 b/metadata/md5-cache/app-i18n/libpinyin-9999
index 6af54b93cc0b..cc56abf9ae6f 100644
--- a/metadata/md5-cache/app-i18n/libpinyin-9999
+++ b/metadata/md5-cache/app-i18n/libpinyin-9999
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/glib:2 sys-libs/db:= virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
DESCRIPTION=Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao
EAPI=6
HOMEPAGE=https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/
@@ -8,4 +8,4 @@ RDEPEND=dev-libs/glib:2 sys-libs/db:=
SLOT=0/13
SRC_URI=mirror://sourceforge/libpinyin/models/model15.text.tar.gz -> libpinyin-model15.text.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 git-r3 25b08efef07cea6bcd45b8c6dcce2782 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=99cd008ac256956b802eafd835eff5d8
+_md5_=2eeb230e407139ae0ee45c2b1b2605b6
diff --git a/metadata/md5-cache/app-i18n/librime-1.2.9 b/metadata/md5-cache/app-i18n/librime-1.2.9
index 13fb4c343474..be8512d11969 100644
--- a/metadata/md5-cache/app-i18n/librime-1.2.9
+++ b/metadata/md5-cache/app-i18n/librime-1.2.9
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-i18n/opencc:= dev-cpp/glog:= >=dev-cpp/yaml-cpp-0.5.0:= >=dev-libs/boost-1.46.0:=[threads] dev-libs/leveldb:= dev-libs/marisa:= x11-proto/xproto test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=app-i18n/opencc:= dev-cpp/glog:= >=dev-cpp/yaml-cpp-0.5.0:= >=dev-libs/boost-1.46.0:=[threads] dev-libs/leveldb:= dev-libs/marisa:= x11-base/xorg-proto test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=Rime Input Method Engine library
EAPI=6
HOMEPAGE=http://rime.im/ https://github.com/rime/librime
@@ -10,4 +10,4 @@ RDEPEND=app-i18n/opencc:= dev-cpp/glog:= >=dev-cpp/yaml-cpp-0.5.0:= >=dev-libs/b
SLOT=0/1
SRC_URI=https://github.com/rime/librime/archive/rime-1.2.9.tar.gz -> librime-1.2.9.tar.gz
_eclasses_=cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd0e7c128bf4dee6783377c845cbfb91
+_md5_=f56db7db105c062bfed79ce368dd381d
diff --git a/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.2 b/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.2
new file mode 100644
index 000000000000..342c89a70240
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/man-pages-zh_CN-1.6.3.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=A somewhat comprehensive collection of Chinese Linux man pages
+EAPI=6
+HOMEPAGE=https://github.com/man-pages-zh/manpages-zh
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=FDL-1.2
+RDEPEND=virtual/man
+SLOT=0
+SRC_URI=https://github.com/man-pages-zh/manpages-zh/archive/v1.6.3.2.tar.gz -> man-pages-zh_CN-1.6.3.2.tar.gz
+_md5_=29cf44298bd28c2a3361751f8c379d04
diff --git a/metadata/md5-cache/app-i18n/tagainijisho-1.0.3-r1 b/metadata/md5-cache/app-i18n/tagainijisho-1.0.3-r1
index a88a1eaa35d6..2e9fe2cbd8f0 100644
--- a/metadata/md5-cache/app-i18n/tagainijisho-1.0.3-r1
+++ b/metadata/md5-cache/app-i18n/tagainijisho-1.0.3-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=dev-db/sqlite-3.11:3 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
DESCRIPTION=Open-source Japanese dictionary and kanji lookup tool
EAPI=5
-HOMEPAGE=http://www.tagaini.net/
+HOMEPAGE=https://www.tagaini.net/
IUSE=l10n_ar l10n_cs l10n_de l10n_es l10n_fa l10n_fi l10n_fr l10n_hu l10n_id l10n_it l10n_nb l10n_nl l10n_pl l10n_pt l10n_ru l10n_sv l10n_th l10n_tr l10n_vi
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+ public-domain
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 >=dev-db/sqlite-3.11:3
SLOT=0
SRC_URI=https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz
_eclasses_=cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f4024ba794081e1d2987e1b00fea0ab2
+_md5_=26aa96ede0e3ca622fd66c7cedb6b8b2
diff --git a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r3 b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r3
index 3e2e839a9923..dfea13bd84e5 100644
--- a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r3
+++ b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r3
@@ -1,15 +1,15 @@
DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( virtual/libmysqlclient ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby22?,ruby_targets_ruby23?,ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion ) dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( virtual/libmysqlclient ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby23?,ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion ) dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Japanese handwriting recognition engine
EAPI=6
HOMEPAGE=http://tomoe.osdn.jp/
-IUSE=hyperestraier mysql python ruby ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 static-libs subversion python_targets_python2_7
+IUSE=hyperestraier mysql python ruby ruby_targets_ruby23 ruby_targets_ruby24 static-libs subversion python_targets_python2_7
KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( virtual/libmysqlclient ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby22?,ruby_targets_ruby23?,ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion )
-REQUIRED_USE=python? ( python_targets_python2_7 ) ruby? ( || ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ) )
+RDEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( virtual/libmysqlclient ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby23?,ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion )
+REQUIRED_USE=python? ( python_targets_python2_7 ) ruby? ( || ( ruby_targets_ruby23 ruby_targets_ruby24 ) )
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ruby-single 7435c1687c234eb8cf5b212756f6381e ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=924f9761f0e8f244ad6da6880b05e53f
+_md5_=a0bbb62dfe7ab3810d9190191abefdef
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.10 b/metadata/md5-cache/app-i18n/transifex-client-0.10
index 757d650df315..d6ac91e5608b 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.10
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.10
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=A command line interface for Transifex
EAPI=5
-HOMEPAGE=https://pypi.org/project/transifex-client http://www.transifex.net/
+HOMEPAGE=https://pypi.org/project/transifex-client/ http://www.transifex.net/
IUSE=python_targets_python2_7
KEYWORDS=amd64 x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://github.com/transifex/transifex-client/archive/0.10.tar.gz -> transifex-client-0.10.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2633965cd307436b98e8a1b3180aa2c
+_md5_=b720f5f364dd6ee5a6af760a0f3c844e
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.12.2 b/metadata/md5-cache/app-i18n/transifex-client-0.12.2
index 1855d6cbe05f..f22f32ddca9c 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.12.2
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.12.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
DESCRIPTION=A command line interface for Transifex
EAPI=6
-HOMEPAGE=https://pypi.org/project/transifex-client http://www.transifex.net/
+HOMEPAGE=https://pypi.org/project/transifex-client/ http://www.transifex.net/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.12.2.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f04797bbe18610444e07be8823cb8751
+_md5_=24f9995512dccd732924d9fa0b5d4477
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.12.4 b/metadata/md5-cache/app-i18n/transifex-client-0.12.4
index c62edb370b3c..2a3ef27fd2d3 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.12.4
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.12.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
DESCRIPTION=A command line interface for Transifex
EAPI=6
-HOMEPAGE=https://pypi.org/project/transifex-client http://www.transifex.net/
+HOMEPAGE=https://pypi.org/project/transifex-client/ http://www.transifex.net/
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.12.4.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=75ffbd56309d26976a47ecba07768727
+_md5_=014a7b9c97535321931f7329246e56d8
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.6-r1 b/metadata/md5-cache/app-i18n/uim-1.8.6-r1
index 2d74d93ca4ad..ecd0ef480c39 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.6-r1
+++ b/metadata/md5-cache/app-i18n/uim-1.8.6-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) expat? ( dev-libs/expat ) libffi? ( virtual/libffi ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) !dev-scheme/sigscheme dev-util/intltool virtual/pkgconfig >=sys-devel/gettext-0.15 X? ( x11-proto/xextproto x11-proto/xproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) expat? ( dev-libs/expat ) libffi? ( virtual/libffi ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0 ) !dev-scheme/sigscheme dev-util/intltool virtual/pkgconfig >=sys-devel/gettext-0.15 X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
DESCRIPTION=Simple, secure and flexible input method library
EAPI=5
HOMEPAGE=https://github.com/uim/uim/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://uim.googlecode.com/files/uim-1.8.6.tar.bz2
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=46f68d21556266d2860739a35fae8d2f
+_md5_=74cbcd096bbee2634b851e38e1676e9e
diff --git a/metadata/md5-cache/app-i18n/uim-1.8.6-r2 b/metadata/md5-cache/app-i18n/uim-1.8.6-r2
index 8778aea7a5df..fc32b0f8e13e 100644
--- a/metadata/md5-cache/app-i18n/uim-1.8.6-r2
+++ b/metadata/md5-cache/app-i18n/uim-1.8.6-r2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) expat? ( dev-libs/expat ) libffi? ( virtual/libffi ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !dev-scheme/sigscheme dev-util/intltool virtual/pkgconfig >=sys-devel/gettext-0.15 X? ( x11-proto/xextproto x11-proto/xproto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) expat? ( dev-libs/expat ) libffi? ( virtual/libffi ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) qt4? ( dev-qt/qtgui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) !dev-scheme/sigscheme dev-util/intltool virtual/pkgconfig >=sys-devel/gettext-0.15 X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
DESCRIPTION=Simple, secure and flexible input method library
EAPI=5
HOMEPAGE=https://github.com/uim/uim/
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://uim.googlecode.com/files/uim-1.8.6.tar.bz2
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e6bceb8e2ed48f73d885fb5ded37f29
+_md5_=49f13933ba586dc1333ba9f4813f96ae
diff --git a/metadata/md5-cache/app-i18n/unicode-cldr-33.0 b/metadata/md5-cache/app-i18n/unicode-cldr-33.0
new file mode 100644
index 000000000000..47bb177cff8b
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/unicode-cldr-33.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Unicode Common Locale Data Repository
+EAPI=6
+HOMEPAGE=http://cldr.unicode.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=unicode
+SLOT=0
+SRC_URI=https://unicode.org/Public/cldr/33/cldr-common-33.0.zip -> unicode-cldr-common-33.0.zip
+_md5_=92bc0f35d4bf28d30c1629edd604927a
diff --git a/metadata/md5-cache/app-i18n/unicode-emoji-11.0 b/metadata/md5-cache/app-i18n/unicode-emoji-11.0
new file mode 100644
index 000000000000..6be8583a3d3e
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/unicode-emoji-11.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=UTS #51 Unicode Emoji
+EAPI=6
+HOMEPAGE=https://unicode.org/emoji/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=unicode
+SLOT=0
+SRC_URI=https://unicode.org/Public/emoji/11.0/emoji-data.txt -> unicode-emoji-data-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-sequences.txt -> unicode-emoji-sequences-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-test.txt -> unicode-emoji-test-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-variation-sequences.txt -> unicode-emoji-variation-sequences-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-zwj-sequences.txt -> unicode-emoji-zwj-sequences-11.0.txt
+_md5_=808d0b4b7a3b9c5a9b78925dd8a2d670
diff --git a/metadata/md5-cache/app-i18n/xvnkb-0.2.8a-r1 b/metadata/md5-cache/app-i18n/xvnkb-0.2.8a-r1
index 53b6f0cc54f3..881a12b84f34 100644
--- a/metadata/md5-cache/app-i18n/xvnkb-0.2.8a-r1
+++ b/metadata/md5-cache/app-i18n/xvnkb-0.2.8a-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install postinst unpack
-DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) x11-proto/xproto
+DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) x11-base/xorg-proto
DESCRIPTION=Vietnamese input keyboard for X
EAPI=0
HOMEPAGE=http://xvnkb.sourceforge.net/
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft )
SLOT=0
SRC_URI=http://xvnkb.sourceforge.net/xvnkb/xvnkb-0.2.8a.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a207af237ed4b27fcd4701f6c2c96c57
+_md5_=64187ed8a5c2d241b4f71af1ab180704
diff --git a/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1 b/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
index 6b8b7fbc9b25..1beadfae4c9f 100644
--- a/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
+++ b/metadata/md5-cache/app-i18n/xvnkb-0.2.9a-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install postinst unpack
-DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) x11-proto/xproto
+DEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) x11-base/xorg-proto
DESCRIPTION=Vietnamese input keyboard for X
EAPI=0
HOMEPAGE=http://xvnkb.sourceforge.net/
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft )
SLOT=0
SRC_URI=http://xvnkb.sourceforge.net/xvnkb-0.2.9a.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66b3539ac46ee9a7d5ab06785886f047
+_md5_=903558669da08f260ac46348616b2ded
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index e7bafcd12232..d8f8fb639e92 100644
Binary files a/metadata/md5-cache/app-laptop/Manifest.gz and b/metadata/md5-cache/app-laptop/Manifest.gz differ
diff --git a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2 b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2
index ab136641656f..8152e00bc9c8 100644
--- a/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2
+++ b/metadata/md5-cache/app-laptop/laptop-mode-tools-1.72.2
@@ -4,10 +4,10 @@ DESCRIPTION=Linux kernel laptop_mode user-space utilities
EAPI=6
HOMEPAGE=https://github.com/rickysarraf/laptop-mode-tools/wiki
IUSE=+acpi apm bluetooth
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=sys-apps/iproute2 sys-apps/ethtool sys-apps/which acpi? ( sys-power/acpid ) apm? ( sys-apps/apmd ) bluetooth? ( net-wireless/bluez:= )
SLOT=0
SRC_URI=https://github.com/rickysarraf/laptop-mode-tools/releases/download/1.72.2/laptop-mode-tools_1.72.2.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 udev d91cac2c73b94629cad2daea66e0d182
-_md5_=17a5c256f16baf157405069452337d74
+_md5_=a6355a8235a5f168fcd632fd79cb5ad6
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index a8573ebad0eb..1b2abf1ed14d 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/postgres_exporter-0.4.6 b/metadata/md5-cache/app-metrics/postgres_exporter-0.4.6
new file mode 100644
index 000000000000..560cae0ade34
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/postgres_exporter-0.4.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install setup test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=PostgreSQL stats exporter for Prometheus
+EAPI=6
+HOMEPAGE=https://github.com/wrouesnel/postgres_exporter
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/wrouesnel/postgres_exporter/archive/v0.4.6.tar.gz -> postgres_exporter-0.4.6.tar.gz
+_eclasses_=golang-base 928887539e385bb489681b292f6b862f golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536 user 8bc2845510e2109af75e3eeac607ec81
+_md5_=76fc337e3f431b54e67a1b233e09a269
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 95c3839779ef..4400109b2a80 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/asciinema-1.4.0 b/metadata/md5-cache/app-misc/asciinema-1.4.0
index fb2b35e7dd6b..0328ebf075d3 100644
--- a/metadata/md5-cache/app-misc/asciinema-1.4.0
+++ b/metadata/md5-cache/app-misc/asciinema-1.4.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
DESCRIPTION=Command line recorder for asciinema.org service
EAPI=6
-HOMEPAGE=https://asciinema.org/ https://pypi.org/project/asciinema
+HOMEPAGE=https://asciinema.org/ https://pypi.org/project/asciinema/
IUSE=test python_targets_python3_4 python_targets_python3_5
KEYWORDS=amd64
LICENSE=GPL-3+
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=https://github.com/asciinema/asciinema/archive/v1.4.0.tar.gz -> asciinema-1.4.0.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a1f41356746c48398aea9d6fa81c8fd1
+_md5_=92f214c880b53fc8d7de9ccda2dee32d
diff --git a/metadata/md5-cache/app-misc/asciinema-2.0.0 b/metadata/md5-cache/app-misc/asciinema-2.0.0
index 17d691e54fd8..53b07eb09ea4 100644
--- a/metadata/md5-cache/app-misc/asciinema-2.0.0
+++ b/metadata/md5-cache/app-misc/asciinema-2.0.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
DESCRIPTION=Command line recorder for asciinema.org service
EAPI=6
-HOMEPAGE=https://asciinema.org/ https://pypi.org/project/asciinema
+HOMEPAGE=https://asciinema.org/ https://pypi.org/project/asciinema/
IUSE=test python_targets_python3_4 python_targets_python3_5
KEYWORDS=~amd64
LICENSE=GPL-3+
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=https://github.com/asciinema/asciinema/archive/v2.0.0.tar.gz -> asciinema-2.0.0.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4a80112a490c69d8a3e43f3b289a1584
+_md5_=b3aa022e13ecca7d215af94b4551e484
diff --git a/metadata/md5-cache/app-misc/faq-0.0.1 b/metadata/md5-cache/app-misc/faq-0.0.1
new file mode 100644
index 000000000000..bb2552fd0d77
--- /dev/null
+++ b/metadata/md5-cache/app-misc/faq-0.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=Format agnostic jQ
+EAPI=6
+HOMEPAGE=https://github.com/jzelinskie/faq
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/jzelinskie/faq/archive/0.0.1.tar.gz -> faq-0.0.1.tar.gz https://github.com/Azure/draft/archive/53924464463d2474f410415f1310d2b95fb8965f.tar.gz -> github.com-Azure-draft-53924464463d2474f410415f1310d2b95fb8965f.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/ashb/jqrepl/archive/70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz -> github.com-ashb-jqrepl-70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz https://github.com/clbanning/mxj/archive/eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz -> github.com-clbanning-mxj-eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/globalsign/mgo/archive/baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz -> github.com-globalsign-mgo-baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/jbrukh/bayesian/archive/bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz -> github.com-jbrukh-bayesian-bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz https://github.com/sirupsen/logrus/archive/c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz -> github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz https://github.com/spf13/cobra/archive/a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz -> github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz https://github.com/spf13/pflag/archive/e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz -> github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz https://github.com/zeebo/bencode/archive/d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz -> github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz https://github.com/golang/crypto/archive/88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz -> github.com-golang-crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz https://github.com/golang/sys/archive/13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz -> github.com-golang-sys-13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz https://github.com/go-yaml/yaml/archive/86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz -> github.com-go-yaml-yaml-86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz
+_eclasses_=golang-base 928887539e385bb489681b292f6b862f golang-build b66349c110e4ddd6203bbe8bf4ae05c1 golang-vcs-snapshot 913580335becddd3ebecefe852e47536
+_md5_=aaa523415aefd0443dac19764dd64aee
diff --git a/metadata/md5-cache/app-misc/geoclue-2.4.8 b/metadata/md5-cache/app-misc/geoclue-2.4.8
index 671df1f5c01f..b5ad24653f67 100644
--- a/metadata/md5-cache/app-misc/geoclue-2.4.8
+++ b/metadata/md5-cache/app-misc/geoclue-2.4.8
@@ -4,10 +4,10 @@ DESCRIPTION=A geoinformation D-Bus service
EAPI=6
HOMEPAGE=https://freedesktop.org/wiki/Software/GeoClue
IUSE=+introspection +modemmanager zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
LICENSE=LGPL-2
RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.14 >=net-libs/libsoup-2.42:2.4 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-1.6 ) zeroconf? ( >=net-dns/avahi-0.6.10[dbus] ) !=dev-python/hachoir-core-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( >=dev-python/pygtk-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome? ( gnome-base/nautilus gnome-extra/zenity ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=Program to extract metadata using Hachoir library
EAPI=5
-HOMEPAGE=https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.org/project/hachoir-metadata
+HOMEPAGE=https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.org/project/hachoir-metadata/
IUSE=gnome gtk python_targets_python2_7
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/h/hachoir-metadata/hachoir-metadata-1.3.3.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9df8c2995b60bbc59f5b3454c3087a8
+_md5_=62a8904126acf3ec7527923c968e4991
diff --git a/metadata/md5-cache/app-misc/hachoir-subfile-0.5.3-r1 b/metadata/md5-cache/app-misc/hachoir-subfile-0.5.3-r1
index f0d82d619105..3abf1c650d22 100644
--- a/metadata/md5-cache/app-misc/hachoir-subfile-0.5.3-r1
+++ b/metadata/md5-cache/app-misc/hachoir-subfile-0.5.3-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=>=dev-python/hachoir-core-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-regex-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=Find subfile in any binary stream
EAPI=5
-HOMEPAGE=https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.org/project/hachoir-subfile
+HOMEPAGE=https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.org/project/hachoir-subfile/
IUSE=python_targets_python2_7
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/h/hachoir-subfile/hachoir-subfile-0.5.3.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=83c3b140fe48c9a85db1ae36e38d104e
+_md5_=c0eb94add3ca8ce68b2d7276c68eeab6
diff --git a/metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1 b/metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1
index 66bfd4aca873..a0d006a94bb6 100644
--- a/metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1
+++ b/metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=>=dev-python/hachoir-core-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-0.9.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=Binary file explorer using Hachoir and urwid libraries
EAPI=5
-HOMEPAGE=https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.org/project/hachoir-urwid
+HOMEPAGE=https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.org/project/hachoir-urwid/
IUSE=python_targets_python2_7
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/h/hachoir-urwid/hachoir-urwid-1.1.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=050563ba9ccb6f137a1098c10e3f3979
+_md5_=8bfed100e5d821019750a8c83485ac12
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.11-r1 b/metadata/md5-cache/app-misc/hivex-1.3.11-r1
index 5de4e57040d4..f9d368aff8d6 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.11-r1
+++ b/metadata/md5-cache/app-misc/hivex-1.3.11-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby22? ( ruby? ( dev-ruby/rake[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby22? ( ruby? ( virtual/rubygems[ruby_targets_ruby22] ) ) ) >=app-portage/elt-patches-20170422 dev-lang/perl[-build(-)]
+DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) dev-lang/perl perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) test? ( ) >=app-portage/elt-patches-20170422 dev-lang/perl[-build(-)]
DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
EAPI=5
HOMEPAGE=http://libguestfs.org
-IUSE=ocaml readline +perl python test static-libs ruby test elibc_FreeBSD ruby_targets_ruby22 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=ocaml readline +perl python test static-libs ruby test elibc_FreeBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
-RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby_targets_ruby22? ( ruby? ( virtual/rubygems[ruby_targets_ruby22] ) ) dev-lang/perl[-build(-)]
+RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) dev-lang/perl[-build(-)]
REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
SLOT=0
SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.11.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-app 4b65c2afee485a204b0b22518141ae47 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-app 4b65c2afee485a204b0b22518141ae47 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=7dd79988fe51c3856a32400042f20f5d
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.14 b/metadata/md5-cache/app-misc/hivex-1.3.14
index c2adce0ade2e..d066a49ad8da 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.14
+++ b/metadata/md5-cache/app-misc/hivex-1.3.14
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby22? ( ruby? ( dev-ruby/rake[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ruby? ( dev-ruby/rake[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby22? ( ruby? ( virtual/rubygems[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ruby? ( virtual/rubygems[ruby_targets_ruby23] ) ) ) dev-lang/perl:=
+DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby23? ( ruby? ( dev-ruby/rake[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby23] dev-ruby/rdoc[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby23? ( ruby? ( virtual/rubygems[ruby_targets_ruby23] ) ) ) dev-lang/perl:=
DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
EAPI=6
HOMEPAGE=http://libguestfs.org
-IUSE=ocaml readline +perl python test static-libs ruby test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=ocaml readline +perl python test static-libs ruby test elibc_FreeBSD ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
-RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby_targets_ruby22? ( ruby? ( virtual/rubygems[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( ruby? ( virtual/rubygems[ruby_targets_ruby23] ) ) dev-lang/perl:=
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) ruby? ( || ( ruby_targets_ruby22 ruby_targets_ruby23 ) )
+RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby_targets_ruby23? ( ruby? ( virtual/rubygems[ruby_targets_ruby23] ) ) dev-lang/perl:=
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) ruby? ( || ( ruby_targets_ruby23 ) )
SLOT=0
SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.14.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=c8e065e37c93c9dcc03675ca652ff9ae
diff --git a/metadata/md5-cache/app-misc/icdiff-1.7.3 b/metadata/md5-cache/app-misc/icdiff-1.7.3
index 4c8cf8fb2e59..5be6d0638e51 100644
--- a/metadata/md5-cache/app-misc/icdiff-1.7.3
+++ b/metadata/md5-cache/app-misc/icdiff-1.7.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
DESCRIPTION=Colourized diff that supports side-by-side diffing
EAPI=6
-HOMEPAGE=http://www.jefftk.com/icdiff
+HOMEPAGE=https://www.jefftk.com/icdiff
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=~amd64
LICENSE=PSF-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=https://github.com/jeffkaufman/icdiff/archive/release-1.7.3.tar.gz -> icdiff-1.7.3.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8634d335f6dea9cb8d29df876a725d83
+_md5_=d8b8a30ea15e6a381f15a37370950a9e
diff --git a/metadata/md5-cache/app-misc/icdiff-1.9.1 b/metadata/md5-cache/app-misc/icdiff-1.9.1
index 08e6ca8a519a..cf819a82ba04 100644
--- a/metadata/md5-cache/app-misc/icdiff-1.9.1
+++ b/metadata/md5-cache/app-misc/icdiff-1.9.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
DESCRIPTION=Colourized diff that supports side-by-side diffing
EAPI=6
-HOMEPAGE=http://www.jefftk.com/icdiff
+HOMEPAGE=https://www.jefftk.com/icdiff
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=~amd64
LICENSE=PSF-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=https://github.com/jeffkaufman/icdiff/archive/release-1.9.1.tar.gz -> icdiff-1.9.1.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=474abe553c5be66db1f8b828b35b5a59
+_md5_=b3b8f5f3454cc7bc1a2dab23cc732dc7
diff --git a/metadata/md5-cache/app-misc/screenfetch-3.8.0 b/metadata/md5-cache/app-misc/screenfetch-3.8.0
index eb9ea9850c4d..963154eaa9b4 100644
--- a/metadata/md5-cache/app-misc/screenfetch-3.8.0
+++ b/metadata/md5-cache/app-misc/screenfetch-3.8.0
@@ -3,9 +3,9 @@ DESCRIPTION=Bash Screenshot Information Tool
EAPI=6
HOMEPAGE=https://github.com/KittyKatt/screenFetch
IUSE=curl X
-KEYWORDS=amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
LICENSE=GPL-3
RDEPEND=curl? ( net-misc/curl ) X? ( media-gfx/scrot x11-apps/xdpyinfo )
SLOT=0
SRC_URI=https://github.com/KittyKatt/screenFetch/archive/v3.8.0.tar.gz -> screenfetch-3.8.0.tar.gz
-_md5_=41aa6a47c79314e8a9bdbbe2f21f1509
+_md5_=485f50a37043d0f131d3dea853e2794a
diff --git a/metadata/md5-cache/app-misc/workrave-1.10.20 b/metadata/md5-cache/app-misc/workrave-1.10.20
index 8d8eb2f24124..5bc78e1bad20 100644
--- a/metadata/md5-cache/app-misc/workrave-1.10.20
+++ b/metadata/md5-cache/app-misc/workrave-1.10.20
@@ -4,11 +4,11 @@ DESCRIPTION=Helpful utility to attack Repetitive Strain Injury (RSI)
EAPI=6
HOMEPAGE=http://www.workrave.org/
IUSE=ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-3+
RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?,X] >=dev-cpp/gtkmm-3.18.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 ayatana? ( >=dev-libs/libdbusmenu-0.4[gtk3,introspection] >=dev-libs/libindicator-0.4:3 ) gnome? ( >=gnome-base/gnome-shell-3.6.2 ) gstreamer? ( media-libs/gstreamer:1.0[introspection?] media-libs/gst-plugins-base:1.0[introspection?] media-plugins/gst-plugins-meta:1.0 ) introspection? ( dev-libs/gobject-introspection:= ) mate? ( mate-base/mate-applets ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) xfce? ( >=x11-libs/gtk+-2.6.0:2[introspection?] >=xfce-base/xfce4-panel-4.4 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
REQUIRED_USE=ayatana? ( introspection ) python_targets_python2_7
SLOT=0
SRC_URI=https://github.com/rcaelers/workrave/archive/v1_10_20.tar.gz -> workrave-1.10.20.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=58df3895d28354a3eb2098613a7cc2d3
+_md5_=c77ca4309e88c756aca20ee3d33ccd89
diff --git a/metadata/md5-cache/app-misc/yq-2.1.2 b/metadata/md5-cache/app-misc/yq-2.1.2
index 42cf795f87b5..da107526a3fa 100644
--- a/metadata/md5-cache/app-misc/yq-2.1.2
+++ b/metadata/md5-cache/app-misc/yq-2.1.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Command-line YAML processor - jq wrapper for YAML documents
EAPI=6
-HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq
+HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/y/yq/yq-2.1.2.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=019d629db32062ac2ce41fa4cc038bc9
+_md5_=2d7aa65ab62825fbe21be5d48d2ccac4
diff --git a/metadata/md5-cache/app-misc/yq-2.3.0 b/metadata/md5-cache/app-misc/yq-2.3.0
index 2334a8b1cfa6..0f068ba1519d 100644
--- a/metadata/md5-cache/app-misc/yq-2.3.0
+++ b/metadata/md5-cache/app-misc/yq-2.3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Command-line YAML processor - jq wrapper for YAML documents
EAPI=6
-HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq
+HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/y/yq/yq-2.3.0.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cba4a4a252a5b913f90de63decd436af
+_md5_=51fd84d0aed7bbaccff3702fd698721e
diff --git a/metadata/md5-cache/app-misc/yq-2.3.3 b/metadata/md5-cache/app-misc/yq-2.3.3
index 1858a943cee8..ac18fcc161ac 100644
--- a/metadata/md5-cache/app-misc/yq-2.3.3
+++ b/metadata/md5-cache/app-misc/yq-2.3.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Command-line YAML processor - jq wrapper for YAML documents
EAPI=6
-HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq
+HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/y/yq/yq-2.3.3.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cba4a4a252a5b913f90de63decd436af
+_md5_=51fd84d0aed7bbaccff3702fd698721e
diff --git a/metadata/md5-cache/app-misc/yq-2.3.4 b/metadata/md5-cache/app-misc/yq-2.3.4
index c21a6df962a8..0763ef8cdf25 100644
--- a/metadata/md5-cache/app-misc/yq-2.3.4
+++ b/metadata/md5-cache/app-misc/yq-2.3.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=app-misc/jq >=dev-python/pyyaml-3.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Command-line YAML processor - jq wrapper for YAML documents
EAPI=6
-HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq
+HOMEPAGE=https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/y/yq/yq-2.3.4.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=019d629db32062ac2ce41fa4cc038bc9
+_md5_=2d7aa65ab62825fbe21be5d48d2ccac4
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 8ce6dc61b9fd..576b15983591 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.38 b/metadata/md5-cache/app-office/gnumeric-1.12.38
index c3959fba6c56..38609f37d2bc 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.12.38
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.38
@@ -4,7 +4,7 @@ DESCRIPTION=The GNOME Spreadsheet
EAPI=6
HOMEPAGE=http://www.gnumeric.org/
IUSE=+introspection libgda perl python python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.38.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.38:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) libgda? ( gnome-extra/libgda:5[gtk] )
REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.38.tar.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c197703b9374936be9c8f25d58e81d14
+_md5_=3feacd488dde92718847b84b22683795
diff --git a/metadata/md5-cache/app-office/grisbi-1.0.2 b/metadata/md5-cache/app-office/grisbi-1.0.2
index 2111df90b3f4..7bc64ba2701e 100644
--- a/metadata/md5-cache/app-office/grisbi-1.0.2
+++ b/metadata/md5-cache/app-office/grisbi-1.0.2
@@ -4,10 +4,10 @@ DESCRIPTION=Grisbi is a personal accounting application for Linux
EAPI=6
HOMEPAGE=http://www.grisbi.org
IUSE=libressl nls ofx ssl
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=dev-libs/libxml2:2 >=dev-libs/glib-2.18.0:2 >=x11-libs/gtk+-2.12.0:2 x11-misc/xdg-utils ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( >=dev-libs/openssl-0.9.5:0= ) ) ofx? ( >=dev-libs/libofx-0.7.0 )
SLOT=0
SRC_URI=mirror://sourceforge/grisbi/grisbi%20stable/1.0.x/grisbi-1.0.2.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f56355f84ed78c575b587b86c38f4b46
+_md5_=ecf3631cafc25ffe19a480e591e15e36
diff --git a/metadata/md5-cache/app-office/libreoffice-5.4.5.1 b/metadata/md5-cache/app-office/libreoffice-5.4.5.1
index 3a6d6555bf9f..7aae4a8b31bd 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.4.5.1
+++ b/metadata/md5-cache/app-office/libreoffice-5.4.5.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=A full office productivity suite
EAPI=6
HOMEPAGE=https://www.libreoffice.org
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
SLOT=0
SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-5.4.5.1.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.4.5.1.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.5//libreoffice-5.4.5.1.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.5//libreoffice-help-5.4.5.1.tar.xz https://download.documentfoundation.org/libreoffice/old/5.4.5.1//libreoffice-5.4.5.1.tar.xz https://download.documentfoundation.org/libreoffice/old/5.4.5.1//libreoffice-help-5.4.5.1.tar.xz collada? ( https://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 check-reqs fd05cf75484aa28d307cf4ee6e1db056 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=459297e58ebc926e03260b9fe2812def
+_md5_=efde8c5fe0c74b7a16f5e43d57bd8559
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-6.0.3.2
index 33f6ac6a0dc3..2076764ec69c 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.3.2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=A full office productivity suite
EAPI=6
HOMEPAGE=https://www.libreoffice.org
@@ -7,9 +7,9 @@ IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstrea
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=|| ( LGPL-3 MPL-1.1 )
PDEPEND==app-office/libreoffice-l10n-6.0*
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
SLOT=0
SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.3.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.3//libreoffice-6.0.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.3//libreoffice-help-6.0.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.3.2/src/libreoffice-6.0.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.3.2/src/libreoffice-help-6.0.3.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 check-reqs fd05cf75484aa28d307cf4ee6e1db056 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e2de29d92b1d8203cb13e6bc9b65204
+_md5_=aa7d87e5113604a5997c106cbd7687b6
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.9999 b/metadata/md5-cache/app-office/libreoffice-6.0.9999
index a01dd7847afc..6638bd3ca15e 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.9999
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=dev-vcs/git-1.8.2.1
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=dev-vcs/git-1.8.2.1
DESCRIPTION=A full office productivity suite
EAPI=6
HOMEPAGE=https://www.libreoffice.org
IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
LICENSE=|| ( LGPL-3 MPL-1.1 )
PDEPEND=!app-office/libreoffice-l10n
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
SLOT=0
SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 check-reqs fd05cf75484aa28d307cf4ee6e1db056 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 25b08efef07cea6bcd45b8c6dcce2782 gnome2-utils 4d211d7614f303710fca59db6ec12c88 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e2de29d92b1d8203cb13e6bc9b65204
+_md5_=513bbe6d1562b8f4422910fc1a705bdd
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 47c87c0c4af2..a7461f308d54 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-libs/libXt x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=dev-vcs/git-1.8.2.1
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.3:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) >=dev-vcs/git-1.8.2.1
DESCRIPTION=A full office productivity suite
EAPI=6
HOMEPAGE=https://www.libreoffice.org
IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
LICENSE=|| ( LGPL-3 MPL-1.1 )
PDEPEND=!app-office/libreoffice-l10n
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
SLOT=0
SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 check-reqs fd05cf75484aa28d307cf4ee6e1db056 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 25b08efef07cea6bcd45b8c6dcce2782 gnome2-utils 4d211d7614f303710fca59db6ec12c88 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f717d19f09661aa74fa31a0adaca57a4
+_md5_=ea0c70ca9e9ce66e28f13f3782121f90
diff --git a/metadata/md5-cache/app-office/lyx-2.2.3-r4 b/metadata/md5-cache/app-office/lyx-2.2.3-r4
deleted file mode 100644
index a9e5efa74b96..000000000000
--- a/metadata/md5-cache/app-office/lyx-2.2.3-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) l10n_he? ( dev-tex/culmus-latex ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) virtual/pkgconfig nls? ( sys-devel/gettext ) !qt5? ( dev-qt/qtsvg:4 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtx11extras:5 ) >=sys-apps/sed-4 X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
-EAPI=6
-HOMEPAGE=https://www.lyx.org/
-IUSE=aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg l10n_he X python_targets_python2_7
-KEYWORDS=alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) l10n_he? ( dev-tex/culmus-latex ) !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-2.2.3.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/lyx-2.2.3/lyx-2.2.3.tar.xz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 font 82836641e7d4639329d8c195234ad0e3 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=59cf240a98c1c9e02078181009055bae
diff --git a/metadata/md5-cache/app-office/lyx-2.3.0 b/metadata/md5-cache/app-office/lyx-2.3.0
index 070624acf2fb..61245e356c6f 100644
--- a/metadata/md5-cache/app-office/lyx-2.3.0
+++ b/metadata/md5-cache/app-office/lyx-2.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
EAPI=6
HOMEPAGE=https://www.lyx.org/
IUSE=aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he X python_targets_python2_7
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos
LICENSE=GPL-2
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-2.3.0.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/lyx-2.3.0/lyx-2.3.0.tar.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 font 82836641e7d4639329d8c195234ad0e3 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6dcce6a77aa5edaed945c983575235e6
+_md5_=ba16ff33f71f75197fea1e90a2274a8d
diff --git a/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1 b/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
index 5a2e7c416e7c..1556b7a17f39 100644
--- a/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
+++ b/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXmu imlib? ( media-libs/imlib2[X] ) !imlib? ( gif? ( media-libs/giflib:= ) png? ( >=media-libs/libpng-1.4:0= ) ) truetype? ( x11-libs/libXft media-libs/fontconfig ) emacs? ( virtual/emacs ) m17n-lib? ( dev-libs/m17n-lib fontconfig? ( media-libs/fontconfig ) ) mng? ( media-libs/libmng ) sys-devel/autoconf x11-proto/xextproto x11-libs/libxkbfile app-text/rman x11-misc/imake >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXmu imlib? ( media-libs/imlib2[X] ) !imlib? ( gif? ( media-libs/giflib:= ) png? ( >=media-libs/libpng-1.4:0= ) ) truetype? ( x11-libs/libXft media-libs/fontconfig ) emacs? ( virtual/emacs ) m17n-lib? ( dev-libs/m17n-lib fontconfig? ( media-libs/fontconfig ) ) mng? ( media-libs/libmng ) sys-devel/autoconf x11-base/xorg-proto x11-libs/libxkbfile app-text/rman x11-misc/imake >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=An X11 based presentation tool
EAPI=5
HOMEPAGE=http://member.wide.ad.jp/wg/mgp/
@@ -11,4 +11,4 @@ REQUIRED_USE=imlib? ( !gif !png )
SLOT=0
SRC_URI=ftp://sh.wide.ad.jp/WIDE/free-ware/mgp-snap/mgp-snap-20121015.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5dc864986bc7b52a0d480f5161952934
+_md5_=1b8dbd18dddb40460b6cf70f8dca1236
diff --git a/metadata/md5-cache/app-office/taskcoach-1.4.3-r1 b/metadata/md5-cache/app-office/taskcoach-1.4.3-r1
index b373c5895b5f..341e24f58fe9 100644
--- a/metadata/md5-cache/app-office/taskcoach-1.4.3-r1
+++ b/metadata/md5-cache/app-office/taskcoach-1.4.3-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=|| ( >=dev-python/wxpython-2.8.9.2:2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-core-10.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=Simple personal tasks and todo lists manager
EAPI=5
-HOMEPAGE=http://www.taskcoach.org https://pypi.org/project/TaskCoach
+HOMEPAGE=http://www.taskcoach.org https://pypi.org/project/TaskCoach/
IUSE=libnotify python_targets_python2_7
KEYWORDS=amd64 x86
LICENSE=GPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://sourceforge/taskcoach/TaskCoach-1.4.3.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e590bece740fba6ca6dcb425b96d6226
+_md5_=306181c41cf58e253f7ec931b292eab7
diff --git a/metadata/md5-cache/app-office/texmacs-1.99.2-r1 b/metadata/md5-cache/app-office/texmacs-1.99.2-r1
index aec449570652..28baaa1bcce5 100644
--- a/metadata/md5-cache/app-office/texmacs-1.99.2-r1
+++ b/metadata/md5-cache/app-office/texmacs-1.99.2-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=app-text/ghostscript-gpl dev-scheme/guile:12[deprecated] media-libs/freetype x11-apps/xmodmap x11-libs/libXext virtual/latex-base imlib? ( media-libs/imlib2 ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) netpbm? ( media-libs/netpbm ) qt4? ( dev-qt/qtgui:4 ) spell? ( app-text/aspell ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) x11-proto/xproto >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DEPEND=app-text/ghostscript-gpl dev-scheme/guile:12[deprecated] media-libs/freetype x11-apps/xmodmap x11-libs/libXext virtual/latex-base imlib? ( media-libs/imlib2 ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) netpbm? ( media-libs/netpbm ) qt4? ( dev-qt/qtgui:4 ) spell? ( app-text/aspell ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) x11-base/xorg-proto >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
DESCRIPTION=Wysiwyg text processor with high-quality maths
EAPI=5
HOMEPAGE=http://www.texmacs.org/
@@ -10,4 +10,4 @@ RDEPEND=app-text/ghostscript-gpl dev-scheme/guile:12[deprecated] media-libs/free
SLOT=0
SRC_URI=ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/TeXmacs-1.99.2-src.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2862f7629550da90930d30ceff2cbff0
+_md5_=b039d649ede394da2ed27dac5114f79a
diff --git a/metadata/md5-cache/app-office/texmacs-1.99.5 b/metadata/md5-cache/app-office/texmacs-1.99.5
index 49834e2ece17..6d6a82a8b80a 100644
--- a/metadata/md5-cache/app-office/texmacs-1.99.5
+++ b/metadata/md5-cache/app-office/texmacs-1.99.5
@@ -1,5 +1,5 @@
DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=app-text/ghostscript-gpl =app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DEPEND=app-text/ghostscript-gpl =app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
DESCRIPTION=Wysiwyg text processor with high-quality maths
EAPI=6
HOMEPAGE=http://www.texmacs.org/
@@ -10,4 +10,4 @@ RDEPEND=app-text/ghostscript-gpl =app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DEPEND=app-text/ghostscript-gpl =app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
DESCRIPTION=Wysiwyg text processor with high-quality maths
EAPI=6
HOMEPAGE=http://www.texmacs.org/
@@ -10,4 +10,4 @@ RDEPEND=app-text/ghostscript-gpl =dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DEPEND=app-text/ghostscript-gpl =dev-util/cmake-3.9.6 >=sys-apps/sed-4
DESCRIPTION=Wysiwyg text processor with high-quality maths
EAPI=6
HOMEPAGE=http://www.texmacs.org/
@@ -10,4 +10,4 @@ RDEPEND=app-text/ghostscript-gpl =dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 sqlite? ( dev-db/sqlite ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) netpbm? ( media-libs/netpbm ) spell? ( app-text/aspell ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) x11-proto/xproto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DEPEND=app-text/ghostscript-gpl =dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 sqlite? ( dev-db/sqlite ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) netpbm? ( media-libs/netpbm ) spell? ( app-text/aspell ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
DESCRIPTION=Wysiwyg text processor with high-quality maths
EAPI=6
HOMEPAGE=http://www.texmacs.org/
IUSE=jpeg netpbm sqlite svg spell
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
RDEPEND=app-text/ghostscript-gpl =dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 sqlite? ( dev-db/sqlite ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) netpbm? ( media-libs/netpbm ) spell? ( app-text/aspell ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
SLOT=0
SRC_URI=ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/TeXmacs-1.99.6-src.tar.gz
_eclasses_=cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1efd3c2134bd7e9e30fb17629db1837e
+_md5_=aa98f7e06e23330c3cf43725154e2416
diff --git a/metadata/md5-cache/app-office/texmaker-4.5-r2 b/metadata/md5-cache/app-office/texmaker-4.5-r2
deleted file mode 100644
index efaddfde34ef..000000000000
--- a/metadata/md5-cache/app-office/texmaker-4.5-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/pkgconfig
-DESCRIPTION=A nice LaTeX-IDE
-EAPI=5
-HOMEPAGE=http://www.xm1math.net/texmaker/
-KEYWORDS=amd64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
-SLOT=0
-SRC_URI=http://www.xm1math.net/texmaker/texmaker-4.5.tar.bz2
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c readme.gentoo 589f4c6d735919e293942dd66311dc40 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=172c866a89531139c3f5cc1ae9bda68d
diff --git a/metadata/md5-cache/app-office/texmaker-4.5-r3 b/metadata/md5-cache/app-office/texmaker-4.5-r3
deleted file mode 100644
index 36d85942418f..000000000000
--- a/metadata/md5-cache/app-office/texmaker-4.5-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/pkgconfig
-DESCRIPTION=A nice LaTeX-IDE
-EAPI=5
-HOMEPAGE=http://www.xm1math.net/texmaker/
-KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
-SLOT=0
-SRC_URI=http://www.xm1math.net/texmaker/texmaker-4.5.tar.bz2
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d2f6ff72f001662adc513328011978ae
diff --git a/metadata/md5-cache/app-office/texmaker-5.0-r1 b/metadata/md5-cache/app-office/texmaker-5.0-r1
index 7390b1980973..9b9dc93b1087 100644
--- a/metadata/md5-cache/app-office/texmaker-5.0-r1
+++ b/metadata/md5-cache/app-office/texmaker-5.0-r1
@@ -3,10 +3,10 @@ DEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text
DESCRIPTION=A nice LaTeX-IDE
EAPI=6
HOMEPAGE=http://www.xm1math.net/texmaker/
-KEYWORDS=amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=app-text/hunspell sys-libs/zlib x11-libs/libX11 x11-libs/libXext app-text/poppler[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtlockedfile dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[X,qt5(+)] dev-qt/qtwebkit:5[printsupport] dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
SLOT=0
SRC_URI=http://www.xm1math.net/texmaker/texmaker-5.0.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e5a489607bff03991dad60111da1255
+_md5_=93c3f3099a68ddd406116f940be02555
diff --git a/metadata/md5-cache/app-office/texstudio-2.12.6-r1 b/metadata/md5-cache/app-office/texstudio-2.12.6-r1
index 766f880886ac..c95fcd6cdc47 100644
--- a/metadata/md5-cache/app-office/texstudio-2.12.6-r1
+++ b/metadata/md5-cache/app-office/texstudio-2.12.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Free cross-platform LaTeX editor (fork from texmakerX)
EAPI=6
HOMEPAGE=http://texstudio.sourceforge.net/
IUSE=video
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=app-text/hunspell:= app-text/poppler[qt5] >=dev-libs/quazip-0.7.2[qt5(+)] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib x11-libs/libX11 x11-libs/libXext video? ( media-libs/phonon[qt5(+)] ) app-text/ghostscript-gpl app-text/psutils media-libs/netpbm virtual/latex-base
SLOT=0
SRC_URI=https://dev.gentoo.org/~jstein/dist/texstudio-2.12.6.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b686e37749689e58bef9a1bfc3f4d6a7
+_md5_=3070f3156410fa575fc0de910dac3698
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index af0724bdc1c5..a0e48006e631 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/pfl-3.0 b/metadata/md5-cache/app-portage/pfl-3.0
index d51ab4364210..3c4c72cf50d8 100644
--- a/metadata/md5-cache/app-portage/pfl-3.0
+++ b/metadata/md5-cache/app-portage/pfl-3.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
+DEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Searchable online file/package database for Gentoo
EAPI=6
HOMEPAGE=http://www.portagefilelist.de
-IUSE=+network-cron python_targets_python3_5
+IUSE=+network-cron python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
LICENSE=GPL-2
-RDEPEND=net-misc/curl || ( sys-apps/portage[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] sys-apps/portage-mgorny[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 )
+RDEPEND=net-misc/curl || ( sys-apps/portage[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sys-apps/portage-mgorny[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=http://files.portagefilelist.de/pfl-3.0.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51505cd2f168fc168d9a5cc90d4b20dc
+_md5_=f09939055b6b4fc3a91d9f7e3f4ccc18
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index b94ac5a6b6c1..9f35adef5f87 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/quoter-3.0_p2-r1 b/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
index 2716ede858e5..c09ca0345269 100644
--- a/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
+++ b/metadata/md5-cache/app-shells/quoter-3.0_p2-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install unpack
+DEFINED_PHASES=configure install unpack
DESCRIPTION=Quote arguments or standard input for usage in POSIX shell by eval
EAPI=6
HOMEPAGE=https://github.com/vaeth/quoter/
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x
LICENSE=MIT
SLOT=0
SRC_URI=https://github.com/vaeth/quoter/archive/v3.0_p2.tar.gz -> quoter-3.0_p2.tar.gz
-_eclasses_=vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=cf759e3121b17fbb4027e2a8ae0c9f0d
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
+_md5_=78ef3ea8a888a0a8bdbf21322db353ae
diff --git a/metadata/md5-cache/app-shells/thefuck-3.26 b/metadata/md5-cache/app-shells/thefuck-3.26
new file mode 100644
index 000000000000..958a6bd90008
--- /dev/null
+++ b/metadata/md5-cache/app-shells/thefuck-3.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/decorator[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/colorama[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyte[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Magnificent app which corrects your previous console command
+EAPI=6
+HOMEPAGE=https://github.com/nvbn/thefuck
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/decorator[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/colorama[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyte[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/nvbn/thefuck/archive/3.26.tar.gz -> thefuck-3.26.tar.gz
+_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a645aa7d7d331eae9cbcb3c4894d41f1
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index be1bb0f1b964..0c70ae637023 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/glark-1.10.5-r1 b/metadata/md5-cache/app-text/glark-1.10.5-r1
index 809188700d56..e12f950547ef 100644
--- a/metadata/md5-cache/app-text/glark-1.10.5-r1
+++ b/metadata/md5-cache/app-text/glark-1.10.5-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby22] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby22] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby22] >=dev-ruby/riel-1.2.0[ruby_targets_ruby22] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby23] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby23] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby23] >=dev-ruby/riel-1.2.0[ruby_targets_ruby23] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby23] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby23] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby23] >=dev-ruby/riel-1.2.0[ruby_targets_ruby23] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
DESCRIPTION=File searcher similar to grep but with fancy output
EAPI=5
HOMEPAGE=https://github.com/jpace/glark
-IUSE=zip test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=zip test elibc_FreeBSD ruby_targets_ruby23 doc test test
KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby22] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby22] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby22] >=dev-ruby/riel-1.2.0[ruby_targets_ruby22] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby23] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby23] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby23] >=dev-ruby/riel-1.2.0[ruby_targets_ruby23] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby23] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby23] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby23] >=dev-ruby/riel-1.2.0[ruby_targets_ruby23] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 )
SLOT=0
SRC_URI=https://github.com/jpace/glark/archive/v1.10.5.tar.gz -> glark-git-1.10.5.tgz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=c464e32ce809e44f79ac6117149f026c
diff --git a/metadata/md5-cache/app-text/hyperestraier-1.4.13 b/metadata/md5-cache/app-text/hyperestraier-1.4.13
index f9722e054081..d66b64e27cbb 100644
--- a/metadata/md5-cache/app-text/hyperestraier-1.4.13
+++ b/metadata/md5-cache/app-text/hyperestraier-1.4.13
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig java? ( >=virtual/jdk-1.4:* ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig java? ( >=virtual/jdk-1.4:* ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=a full-text search system for communities
EAPI=6
HOMEPAGE=http://fallabs.com/hyperestraier/
-IUSE=bzip2 debug java lzo mecab perl ruby +zlib elibc_FreeBSD java elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=bzip2 debug java lzo mecab perl ruby +zlib elibc_FreeBSD java elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=LGPL-2.1
-RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=http://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e perl-functions 01e8c68d5a528bbcda4d3c60205983df preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e perl-functions 01e8c68d5a528bbcda4d3c60205983df preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=76e15e82538576d06e91a8ed9b99dc8e
diff --git a/metadata/md5-cache/app-text/jist-1.5.1-r1 b/metadata/md5-cache/app-text/jist-1.5.1-r1
index 3e9652a1b87f..1b0dbbcfd3a3 100644
--- a/metadata/md5-cache/app-text/jist-1.5.1-r1
+++ b/metadata/md5-cache/app-text/jist-1.5.1-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock:0[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
DESCRIPTION=A ruby gem to publish a gist
EAPI=5
HOMEPAGE=https://github.com/ConradIrwin/jist
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 test test
KEYWORDS=amd64
LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 )
SLOT=0
SRC_URI=mirror://rubygems/jist-1.5.1.gem
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=05fc01ad24083a1d6608c4153051f3e1
diff --git a/metadata/md5-cache/app-text/nfoview-1.24 b/metadata/md5-cache/app-text/nfoview-1.24
new file mode 100644
index 000000000000..b29ebf507ca8
--- /dev/null
+++ b/metadata/md5-cache/app-text/nfoview-1.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
+DESCRIPTION=simple viewer for NFO files, which are ASCII art in the CP437 codepage
+EAPI=6
+HOMEPAGE=https://otsaloma.io/nfoview/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/otsaloma/nfoview/archive/1.24.tar.gz -> nfoview-1.24.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5c4e62f85edb8eb0248f6d8c24ed93fa
diff --git a/metadata/md5-cache/app-text/pelican-3.6.0 b/metadata/md5-cache/app-text/pelican-3.6.0
index 91c0b3952c59..2ea856a7cd49 100644
--- a/metadata/md5-cache/app-text/pelican-3.6.0
+++ b/metadata/md5-cache/app-text/pelican-3.6.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=>=dev-python/feedgenerator-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
DESCRIPTION=A tool to generate a static blog, with restructured text or markdown input files
EAPI=5
-HOMEPAGE=http://blog.getpelican.com/ https://pypi.org/project/pelican
+HOMEPAGE=http://blog.getpelican.com/ https://pypi.org/project/pelican/
IUSE=examples markdown python_targets_python2_7 python_targets_python3_4
KEYWORDS=amd64 x86
LICENSE=AGPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
SLOT=0
SRC_URI=https://github.com/getpelican/pelican/archive/3.6.0.tar.gz -> pelican-3.6.0.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8f7d4ba87c704b54551381358eda2d9c
+_md5_=916449068aaed4c05e5ba91119f04d58
diff --git a/metadata/md5-cache/app-text/pelican-3.6.3 b/metadata/md5-cache/app-text/pelican-3.6.3
index 8496a09b2bdc..cc7b75797317 100644
--- a/metadata/md5-cache/app-text/pelican-3.6.3
+++ b/metadata/md5-cache/app-text/pelican-3.6.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=>=dev-python/feedgenerator-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
DESCRIPTION=A tool to generate a static blog, with restructured text or markdown input files
EAPI=6
-HOMEPAGE=http://blog.getpelican.com/ https://pypi.org/project/pelican
+HOMEPAGE=http://blog.getpelican.com/ https://pypi.org/project/pelican/
IUSE=doc examples markdown test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=~amd64 ~x86
LICENSE=AGPL-3
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/getpelican/pelican/archive/3.6.3.tar.gz -> pelican-3.6.3.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e1e80d8070aa2d54f7320a65760ee282
+_md5_=2b5d4ae4a2d9c7cd905dd99e81dea3af
diff --git a/metadata/md5-cache/app-text/pelican-3.7.0 b/metadata/md5-cache/app-text/pelican-3.7.0
index aa048f9c82ba..172a67ae074d 100644
--- a/metadata/md5-cache/app-text/pelican-3.7.0
+++ b/metadata/md5-cache/app-text/pelican-3.7.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=>=dev-python/feedgenerator-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
DESCRIPTION=A tool to generate a static blog, with restructured text or markdown input files
EAPI=6
-HOMEPAGE=http://blog.getpelican.com/ https://pypi.org/project/pelican
+HOMEPAGE=http://blog.getpelican.com/ https://pypi.org/project/pelican/
IUSE=doc examples markdown test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=amd64 x86
LICENSE=AGPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=https://github.com/getpelican/pelican/archive/3.7.0.tar.gz -> pelican-3.7.0.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=468284061be383cfdd4c44665b2dc811
+_md5_=bef3cfc90c4058180dcf69832b9db637
diff --git a/metadata/md5-cache/app-text/pelican-3.7.1 b/metadata/md5-cache/app-text/pelican-3.7.1
index c8c9fc2ce962..b2cbfe1eb1dc 100644
--- a/metadata/md5-cache/app-text/pelican-3.7.1
+++ b/metadata/md5-cache/app-text/pelican-3.7.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=>=dev-python/feedgenerator-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
DESCRIPTION=A tool to generate a static blog, with restructured text or markdown input files
EAPI=6
-HOMEPAGE=http://blog.getpelican.com/ https://pypi.org/project/pelican
+HOMEPAGE=http://blog.getpelican.com/ https://pypi.org/project/pelican/
IUSE=doc examples markdown test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
KEYWORDS=~amd64 ~x86
LICENSE=AGPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=https://github.com/getpelican/pelican/archive/3.7.1.tar.gz -> pelican-3.7.1.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=063852606cbe04c285520421e8f25611
+_md5_=07fca493e1fb92fc33962a2e3a76e7da
diff --git a/metadata/md5-cache/app-text/pelican-9999 b/metadata/md5-cache/app-text/pelican-9999
index 48812c3c3692..0482f7a8f86d 100644
--- a/metadata/md5-cache/app-text/pelican-9999
+++ b/metadata/md5-cache/app-text/pelican-9999
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=>=dev-python/feedgenerator-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1
DESCRIPTION=A tool to generate a static blog, with restructured text or markdown input files
EAPI=6
-HOMEPAGE=http://blog.getpelican.com/ https://pypi.org/project/pelican
+HOMEPAGE=http://blog.getpelican.com/ https://pypi.org/project/pelican/
IUSE=doc examples markdown test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
LICENSE=AGPL-3
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
RESTRICT=test
SLOT=0
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 git-r3 25b08efef07cea6bcd45b8c6dcce2782 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bed233a3df44e447e9c71cb1ae4acc4d
+_md5_=0074faf789cfd9100bc4aa9935070fd9
diff --git a/metadata/md5-cache/app-text/poppler-data-0.4.9 b/metadata/md5-cache/app-text/poppler-data-0.4.9
new file mode 100644
index 000000000000..656fcf9ef3f0
--- /dev/null
+++ b/metadata/md5-cache/app-text/poppler-data-0.4.9
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
+EAPI=6
+HOMEPAGE=https://poppler.freedesktop.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD GPL-2 MIT
+SLOT=0
+SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.9.tar.gz
+_md5_=45f818afea0f6796a868d155dc0747d3
diff --git a/metadata/md5-cache/app-text/restview-2.7.0 b/metadata/md5-cache/app-text/restview-2.7.0
index 37432da53080..c374b5fd53ac 100644
--- a/metadata/md5-cache/app-text/restview-2.7.0
+++ b/metadata/md5-cache/app-text/restview-2.7.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=reStructuredText viewer
EAPI=6
-HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview
+HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview/
IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
SLOT=0
SRC_URI=mirror://pypi/r/restview/restview-2.7.0.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0333620e6838c1dd4abf6e0e410f3e0d
+_md5_=25b0003131ddeb095a8aa0f20c2f0ad6
diff --git a/metadata/md5-cache/app-text/restview-2.8.0 b/metadata/md5-cache/app-text/restview-2.8.0
index 686929f72786..9e3e664a96ef 100644
--- a/metadata/md5-cache/app-text/restview-2.8.0
+++ b/metadata/md5-cache/app-text/restview-2.8.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=reStructuredText viewer
EAPI=6
-HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview
+HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview/
IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
SLOT=0
SRC_URI=mirror://pypi/r/restview/restview-2.8.0.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0333620e6838c1dd4abf6e0e410f3e0d
+_md5_=25b0003131ddeb095a8aa0f20c2f0ad6
diff --git a/metadata/md5-cache/app-text/restview-2.8.1 b/metadata/md5-cache/app-text/restview-2.8.1
index 4f1805f194a8..56794124c9a1 100644
--- a/metadata/md5-cache/app-text/restview-2.8.1
+++ b/metadata/md5-cache/app-text/restview-2.8.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=reStructuredText viewer
EAPI=6
-HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview
+HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview/
IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
SLOT=0
SRC_URI=mirror://pypi/r/restview/restview-2.8.1.tar.gz
_eclasses_=distutils-r1 c25bafd988acc946bfa457eac09621d8 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=88242ccbe52eeecc12399511b539f4da
+_md5_=2c896dcf97708da6ed2f60f8045016a3
diff --git a/metadata/md5-cache/app-text/ronn-0.7.3-r3 b/metadata/md5-cache/app-text/ronn-0.7.3-r3
index bfa03db8de2f..605f962e9988 100644
--- a/metadata/md5-cache/app-text/ronn-0.7.3-r3
+++ b/metadata/md5-cache/app-text/ronn-0.7.3-r3
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby22] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby22] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby22] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby22] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=Converts simple, human readable textfiles to roff for terminal display, and HTML
EAPI=5
HOMEPAGE=https://github.com/rtomayko/ronn/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris
LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby22] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby22] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/ronn-0.7.3.gem
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=acaca37fc2faca797962031979a3945b
diff --git a/metadata/md5-cache/app-text/webgen-1.4.1 b/metadata/md5-cache/app-text/webgen-1.4.1
index a6ec9a64ed3c..cbd9dc4241fc 100644
--- a/metadata/md5-cache/app-text/webgen-1.4.1
+++ b/metadata/md5-cache/app-text/webgen-1.4.1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) test? ( dev-ruby/kramdown[ruby_targets_ruby22] dev-ruby/minitest:5[ruby_targets_ruby22] dev-ruby/rdiscount[ruby_targets_ruby22] >=dev-ruby/sass-3.2:*[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) test? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] >=dev-ruby/sass-3.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) test? ( dev-ruby/kramdown[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rdiscount[ruby_targets_ruby24] >=dev-ruby/sass-3.2:*[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby22] >=dev-ruby/systemu-2.5[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby22] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby22] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby23] >=dev-ruby/systemu-2.5[ruby_targets_ruby23] >=dev-ruby/kramdown-1.3[ruby_targets_ruby23] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby23] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby23] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby24] >=dev-ruby/systemu-2.5[ruby_targets_ruby24] >=dev-ruby/kramdown-1.3[ruby_targets_ruby24] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby24] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby24] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) test? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] >=dev-ruby/sass-3.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) test? ( dev-ruby/kramdown[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rdiscount[ruby_targets_ruby24] >=dev-ruby/sass-3.2:*[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby23] >=dev-ruby/systemu-2.5[ruby_targets_ruby23] >=dev-ruby/kramdown-1.3[ruby_targets_ruby23] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby23] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby23] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby24] >=dev-ruby/systemu-2.5[ruby_targets_ruby24] >=dev-ruby/kramdown-1.3[ruby_targets_ruby24] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby24] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby24] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby24] ) ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A template-based static website generator
EAPI=6
HOMEPAGE=https://webgen.gettalong.org
-IUSE=builder highlight markdown test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=builder highlight markdown test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
KEYWORDS=~amd64
LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby22] >=dev-ruby/systemu-2.5[ruby_targets_ruby22] >=dev-ruby/kramdown-1.3[ruby_targets_ruby22] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby22] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby22] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby23] >=dev-ruby/systemu-2.5[ruby_targets_ruby23] >=dev-ruby/kramdown-1.3[ruby_targets_ruby23] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby23] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby23] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby24] >=dev-ruby/systemu-2.5[ruby_targets_ruby24] >=dev-ruby/kramdown-1.3[ruby_targets_ruby24] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby24] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby24] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby23] >=dev-ruby/systemu-2.5[ruby_targets_ruby23] >=dev-ruby/kramdown-1.3[ruby_targets_ruby23] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby23] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby23] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby24] >=dev-ruby/systemu-2.5[ruby_targets_ruby24] >=dev-ruby/kramdown-1.3[ruby_targets_ruby24] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby24] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby24] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/webgen-1.4.1.gem
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem cf1343b57e8029745950b4b147ff4d3a ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=0cb7ea35037e104188c5a6a2fec3d2ca
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index e38a2baec991..febea8e96532 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/command-t-5.0.1 b/metadata/md5-cache/app-vim/command-t-5.0.1
index 21dc229849ac..ae3037d07097 100644
--- a/metadata/md5-cache/app-vim/command-t-5.0.1
+++ b/metadata/md5-cache/app-vim/command-t-5.0.1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
DESCRIPTION=vim plugin: fast file navigation for vim
EAPI=6
HOMEPAGE=https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=https://github.com/wincent/command-t/archive/5.0.1.tar.gz -> command-t-5.0.1.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
_md5_=35f4d1122c92cb843334fdc41c9010cd
diff --git a/metadata/md5-cache/app-vim/command-t-5.0.2 b/metadata/md5-cache/app-vim/command-t-5.0.2
index 5f4bd45dbe37..a36f57c4cef1 100644
--- a/metadata/md5-cache/app-vim/command-t-5.0.2
+++ b/metadata/md5-cache/app-vim/command-t-5.0.2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
DESCRIPTION=vim plugin: fast file navigation for vim
EAPI=6
HOMEPAGE=https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=https://github.com/wincent/command-t/archive/5.0.2.tar.gz -> command-t-5.0.2.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
_md5_=e92884084ab3adccea4067954ef96a63
diff --git a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1 b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
index 7090d84bcad5..427d0554d505 100644
--- a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
+++ b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
DESCRIPTION=vim plugin: syntax highlighting for dhcpd.conf
EAPI=6
HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=744
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=vim
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
SLOT=0
SRC_URI=mirror://gentoo/dhcpd-syntax-20030825.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dhcpd-syntax-20030825.tar.bz2
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=e0bc5b32d07b94fcf004fbdccf83d7c9
+_md5_=267d9a6ed5dda86dcbb05bbe6dd4191a
diff --git a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2 b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
index b7641812c874..a4bb0e45361d 100644
--- a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
+++ b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
DESCRIPTION=vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting
EAPI=6
HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=545
-KEYWORDS=~alpha amd64 ia64 ~mips ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ia64 ~mips ppc ~ppc64 sparc x86
LICENSE=vim
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
SLOT=0
SRC_URI=mirror://gentoo/ebnf-syntax-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ebnf-syntax-1.1.tar.bz2
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=7c0b340a9c7d782aefb8d8428cd2acf2
+_md5_=868c27978b6fef097a7ee15ff5b383e3
diff --git a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2 b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
index 9e8bea906f3a..f2f97dfcd9f4 100644
--- a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
+++ b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
DESCRIPTION=vim plugin: syntax highlighting for eruby
EAPI=6
HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=403
-KEYWORDS=~alpha amd64 ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd
LICENSE=vim.org
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
SLOT=0
SRC_URI=mirror://gentoo/eruby-syntax-2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/eruby-syntax-2.0.tar.bz2
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=3a64b51ba3b03e7f0bb69afc2bb2180a
+_md5_=387eb6c12b2381c83d0cbe6696f55e8a
diff --git a/metadata/md5-cache/app-vim/nagios-syntax-1.8 b/metadata/md5-cache/app-vim/nagios-syntax-1.8
index 2965c9dff341..5f7ebdf058e8 100644
--- a/metadata/md5-cache/app-vim/nagios-syntax-1.8
+++ b/metadata/md5-cache/app-vim/nagios-syntax-1.8
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
DESCRIPTION=vim plugin: Nagios configuration files syntax
EAPI=6
HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2261
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86
LICENSE=vim.org
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~monsieurp/packages/nagios-syntax-1.8.tar.gz
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a93b72ff5c45dd7cdc7375a9c67bbf2d
+_md5_=8e38f65a9eaff57c65e8e0ab1267a88b
diff --git a/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1 b/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
index c41d57e161d2..32b9329d2cc4 100644
--- a/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
+++ b/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
DESCRIPTION=vim plugin: syntax highlighting for perl module Template-Toolkit
EAPI=6
HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=830
-KEYWORDS=amd64 ~arm ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd
LICENSE=vim
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
SLOT=0
SRC_URI=mirror://gentoo/tt2-syntax-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tt2-syntax-1.13.tar.bz2
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=7199cc67fc0830c938e5f7ea1eeb7ec2
+_md5_=32ef03bbef8a9d4cb092f1aba1ff39ae
diff --git a/metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1 b/metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1
index 73d919819791..d16b69dafb88 100644
--- a/metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: Czech (cs)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 sparc ~x86
+KEYWORDS=amd64 sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-cs-20061021.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=3e7160899b41f47496053c81c976c6a9
+_md5_=dcbab36cbbdc52fbb66d54b706a0ad78
diff --git a/metadata/md5-cache/app-vim/vim-spell-da-20060116-r1 b/metadata/md5-cache/app-vim/vim-spell-da-20060116-r1
index 7fe41b4effc6..b54a705f6955 100644
--- a/metadata/md5-cache/app-vim/vim-spell-da-20060116-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-da-20060116-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: Danish (da)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 ~ia64 ppc sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-da-20060116.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=feafc0ada42f8c99724f6526fe02a2e6
+_md5_=d21ea7b448f515ebe14192a0efd464b7
diff --git a/metadata/md5-cache/app-vim/vim-spell-el-20080402-r1 b/metadata/md5-cache/app-vim/vim-spell-el-20080402-r1
index 0f0f23565e92..d966a1140055 100644
--- a/metadata/md5-cache/app-vim/vim-spell-el-20080402-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-el-20080402-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: Greek (el)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-el-20080402.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=4889974c29d8b7e44f5fae557adf808e
+_md5_=14f946c5643db7573e3fd97e404fb1b1
diff --git a/metadata/md5-cache/app-vim/vim-spell-en-20060123-r1 b/metadata/md5-cache/app-vim/vim-spell-en-20060123-r1
index b2efe51123e6..ce7ff32af4cd 100644
--- a/metadata/md5-cache/app-vim/vim-spell-en-20060123-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-en-20060123-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: English (en)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 ~arm ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
LICENSE=BSD LGPL-2.1 public-domain
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-en-20060123.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=012bb7e24373cd7153dbc9552ed2e65b
+_md5_=da732fbb5765a50218e6d64a87a0406a
diff --git a/metadata/md5-cache/app-vim/vim-spell-es-20060208-r1 b/metadata/md5-cache/app-vim/vim-spell-es-20060208-r1
index 920082c47293..14e4d993e325 100644
--- a/metadata/md5-cache/app-vim/vim-spell-es-20060208-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-es-20060208-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: Spanish (es)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 ppc sparc ~x86
+KEYWORDS=~alpha amd64 ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-es-20060208.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=29bfda90a1e190a18bc78ebd3e11bf8d
+_md5_=14c30cab0c52cddf32249d02696ed227
diff --git a/metadata/md5-cache/app-vim/vim-spell-fr-20060121-r1 b/metadata/md5-cache/app-vim/vim-spell-fr-20060121-r1
index c419d73453e9..5569ec659b43 100644
--- a/metadata/md5-cache/app-vim/vim-spell-fr-20060121-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-fr-20060121-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: French (fr)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc sparc ~x86
+KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-fr-20060121.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=5a1fad868b848018c52028aa6c727cc6
+_md5_=20b1ef4483564241e9a31ed488d9ceee
diff --git a/metadata/md5-cache/app-vim/vim-spell-he-20100312-r1 b/metadata/md5-cache/app-vim/vim-spell-he-20100312-r1
index 504d7ce4235d..49b2691c3acc 100644
--- a/metadata/md5-cache/app-vim/vim-spell-he-20100312-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-he-20100312-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: Hebrew (he)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-he-20100312.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=45cbd7399687c96fbf18b3758eaa6798
+_md5_=3d889ea4bb6ce6b75a5087961ffa7c95
diff --git a/metadata/md5-cache/app-vim/vim-spell-hu-20100312-r1 b/metadata/md5-cache/app-vim/vim-spell-hu-20100312-r1
index 8f7bf39e1773..723685df18a2 100644
--- a/metadata/md5-cache/app-vim/vim-spell-hu-20100312-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-hu-20100312-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: Hungarian (hu)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-hu-20100312.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=a17339da9eb424c89ff99f11907d82f0
+_md5_=8ea3b1d3e1ec1e2eb4fc51e87dd7e061
diff --git a/metadata/md5-cache/app-vim/vim-spell-it-20100312-r1 b/metadata/md5-cache/app-vim/vim-spell-it-20100312-r1
index d4222f5646a0..8cffb1357d17 100644
--- a/metadata/md5-cache/app-vim/vim-spell-it-20100312-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-it-20100312-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: Italian (it)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-it-20100312.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=9ad993d2e596b22e6e3ae6b94c5bcb22
+_md5_=944db227d7309272a8aab89fb449bbe8
diff --git a/metadata/md5-cache/app-vim/vim-spell-nl-20051007-r1 b/metadata/md5-cache/app-vim/vim-spell-nl-20051007-r1
index 1c7f9693ef29..43393321244d 100644
--- a/metadata/md5-cache/app-vim/vim-spell-nl-20051007-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-nl-20051007-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: Dutch (nl)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-nl-20051007.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=d8102befe5c83a3e4c294660c2d5a7a0
+_md5_=d738d5251eb2a67067059aa3504eff5f
diff --git a/metadata/md5-cache/app-vim/vim-spell-pl-20060218-r1 b/metadata/md5-cache/app-vim/vim-spell-pl-20060218-r1
index 8d349e47c68a..d5d93506a2d5 100644
--- a/metadata/md5-cache/app-vim/vim-spell-pl-20060218-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-pl-20060218-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: Polish (pl)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc sparc ~x86
+KEYWORDS=amd64 ppc sparc x86
LICENSE=CC-BY-SA-2.0
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-pl-20060218.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=b995981d8c8d35b6d78922103a24a235
+_md5_=ff0a7c56524b8fbf7308b427c608443c
diff --git a/metadata/md5-cache/app-vim/vim-spell-pt-20100312-r1 b/metadata/md5-cache/app-vim/vim-spell-pt-20100312-r1
index fb93bf33f1ff..f995fbb96ca8 100644
--- a/metadata/md5-cache/app-vim/vim-spell-pt-20100312-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-pt-20100312-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: Portuguese (pt)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2 LGPL-2.1 MPL-1.1
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-pt-20100312.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=3c70c808b9c8baf4eedeec4be219aa6a
+_md5_=1b65793379b6fe78371228cd388f19e5
diff --git a/metadata/md5-cache/app-vim/vim-spell-ru-20070506-r1 b/metadata/md5-cache/app-vim/vim-spell-ru-20070506-r1
index 356d7c7c563a..9c5d5d58c1fa 100644
--- a/metadata/md5-cache/app-vim/vim-spell-ru-20070506-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-ru-20070506-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
DESCRIPTION=vim spell files: Russian (ru)
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc sparc ~x86
+KEYWORDS=amd64 ppc sparc x86
LICENSE=myspell-ru_RU-AlexanderLebedev
SLOT=0
SRC_URI=mirror://gentoo/vim-spell-ru-20070506.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=1b8058439c3500ab942abf057502bdde
+_md5_=6257fea729e58a7076ff8186856d8985
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 04edbad76473..ed13bbaded97 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/glog-0.3.3-r1 b/metadata/md5-cache/dev-cpp/glog-0.3.3-r1
index 1ceb251fcec9..58b13a04af56 100644
--- a/metadata/md5-cache/dev-cpp/glog-0.3.3-r1
+++ b/metadata/md5-cache/dev-cpp/glog-0.3.3-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind ) test? ( >=dev-cpp/gmock-1.7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/gtest-1.6.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind ) test? ( >=dev-cpp/gtest-1.8.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
DESCRIPTION=Google's C++ logging library
EAPI=4
HOMEPAGE=https://github.com/google/glog
@@ -10,4 +10,4 @@ RDEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
SLOT=0
SRC_URI=https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd5e96139a5ee5351dc368056afaa119
+_md5_=ee03a4d0c51d584898d766d3a8583cf0
diff --git a/metadata/md5-cache/dev-cpp/glog-0.3.4 b/metadata/md5-cache/dev-cpp/glog-0.3.4
index cc516d2c59d0..2503897e28cb 100644
--- a/metadata/md5-cache/dev-cpp/glog-0.3.4
+++ b/metadata/md5-cache/dev-cpp/glog-0.3.4
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind ) test? ( >=dev-cpp/gmock-1.7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/gtest-1.6.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind ) test? ( >=dev-cpp/gtest-1.8.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
DESCRIPTION=Google's C++ logging library
EAPI=5
HOMEPAGE=https://github.com/google/glog
@@ -10,4 +10,4 @@ RDEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
SLOT=0
SRC_URI=https://github.com/google/glog/archive/v0.3.4.tar.gz -> glog-0.3.4.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6cea223c1eba964eba3566812b3b8bb6
+_md5_=374d4f14fa8a3eff15afaa1c2a64f7f7
diff --git a/metadata/md5-cache/dev-cpp/glog-0.3.4-r1 b/metadata/md5-cache/dev-cpp/glog-0.3.4-r1
index 3c3a0685c2b8..a91d1d96fcc0 100644
--- a/metadata/md5-cache/dev-cpp/glog-0.3.4-r1
+++ b/metadata/md5-cache/dev-cpp/glog-0.3.4-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-cpp/gmock-1.7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/gtest-1.6.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-cpp/gtest-1.8.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Google's C++ logging library
EAPI=6
HOMEPAGE=https://github.com/google/glog
@@ -10,4 +10,4 @@ RDEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
SLOT=0
SRC_URI=https://github.com/google/glog/archive/v0.3.4.tar.gz -> glog-0.3.4.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 libtool 0081a71a261724730ec4c248494f044d multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5aa38bf760c4c62c6935eea19b801ed0
+_md5_=0783e92df72516b3a4fc6da20b8d86fc
diff --git a/metadata/md5-cache/dev-cpp/mm-common-0.9.12 b/metadata/md5-cache/dev-cpp/mm-common-0.9.12
index b713bb4f13ff..3bf76409809a 100644
--- a/metadata/md5-cache/dev-cpp/mm-common-0.9.12
+++ b/metadata/md5-cache/dev-cpp/mm-common-0.9.12
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev
DESCRIPTION=Build infrastructure and utilities for GNOME C++ bindings
EAPI=5
HOMEPAGE=https://www.gtkmm.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gnome/sources/mm-common/0.9/mm-common-0.9.12.tar.xz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6a429553d78bf9289560bc7c01d7b09
+_md5_=4f35063dc63058e2e0ca7193345cef0d
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 43ec09f38a60..e7de4c069759 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/etcd-2.3.8 b/metadata/md5-cache/dev-db/etcd-2.3.8
deleted file mode 100644
index e15b4b602efe..000000000000
--- a/metadata/md5-cache/dev-db/etcd-2.3.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/go-1.4:= virtual/pkgconfig
-DESCRIPTION=Highly-available key value store for shared configuration and service discovery
-EAPI=5
-HOMEPAGE=https://github.com/coreos/etcd/
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!dev-db/etcdctl
-SLOT=0
-SRC_URI=https://github.com/coreos/etcd/archive/v2.3.8.tar.gz -> etcd-2.3.8.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=7ccf38791c9857a132d0ba2b47b65dd3
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.2 b/metadata/md5-cache/dev-db/etcd-3.3.2
deleted file mode 100644
index 389cc9307eda..000000000000
--- a/metadata/md5-cache/dev-db/etcd-3.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9:= virtual/pkgconfig >=dev-lang/go-1.9
-DESCRIPTION=Highly-available key value store for shared configuration and service discovery
-EAPI=6
-HOMEPAGE=https://github.com/coreos/etcd
-IUSE=doc +server
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!dev-db/etcdctl
-SLOT=0
-SRC_URI=https://github.com/coreos/etcd/archive/v3.3.2.tar.gz -> etcd-3.3.2.tar.gz
-_eclasses_=golang-base 928887539e385bb489681b292f6b862f golang-vcs-snapshot 913580335becddd3ebecefe852e47536 multilib 97f470f374f2e94ccab04a2fb21d811e systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=c704622a9bd1aecc273e42ab8ac9a802
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
index 6cd9953ab059..fac9ab1234c2 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.4:* ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.4:* ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=Quick Database Manager
EAPI=6
HOMEPAGE=http://fallabs.com/qdbm/
-IUSE=bzip2 cxx debug java lzo perl ruby zlib elibc_FreeBSD java elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24
+IUSE=bzip2 cxx debug java lzo perl ruby zlib elibc_FreeBSD java elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=LGPL-2.1
-RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=http://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e perl-functions 01e8c68d5a528bbcda4d3c60205983df preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng 2da44d50080e3d54e1a4ac7d91d149f8 ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e perl-functions 01e8c68d5a528bbcda4d3c60205983df preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
_md5_=0f3d281c6e5781a8dc90a7c6e06d08e4
diff --git a/metadata/md5-cache/dev-db/sqlite-3.23.1 b/metadata/md5-cache/dev-db/sqlite-3.23.1
index 8de9cd03adbc..8d28a7afe659 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.23.1
+++ b/metadata/md5-cache/dev-db/sqlite-3.23.1
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
EAPI=6
HOMEPAGE=https://sqlite.org/
IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=public-domain
RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=3
SRC_URI=doc? ( https://sqlite.org/2018/sqlite-doc-3230100.zip ) tcl? ( https://sqlite.org/2018/sqlite-src-3230100.zip ) test? ( https://sqlite.org/2018/sqlite-src-3230100.zip ) tools? ( https://sqlite.org/2018/sqlite-src-3230100.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz ) ) )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=34eb22c7fe3c29679a8ed71d1d781594
+_md5_=afc60d56d04fa7ce283f84051b3fc1fa
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 6bed6d678619..e721eb245ae1 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/sdcc-2.5.0_p20060502 b/metadata/md5-cache/dev-embedded/sdcc-2.5.0_p20060502
index e2ca16229858..bb67671d3ea3 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-2.5.0_p20060502
+++ b/metadata/md5-cache/dev-embedded/sdcc-2.5.0_p20060502
@@ -4,10 +4,10 @@ DESCRIPTION=Small device C compiler (for various microprocessors)
EAPI=0
HOMEPAGE=http://sdcc.sourceforge.net/
IUSE=doc
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=!dev-embedded/sdcc-svn !dev-embedded/sdcc-svn
SLOT=0
SRC_URI=http://sdcc.sourceforge.net/snapshots/sdcc-src/sdcc-src-20060502.tar.gz doc? ( http://sdcc.sourceforge.net/snapshots/docs/sdcc-doc-20060502.tar.gz )
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=51509887cb4fba607e2f3ee64a81dab3
+_md5_=8f3ff5986d61ec83dad860102294d944
diff --git a/metadata/md5-cache/dev-embedded/sdcc-2.6.0 b/metadata/md5-cache/dev-embedded/sdcc-2.6.0
index d7612ffd8c9f..4ace1d268879 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-2.6.0
+++ b/metadata/md5-cache/dev-embedded/sdcc-2.6.0
@@ -4,9 +4,9 @@ DESCRIPTION=Small device C compiler (for various microprocessors)
EAPI=0
HOMEPAGE=http://sdcc.sourceforge.net/
IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!dev-embedded/sdcc-svn
SLOT=0
SRC_URI=mirror://sourceforge/sdcc/sdcc-src-2.6.0.tar.gz doc? ( mirror://sourceforge/sdcc/sdcc-doc-2.6.0.tar.gz )
-_md5_=91e27e9bfb813e967b9a70a5019b2df6
+_md5_=8e0a9ef1077977c06dcd8515c6898e34
diff --git a/metadata/md5-cache/dev-embedded/sdcc-2.7.0 b/metadata/md5-cache/dev-embedded/sdcc-2.7.0
index 79867549ea69..5b327540f057 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-2.7.0
+++ b/metadata/md5-cache/dev-embedded/sdcc-2.7.0
@@ -4,9 +4,9 @@ DESCRIPTION=Small device C compiler (for various microprocessors)
EAPI=0
HOMEPAGE=http://sdcc.sourceforge.net/
IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!dev-embedded/sdcc-svn
SLOT=0
SRC_URI=mirror://sourceforge/sdcc/sdcc-src-2.7.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-2.7.0.tar.bz2 )
-_md5_=3b64c0d3f43cbec51888be007178ff43
+_md5_=0559dcf798a6f1e15f167e3729cb1f9e
diff --git a/metadata/md5-cache/dev-embedded/sdcc-2.8.0 b/metadata/md5-cache/dev-embedded/sdcc-2.8.0
index 13d3229ec745..c8df514baed2 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-2.8.0
+++ b/metadata/md5-cache/dev-embedded/sdcc-2.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=Small device C compiler (for various microprocessors)
EAPI=0
HOMEPAGE=http://sdcc.sourceforge.net/
IUSE=boehm-gc doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!dev-embedded/sdcc-svn
SLOT=0
SRC_URI=mirror://sourceforge/sdcc/sdcc-src-2.8.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-2.8.0.tar.bz2 )
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=254f96461b514798be707ba08ed81a1d
+_md5_=9b27aa184cbb8a6b220bfa1b2684fdda
diff --git a/metadata/md5-cache/dev-embedded/sdcc-2.9.0 b/metadata/md5-cache/dev-embedded/sdcc-2.9.0
index 2929bca191d3..993048751109 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-2.9.0
+++ b/metadata/md5-cache/dev-embedded/sdcc-2.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Small device C compiler (for various microprocessors)
EAPI=2
HOMEPAGE=http://sdcc.sourceforge.net/
IUSE=+boehm-gc doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses sys-libs/readline >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc ) !dev-embedded/sdcc-svn
RESTRICT=strip
SLOT=0
SRC_URI=mirror://sourceforge/sdcc/sdcc-src-2.9.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-2.9.0.tar.bz2 )
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=82a9ea4fd5daeb48ba562e774002a2f3
+_md5_=d88dd35240d9e6b73c07b79bf82fe71f
diff --git a/metadata/md5-cache/dev-embedded/sdcc-3.5.0 b/metadata/md5-cache/dev-embedded/sdcc-3.5.0
index 04c93f09e14a..c95cd56dbd75 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-3.5.0
+++ b/metadata/md5-cache/dev-embedded/sdcc-3.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Small device C compiler (for various microprocessors)
EAPI=5
HOMEPAGE=http://sdcc.sourceforge.net/
IUSE=mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8 ucsim device-lib packihx +sdcpp sdcdb sdbinutils non-free +boehm-gc doc
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2 ZLIB non-free? ( MicroChip-SDCC ) packihx? ( public-domain )
RDEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc:= ) !dev-embedded/sdcc-svn
REQUIRED_USE=mcs51? ( sdbinutils ) ds390? ( sdbinutils ) ds400? ( sdbinutils ) hc08? ( sdbinutils ) s08? ( sdbinutils )
@@ -12,4 +12,4 @@ RESTRICT=strip
SLOT=0
SRC_URI=mirror://sourceforge/sdcc/sdcc-src-3.5.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-3.5.0.tar.bz2 )
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0e03f5f78c2d38f8f2bb8a09fdcd2c24
+_md5_=c394113a8671436400a2b2fa82e454bc
diff --git a/metadata/md5-cache/dev-embedded/sdcc-9999 b/metadata/md5-cache/dev-embedded/sdcc-9999
index 7a9cd286eb13..ea5e72bba1f4 100644
--- a/metadata/md5-cache/dev-embedded/sdcc-9999
+++ b/metadata/md5-cache/dev-embedded/sdcc-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=mcs51? ( sdbinutils ) ds390? ( sdbinutils ) ds400? ( sdbinutils ) h
RESTRICT=strip
SLOT=0
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 subversion a5d5826a85609611f098c0553eb24cc1 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=897c1ee6519588629e38190be273b3aa
+_md5_=526c6f7a5f932d582ab9142647140625
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index b2db394ec3b0..495e8a4c8a6e 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/ode-0.11.1 b/metadata/md5-cache/dev-games/ode-0.11.1
index a312dc42b2c4..4f84ce89348b 100644
--- a/metadata/md5-cache/dev-games/ode-0.11.1
+++ b/metadata/md5-cache/dev-games/ode-0.11.1
@@ -4,10 +4,10 @@ DESCRIPTION=Open Dynamics Engine SDK
EAPI=5
HOMEPAGE=http://ode.org/
IUSE=debug doc double-precision examples gyroscopic static-libs
-KEYWORDS=amd64 ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
LICENSE=|| ( LGPL-2.1 BSD )
RDEPEND=examples? ( virtual/opengl )
SLOT=0
SRC_URI=mirror://sourceforge/opende/ode-0.11.1.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ff1bc0097f7339f2021a895b304d78cc
+_md5_=50bf845dba3bba33881369491e2a7f09
diff --git a/metadata/md5-cache/dev-games/ode-0.12 b/metadata/md5-cache/dev-games/ode-0.12
index 3da1bc432fa7..838f3e9ea7ef 100644
--- a/metadata/md5-cache/dev-games/ode-0.12
+++ b/metadata/md5-cache/dev-games/ode-0.12
@@ -4,10 +4,10 @@ DESCRIPTION=Open Dynamics Engine SDK
EAPI=5
HOMEPAGE=http://ode.org/
IUSE=debug doc double-precision examples gyroscopic static-libs
-KEYWORDS=amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=|| ( LGPL-2.1 BSD )
RDEPEND=examples? ( virtual/opengl )
SLOT=0
SRC_URI=mirror://sourceforge/opende/ode-0.12.tar.bz2
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5d4ae949eff8af74e01e2d1d535e8dc3
+_md5_=a754312a2363493a85eed5fa7469b864
diff --git a/metadata/md5-cache/dev-games/ode-0.14-r1 b/metadata/md5-cache/dev-games/ode-0.14-r1
index 4ee9ebd97d51..37bb57e6de96 100644
--- a/metadata/md5-cache/dev-games/ode-0.14-r1
+++ b/metadata/md5-cache/dev-games/ode-0.14-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Open Dynamics Engine SDK
EAPI=5
HOMEPAGE=http://ode.org/
IUSE=debug doc double-precision examples gyroscopic static-libs
-KEYWORDS=amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=|| ( LGPL-2.1+ BSD )
RDEPEND=examples? ( virtual/glu virtual/opengl )
SLOT=0/6
SRC_URI=https://bitbucket.org/odedevs/ode/downloads/ode-0.14.tar.gz
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=911eea1072771dbe2c3e48b8b9c2c793
+_md5_=ba35d7ff90397244b77d6eca37c57a92
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 97ad3e086f98..8957c7577aef 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/ant-1.9.2-r1 b/metadata/md5-cache/dev-java/ant-1.9.2-r1
index 483408ff5048..1259e912b195 100644
--- a/metadata/md5-cache/dev-java/ant-1.9.2-r1
+++ b/metadata/md5-cache/dev-java/ant-1.9.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Java-based build tool similar to 'make' that uses XML configuration
EAPI=6
HOMEPAGE=http://ant.apache.org/
IUSE=X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf +jsch +log4j +oro +regexp +resolver testutil
-KEYWORDS=amd64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=~dev-java/ant-core-1.9.2 ~dev-java/ant-core-1.9.2 ~dev-java/ant-junit-1.9.2 !dev-java/ant-optional !dev-java/ant-tasks ~dev-java/ant-apache-xalan2-1.9.2 antlr? ( ~dev-java/ant-antlr-1.9.2 ) bcel? ( ~dev-java/ant-apache-bcel-1.9.2 ) bsf? ( ~dev-java/ant-apache-bsf-1.9.2 ) log4j? ( ~dev-java/ant-apache-log4j-1.9.2 ) oro? ( ~dev-java/ant-apache-oro-1.9.2 ) regexp? ( ~dev-java/ant-apache-regexp-1.9.2 ) resolver? ( ~dev-java/ant-apache-resolver-1.9.2 ) commonslogging? ( ~dev-java/ant-commons-logging-1.9.2 ) commonsnet? ( ~dev-java/ant-commons-net-1.9.2 ) jai? ( ~dev-java/ant-jai-1.9.2 ) javamail? ( ~dev-java/ant-javamail-1.9.2 ) jdepend? ( ~dev-java/ant-jdepend-1.9.2 ) jmf? ( ~dev-java/ant-jmf-1.9.2 ) jsch? ( ~dev-java/ant-jsch-1.9.2 ) testutil? ( ~dev-java/ant-testutil-1.9.2 ) X? ( ~dev-java/ant-swing-1.9.2 )
SLOT=0
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=da838fcc5547fff78dcbdfb17ddff178
+_md5_=3063a23da121af1456dacccbf87cbf60
diff --git a/metadata/md5-cache/dev-java/bcpg-1.50-r2 b/metadata/md5-cache/dev-java/bcpg-1.50-r2
new file mode 100644
index 000000000000..08f63fcb019e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bcpg-1.50-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=dev-java/bcprov:1.50 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Java cryptography APIs
+EAPI=6
+HOMEPAGE=http://www.bouncycastle.org/java.html
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=dev-java/bcprov:1.50 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=1.50
+SRC_URI=http://polydistortion.net/bc/download/bcpg-jdk15on-150.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple 3e71074eb6884746b37b70b2c9c881f4 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=af17fbcd86bff8d2a6ea5a13864060ba
diff --git a/metadata/md5-cache/dev-java/bcpg-1.52-r2 b/metadata/md5-cache/dev-java/bcpg-1.52-r2
new file mode 100644
index 000000000000..c43487250fa2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bcpg-1.52-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=dev-java/bcprov:1.52 >=virtual/jdk-1.6 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Java cryptography APIs
+EAPI=6
+HOMEPAGE=http://www.bouncycastle.org/java.html
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=dev-java/bcprov:1.52 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=1.52
+SRC_URI=http://polydistortion.net/bc/download/bcpg-jdk15on-152.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple 3e71074eb6884746b37b70b2c9c881f4 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3d4c36f84ca9cf12c47e8abd647d7f30
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6 b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6
index cbead2269981..5490447f3e93 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6
+++ b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=app-arch/zip gtk? ( x11-libs/libXrender >=x11-libs/libXtst-1.1.0 x11-proto/xproto ) >=virtual/jdk-1.5 alsa? ( media-libs/alsa-lib ) dssi? ( >=media-libs/dssi-0.9 ) gconf? ( gnome-base/gconf:2= ) gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 ) gmp? ( >=dev-libs/gmp-4.2.4:0= ) gtk? ( >=x11-libs/gtk+-2.8:2= dev-libs/glib:2= media-libs/freetype:2= >=x11-libs/cairo-1.1.9:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango ) xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 ) >=dev-java/java-config-2.2.0-r3
+DEPEND=app-arch/zip gtk? ( x11-base/xorg-proto x11-libs/libXrender >=x11-libs/libXtst-1.1.0 ) >=virtual/jdk-1.5 alsa? ( media-libs/alsa-lib ) dssi? ( >=media-libs/dssi-0.9 ) gconf? ( gnome-base/gconf:2= ) gjdoc? ( >=dev-java/antlr-2.7.7-r7:0 ) gmp? ( >=dev-libs/gmp-4.2.4:0= ) gtk? ( >=x11-libs/gtk+-2.8:2= dev-libs/glib:2= media-libs/freetype:2= >=x11-libs/cairo-1.1.9:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango ) xml? ( >=dev-libs/libxml2-2.6.8:2= >=dev-libs/libxslt-1.1.11 ) >=dev-java/java-config-2.2.0-r3
DESCRIPTION=Free core class libraries for use with Java VMs and compilers
EAPI=5
HOMEPAGE=https://www.gnu.org/software/classpath
@@ -11,4 +11,4 @@ REQUIRED_USE=doc? ( gjdoc )
SLOT=0.98
SRC_URI=mirror://gnu/classpath/classpath-0.98.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f98ebdb5de0ffbd14d4913dd745a7bc3
+_md5_=32d6ab8ed7ae1d21b2c33470d513c1c3
diff --git a/metadata/md5-cache/dev-java/icedtea-3.7.0 b/metadata/md5-cache/dev-java/icedtea-3.7.0
index b854e31690b5..c57d58d82210 100644
--- a/metadata/md5-cache/dev-java/icedtea-3.7.0
+++ b/metadata/md5-cache/dev-java/icedtea-3.7.0
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=media-libs/lcms-2.5:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto || ( dev-java/icedtea-bin:8 dev-java/icedtea-bin:7 dev-java/icedtea:8 dev-java/icedtea:7 dev-java/oracle-jdk-bin:1.8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax_kernel? ( sys-apps/elfix ) >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DEPEND=>=dev-libs/glib-2.26:2= >=dev-util/systemtap-1 media-libs/fontconfig:1.0= >=media-libs/freetype-2.5.3:2= >=media-libs/lcms-2.5:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) sunec? ( >=dev-libs/nss-3.16.1-r1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 x11-libs/libXcomposite x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 || ( dev-java/icedtea-bin:8 dev-java/icedtea-bin:7 dev-java/icedtea:8 dev-java/icedtea:7 dev-java/oracle-jdk-bin:1.8 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates dev-lang/perl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0 ) sys-apps/attr sys-apps/lsb-release x11-libs/libXt virtual/pkgconfig pax_kernel? ( sys-apps/elfix ) >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
DESCRIPTION=A harness to build OpenJDK using Free Software build tools and dependencies
EAPI=6
HOMEPAGE=http://icedtea.classpath.org
@@ -12,4 +12,4 @@ REQUIRED_USE=gtk? ( !headless-awt )
SLOT=8
SRC_URI=http://icedtea.classpath.org/download/source/icedtea-3.7.0.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.7.0/openjdk.tar.xz -> icedtea-3.7-openjdk-644bdc77dd18.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.7.0/corba.tar.xz -> icedtea-3.7-corba-872ca6c060bb.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.7.0/jaxp.tar.xz -> icedtea-3.7-jaxp-154d73707643.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.7.0/jaxws.tar.xz -> icedtea-3.7-jaxws-3f0a3aea44b4.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.7.0/jdk.tar.xz -> icedtea-3.7-jdk-80cebaab0ba5.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.7.0/hotspot.tar.xz -> icedtea-3.7-hotspot-074a569c30e4.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.7.0/nashorn.tar.xz -> icedtea-3.7-nashorn-136ab780f038.tar.xz http://icedtea.classpath.org/download/drops/icedtea8/3.7.0/langtools.tar.xz -> icedtea-3.7-langtools-0a2dce555d35.tar.xz shenandoah? ( http://icedtea.classpath.org/download/drops/icedtea8/3.7.0/shenandoah.tar.xz -> icedtea-3.7-shenandoah-773364cde857.tar.xz ) arm? ( http://icedtea.classpath.org/download/drops/icedtea8/3.7.0/aarch32.tar.xz -> icedtea-3.7-aarch32-1cd346521065.tar.xz ) http://icedtea.classpath.org/download/drops/cacao/cacao-c182f119eaad.tar.xz -> icedtea-cacao-c182f119eaad.tar.xz http://icedtea.classpath.org/download/drops/jamvm/jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz -> icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz
_eclasses_=check-reqs fd05cf75484aa28d307cf4ee6e1db056 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 java-vm-2 771452d15e0b51ec559962d22c627449 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils b963274a93e76570a88168c1f1db4cd7 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c01f115fed433edbc33dc94f5069fc79
+_md5_=3a15ca8f604bf8941172b26fa828835c
diff --git a/metadata/md5-cache/dev-java/json-simple-1.1-r1 b/metadata/md5-cache/dev-java/json-simple-1.1-r1
new file mode 100644
index 000000000000..f5df95f66ee2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/json-simple-1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Simple Java toolkit for JSON
+EAPI=6
+HOMEPAGE=http://www.json.org
+IUSE=elibc_FreeBSD source doc elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/fangyidong/json-simple/archive/tag_release_1_1_1.tar.gz -> json-simple-1.1.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple 3e71074eb6884746b37b70b2c9c881f4 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ead702e3e5efa10cb11fe01dd3f52003
diff --git a/metadata/md5-cache/dev-java/lucene-3.5.0-r2 b/metadata/md5-cache/dev-java/lucene-3.5.0-r2
index eda38b2364da..47f636d95191 100644
--- a/metadata/md5-cache/dev-java/lucene-3.5.0-r2
+++ b/metadata/md5-cache/dev-java/lucene-3.5.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=High-performance, full-featured text search engine written entirely
EAPI=6
HOMEPAGE=https://lucene.apache.org
IUSE=elibc_FreeBSD doc source test contrib elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/junit:4 dev-java/ant-junit:0 dev-java/ant-core:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=3.5
SRC_URI=mirror://apache/lucene/java/3.5.0/lucene-3.5.0-src.tgz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=115dcb49d6b93d770b06b6a4abf93153
+_md5_=24e3a74193991435b5f4ddc82821273e
diff --git a/metadata/md5-cache/dev-java/lucene-3.6.2-r2 b/metadata/md5-cache/dev-java/lucene-3.6.2-r2
index 635617e4d5f8..687119c573fb 100644
--- a/metadata/md5-cache/dev-java/lucene-3.6.2-r2
+++ b/metadata/md5-cache/dev-java/lucene-3.6.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=High-performance, full-featured text search engine written entirely
EAPI=6
HOMEPAGE=https://lucene.apache.org
IUSE=elibc_FreeBSD doc source test contrib elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/ant-ivy:2 dev-java/ant-junit:0 dev-java/ant-core:0 dev-java/hamcrest-core:0 contrib? ( dev-java/jakarta-regexp:1.4 dev-java/commons-compress:0 dev-java/commons-collections:0 dev-java/commons-digester:0 dev-java/commons-logging:0 dev-java/commons-beanutils:1.7 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=3.6
SRC_URI=mirror://apache/lucene/java/3.6.2/lucene-3.6.2-src.tgz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fbcaf6e3313527f0b7bb5580a25b476d
+_md5_=ce94c6017e2d710917103fd75d8b415f
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.162-r1 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.162-r1
deleted file mode 100644
index 5d1242a96974..000000000000
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.162-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare prerm setup unpack
-DEPEND=app-arch/zip examples? ( x64-macos? ( app-arch/unzip ) ) >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Oracle's Java SE Development Kit
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm
-KEYWORDS=-* amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris
-LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:1.8 ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-REQUIRED_USE=javafx? ( alsa fontconfig )
-RESTRICT=fetch preserve-libs strip
-SLOT=1.8
-SRC_URI=amd64? ( jdk-8u162-linux-x64.tar.gz examples? ( jdk-8u162-linux-x64-demos.tar.gz ) ) arm? ( jdk-8u162-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u162-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u162-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u162-linux-arm64-vfp-hflt-demos.tar.gz ) ) x86? ( jdk-8u162-linux-i586.tar.gz examples? ( jdk-8u162-linux-i586-demos.tar.gz ) ) x64-macos? ( jdk-8u162-macosx-x64.dmg examples? ( jdk-8u162-macosx-x86_64-demos.zip ) ) sparc64-solaris? ( jdk-8u162-solaris-sparcv9.tar.gz examples? ( jdk-8u162-solaris-sparcv9-demos.tar.gz ) ) x64-solaris? ( jdk-8u162-solaris-x64.tar.gz examples? ( jdk-8u162-solaris-x64-demos.tar.gz ) )
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 java-vm-2 771452d15e0b51ec559962d22c627449 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9cc1578dd07091766e58cfcf4237b86f
diff --git a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.162-r1 b/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.162-r1
deleted file mode 100644
index 506f17e09dc4..000000000000
--- a/metadata/md5-cache/dev-java/oracle-jre-bin-1.8.0.162-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare prerm setup
-DEPEND=app-arch/zip >=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-DESCRIPTION=Oracle's Java SE Runtime Environment
-EAPI=6
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux
-KEYWORDS=-* amd64 x86
-LICENSE=Oracle-BCLA-JavaSE
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
-RESTRICT=fetch preserve-libs strip
-SLOT=1.8
-SRC_URI=amd64? ( jre-8u162-linux-x64.tar.gz ) x86? ( jre-8u162-linux-i586.tar.gz )
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 java-vm-2 771452d15e0b51ec559962d22c627449 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe5596c81be25f7854a6e5fe958bc6fb
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.0.0_beta3_p1 b/metadata/md5-cache/dev-java/protobuf-java-3.0.0_beta3_p1
deleted file mode 100644
index 92a46aa0d4ab..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.0.0_beta3_p1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-libs/protobuf-3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - official Java Bindings
-EAPI=5
-HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
-IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/10b3
-SRC_URI=https://github.com/google/protobuf/archive/v3.0.0-beta-3.1.tar.gz -> protobuf-3.0.0_beta3_p1.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple 3e71074eb6884746b37b70b2c9c881f4 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=31195bc37ee19523dc7e3b72b9ce03e6
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.0.2 b/metadata/md5-cache/dev-java/protobuf-java-3.0.2
deleted file mode 100644
index 01f79f3b5543..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-libs/protobuf-3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - official Java Bindings
-EAPI=6
-HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
-IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/10
-SRC_URI=https://github.com/google/protobuf/archive/v3.0.2.tar.gz -> protobuf-3.0.2.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple 3e71074eb6884746b37b70b2c9c881f4 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=790d2e2196275324416cb7eb31b83db1
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.1.0 b/metadata/md5-cache/dev-java/protobuf-java-3.1.0
deleted file mode 100644
index 7b65aaed547f..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-libs/protobuf-3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - official Java Bindings
-EAPI=6
-HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
-IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/11
-SRC_URI=https://github.com/google/protobuf/archive/v3.1.0.tar.gz -> protobuf-3.1.0.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple 3e71074eb6884746b37b70b2c9c881f4 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d6dedf503fbc88ee52fe7b27a5f7cdf3
diff --git a/metadata/md5-cache/dev-java/protobuf-java-3.3.0 b/metadata/md5-cache/dev-java/protobuf-java-3.3.0
deleted file mode 100644
index e02f48735a68..000000000000
--- a/metadata/md5-cache/dev-java/protobuf-java-3.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 ~dev-libs/protobuf-3.3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Google's Protocol Buffers - official Java Bindings
-EAPI=6
-HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
-IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 !=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0/13
-SRC_URI=https://github.com/google/protobuf/archive/v3.3.0.tar.gz -> protobuf-3.3.0.tar.gz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple 3e71074eb6884746b37b70b2c9c881f4 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7b9cbf630025abd5113d42cfc9b32a7d
diff --git a/metadata/md5-cache/dev-java/swt-3.7.2-r2 b/metadata/md5-cache/dev-java/swt-3.7.2-r2
index 8985a1f10c50..9bcea294bb59 100644
--- a/metadata/md5-cache/dev-java/swt-3.7.2-r2
+++ b/metadata/md5-cache/dev-java/swt-3.7.2-r2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 x11-proto/inputproto virtual/pkgconfig >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.4 app-arch/unzip x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 virtual/pkgconfig >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=GTK based SWT Library
EAPI=4
HOMEPAGE=http://www.eclipse.org/
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs
SLOT=3.7
SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip )
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-osgi c90eda970384b702459d01fc288d647d java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e220b1e4a200130a18e2508812411db4
+_md5_=7bfb72bcfc4512d935f0da156ebfa526
diff --git a/metadata/md5-cache/dev-java/swt-3.8.2-r2 b/metadata/md5-cache/dev-java/swt-3.8.2-r2
index 3e923cfea4aa..51e78997e672 100644
--- a/metadata/md5-cache/dev-java/swt-3.8.2-r2
+++ b/metadata/md5-cache/dev-java/swt-3.8.2-r2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 x11-proto/inputproto virtual/pkgconfig >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( gnome-base/gnome-vfs:2 gnome-base/libgnome gnome-base/libgnomeui ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.4 app-arch/unzip x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 virtual/pkgconfig >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( gnome-base/gnome-vfs:2 gnome-base/libgnome gnome-base/libgnomeui ) opengl? ( virtual/opengl virtual/glu ) x11-libs/libXtst >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=GTK based SWT Library
EAPI=5
HOMEPAGE=http://www.eclipse.org/
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs
SLOT=3.8
SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip )
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-osgi c90eda970384b702459d01fc288d647d java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b5af815b3c3d800b1718c09fbca33ff5
+_md5_=64eeb20e208e0cf4effade81e08291e5
diff --git a/metadata/md5-cache/dev-java/swt-4.2-r3 b/metadata/md5-cache/dev-java/swt-4.2-r3
index 8ee7989288c3..490afaf36d98 100644
--- a/metadata/md5-cache/dev-java/swt-4.2-r3
+++ b/metadata/md5-cache/dev-java/swt-4.2-r3
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jdk-1.4 app-arch/unzip virtual/pkgconfig x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 x11-proto/inputproto >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/gnome-vfs-2* =gnome-base/libgnome-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jdk-1.4 app-arch/unzip virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=GTK based SWT Library
EAPI=5
HOMEPAGE=http://www.eclipse.org/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-l
SLOT=4.2
SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-osgi c90eda970384b702459d01fc288d647d java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bf735aa703b2454878c0c17c83cdd4ec
+_md5_=f789ebe822a7ac494784cafcc8a315e0
diff --git a/metadata/md5-cache/dev-java/tapestry-3.0.4-r3 b/metadata/md5-cache/dev-java/tapestry-3.0.4-r3
index 5956dbc34bb3..8c9ef972aa64 100644
--- a/metadata/md5-cache/dev-java/tapestry-3.0.4-r3
+++ b/metadata/md5-cache/dev-java/tapestry-3.0.4-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Dynamic, robust, highly scalable web framework in Java
EAPI=6
HOMEPAGE=https://tapestry.apache.org/
IUSE=doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/bsf:2.3 dev-java/commons-beanutils:1.7 dev-java/commons-codec:0 dev-java/commons-digester:0 dev-java/commons-fileupload:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jakarta-oro:2.0 dev-java/javassist:2 dev-java/ognl:3.0 dev-java/tomcat-servlet-api:2.4 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=3.0
SRC_URI=mirror://apache/tapestry/Tapestry-3.0.4-src.zip
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=10a902d67732d2281a28dddcf2f72a0a
+_md5_=1f560b9de9be0ee7dfd2a907a10bdcae
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 4c52ae2af0c8..b5d0e3bfac5f 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/R-3.4.1 b/metadata/md5-cache/dev-lang/R-3.4.1
index 84526d296866..f1f4597579d2 100644
--- a/metadata/md5-cache/dev-lang/R-3.4.1
+++ b/metadata/md5-cache/dev-lang/R-3.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=Language and environment for statistical computing and graphics
EAPI=6
HOMEPAGE=http://www.r-project.org/
IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X
-KEYWORDS=amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= net-misc/curl virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) >=sys-libs/zlib-1.2.5.1-r2:0[minizip] java? ( >=virtual/jre-1.5 ) virtual/fortran
REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
@@ -12,4 +12,4 @@ RESTRICT=minimal? ( test )
SLOT=0
SRC_URI=mirror://cran/src/base/R-3/R-3.4.1.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 bash-completion-r1 8e447753aaf658afa609fbf961d80ab7 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 fortran-2 9e7f20c99213f0627ff7f873d4aaa25d libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f28d202adc2cd5414f02e40ed08b672a
+_md5_=7c864aa2bc34db505591eeb82e568bc7
diff --git a/metadata/md5-cache/dev-lang/mono-4.8.0.524 b/metadata/md5-cache/dev-lang/mono-4.8.0.524
index 105cdaa85768..28a3bd908bc6 100644
--- a/metadata/md5-cache/dev-lang/mono-4.8.0.524
+++ b/metadata/md5-cache/dev-lang/mono-4.8.0.524
@@ -4,10 +4,10 @@ DESCRIPTION=Mono runtime and class libraries, a C# compiler/interpreter
EAPI=6
HOMEPAGE=https://www.mono-project.com/Main_Page
IUSE=nls minimal pax_kernel xen doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux
LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL
RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx )
SLOT=0
SRC_URI=https://download.mono-project.com/sources/mono/mono-4.8.0.524.tar.bz2
_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 607e058da37aa6dabfa408b7d61da72e mono-env 1f24c032c78290b0d9a07d5b343051a7 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 8ffb5e2112a70fef5f37fcacad308726 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c6bd0365282c642231c73f2e2ecf8d31
+_md5_=ca0e31a5e120ade1493d80c060e4c188
diff --git a/metadata/md5-cache/dev-lang/php-5.6.36 b/metadata/md5-cache/dev-lang/php-5.6.36
new file mode 100644
index 000000000000..5b13b0e9986e
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-5.6.36
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
+SLOT=5.6
+SRC_URI=https://php.net/distributions/php-5.6.36.tar.xz
+_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3d2623409c8aa96638a822afcbeed7bb
diff --git a/metadata/md5-cache/dev-lang/php-7.0.30 b/metadata/md5-cache/dev-lang/php-7.0.30
new file mode 100644
index 000000000000..0f48d935ca01
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.0.30
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
+SLOT=7.0
+SRC_URI=https://secure.php.net/distributions/php-7.0.30.tar.xz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7b730f320db28750f0a899592d21181d
diff --git a/metadata/md5-cache/dev-lang/php-7.1.14 b/metadata/md5-cache/dev-lang/php-7.1.14
deleted file mode 100644
index 6002b28a5518..000000000000
--- a/metadata/md5-cache/dev-lang/php-7.1.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=https://secure.php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
-REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) )
-SLOT=7.1
-SRC_URI=https://secure.php.net/distributions/php-7.1.14.tar.xz
-_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd a31844b675f1a1fea87fbe1144aee5f5 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5a81c75a8253723f43fef5ddfe1a9ccb
diff --git a/metadata/md5-cache/dev-lang/php-7.1.17 b/metadata/md5-cache/dev-lang/php-7.1.17
new file mode 100644
index 000000000000..5e3cc07441f3
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-7.1.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) session-mm? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=https://secure.php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session session-mm sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] fpm? ( acl? ( sys-apps/acl ) ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]