Sync with portage [Mon May 29 09:54:32 MSK 2017].

7 years ago · baa5692c79
parent 8338e6bd56
commit baa5692c79
2973 changed files with 13596 additions and 6095 deletions
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ b/app-admin/hddtemp/files/hddgentoo.db
@ -23,6 +23,7 @@
 "ST3750630AS"							194 C "Seagate Barracuda 7200.11 SATA 750GB 16MB"
 "ST31000340AS"							194 C "Seagate Barracuda 7200.11 SATA 1000GB 32MB"
 "SAMSUNG HD403LJ"						194 C "Samsung HD403LJ"
+"SAMSUNG HD250HJ"						194 C "Samsung SpinPoint SpinPoint S250"
 "ST3320620NS"							194 C "Seagate 320GB 7200rpm 16MB SATAII"
 "FUJITSU MHZ2250BJ FFS G2"					194 C "FUJITSU MHZ2250BJ FFS G2"
 "ST3500630A"							194 C "Seagate Barracuda 7200.10 PATA 500GB 16MB"
@ -61,7 +62,9 @@
 "WDC WD3202ABYS-02B7A0"						194 C "Western Digital Caviar WD3202ABYS"
 "FUJITSU MHY2200BH"						194 C "FUJITSU MHY2200BH"
 "ST3320418AS"							194 C "Seagate Barracuda 7200.12 SATA 320GB"
-"TOSHIBA MK7559GSXP"						194 C  "Toshiba MK7559GSXP"
+"TOSHIBA MK7559GSXP"						194 C "Toshiba MK7559GSXP"
+"TOSHIBA MK1637GSX"						194 C "Toshiba MK1637GSX 160GB SATA2 5200RPM"
+"TOSHIBA MG03ACA300"						194 C "Toshiba MG03ACA300 3TB SATA3 7200RPM"
 "OCZ-VERTEX2"							194 C "OCZ Vertex 2"
 "SAMSUNG HD204UI"						194 C "Samsung Spinpoint F4EG 2TB SATA2 5400RPM 32MB"
 "SAMSUNG HD154UI"						194 C "Samsung Spinpoint F2EG 1.5TB SATA2 5400RPM 32MB"
@ -197,6 +200,7 @@
 "SAMSUNG HM160HC"						194 C "Samsung HM160HC"
 "WDC WD1003FBYX-01Y7B1"						194 C "Western Digital RE4 1TB SATA2 7200RPM 64MB"
 "WDC WD3003FZEX-00Z4SA0"					194 C "Western Digital Caviar Black 3TB SATA3 7200RPM 64MB"
+"WDC WD3000FYYZ-01UL1B2"					194 C "Western Digital WD3000FYYZ 3TB SATA3 7200RPM"
 "TOSHIBA DT01ACA050"						194 C "Toshiba 500GB SATA3 7200RPM 32MB"
 "WDC WD10JFCX-68N6GN0"						194 C "Western Digital Red 1TB SATA3 IntelliPower 64MB"
 "WDC WD40EFRX"			 				194 C "Western Digital Red 4TB SATA3 IntelliPower 64MB"
--- a/app-admin/hddtemp/metadata.xml
+++ b/app-admin/hddtemp/metadata.xml
@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>aidecoe@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="network-cron">
 		Monthly cronjob to update hddtemp.db.
--- a/app-backup/buttersink/Manifest
+++ b/app-backup/buttersink/Manifest
@ -0,0 +1 @@
+DIST buttersink-0.6.8.tar.gz 51784 SHA256 12dc5683256bc6aab5ce6db5ae40c8f565b9ad7c3da944bdba46182ae89f21d3 SHA512 52898140d983bcc6776497504191f0c1c727b24fa9543f5a5997a54ced26301ca492518094ca8770fce8064bc99dc6d3f6760e986eb66f08a758985a7a85ffff WHIRLPOOL 48e487b498cc8d827a3a5b54c5fdf019ffa5719dd925830a5f3c331344fd72e75a665a48c3cea0dc755add973f162c77916af65036ae8eef67af613eeab319ff
--- a/app-backup/buttersink/buttersink-0.6.8.ebuild
+++ b/app-backup/buttersink/buttersink-0.6.8.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="rsync-like utility for btrfs snapshots"
+HOMEPAGE="https://github.com/AmesCornish/buttersink"
+
+LICENSE="GPL-3"
+SLOT=0
+
+# local tests would require root and cause sandbox issues with btrfs subvolume
+# operations, and network tests would require an SSH server with root login to
+# test the SSH backend, or remote S3 for that backend
+RESTRICT="test"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/AmesCornish/buttersink"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/AmesCornish/buttersink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/crcmod[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	sys-fs/btrfs-progs"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	if [[ ${PV} == 9999 ]] ; then
+		emake makestamps buttersink/version.py
+	else
+		mkdir makestamps || die
+		echo "version = \"${PV}\"" > buttersink/version.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
--- a/app-backup/buttersink/buttersink-9999.ebuild
+++ b/app-backup/buttersink/buttersink-9999.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="rsync-like utility for btrfs snapshots"
+HOMEPAGE="https://github.com/AmesCornish/buttersink"
+
+LICENSE="GPL-3"
+SLOT=0
+
+# local tests would require root and cause sandbox issues with btrfs subvolume
+# operations, and network tests would require an SSH server with root login to
+# test the SSH backend, or remote S3 for that backend
+RESTRICT="test"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/AmesCornish/buttersink"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/AmesCornish/buttersink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/crcmod[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	sys-fs/btrfs-progs"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	if [[ ${PV} == 9999 ]] ; then
+		emake makestamps buttersink/version.py
+	else
+		mkdir makestamps || die
+		echo "version = \"${PV}\"" > buttersink/version.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
--- a/app-backup/buttersink/metadata.xml
+++ b/app-backup/buttersink/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>adebeus@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+  </maintainer>
+  <longdescription>rsync-like utility for btrfs snapshots</longdescription>
+</pkgmetadata>
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@ -1 +1,2 @@
 DIST ccid-1.4.26.tar.bz2 628038 SHA256 3267bf708ab780c02f01f6241b7c7277cb892d30fd1179a9926a8cc0ca40be2f SHA512 4a2e5e9412f2aa4870e14114e54da96fd8b3418ea6d3a236b83e19d6349adb20a94ef7f48628c108f8459f008c10b0606bbf4d797ae4be9183e1acde032c618c WHIRLPOOL 7118e57ca9a394de3b37166bb2c4f4d398fdf744caa0803ef9f1470db7020d999f795ca816a5a70db2b59b64db7225df2dd9366fd329ca34d52b5e4611fd5d21
+DIST ccid-1.4.27.tar.bz2 632817 SHA256 a660e269606986cb94840ad5ba802ffb0cd23dd12b98f69a35035e0deb9dd137 SHA512 14fb5d9878ed36de912d860d8537758170781f225957a99d5fed447dcfba0cba3133f78d2cc4bc7db60d3527399f70e4a7d1d1f8348fb50d1bcfc75820a23522 WHIRLPOOL 062ebe1be40ad09865db642c763cf32cc471b860df66072fe5e98c4b3b5a5efced7b2aeba1001a635231adaf9569e3e4fc2746ad9ebaa921b62302a0ebcf2273
--- a/app-crypt/ccid/ccid-1.4.27.ebuild
+++ b/app-crypt/ccid/ccid-1.4.27.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+STUPID_NUM="4218"
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
+SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="twinserial kobil-midentity +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+	usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README AUTHORS )
+
+src_configure() {
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
+		$(use_enable usb libusb)
+}
+
+src_compile() {
+	default
+	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+	default
+
+	if use kobil-midentity; then
+		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+	fi
+
+	if use kernel_linux; then
+		# note: for eudev support, rules probably will always need to be
+		# installed to /usr
+
+		# ccid >=1.4.11 version changed the rules drastically in a minor
+		# release to no longer use the pcscd group. Using the old ones in
+		# the mean time.
+		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+
+		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+		if ! use kobil-midentity; then
+			sed \
+				-e '/Kobil_mIDentity_switch/s/^/#/' \
+				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+		fi
+
+	fi
+}
--- a/app-crypt/stoken/Manifest
+++ b/app-crypt/stoken/Manifest
@ -1 +1,2 @@
-DIST v0.90.tar.gz 116642 SHA256 45912c200e2bcf0d605ba4b1177fbc9191cfd0ca509dd33075fd7ba17ebd6dda SHA512 7c75a04ea6542a13d639bbb74523443e030559dcf65d181d07fc64277442500a8a18daf2351248a552e42daf815fe5d0079b5b559402522d45ac10ed7762c818 WHIRLPOOL cfeb2bf9ac173a5416a08c99405bdc2ea0feff10cb040ffe5e89fc95c570da369d85fc5679fdedcdb017fdfcc89374dfd8544f519b6df587cad7b4e7bc113f8e
+DIST stoken-0.90.tar.gz 116642 SHA256 45912c200e2bcf0d605ba4b1177fbc9191cfd0ca509dd33075fd7ba17ebd6dda SHA512 7c75a04ea6542a13d639bbb74523443e030559dcf65d181d07fc64277442500a8a18daf2351248a552e42daf815fe5d0079b5b559402522d45ac10ed7762c818 WHIRLPOOL cfeb2bf9ac173a5416a08c99405bdc2ea0feff10cb040ffe5e89fc95c570da369d85fc5679fdedcdb017fdfcc89374dfd8544f519b6df587cad7b4e7bc113f8e
+DIST stoken-0.91.tar.gz 116846 SHA256 5e5cce38e958de07b2d447d24e9564edaf566571b6fe04ce9099b5dc2dd3c0ac SHA512 7d34c3ec3022aabd909fcb89fabd03003fdc4d635a064401407ce78068c0965012b9b61b53ce2d6e018973fe2e23a7e4d35913fca564e0af65fd0f0fb7fb30b4 WHIRLPOOL 89cdea90c95f4ad3d5c1572fb42fac6630654ad6d92511e107d41540880920cb27402fbc7c9af2b8347200264dd79ff15c96d43aea0be148ed94bb056cc0d312
--- a/app-crypt/stoken/stoken-0.90.ebuild
+++ b/app-crypt/stoken/stoken-0.90.ebuild
@ -7,7 +7,7 @@ inherit autotools

 DESCRIPTION="Software Token for Linux/UNIX"
 HOMEPAGE="https://github.com/cernekee/stoken"
-SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="LGPL-2.1+"
 SLOT="0"
--- a/app-crypt/stoken/stoken-0.91.ebuild
+++ b/app-crypt/stoken/stoken-0.91.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="Software Token for Linux/UNIX"
+HOMEPAGE="https://github.com/cernekee/stoken"
+SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	|| ( dev-libs/nettle dev-libs/libtomcrypt )
+	gtk? ( >=x11-libs/gtk+-3.12:3 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with gtk)
+}
--- a/app-editors/emacs/emacs-25.2.ebuild
+++ b/app-editors/emacs/emacs-25.2.ebuild
@ -11,7 +11,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 ~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 ~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 hesiod 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 xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"

--- a/app-editors/gvim/gvim-8.0.0386-r1.ebuild
+++ b/app-editors/gvim/gvim-8.0.0386-r1.ebuild
@ -0,0 +1,388 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-single-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk3? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk3? (
+			gtk? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+				gnome? ( >=gnome-base/libgnomeui-2.6 )
+			)
+			!gtk? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--enable-multibyte
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python pythoninterp)
+		$(use_enable python python3interp)
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope ; then
+		sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+			die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk3                    GTK3
+	# -aqua -gtk3 gnome             GNOME2
+	# -aqua -gtk3 -gnome gtk        GTK2
+	# -aqua -gtk -gtk3 motif        MOTIF
+	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
+	# -aqua -gtk -gtk3 -motif -neXt ATHENA
+	echo ; echo
+	if use aqua ; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk3 ; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk ; then
+		myconf+=( --enable-gtk2-check )
+		if use gnome ; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=( --enable-gui=gnome2 )
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=( --enable-gui=gtk2 )
+		fi
+	elif use motif ; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt ; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@ -5,7 +5,7 @@ EAPI=6
 VIM_VERSION="8.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-r1
+inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-single-r1

 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@ -25,11 +25,7 @@ LICENSE="vim"
 IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
 REQUIRED_USE="
 	luajit? ( lua )
-	python? (
-		|| ( $(python_gen_useflags '*') )
-		?? ( $(python_gen_useflags 'python2*') )
-		?? ( $(python_gen_useflags 'python3*') )
-	)
+	python? ( ${PYTHON_REQUIRED_USE} )
 "

 RDEPEND="
@ -92,6 +88,8 @@ pkg_setup() {
 	# Gnome sandbox silliness. bug #114475.
 	mkdir -p "${T}"/home
 	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
 }

 src_prepare() {
@ -188,6 +186,8 @@ src_configure() {
 		$(use_enable netbeans)
 		$(use_enable nls)
 		$(use_enable perl perlinterp)
+		$(use_enable python pythoninterp)
+		$(use_enable python python3interp)
 		$(use_enable racket mzschemeinterp)
 		$(use_enable ruby rubyinterp)
 		$(use_enable selinux)
@ -195,25 +195,6 @@ src_configure() {
 		$(use_enable tcl tclinterp)
 	)

-	if use python ; then
-		py_add_interp() {
-			local v
-
-			[[ ${EPYTHON} == python3* ]] && v=3
-			myconf+=(
-				--enable-python${v}interp
-				vi_cv_path_python${v}="${PYTHON}"
-			)
-		}
-
-		python_foreach_impl py_add_interp
-	else
-		myconf+=(
-			--disable-pythoninterp
-			--disable-python3interp
-		)
-	fi
-
 	# --with-features=huge forces on cscope even if we --disable it. We need
 	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
 	if ! use cscope ; then
--- a/app-editors/vim/vim-8.0.0386-r1.ebuild
+++ b/app-editors/vim/vim-8.0.0386-r1.ebuild
@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager ; then
+		cat <<-END > "${S}"/runtime/macros/manpager.sh
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			END
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	if use minimal ; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-multibyte
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			--enable-multibyte
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python pythoninterp)
+			$(use_enable python python3interp)
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope ; then
+			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+				die "couldn't disable cscope"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@ -5,7 +5,7 @@ EAPI=6
 VIM_VERSION="8.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1

 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@ -24,11 +24,7 @@ LICENSE="vim"
 IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
 REQUIRED_USE="
 	luajit? ( lua )
-	python? (
-		|| ( $(python_gen_useflags '*') )
-		?? ( $(python_gen_useflags 'python2*') )
-		?? ( $(python_gen_useflags 'python3*') )
-	)
+	python? ( ${PYTHON_REQUIRED_USE} )
 "

 RDEPEND="
@ -67,6 +63,8 @@ pkg_setup() {
 	# Gnome sandbox silliness. bug #114475.
 	mkdir -p "${T}"/home
 	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
 }

 src_prepare() {
@ -195,31 +193,14 @@ src_configure() {
 			$(use_with luajit)
 			$(use_enable nls)
 			$(use_enable perl perlinterp)
+			$(use_enable python pythoninterp)
+			$(use_enable python python3interp)
 			$(use_enable racket mzschemeinterp)
 			$(use_enable ruby rubyinterp)
 			$(use_enable selinux)
 			$(use_enable tcl tclinterp)
 		)

-		if use python ; then
-			py_add_interp() {
-				local v
-
-				[[ ${EPYTHON} == python3* ]] && v=3
-				myconf+=(
-					--enable-python${v}interp
-					vi_cv_path_python${v}="${PYTHON}"
-				)
-			}
-
-			python_foreach_impl py_add_interp
-		else
-			myconf+=(
-				--disable-pythoninterp
-				--disable-python3interp
-			)
-		fi
-
 		# --with-features=huge forces on cscope even if we --disable it. We need
 		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
 		if ! use cscope ; then
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@ -1,2 +1,2 @@
 DIST aide-0.14.2.tar.gz 418098 SHA256 bf4cd417b0f4778b4f9a618d23e0b0b7db10349ba6a0129394dc82fbc2fa8b9b SHA512 4ef96078fde057a54dda467fb55711e30d947969873715a02052362c57112f5bfd3155460ef353f70ce69fea3a3c491b7925bebbdb7034dbf618c63c360347df WHIRLPOOL fa91e4493bcac4cf11a8fedfd5e3c490752936f9ea04871d812b831f33089b694892e32ed19cef273926d3a8c091fb15a7b98a5e5303f08609f164773475d142
-DIST aide-0.15.1.tar.gz 424970 SHA256 303e5c186257df8c86e418193199f4ea2183fc37d3d4a9098a614f61346059ef SHA512 6afe327474858c697ba017b02bd40717c33874e69b801c171c2496ff9042b557e840bef4a151bda0e4d835ddb0d972b88790237a72f250525dc1fc6b8fa673e7 WHIRLPOOL 4c21221cfbaeff3aa00a3f22c4e31c1fffd3f00d112828540ab6ab94dd019086244de71e5d19d1120078acc7b81b9efa5a36d55937292f523bcb4e064830ba6a
+DIST aide-0.16.tar.gz 391009 SHA256 a81c53a131c4fd130b169b3a26ac35386a2f6e1e014f12807524cc273ed97345 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7 WHIRLPOOL d9ecba06d8367ed2ef622ee6b3ccf6a0ed37bad52548063c5c153bd31b856ed8a3379e6057cc1d4aebd29473ded71e9190c8c17dbeaa65eec3365be1d43d5f46
--- a/app-forensics/aide/aide-0.15.1.ebuild
+++ b/app-forensics/aide/aide-0.15.1.ebuild
@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit autotools confutils eutils
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl audit curl mhash nls postgres prelink selinux static xattr zlib"
-
-CDEPEND="acl? ( virtual/acl )
-	audit? ( sys-process/audit )
-	curl? ( net-misc/curl )
-	mhash? ( >=app-crypt/mhash-0.9.2 )
-	!mhash? ( dev-libs/libgcrypt:0 )
-	nls? ( virtual/libintl )
-	postgres? ( dev-db/postgresql )
-	prelink? ( sys-devel/prelink )
-	selinux? (
-		sys-libs/libselinux
-	)
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )"
-
-RDEPEND="!static? ( ${CDEPEND} )
-	selinux? ( sec-policy/selinux-aide )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	confutils_use_conflict mhash postgres
-	confutils_use_conflict static curl postgres
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.15.1-gentoo.patch"
-
-	# fix as-need issue, bug #271326
-	epatch "${FILESDIR}/${PN}-0.14-as-needed.patch"
-
-	# fix configure issue, bug #323187
-	epatch "${FILESDIR}/${PN}-0.14-configure.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with acl posix-acl) \
-		$(use_with audit) \
-		$(use_with curl) \
-		$(use_with !mhash gcrypt) \
-		$(use_with mhash mhash) \
-		$(use_with nls locale) \
-		$(use_with postgres psql) \
-		$(use_with prelink) \
-		$(use_with selinux) \
-		$(use_enable static) \
-		$(use_with xattr) \
-		$(use_with zlib) \
-		--sysconfdir="${EPREFIX}/etc/aide" || die "econf failed"
-#		$(use_with e2fsattrs) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man || die "emake install failed"
-
-	keepdir /var/lib/aide || die
-	fowners root:0 /var/lib/aide || die
-	fperms 0755 /var/lib/aide || die
-
-	keepdir /var/log/aide || die
-
-	insinto /etc/aide
-	doins "${FILESDIR}"/aide.conf || die
-
-	dosbin "${FILESDIR}"/aideinit || die
-
-	dodoc AUTHORS ChangeLog NEWS README Todo "${FILESDIR}"/aide.cron || die
-	dohtml doc/manual.html || die
-}
-
-pkg_postinst() {
-	elog
-	elog "A sample configuration file has been installed as"
-	elog "/etc/aide/aide.conf.  Please edit to meet your needs."
-	elog "Read the aide.conf(5) manual page for more information."
-	elog "A helper script, aideinit, has been installed and can"
-	elog "be used to make AIDE management easier. Please run"
-	elog "aideinit --help for more information"
-	elog
-
-	if use postgres; then
-		elog "Due to a bad assumption by aide, you must issue the following"
-		elog "command after the database initialization (aide --init ...):"
-		elog
-		elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
-		elog "  where pg_class.relname='TABLE_pkey' and \ "
-		elog '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
-		elog
-		elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
-		elog "your aide.conf."
-		elog
-	fi
-}
--- a/app-forensics/aide/aide-0.16.ebuild
+++ b/app-forensics/aide/aide-0.16.ebuild
@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools readme.gentoo-r1
+
+DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker"
+HOMEPAGE="http://aide.sourceforge.net/"
+SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl audit curl e2fs mhash postgres prelink selinux static xattr zlib"
+
+COMMON_DEPEND="
+	!mhash? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	mhash? ( app-crypt/mhash )
+	dev-libs/libpcre
+	acl? ( virtual/acl )
+	audit? ( sys-process/audit )
+	curl? ( net-misc/curl )
+	e2fs? ( sys-fs/e2fsprogs )
+	postgres? ( dev-db/postgresql:= )
+	prelink? ( dev-libs/elfutils )
+	selinux? ( sys-libs/libselinux )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="
+	!static? ( ${COMMON_DEPEND} )
+	prelink? ( sys-devel/prelink )
+	selinux? ( sec-policy/selinux-aide )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	static? (
+		!mhash? (
+			dev-libs/libgcrypt:0[static-libs]
+			dev-libs/libgpg-error[static-libs]
+		)
+		mhash? ( app-crypt/mhash[static-libs] )
+		dev-libs/libpcre[static-libs]
+		acl? ( virtual/acl[static-libs] )
+		e2fs? ( sys-fs/e2fsprogs[static-libs] )
+		prelink? ( dev-libs/elfutils[static-libs] )
+		selinux? ( sys-libs/libselinux[static-libs] )
+		xattr? ( sys-apps/attr[static-libs] )
+		zlib? ( sys-libs/zlib[static-libs] )
+	)
+"
+
+REQUIRED_USE="
+	postgres? ( !mhash )
+	static? ( !audit !curl !postgres )
+"
+
+HTML_DOCS=( doc/manual.html )
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+Example configuration file was installed at '${EPREFIX}/etc/aide/aide.conf'.
+Please edit it to meet your needs. Refer to aide.conf(5) manual page
+for more information.
+
+A helper script, aideinit, was installed and can be used to make AIDE
+management easier. Please run 'aideinit --help' for more information.
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-add-missing-include.patch"
+	"${FILESDIR}/${P}-fix-LIBS-LDFLAGS-mixing.patch"
+	"${FILESDIR}/${P}-fix-acl-configure-option.patch"
+)
+
+src_prepare() {
+	default_src_prepare
+	sed -i -e 's| -Werror||g' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+		--with-confighmactype="sha512"		# Override default weak MD5 hash.
+		--with-dbhmackey="sha512"			# Override default weak MD5 hash.
+		# Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/
+		# This doesn't affect anything because there are no localizations yet.
+		--without-locale
+		$(use_enable static)
+		$(use_with zlib)
+		$(use_with curl)
+		$(use_with acl posix-acl)
+		$(use_with selinux)
+		$(use_with prelink prelink "${EPREFIX}/usr/sbin/prelink")
+		$(use_with xattr)
+		$(use_with e2fs e2fsattrs)
+		$(use_with mhash mhash)
+		$(use_with !mhash gcrypt)
+		$(use_with postgres psql)
+		$(use_with audit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default_src_install
+	readme.gentoo_create_doc
+
+	insinto /etc/${PN}
+	doins "${FILESDIR}"/aide.conf
+
+	dosbin "${FILESDIR}"/aideinit
+	dodoc "${FILESDIR}"/aide.cron
+
+	keepdir /var/{lib,log}/${PN}
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if use postgres; then
+		elog
+		elog "Due to a bad assumption by aide, you must issue the following"
+		elog "command after the database initialization (aide --init ...):"
+		elog
+		elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
+		elog "  where pg_class.relname='TABLE_pkey' and \ "
+		elog '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
+		elog
+		elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
+		elog "in your aide.conf."
+		elog
+	fi
+}
--- a/app-forensics/aide/files/aide-0.15.1-gentoo.patch
+++ b/app-forensics/aide/files/aide-0.15.1-gentoo.patch
@ -1,26 +0,0 @@
-diff -Naur aide-0.15.1.orig//src/Makefile.am aide-0.15.1//src/Makefile.am
--- aide-0.15.1.orig//src/Makefile.am	2010-08-02 03:23:44.000000000 +0900
-+++ aide-0.15.1//src/Makefile.am	2010-10-28 01:22:49.897871135 +0900
-@@ -26,7 +26,7 @@
- LEX_OUTPUT_ROOT = lex.yy
- 
- LDADD = -lm @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ @E2FSATTRSLIB@ @ELFLIB@
-AM_CFLAGS = @AIDE_DEFS@ -W -Wall -g
-+AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" @AIDE_DEFS@ -W -Wall -g
- 
- CLEANFILES = conf_yacc.h conf_yacc.c conf_lex.c db_lex.c *~
- 
-diff -Naur aide-0.15.1.orig//src/db.c aide-0.15.1//src/db.c
--- aide-0.15.1.orig//src/db.c	2010-08-09 02:39:31.000000000 +0900
-+++ aide-0.15.1//src/db.c	2010-10-28 01:22:12.930091842 +0900
-@@ -27,6 +27,10 @@
- #include "db_file.h"
- #include "db_disk.h"
- 
-+#ifdef WITH_CURL
-+#include "fopen.h"
-+#endif
-+
- #ifdef WITH_PSQL
- #include "db_sql.h"
- #endif
--- a/app-forensics/aide/files/aide-0.16-add-missing-include.patch
+++ b/app-forensics/aide/files/aide-0.16-add-missing-include.patch
@ -0,0 +1,24 @@
+commit 1cbb888d55388d6bb88141c946bd6993b3e9872f
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date:   Tue May 23 17:24:29 2017 +0300
+
+db: add missing include
+
+url_fclose() function used in this file is defined in fopen.h.
+See https://sourceforge.net/p/aide/bugs/99/
+
+diff --git a/src/db.c b/src/db.c
+index dd133d4..858240d 100644
+--- a/src/db.c
+++ b/src/db.c
+@@ -28,6 +28,10 @@
+ #include "db_disk.h"
+ #include "md.h"
+
+#ifdef WITH_CURL
+#include "fopen.h"
+#endif
+
+ #ifdef WITH_PSQL
+ #include "db_sql.h"
+ #endif
--- a/app-forensics/aide/files/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch
+++ b/app-forensics/aide/files/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch
@ -0,0 +1,23 @@
+commit 6da37687ba7cf259ac19cae2e1c16115b6848143
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date:   Thu May 25 13:34:55 2017 +0300
+
+build: fix incorrect LIBS/LDFLAGS mixing
+
+Otherwise build with LDFLAGS='-Wl,--as-needed' and curl support fails.
+See https://bugs.gentoo.org/show_bug.cgi?id=271326
+and https://sourceforge.net/p/aide/bugs/96/
+
+diff --git a/configure.ac b/configure.ac
+index 3598ebe..0c5cb0c 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -713,7 +713,7 @@ if test x$with_curl = xyes; then
+   AC_CHECK_HEADERS(curl/curl.h,,
+  	[AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])])
+   CFLAGS="$CFLAGS $CURL_CFLAGS"
+-  LDFLAGS="$LDFLAGS $CURL_LIBS"
+  LIBS="$LIBS $CURL_LIBS"
+   AC_CHECK_LIB(curl,curl_easy_init,havecurl=yes,
+  	[AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])]
+ )
--- a/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch
+++ b/app-forensics/aide/files/aide-0.16-fix-acl-configure-option.patch
@ -0,0 +1,23 @@
+commit 3d9746bccbb50809e4c3de90ab5145a17af39aeb
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date:   Thu May 25 14:38:02 2017 +0300
+
+build: respect user choice for posix-acl configure option
+
+Otherwise acl support is enabled automagically, which is bad.
+See https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Automagic_dependencies
+and https://sourceforge.net/p/aide/bugs/97/
+
+diff --git a/configure.ac b/configure.ac
+index 3598ebe..c45bbee 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -450,7 +450,7 @@ AC_MSG_CHECKING(for posix-acl-support)
+ AC_ARG_WITH([posix-acl],
+ 	[AC_HELP_STRING([--with-posix-acl],
+ 		[use POSIX ACLs (no checking)])],
+-	[],
+	[with_posix_acl_support="$withval"],
+ 	[with_posix_acl_support=no]
+ )
+
--- a/app-forensics/aide/metadata.xml
+++ b/app-forensics/aide/metadata.xml
@ -5,8 +5,17 @@
 		<email>forensics@gentoo.org</email>
 		<name>Gentoo Forensics Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
-		<flag name="prelink">Enable support for <pkg>sys-devel/prelink</pkg></flag>
+		<flag name="e2fs">Enable support for checking file attributes on ext2/ext3/ext4 filesystems</flag>
+		<flag name="prelink">Bypass prelinking when calculating checksums</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">aide</remote-id>
--- a/app-forensics/foremost/foremost-1.5.7-r3.ebuild
+++ b/app-forensics/foremost/foremost-1.5.7-r3.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=4
+EAPI=6

 inherit eutils toolchain-funcs

@ -11,13 +11,15 @@ HOMEPAGE="http://foremost.sourceforge.net/"
 # starting to hate sf.net ...
 SRC_URI="http://foremost.sourceforge.net/pkg/${P}.tar.gz"

-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 LICENSE="public-domain"
 SLOT="0"

 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.4-config-location.patch"
+	epatch "${FILESDIR}/${PN}-1.5.7-format-security.patch"
+	default_src_prepare
 }

 src_compile() {
@ -27,7 +29,8 @@ src_compile() {

 src_install() {
 	dobin foremost
-	doman foremost.8.gz
+	gunzip foremost.8.gz
+	doman foremost.8
 	insinto /etc
 	doins foremost.conf
 	dodoc README CHANGES
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@ -1 +1,2 @@
 DIST mosquitto-1.4.10.tar.gz 359569 SHA256 437648d68a4a781dd8d913814cd5451f59ab4a5fcf84cccaf7c36e6a07459770 SHA512 fe5d6d7196a137a496ba6881c77d852396baefb4f0b83ccd9a22175fc05b09e48a09ea249e30ec7db966e11de134ebcc4e2e9b1fd40b31dc59fb0fa2f60b75a1 WHIRLPOOL 9510060701259e78c39bf88989ce8142d11e0b53348a20c1a71ffc69b98d7c1725c9315026d392d8d86d131bc55c86492a91ddde94eca0d353f1d3ab6ef6900f
+DIST mosquitto-1.4.11.tar.gz 361468 SHA256 ca47533bbc1b7c5e15d6e5d96d3efc59677f2515b6692263c34b7c48f33280c5 SHA512 c05ca8679b9a6f540868f4ccf701257fcabc114d5450ac0bbbe80b91bb7cd4fc52668773e945506760c7a5bd8a494e0a56100714112e5d2713d57bfab8951587 WHIRLPOOL d4418b951ff55eaba1fc67b324f1ecdd0d55c0eea066be9793de30e8561d0fe0e36537adb688fc98764758998086eb64b827041e76160ddc858c6066f83e8f21
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@ -13,5 +13,6 @@
 		<flag name="bridge">Enable bridge support in the MQTT broker.</flag>
 		<flag name="persistence">Store messages and subscriptions to a file.</flag>
 		<flag name="srv">Include SRV lookup support.</flag>
+		<flag name="websockets">Support the WebSocket protocol.</flag>
 	</use>
 </pkgmetadata>
--- a/app-misc/mosquitto/mosquitto-1.4.11.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.4.11.ebuild
@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="http://mosquitto.org/"
+SRC_URI="http://mosquitto.org/files/source/${P}.tar.gz"
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm"
+IUSE="bridge examples +persistence +srv ssl tcpd websockets"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	srv? ( net-dns/c-ares )
+	websockets? ( net-libs/libwebsockets )"
+
+pkg_setup() {
+	enewgroup mosquitto
+	enewuser mosquitto -1 -1 -1 mosquitto
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.4.10-conditional-tests.patch"
+	if use persistence; then
+		sed -i -e "s:^#autosave_interval:autosave_interval:" \
+			-e "s:^#persistence false$:persistence true:" \
+			-e "s:^#persistence_file:persistence_file:" \
+			-e "s:^#persistence_location$:persistence_location /var/lib/mosquitto/:" \
+			mosquitto.conf || die
+	fi
+
+	# Remove prestripping
+	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
+		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
+
+	python_setup
+	python_fix_shebang test
+}
+
+src_configure() {
+	LIBDIR=$(get_libdir)
+	makeopts=(
+		"CC=$(tc-getCC)"
+		"LIB_SUFFIX=${LIBDIR:3}"
+		"WITH_BRIDGE=$(usex bridge)"
+		"WITH_PERSISTENCE=$(usex persistence)"
+		"WITH_SRV=$(usex srv)"
+		"WITH_TLS=$(usex ssl)"
+		"WITH_WEBSOCKETS=$(usex websockets)"
+		"WITH_WRAP=$(usex tcpd)"
+	)
+}
+
+src_compile() {
+	emake "${makeopts[@]}"
+}
+
+src_test() {
+	emake "${makeopts[@]}" test
+}
+
+src_install() {
+	emake "${makeopts[@]}" DESTDIR="${D}" prefix=/usr install
+	keepdir /var/lib/mosquitto
+	fowners mosquitto:mosquitto /var/lib/mosquitto
+	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
+	doinitd "${FILESDIR}"/mosquitto
+	insinto /etc/mosquitto
+	doins mosquitto.conf
+	systemd_dounit "${FILESDIR}/mosquitto.service"
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r examples/*
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	elog "The Python module has been moved out of mosquitto."
+	elog "See http://mosquitto.org/documentation/python/"
+	elog ""
+	elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
+	elog ""
+	elog "    rc-update add mosquitto default"
+	elog "    or"
+	elog "    systemctl enable mosquitto"
+}
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@ -1,7 +1,4 @@
-DIST xmind-7-update1-portable.zip 263875799 SHA256 2823c93178e55ff21d3a75ff2a9d2aa694f50a94a7220207a1ad757660cdf030 SHA512 c60cda54af5aefefde480627e7191ebdaf32df27e2873ac738ee7814ad0acda7066ef1ff62ffdc16148d190438d60991ca036fe0903cda44edbab91e2237b4bb WHIRLPOOL 4f177c52faef598143eb479b5cd9f7a55ddd7c82e7610852f01074227f6d8a29cf00c4ddd3d3d35d30ae6e859670791734594cf2c1f6d2ab2ec406207b612350
-DIST xmind-8-linux.zip 142262044 SHA256 3b57e41953672379e3b7ab7a2fe1c577164be36f025895c792d76ca63b5d0439 SHA512 8f7f386eac1341e4e8e5cb86a701596e0cc2efcf0a20f6cc53af2fc5dd6b9859dfaf54ab104316c60a52a1083fa55fa8ab0c58498151d29cd463012c9474b5e7 WHIRLPOOL 825757d60a9c82cd964c642ac73320ceb33e460580cecd1899a0c7158c611f394b7f2b262461b2c5ea523970560c700e43c274adb8ddc856d40d69ef241dee16
 DIST xmind-8-update1-linux.zip 142395100 SHA256 59dc865856d8b560ebc5a9d220a26e6694cb004b67cd1e7c76e177637f432e35 SHA512 725268287dfa9dc9a5d9fd429277eecd43ef2e09158b3bb8ef51e06355620741b2aa709c227debd0069f4401623b7274082f6b81b3ace153289ef7ffac25fca4 WHIRLPOOL 2b23a85c56d44ac3d4fa8480e6995386a2595f8947932a0e8179238f78c088c1b7af9b8ffc532121175ad7c0ab02fdecaae9008c53d99e1a5724225d0c689df5
+DIST xmind-8-update2-linux.zip 120800791 SHA256 e4b1a4f6b98b4d8801f09b12def790bbc4516d8ea1cc4463df7f0cc9485bfe23 SHA512 e658714a5944e8de62577302c22763e9c55d1f82ce6cbda187ec39801ac7cbd5c34de6e4d7d9735546bcef26795c21c194ff026cebf39b2c9af2663cec98ce58 WHIRLPOOL 0749a7611d06479e1fe2bba338d2437cc3731989eb07fb87ac1d36067f1ce315ad738adee867faa67394b387a3ee6aa25d1d35015f37b4b955ea877b2419aad9
 DIST xmind-icons.tar.xz 5024 SHA256 6a5e087c5c66aa6f36b7822268b486922157e3b75a091b6fbdeec905607b8aa5 SHA512 3ee6b8e42b75305bec8f97f733575f10ca3d08e1c5a76a10700776cb7740ae6f8a0f3dfbc4112d60ab2499915ca4ea0e3d56fd49e55bec00fccdc8710d9f9f0d WHIRLPOOL 590571a8b950ff6200d92417ab7eede2a8856263bc07c00fb129d751d9a00ae9bab69d916aab2f04d8270eadb0466723e99570032eacabd7350afd3cca4b8f23
-DIST xmind-portable-3.4.1.201401221918.zip 138440913 SHA256 f70b8317ec0fe512e507bc26cc7fed70348af3c1d8c17603a78359175fc01261 SHA512 06d6473b26a0eef97d6651d14c13d7fd28fda19b33b2aea4f924d2e0f0d3131f19d5b64e081ba0d537c44eb09e27a83596aca91156bd32c5377903fbb7da9804 WHIRLPOOL 2601e8f293ef97d12576a461bb3b7a8e68bf6a4f807f780b9e6b7a12c20030bc979f61cf1f76f6deb617c57aa2c16e8d35621e66c5df825f8800ca38304d8ee0
-DIST xmind-portable-3.5.1.201411201906.zip 160601004 SHA256 920321dc254604d51d4b3b4718ba04271de0e47b63a836fc597467c4062a89e4 SHA512 24da7bf3bfbc0beddbf6f4bb4b9d465e28c652b6e80ba9e0bc2a52cc2ff8c175a83ea8cc0d5b3dc87961c5b6666b6294ca836e29795631db41455ef1b8b2b3f0 WHIRLPOOL 9dab13d6578fe7e817cfa43ce171e33ae5f6d0f939f307b8cf15d651a70800763776bf9ed318a7116716dc7aa20793455a771d46f38ca13780dc9272024f73fe
 DIST xmind-portable-3.5.3.201506180105.zip 159265180 SHA256 38a20e7c4a19c13eb26f5f27ff1898fa4ca463d234e72c616b2305c7a3b31efc SHA512 d41deebec769d06276d051c57e546c44e4283feabd5f6c45ce97efdbf755d75e9b99d39b6fd10baf2f4735f25a695d2902ca9888d94ad414318f38c55e3f4af5 WHIRLPOOL 8aae5af4a2ad14afc2883b56a8b57b9906a7a1cd8e7959175d3a3e780b48725d5e7af83325e0c10e4f5cfee921637656171d21f8190f47810d7b40095a0da489
--- a/app-misc/xmind/xmind-3.4.1.201401221918.ebuild
+++ b/app-misc/xmind/xmind-3.4.1.201401221918.ebuild
@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib gnome2-utils
-
-MY_PN="${PN}-portable"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A brainstorming and mind mapping software tool"
-HOMEPAGE="http://www.xmind.net"
-SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
-	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5
-	x11-libs/gtk+:2
-"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
-QA_FLAGS_IGNORED="
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.200.v20120522-1813/eclipse_1502.so
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20120522-1813/eclipse_1502.so
-	opt/xmind/XMind/libcairo-swt.so
-	opt/xmind/XMind/XMind
-"
-
-src_configure() {
-	if use amd64; then
-		XDIR="XMind_Linux_64bit"
-	else
-		XDIR="XMind_Linux"
-	fi
-	mv "$XDIR" XMind || die
-	mv XMind/.eclipseproduct Commons || die
-	cp "${FILESDIR}"/${PN}-3.4.0-config.ini Commons/configuration || die #Combined common+linux config.ini
-	# force data instance & config area to be at home/.xmind directory
-	sed \
-		-e '/-configuration/d' \
-		-e '/\.\/configuration/d' \
-		-e '/-data/d' \
-		-e '/\.\.\/Commons\/data\/workspace-cathy/d' \
-		-e 's/\.\.\/Commons/\/opt\/xmind\/Commons/g' \
-		-i XMind/XMind.ini || die
-	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
-	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /opt/xmind
-	doins -r Commons XMind
-	fperms a+rx  "/opt/xmind/XMind/XMind"
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}/xmind-wrapper" xmind
-
-	# install icons
-	local res
-	for res in 16 32 48; do
-		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
-	done
-
-	# make desktop entry
-	make_desktop_entry "xmind %F" XMind xmind Office "MimeType=application/x-xmind;"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "For audio notes support, install media-sound/lame"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/app-misc/xmind/xmind-3.5.1.201411201906.ebuild
+++ b/app-misc/xmind/xmind-3.5.1.201411201906.ebuild
@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib gnome2-utils
-
-MY_PN="${PN}-portable"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A brainstorming and mind mapping software tool"
-HOMEPAGE="http://www.xmind.net"
-SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
-	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5
-	x11-libs/gtk+:2
-"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
-QA_FLAGS_IGNORED="
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.200.v20120522-1813/eclipse_1502.so
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.200.v20120522-1813/eclipse_1502.so
-	opt/xmind/XMind/libcairo-swt.so
-	opt/xmind/XMind/XMind
-"
-
-src_configure() {
-	if use amd64; then
-		XDIR="XMind_Linux_64bit"
-	else
-		XDIR="XMind_Linux"
-	fi
-	mv "$XDIR" XMind || die
-	mv XMind/.eclipseproduct Commons || die
-	cp "${FILESDIR}"/${PN}-3.4.0-config.ini Commons/configuration || die #Combined common+linux config.ini
-	# force data instance & config area to be at home/.xmind directory
-	sed \
-		-e '/-configuration/d' \
-		-e '/\.\/configuration/d' \
-		-e '/-data/d' \
-		-e '/\.\.\/Commons\/data\/workspace-cathy/d' \
-		-e 's/\.\.\/Commons/\/opt\/xmind\/Commons/g' \
-		-i XMind/XMind.ini || die
-	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
-	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /opt/xmind
-	doins -r Commons XMind
-	fperms a+rx  "/opt/xmind/XMind/XMind"
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}/xmind-wrapper" xmind
-
-	# install icons
-	local res
-	for res in 16 32 48; do
-		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
-	done
-
-	# make desktop entry
-	make_desktop_entry "xmind %F" XMind xmind Office "MimeType=application/x-xmind;"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "For audio notes support, install media-sound/lame"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/app-misc/xmind/xmind-3.6.1-r1.ebuild
+++ b/app-misc/xmind/xmind-3.6.1-r1.ebuild
@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib gnome2-utils
-
-MY_PV="7-update1"
-MY_P="${PN}-${MY_PV}-portable"
-
-DESCRIPTION="A brainstorming and mind mapping software tool"
-HOMEPAGE="http://www.xmind.net"
-SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
-	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5
-	x11-libs/gtk+:2
-"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
-QA_FLAGS_IGNORED="
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.300.v20150602-1417/eclipse_1612.so
-	opt/xmind/Commons/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.300.v20150602-1417/eclipse_1612.so
-	opt/xmind/XMind/libcairo-swt.so
-	opt/xmind/XMind/XMind
-"
-
-src_configure() {
-	if use amd64; then
-		XDIR="XMind_Linux_64bit"
-	else
-		XDIR="XMind_Linux"
-	fi
-	mv "$XDIR" XMind || die
-	cp "${FILESDIR}"/${PN}-3.4.0-config.ini Commons/configuration || die #Combined common+linux config.ini
-	# force data instance & config area to be at home/.xmind directory
-	sed \
-		-e '/-configuration/d' \
-		-e '/\.\/configuration/d' \
-		-e '/-data/d' \
-		-e '/\.\.\/Commons\/data\/workspace-cathy/d' \
-		-e 's/\.\.\/Commons/\/opt\/xmind\/Commons/g' \
-		-i XMind/XMind.ini || die
-	echo '-vmargs' >> XMind/XMind.ini || die
-	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
-	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /opt/xmind
-	doins -r Commons XMind
-	fperms a+rx  "/opt/xmind/XMind/XMind"
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}/xmind-wrapper-3.5.3" xmind
-
-	# install icons
-	local res
-	for res in 16 32 48; do
-		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
-	done
-
-	make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "For audio notes support, install media-sound/lame"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/app-misc/xmind/xmind-3.7.2.ebuild
+++ b/app-misc/xmind/xmind-3.7.2.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

 inherit eutils multilib gnome2-utils font

-MY_PV="8"
+MY_PV="8-update2"
 MY_P="${PN}-${MY_PV}-linux"

 DESCRIPTION="A brainstorming and mind mapping software tool"
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@ -1,2 +1 @@
-DIST kmymoney-4.7.2.tar.xz 20391472 SHA256 bfb2c29ff30988f46324c2dae197a06b58d07336a1947adc22bcfed3e554393d SHA512 43db5b3e52d21dee517c8fadccf120aed5854dc16cbd7e265c327149c3a0c900ec02de06a56a9f5b8ad4d04c15730916c79238a3cf2778911e9d8cc4a65afbb1 WHIRLPOOL 461ce894aedb653e696572068ec7a006c3c3fcc2c7493caf634052393bc5874d19e3a6e87e73fd6100316d9bfbfe65eba4d6c87ea2f3b11ea4b354fc91422db7
 DIST kmymoney-4.8.0.tar.xz 20785888 SHA256 c2a635710aafa6925a49803c480e043e0bf4bc5b62430689aa5eb95619f48ac2 SHA512 883635a94333341cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381 WHIRLPOOL acbada22e3e9c83e88e571b397c37da79eb36ce05a55786c352af306d3f863dc2db7140c9f1e1757393ea7f6dc9a1728debe077c71ce28b655c65e707f1130cd
--- a/app-office/kmymoney/kmymoney-4.7.2.ebuild
+++ b/app-office/kmymoney/kmymoney-4.7.2.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr gl
-hu it kk nds nl pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
-
-DESCRIPTION="Personal finance manager for KDE"
-HOMEPAGE="http://kmymoney2.sourceforge.net/"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug calendar doc hbci ofx quotes"
-
-COMMON_DEPEND="
-	app-crypt/gpgme
-	>=app-office/libalkimia-4.3.2
-	dev-libs/gmp:0
-	dev-libs/libgpg-error
-	$(add_kdeapps_dep kdepimlibs)
-	x11-misc/shared-mime-info
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.0.1
-		>=sys-libs/gwenhywfar-4.0.1[qt4]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!~kde-apps/kdepimlibs-4.14.10_p20160611
-	!>kde-apps/kdepimlibs-4.14.11_pre20160211-r3
-	quotes? ( dev-perl/Finance-Quote )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake-utils_use_enable calendar LIBICAL)
-		$(cmake-utils_use_use doc DEVELOPER_DOC)
-		$(cmake-utils_use_enable hbci KBANKING)
-		$(cmake-utils_use_enable ofx LIBOFX)
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-
-	use doc && kde4-base_src_compile apidoc
-}
-
-src_install() {
-	use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/")
-	kde4-base_src_install
-}
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@ -1,12 +1,24 @@
+DIST amd64-debug-libreoffice-5.2.7.2-r1.tar.xz 1032127800 SHA256 d50ae862de24ddf3595859513f33e7886f2bf135e1535268b30a5cc0a4e9ba81 SHA512 02dff85ad817514a0fc00a52c2ffd9ebacf2eb82d619578ffaee18844981b5310064fb8fb5ca589fd53894f11c3bfa7386f7e8b4387db36365629f5b7ebe2141 WHIRLPOOL 365432423ee620146aad894f4ed6e3d69091e07a82867785092ea8273ef7c4aca9d7df3bb9fdb19f3924eb72e25d953eae7213680695a48b3711dd9596e1bd8b
 DIST amd64-debug-libreoffice-5.2.7.2.tar.xz 1032133252 SHA256 fdcab0d583599926f0633951eab674f35966374ecaf8258eb21917dbd844e7b9 SHA512 e417f32186796c77f6154611341ca00e54cf0d2501bc3fdc788279c2aecc41b0a03af1f17dd390f205383e42a2c249c8b02c9e6b2499cf8d62364806732f91ce WHIRLPOOL 1692cc5e9efab94d7e7757e8e876acdc4fbb114324f30ace83938d7d34a627c86745b9fac23e39b8f7adc0015f092ba737bcdcdd2e58737a64c32b35ec6b8840
+DIST amd64-debug-libreoffice-gnome-5.2.7.2-r1.xd3 291363125 SHA256 8d7346a149f2e734c444564fd128ea53f7dbd0507b190f2ec92d25a2ccfa9b55 SHA512 c9661c8ae9e2b522c09e9cd8712b6074cbd4dd4da5a5089ecdc17c4e20d6ff64d31eba0d1252c7ae0933b116490c85961cc38f841260085164659c37eeb61929 WHIRLPOOL f3aa7eec25aa117b21f363bd121ba738124d2745bea3ebc152b16477d935320565aa7d0b078bc6f512171037c9d639fa13183cf5d35dc8a9f8c8085acef56bde
 DIST amd64-debug-libreoffice-gnome-5.2.7.2.xd3 291363224 SHA256 b11c0850790cb9291e2e84e8a8697b07c42e5b01ba7625c16d3db1bc2d6ce6dc SHA512 62444032f4a56db59f58f69f329ddc3dc73cb5a3233353bd8478c5445ea4b3dafd6c5733ff6f7d9ffb79442bc129f9b476918f28d53f42958973093343a8bf1e WHIRLPOOL e758d4f47fbd0be6e4897b4273b4c6a2c665a744496ac25d4b099649442c172197ad4bfa70fe2610a32c4054f35bc89f0cfb732966ea299facfbaf47493dec10
+DIST amd64-debug-libreoffice-gnome-java-5.2.7.2-r1.xd3 487998797 SHA256 62de5a3cebc2f3e8f4df7e8446b0f1a26eb82f2ecd5b42cbda2de8288cd9815d SHA512 1321f92228e9ae9fd6d2f6edf1b037960ac8535f392c0cc6a64e6c4c44c40f5e0173bd161e2bd7363b5f4a33bc642d6eda6d28976789ad1a06af56ba93183f61 WHIRLPOOL 92cc3a98569cb50efaed8ba00e8208a06b3b940a71b3542b9a550a008280cc0e1d7dc5810621b2a961c4bcd307e663b2a0bb3f359f577fc3fd938a9a07d64d2c
 DIST amd64-debug-libreoffice-gnome-java-5.2.7.2.xd3 487998478 SHA256 1a761c41957d0a56ea6b540e24cc7c8a651e2155782a11f910d05e97bf6bb698 SHA512 7acac19c2ebc972b858475421ccede7fe60481d5ad638c3bca31ab570ad0d69a386442e5d3f7042d0fa89c63d2a376f94c3e509f8ec2a43cb7eef9c10bea0ef9 WHIRLPOOL 96d52a7bf3a1989224b49d150d1cf5b5f25985722acbd244ca7b00163a5ad2c0cb37d78baa96358605bd89b41d6b65f592fab67cff69640b1b49d06874733f77
+DIST amd64-debug-libreoffice-java-5.2.7.2-r1.xd3 480762438 SHA256 a3fecc06af07440d93133f911fa92c4d355ff199a45350bc77b18a10a861e5c5 SHA512 fb8deb4fb267ca9281264fc1638c76b923bbf1a369fc7cca90a15b15bb6866a408494212d4bdf8cece15909c1363e6b9dc5372bd7cd842a424af46889ccc59ff WHIRLPOOL 64ca5e31738944b8720aa3963077bce7fb24d56308280b6c2ada416c2ace779c8d00411e213c2cb3fe93ede3cc788719b96586a40a922d350c971eb6e3cab4a8
 DIST amd64-debug-libreoffice-java-5.2.7.2.xd3 480762826 SHA256 29bac7555423cccf27c76e80754bba04bab348aeb8804000891123901a62cd08 SHA512 57841ce7817dc3b7ba2621b17a954f97cfa68769fd8427613426cc65a2084924c4bd6b0fcef71a925ff0a3517fdbbdac3deac03492c907728b4836d13e7b6a00 WHIRLPOOL 9ee9510d0fdf4edde18a5a85054fca68b461aa8185b90e6506210f48189ed21e78d5713147f0106cdc5185309fa955a87371745ff11de600e418e47102dc177a
+DIST amd64-debug-libreoffice-kde-5.2.7.2-r1.xd3 295540274 SHA256 f81dc6f206f32d991c1fc2efdafb0cb1a6d6f2d4ee3f8e3e6dd6c5f44bba0308 SHA512 0983427c8036ba91938f9d4b5c1914b1c8f821fde857691df49c971d535d663d4e010f7f725e40648b522a8af51f3a2f794ee1e4124db02221e32764a07e5663 WHIRLPOOL 07edfc5c1f70b08cdedb885016a4b9e08a205566abe4157b3d13b11b30974df93768ec3d9716dc5af0a00909878aff771aee43158675a3c154523b4736140110
 DIST amd64-debug-libreoffice-kde-5.2.7.2.xd3 295540634 SHA256 8101a93cd55a4bba213f24746c7f0c50b5fd78e8ebbf89ea52135f1efebf6b84 SHA512 8cced3b64cadbd6bbfcf71a4bf19596faaf603494f4e78889fc8180397eb2c477e0e28734a54b5a980d9620ae856721c607c4865ae30fcc81ffe56a003ab19dd WHIRLPOOL 64db581802ccc1d561311ea9f65e3b3aef97eb77c72a9644d749ac5cb2fc323c59bbd25cc45499113591a8d7183a06d8f4f4218bcc2609b8c4a1b47f39af5df6
+DIST amd64-debug-libreoffice-kde-java-5.2.7.2-r1.xd3 482383437 SHA256 fb162f0d44632db45aec4f1e5ffbb5559daaa0391dbb1c06a041f4c158043a9b SHA512 66348068366aa1ef7e1854feb48bd326fb4abf292a41ede40cb90c479d5890c0eef7154c2e5f993f93ff618948a8bcfbd3da327ea0a71d5896b7da7d9d0127ab WHIRLPOOL fcbafc032f6f32b930d4307c64f467b12ec44bca5964bae9f4c606e7ffb876857a550984618043f02dda148676fa76adc7ac9f64def064f377039793b5790046
 DIST amd64-debug-libreoffice-kde-java-5.2.7.2.xd3 482388926 SHA256 a0e39941e4b71a1cb9133d322fbc5a767e4400cc1539f93f6cbe0461ce03165f SHA512 73d76ccdbda7f36d2dd5428163417122c6a9385df35c6be40b41c57274e871855126164d9a42137c8af11b1b02d7bbc83576a43b95a33b39d9832b4c2444f6dd WHIRLPOOL 1ed46dd02b89c0d9077e278f67febf5fcc993afc0041c3d91944aab4a6fd0b1724324b015b8b957351b495efd92fb371195358c4b82783dac8e600cdd7cb6ebe
+DIST x86-debug-libreoffice-5.2.7.2-r1.tar.xz 1000877664 SHA256 c324c8b822aff542b39cf9ea812e8c6cae65e765f857987c5d62be8dcf2e65aa SHA512 70aaf733bb0ed03920bc10f6455ad2dc70f6ab3736ba9171e558ce75b185eeee7f26a65c57bca69a28ac9c7a1560e8d2d73f65b117abea3ce1196eb5c684a474 WHIRLPOOL 25346f601206240b08e4fd8254eb75ca2d59f82fdb02723ad84a086481e0b405123362e6466789217a2d36a35f26d56a8c4f6af3a1148d9451b407b41f0b816f
 DIST x86-debug-libreoffice-5.2.7.2.tar.xz 1000899080 SHA256 303cb2fad5813fe86cdaf4a2956dbbb0fa74b467c40ebb3d5f238b07f59dd7d3 SHA512 13e14be53319288ab9a97c27888c68ffd4e8e07b2d0b503e878690629162bb99bb2c675146327dba72833978c7799a0d1978f4cee22b503399b8be9472e673cf WHIRLPOOL 866c931fe86c60dc487d024be1485feb25e5c33405d9e149225b87792f81fe1b45c54ad507b0b22874dcaecea854a52eaee73e14677bce42a9149730023bec47
+DIST x86-debug-libreoffice-gnome-5.2.7.2-r1.xd3 280536647 SHA256 9a023f54203cf6395745fa6c13edf8700aefd1a55b8570fcb0fe389c33bd12cc SHA512 d7fc1db2a067d5fb0f986b394d34fe22f4c5c4e49d8ad6bd216e67d4610fd89ff7e3ec590cca6dbce03af9f6c4678d6b46023cd5ca8238fade33cb3509974394 WHIRLPOOL 07e14b095c48cbce7f9bf5fdd3952e9fc90b2fc5e5638b1d9018b5cbada413d327dc787ddafe546f8cdc530f06a8e08ea70dfb6c38d98d16eed55c79b291347e
 DIST x86-debug-libreoffice-gnome-5.2.7.2.xd3 280536686 SHA256 6f878c167f2ab627be1f78eaeac38d6af44b07c6593b979af06718ba7224bb81 SHA512 c8e082e9a223bc37f577091beae1e19731285cc9fcbc666dd75a5bdb9e8973d26629fccd2cb73183cdaf4963f7086ab4701aa2cc7deb19650f5ac4a80bd4be15 WHIRLPOOL b0e24858f555e0c1dce86828329299dfe1d2d43da0e65c55754d614d471e9c6f41cd7c7d327fcc3fb9825bcc403959c67cf82c2b9e23645020967231965c9219
+DIST x86-debug-libreoffice-gnome-java-5.2.7.2-r1.xd3 459997423 SHA256 e90fb0d871f7a767e85c35e50bd4f78b3dbe0c46e3a19372d3002298ac89b4fd SHA512 41374f2bcc3b57372d4527ff898dc63a2eab387ae3346b07c6f0a77bb157e348921df5817d0fc0e45d670d639cddc004cfce4f53fa1ead97e5487235c7323ec7 WHIRLPOOL 8fc487e5b018a55bc102199e46e92101479020b9d2fc371cdf9e5b6a51dbb3550836855a4d434f03aceaf5a90e54d5df4ff5629654618e3cef51f63a08d095d1
 DIST x86-debug-libreoffice-gnome-java-5.2.7.2.xd3 459997668 SHA256 2538550ca034d5c69165c11d06c93bc20cb676d41f6a74502547b1b9a661b0a1 SHA512 89a11be8d9c2da12289180bf3f3b3bc922aa70eac26eedf78f093c2e12881178ea07f7c7b3599fd7550fb3095c649cbddb5bf9a329b0a7db6fbcf6fc7efed7ad WHIRLPOOL ea1c208f220d26bd0ca5c43f6f398f6c8f4362a5cf63b34ef91a5b8db4f08064421b7c08015b7287cd483c985514bc8202443aad5b81bc72fcd17224b7494d30
+DIST x86-debug-libreoffice-java-5.2.7.2-r1.xd3 452936680 SHA256 6cdc9d0018d131b71e42572b599fb5e0f9029e2ab8e77b197ea3233b00f19de3 SHA512 be59bb820ec63f34baa3543994e202d4aecb92b735804334fa12c8a41acf27ee0adaaa79b2bce782da7dd1783e074b2ca0c8017c736996149643c15c0df7e5eb WHIRLPOOL b3fcd68af22bb52ebc5bd291a72a1574bc3a7ea65518a9fabca6f4ed0da8b84f13c36feb258bea7c616f51bb150728cdd3c37ae7201601cac9c85089d653c103
 DIST x86-debug-libreoffice-java-5.2.7.2.xd3 452939226 SHA256 2ba89b81ab6bde324989c06bd2ffc855519dabffa1eee6f03b7280d21e7da708 SHA512 61f5646037712f889725d89e87b60adc1ca81b73357f30cb83292b37e90138c49b6dad29c942c739f2ea12988f714b5d88ded52a2e61e89719bfd972e02729d5 WHIRLPOOL ff8da4148afa4145fbfe7a4b38cc97fee3b7348adf3b0e52722b6e7ea1531ec939d72ac361303415b1c74b9eae422cc6cb46f8915386a0bfd39a688a5c8f3bbc
+DIST x86-debug-libreoffice-kde-5.2.7.2-r1.xd3 282348044 SHA256 e3554674d05f1279df5fbbc4ea1cba39068f4d4a672f6e743d240fd14aaedcf0 SHA512 3d2ee05ac470a64fed2b1580c6e3e16a6f4eebc3b94c7109eb3ec9bdd04b29e3cfbf853ff779d972c76792080c649a8a654665d9a7fac3b464539da091426b58 WHIRLPOOL e41898877953d578d6a46679e70fc81f05284e24cceb34eab7f1cafe077e952945ccfcfcaba55cc8e515cb595afcf9fe01fb87c892f47471aba9ae35f02e7e8a
 DIST x86-debug-libreoffice-kde-5.2.7.2.xd3 282348165 SHA256 fef6838ee0f69a65e757cd11420d22adb07be2980616faaa8ec16831f96fac41 SHA512 6528c4a4c5f19251dfb1590c2084fe2a5b61a0ef61b14c9bdb86119698bacbce49e3a5ccc46a3c63d42ecf648e82ba364d10cc481abd00af4193155463734f0b WHIRLPOOL f3938a12873cbc27d72b6ab216f21a79a7ce0d534ac3e480659955b69636d49badd2e3c57698c31989227e29ca1e4d37d2c33971133c6ba0848d2c3883df8869
+DIST x86-debug-libreoffice-kde-java-5.2.7.2-r1.xd3 454545397 SHA256 fcfaa9998ddda817a14434b425775b77c73ae86821667fe647a56f8ef521de7f SHA512 89cd052ea6b71cdcc426479e658b285ccd95a7b78126fc15d76ce8b09c45a24837d9c9d165648f56ec53fed95d34575a7b93e48a24fe83d8fe67e97be9028a81 WHIRLPOOL 07317658d890fa43ece5da3614e22e254ad2a75e4c9852ac0cef2728b5926de2588f582bf24e6cfcb7a3cec5b82ba461972a3b13579cdcac0410ebd333901783
 DIST x86-debug-libreoffice-kde-java-5.2.7.2.xd3 454545143 SHA256 7400e795c6a8c38884c33807004abe2bba780f482d48a459054490acbe5942c7 SHA512 4f963c6aae5f0c4f3607285395f6f322f73be35cb3e7b171410bbcdeb46e53970b876076c7a0aad640b5bd83646cce6e14e7673aa95fd1448f62141e0a686ccf WHIRLPOOL b3ce625c30f7b76a21c1f37d19c047787bd51c4768ccf321cf1532cf525364e10c3abb57485f106054e1e05c5f873a66a535e942f82d8785f284ef486840df16
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.2.7.2-r1.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.2.7.2-r1.ebuild
@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [ -n "${patchname}" ]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@ -1,12 +1,24 @@
+DIST amd64-bin-libreoffice-5.2.7.2-r1.tar.xz 74001496 SHA256 65dd7e60d790c0d094faccec43e5686a464ce2b378b24b04a88b02b2f7b8b13d SHA512 49f1086b9b617a0f4b52e6405e92ee64d7ae1556f046a855544d8f1e3ca42c62c0b9f24de5241841b3a6ee8a1003194a25b51e9c802f7b3de0a4ea9120c4a6cd WHIRLPOOL 7877350af51a560a7376ba75be2ecd23a03ab4b45d4ac6166e5d59eed9916deb06cc8f33267aa2cd8de52d0e6a69db237a09fb1a2798bfffae6d5180df86a62b
 DIST amd64-bin-libreoffice-5.2.7.2.tar.xz 74008020 SHA256 ea3f998142dc8c72012d80701773b2ccb41057586364b946766d031e7d44d00d SHA512 ee1fb0eaff8b7c5ea2311d6b1adae6cfe7ca5e43db66bb65326acc778792c7de1ab82cc67fc20662d48739e92655481b23e7b51011819a4927ce0118f6c7c4df WHIRLPOOL 5c07e7344fee20e2c696f5d11b6c02c58a034dbdbfa089272afb79839ef46290bb4aa1e29b51232e315d40260c44693ce883199e6034a8e6cfe3513824682837
+DIST amd64-bin-libreoffice-gnome-5.2.7.2-r1.xd3 15383510 SHA256 4e19080462c146712b2984f559ce2023d2b3b4f972f653b65090796b8eff6b39 SHA512 633da1350049275d0bbd1aac5ceba28f07d8ef5b11a250a014cb1cc48d7ad8167b0c07d0c536a14973e4215d4f2765e3aca2c5109e08161c3dd964f1ffdf6bec WHIRLPOOL 9a569de92eec269271b752203653f24f2eef5fd45ed96fef907fc6ed4aaaaef20db04fed57cf6d653375aab628fd7bae917c04924f7a872fb78f80ba42bddca8
 DIST amd64-bin-libreoffice-gnome-5.2.7.2.xd3 15383875 SHA256 9ddee3834cef610ce54d0b60280e16b5457223c96eccc58f4177be328f2aa1fa SHA512 d2c274440e45b3ad96d329b39aa5aec2b282aa38f9e7e6f5c7a648073fbafb8c48463647f5f7ab92fe80bd8fb45046c4dfc059bd4d63b9910430bb989efdbd75 WHIRLPOOL 6aaa1818ac852f2c77ae1f0107b23616cc9f477ec0de5f79990dc63c43138a0fce11290db804cf590827417dd26cf3711523f38b5b3586d093cb178feea1885e
+DIST amd64-bin-libreoffice-gnome-java-5.2.7.2-r1.xd3 24391729 SHA256 da7e5f79ea8bfff90ee6ceb2b79da0a0124a29777e012ebf2bd3349abf0edf91 SHA512 f153c41b4f6de78399978177722127fd5a1dee22186c8632d6762d9a9ed55c79ba613afe08b240c48bd012df1dd42cd43fcc6b4a399092a020ef632667e10745 WHIRLPOOL fc2b43027cf663d94a041f4a545b06945d1d99f0e4aa2b37a106f0258d07fc52030c4c70561e8b2d6d4fb86c77198dfbe7a60337d4a0995aea92441e33d5cb7d
 DIST amd64-bin-libreoffice-gnome-java-5.2.7.2.xd3 24392555 SHA256 5cca2c63392bcf479caf1a244af79bf2b81a4ba8248d8101df1c8af55be8e749 SHA512 deb591c242e5d175824d3cdee896e95d5f82424be4e1108b224e09b950126a0e25ad6f87be82622482fe63638304ad058bb42e2c5b6bd4af56cfcca945cf950e WHIRLPOOL bf9760d0cbcd0763cd159f0f04dbddcffdddbe270f33a4186a8c0e020a0ea0ae263a002a74cd51478553e3acb0131a3f19bfb344e1cc6fbc110ee094f22785c2
+DIST amd64-bin-libreoffice-java-5.2.7.2-r1.xd3 23495434 SHA256 d1fa03b61e8524b2c4fca6c9eef99b935cdc950cd935dc93592fe6647fc87550 SHA512 4b2b70d636cfec0cbd9f3ec54bb477892a6541ca46d9fbee205c4f9aea95c51b7f2eee06f115933a96ebf786e3281535aefcfb52ffefd9a47e446ede6905a4a2 WHIRLPOOL 5c9b4c1a4a2420110ecfa854b4d467b175188960eab495cbbfc908bf74bb8bc09a1deb74af12557b358b612d994038ef8119dfc9f1dfe522031ebc8d1625c107
 DIST amd64-bin-libreoffice-java-5.2.7.2.xd3 23497383 SHA256 fbbfda1d198ebb57882df84ff3413bb78321cb4c4115fa77a61b492c9245a692 SHA512 5eb05dd5a6fc01b807e6b7efa23a78fa9a67644de202b6a055d738994118c36777a988ca32e51780e9f876d579b3f2f764ac00114242febee33ee1359e8c12b5 WHIRLPOOL 237ce03f2bb4c01fe073773eb5f85f5a2eff2591b951bcba30e47c6b317933ebe33ee48c10fca5bac86f4392e5386dbf4c0755d6a656ab5218c9d50c22521e51
+DIST amd64-bin-libreoffice-kde-5.2.7.2-r1.xd3 7844257 SHA256 7becc126a59c0096e7ff1a3b347dec76cec7abb3fded7e328128640ed47720d4 SHA512 23792b9defc514f82dcf1b3d23ebb75e4f4697ff6d9f48e4e827147aa3e92d3bf6bf5bb7e94fe3639ac4cfecf2e237e5669b11256b1cc30c3d07c31783efef0a WHIRLPOOL e5bb14b094aa5b6fc86ba7f52e5ed7d72cd6f01555d0ce687331dffb9b0610d5035895bfc70f1a81af0ccda466003408e0fd360853f8ae11d46aa169044f6856
 DIST amd64-bin-libreoffice-kde-5.2.7.2.xd3 7844820 SHA256 1dd1dc1d8e3be789ed23c3146a46eaf6a2f55dc7e59932ff5aa892fd4c026495 SHA512 43fc71e58819e62620abd327991ac0de01c2e3de38e487aa83b127aa0eea03e437bab2490fb2dfbfc43c4e72d3631b4dc8b42f4fea41551a1767b4d22ed3a144 WHIRLPOOL af47d4b0fc4fbb829f98ac5cb57ac5115ad92e67e5dbf49337f29b1d396992448ae1e0d50b89fa823dab46687f342ded6d465d8ce9c3672bde5c9928bf8f840c
+DIST amd64-bin-libreoffice-kde-java-5.2.7.2-r1.xd3 23683325 SHA256 c62088937538bd2882261c0ba5e0c16543e09978950043946bfe504d542d4fb7 SHA512 8b9971ca43069dd316b8321e8b3b45199fef2ebc08c007d2245304683d6682eb1a5a803b8536ab10f555c4bba1d24683aa1906fb92acf41a8ede4688820cf9c5 WHIRLPOOL 1a215bed96c98a9b95eb87283343332df69f82570b501605f467806c1a91c88b475b41b65872a13ccb69b35ba66dd5074f235f78870cbcd2b22374e6129799ea
 DIST amd64-bin-libreoffice-kde-java-5.2.7.2.xd3 23683089 SHA256 a428206a6890e063ab60dd42031d54cce5153f6e29b95798006b16a0efd0f08f SHA512 a7ede56c4757d4fcdc4019344c4b8859dd157e1e06486087fd04545b136d53b7809102219baf73d3d038643b7ca24edc89e3264904b0a6ec0c28a9d0c7bcabb8 WHIRLPOOL 1eff7d08eee884a15f31273bfb4351337b486dcb7a4496683a8d9ab50e2676f9306c6396f4cf4db47040e9e3a5f0db75e73f9af03fc534dbf349e28eabfa4c95
+DIST x86-bin-libreoffice-5.2.7.2-r1.tar.xz 74279800 SHA256 97866e4bc1a26e16d051525f860632d6997f3c8523dc40ed11375f2cfe3485f1 SHA512 985cb9d2afdcb8e974b3e15aa0534c4faf015a0439d2e157c8e09927c5139d8d8cde3266b6de99c97122e43c01d82db6428310f2833f86444936e2898499aef7 WHIRLPOOL 1bb440ef61e3d98b0ef6c9f600f3f06c5a98ef1f352e2d77b7774a8328f1102fdc0767f079f71e2118890de17e9471103c6bda6a3892b493e48d15e6edb79766
 DIST x86-bin-libreoffice-5.2.7.2.tar.xz 74278384 SHA256 c78957f87ba89fd646fcb7974a709f60094dc253c5824c32598987216bb152af SHA512 9ab468714826f8be3c6a8a8dd9f90cec8a9a88bc60430792dc4921637903d3bae07828bbc01df282480ea3012299fc31e3ca3c50dd20adf77cd54bd6ae6f3277 WHIRLPOOL 51b9073ef0c22fab137c68a89eff265de995b8486c5402390ab74f7c2b3cd659ca67c3320c1ca77fc0966733142c4ef7af891af631fcf5ae4ec876b1d2d6f4f0
+DIST x86-bin-libreoffice-gnome-5.2.7.2-r1.xd3 15516282 SHA256 b11d4ee6524cf2774fa04ce4896d50964b1a16ce14abe89d088b34461a4ff912 SHA512 2755549cd3d387e86590f249f37916e52ba3b99c5e1d7f81fba168ac4a70f4645d1134fc4fd848a8bb0b3a2ac997941192089938e86c727f06f797ac7d1e34f6 WHIRLPOOL 9a6298d6c7ea1be3ee27cb2999b812a315dfefb834c5ea1bd2358982ed0911eb59f1dc607467f8b06ec93fd73821df9b44d2bb514b24a3b21eeec1a004445ff8
 DIST x86-bin-libreoffice-gnome-5.2.7.2.xd3 15520438 SHA256 54cd92b8936b0dee84efaa952bd9634a74ca74dc0f9697e30ef5ddd9959b573d SHA512 988f36b1efdf466598d2a1545bf8f03dbc3d37947649804c54b8a8031e1ed579fab6afba2954133e05c76a0a2093d9f1f30e36f2d27e5461290d70b9de01ee61 WHIRLPOOL c6fffa59b8fcc44710cad1d4e89715332fbd8788d1db51bbf4b88641c60069115fd03ba898639c97530fcb23aa38dbfce41e854403e94ea1a580920c27fa2d15
+DIST x86-bin-libreoffice-gnome-java-5.2.7.2-r1.xd3 22133672 SHA256 84f619067fdae2ae6972c2a17ccab018d82eaadf62e505b53120f0693f04694c SHA512 3b19b0935b609241bb7b6a827aef9a1cec5c2fcc2443a54d1b33a70dafb110f975ccaf3ee9f2a26b9dc7f86d728c028e3b83d539240dae1909246be5c8e89a87 WHIRLPOOL 6ae42688e303b176f33244c0fa1d9d0b7f18d194db8721812d888f8bb74090851da0e5344e9a317088d48621a356420c1142580924a449ecc44a75862290e500
 DIST x86-bin-libreoffice-gnome-java-5.2.7.2.xd3 22136298 SHA256 669c5bc5225d02c4a878c818cf819041952d9f4264a5826a363c46c834cf05d7 SHA512 44f2fdc8b781b62c6c1c7afd35c11f46698d1271090e6542d20c69ba8e54e220b9586344c5eec4fca0b2ee6e8623d79000e5c9b95d95913ee17f5980057be22c WHIRLPOOL 3e89193fcb00beeb92f709e2cbc1b1b82c36b7b69d209173d024190327eebda840cfbfefb71bedfee3f8ae0dc8d4995622d22168fda7b2ccf430e46a9ccf376f
+DIST x86-bin-libreoffice-java-5.2.7.2-r1.xd3 21832419 SHA256 40ac64242f731c9c02575cb159ee780e43cfd5317fe92e38141442a47133c652 SHA512 31875260c096374004bf27ab01862eeebc7a08c111cfaba3c7f4553c8d33dbf0780b4f9ea3c88e97a7de868f870c44588895cefb028955eb7749b0f07dff02c8 WHIRLPOOL c24b1479083849658eefc70a54e9e884799a386abb87a3727f35a05aadb404933709a53dc0f223bee628eccd7c5009629db9f17a4601b6a54193832773301b6d
 DIST x86-bin-libreoffice-java-5.2.7.2.xd3 21833970 SHA256 963d52886c78f8148dd48a8bc65fecb5bb61d6f812d79e26287b1b617b64251e SHA512 45ac43b1f331d07f5e266b6de144aa466b08c4539c91943477813f2b0ee8b1951fb5e99765cb49abebd750e379d077d667958c87f9bdefe1ca0e8b507efc1dd8 WHIRLPOOL dfd9858891b4de81e4741fc90adae253a9fdd8a029e14183d7a545bab102a4d35ce38ba9485147c8aa7897338f8b541cb0bc0b2be7e85ca215ce5151cf74fdfb
+DIST x86-bin-libreoffice-kde-5.2.7.2-r1.xd3 5112408 SHA256 1b2764fadd7a7aad6be2b6177c73e8678172561e0f1f800119665b832c7aa568 SHA512 36051a7a918d29607d851ecf7b3f016fa6cbe53563673797e2985aab3a4b45ac37e5a1e2db51bf992617ff416bc086fa137f30a83e71296832fe9d3d912d4201 WHIRLPOOL 15f56c6b02bde10f5d965c68a513e40e7e81716cda0088328b59f91c1b575f9af81a31d30bdc06adcd30e495ee9522bec49b0c3d6596824b1fb88cd1e897ddff
 DIST x86-bin-libreoffice-kde-5.2.7.2.xd3 5113579 SHA256 9056a38d9f136f68a9e21d496581a343fbbbdde20bb8de46b8d34afa926ca2e4 SHA512 4610c58851bc605ebba223e8956a86e7317119db3077eb9caaebc20db2e3c5da6b498289a77aa7406c2655b3a0ca252f16b3ce25eccbb716e89a4f8f4ea2b3b4 WHIRLPOOL fdd7dcacd520eab3f18070a56c55209979832567030a8f89b428233c52a8450bff0af8007e5e04d4df99b9497bac02a9dd356068c26ce763ed973e5183fa88f3
+DIST x86-bin-libreoffice-kde-java-5.2.7.2-r1.xd3 21898456 SHA256 bb8a4840e77428490620ce531c539fd88612795ffcec56e6a96274d0e3affa15 SHA512 e2e42b19127ecd1c9efdfcce3afffb99e42b307e437d283ca720ee5d0186cdbf0bc80806ff9d17c661e9acf5f7b4f6963ff1bfd66bad08abe8cfe87765d4605a WHIRLPOOL 1f90c03ce7011d7f2190b890250a2bafa95178c1d19a57e521f7e4d439919c899d8ee0c183e05b8a70e1dfc45ae8a33115efd1fb0d19570a437d586283f846e5
 DIST x86-bin-libreoffice-kde-java-5.2.7.2.xd3 21900376 SHA256 49001c8f6aef7049b0856750cd41ece0bc77f86a1ee8483fb0700af7d4199c24 SHA512 9b78114fb61cc7a70d006bf3914366c44ef2398a29d55f3ebcbf10c8b6935441077637f40d04bd9bb59ecdc84c5e687f3f4dd6cab54ef71994fffdc86374b464 WHIRLPOOL 517cfc41eddeb3f3ca5fb4d8b7df58ab34a6019815f74a5c2f2b7eb3754d2a6095aaefe74731e1ba661db526eb0d73c23dec5f7bd426db322172434ca17efe25
--- a/app-office/libreoffice-bin/libreoffice-bin-5.2.7.2-r1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-5.2.7.2-r1.ebuild
@ -0,0 +1,244 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+CMAKE_REQUIRED="never"
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+inherit kde4-base java-pkg-opt-2 python-single-r1 pax-utils prefix versionator
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+	app-text/hunspell:0/1.6
+	=app-text/libexttextcat-3.4*
+	=app-text/libmwaw-0.3*
+	dev-libs/boost:0/1.62.0
+	dev-libs/icu:0/58.2
+	>=media-gfx/graphite2-1.2.0
+	media-libs/glew:0/1.13
+	media-libs/harfbuzz:0/0.9.18[icu]
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-5.4.0-r3
+	>=sys-libs/glibc-2.23
+	virtual/jpeg:62
+	kde? ( >=kde-frameworks/kdelibs-4.14.32:4 >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtgui-4.8.7:4 )
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+	${BIN_COMMON_DEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	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/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-1.55:=
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	=dev-libs/liborcus-0.11*
+	dev-libs/librevenge
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/openssl-1.0.0d:0
+	>=dev-libs/redland-1.0.16
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/glew-1.10:=
+	>=media-libs/harfbuzz-0.9.18:=[icu(+)]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	net-libs/neon
+	net-misc/curl
+	net-nds/openldap
+	sci-mathematics/lpsolve
+	virtual/jpeg:0
+	x11-libs/cairo[X,-xlib-xcb(-)]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	virtual/glu
+	virtual/opengl
+	net-print/cups
+	dev-libs/dbus-glib
+	gnome? (
+		dev-libs/glib:2
+		gnome-extra/evolution-data-server
+	)
+	gnome? ( gnome-base/dconf )
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.24:2
+	gnome? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		>=x11-libs/gtk+-3.8:3
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	media-fonts/libertine
+	media-fonts/urw-fonts
+	java? ( >=virtual/jre-1.6 )
+	kde? ( $(add_kdeapps_dep kioclient) )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-${PV}*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_pretend() {
+	[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
+		&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
+}
+
+pkg_setup() {
+	kde4-base_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [ -n "${patchname}" ]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+	default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_preinst() {
+	# Cache updates - all handled by kde eclass for all environments
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+
+	use java || \
+		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+	kde4-base_pkg_postrm
+}
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@ -8,7 +8,7 @@ PYTHON_REQ_USE='bzip2(+)'

 inherit distutils-r1

-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
 	S="${WORKDIR}/${P}/repoman"
@ -30,24 +30,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"

-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if [[ -n "${EPREFIX}" ]] ; then
-		einfo "Prefixing shebangs ..."
-
-		local file
-		while read -r -d $'\0' file; do
-			local shebang=$(head -n1 "${file}")
-
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${file}" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
 python_test() {
 	esetup.py test
 }
--- a/app-vim/colorv/colorv-3.0.2-r1.ebuild
+++ b/app-vim/colorv/colorv-3.0.2-r1.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# TODO: supposedly supports python3... but that conflicts with pygtk
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: a color tool for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		( app-editors/gvim[python,${PYTHON_USEDEP}] dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	)"
+
+src_prepare() {
+	eapply_user
+
+	# fix shebangs in Python files (note: one of them is python3...)
+	sed -i -e "1s:python[23]:${EPYTHON}:" autoload/colorv/*.py || die 
+	# use python colorpicker instead of C-based picker
+	rm autoload/colorv/{colorpicker.c,Makefile} || die
+}
--- a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
+++ b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
@ -4,8 +4,7 @@
 EAPI=6

 PYTHON_COMPAT=(python2_7 python3_4 python3_5 python3_6)
-
-inherit python-r1 vim-plugin
+inherit python-single-r1 vim-plugin

 DESCRIPTION="vim plugin: Support EditorConfig files "
 HOMEPAGE="http://editorconfig.org/"
--- a/app-vim/gundo/Manifest
+++ b/app-vim/gundo/Manifest
@ -1 +1,2 @@
 DIST gundo-2.6.1.tar.gz 153125 SHA256 6cacba104238169af6e9e2863cf500922a59cb6cb49885b36381a7f5d108be77 SHA512 c8b9b20ff8ef24bd94b0adc18b2cf912cbd0a07c5a70df11be39fbe69d81306027b73d9a60c9127c658c913602a819774c7b1202a8db704677da59cb9916532b WHIRLPOOL a29477209922ec6e0602f26cab96dac4c76d4f0fa4cd86df3f8f01af8d3022a57eced609423dbda73f82e01718cdd6e7bf8b2bc8c5ef2cbe465edf5401ed2152
+DIST gundo-2.6.2.tar.bz2 144107 SHA256 d03d9d96b4f65cee184438679a5d686bc0cc628b292ace02d29132af146b0982 SHA512 e03450a1bfb0a7f5013c1493f1b25b963c2bbb37fc8fa24c1b85237bd12847c3edd7b9465caae7bdadf8923dbdcdb24930b160d7824f835417bf30725fa910b4 WHIRLPOOL 3bdb7555e37374efcf684c163b937ac71f98d8c73b5f8c3f05f540dd372c937d62e94676b3b260d422277ec5d75a91aae522a88cfc88bb76d83e92309558ad19
--- a/app-vim/gundo/gundo-2.6.1.ebuild
+++ b/app-vim/gundo/gundo-2.6.1.ebuild
@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit vim-plugin python-single-r1

 DESCRIPTION="vim plugin: visualize your vim undo tree"
-HOMEPAGE="https://sjl.bitbucket.org/gundo.vim/"
+HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
 SRC_URI="https://github.com/sjl/gundo.vim/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2+"
@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 RDEPEND="
 	|| (
-		app-editors/vim[${PYTHON_USEDEP}]
-		app-editors/gvim[${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
 	)
 	${PYTHON_DEPS}"

--- a/app-vim/gundo/gundo-2.6.2.ebuild
+++ b/app-vim/gundo/gundo-2.6.2.ebuild
@ -0,0 +1,30 @@
+# 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,3_5,3_6} )
+
+inherit vim-plugin python-single-r1 vcs-snapshot
+
+DESCRIPTION="vim plugin: visualize your vim undo tree"
+HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
+SRC_URI="https://bitbucket.org/sjl/gundo.vim/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)
+	${PYTHON_DEPS}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	rm -r .gitignore .hg* package.sh README* site tests || die
+	default
+}
--- a/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
+++ b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -14,8 +14,8 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"

 CDEPEND="|| (
-	>=app-editors/vim-7.3[${PYTHON_USEDEP}]
-	>=app-editors/gvim-7.3[netbeans,${PYTHON_USEDEP}]
+	>=app-editors/vim-7.3
+	>=app-editors/gvim-7.3[netbeans]
 )"
 DEPEND="${CDEPEND}
 	app-arch/vimball
--- a/app-vim/python-mode/python-mode-0.6.18-r4.ebuild
+++ b/app-vim/python-mode/python-mode-0.6.18-r4.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_PLUGIN_MESSAGES="filetype"
+VIM_PLUGIN_HELPFILES="PythonModeCommands"
+VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
+SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)
+	dev-python/astng[${PYTHON_USEDEP}]
+	dev-python/autopep8[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/rope[${PYTHON_USEDEP}]
+	dev-python/ropemode[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-dont-add-cwd-to-syspath.patch
+	eapply_user
+
+	# debundling fun
+	rm -rf pylibs/pylama/{pep8.py,pyflakes} pylibs/{autopep8.py}
+	#rm -rf pylibs/{rope,ropemode}  #475686
+	sed -e 's/from .pep8/from pep8/g' \
+		-e 's/from .pyflakes/from pyflakes/g' \
+		-i pylibs/pylama/utils.py || die
+	# there's still pylint left, I failed to debundle it :/
+
+	mv pylint.ini "${T}" || die
+	sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
+		-i autoload/pymode.vim || die # use custom path
+}
+
+src_install() {
+	vim-plugin_src_install
+	insinto usr/share/${PN}
+	doins "${T}"/pylint.ini
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+	einfo "If you use custom pylintrc make sure you append the contents of"
+	einfo " ${EPREFIX}/usr/share/${PN}/pylint.ini"
+	einfo "to it. Otherwise PyLint command will not work properly."
+}
--- a/app-vim/splice/splice-1.1.0.ebuild
+++ b/app-vim/splice/splice-1.1.0.ebuild
@ -17,8 +17,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		app-editors/vim[python]
-		app-editors/gvim[python]
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
 	)"

 VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/vim-latex/vim-latex-1.8.23.20141116.ebuild
+++ b/app-vim/vim-latex/vim-latex-1.8.23.20141116.ebuild
@ -15,14 +15,14 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"

 LICENSE="vim"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="html python"
+IUSE="html"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 RDEPEND="
 	${PYTHON_DEPS}
 	|| (
-		app-editors/vim[python?]
-		app-editors/gvim[python?]
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
 	)
 	virtual/latex-base
 	!app-vim/vimtex"
--- a/app-vim/vimpress/vimpress-3.2.0.ebuild
+++ b/app-vim/vimpress/vimpress-3.2.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -14,7 +14,7 @@ IUSE=""

 RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}
-	dev-python/markdown"
+	dev-python/markdown[${PYTHON_USEDEP}]"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}

 VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/voom/voom-5.1-r1.ebuild
+++ b/app-vim/voom/voom-5.1-r1.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: emulates a two-pane text outliner"
+HOMEPAGE="https://vim-voom.github.com/ http://www.vim.org/scripts/script.php?script_id=2657"
+
+LICENSE="CC0-1.0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)"
--- a/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
+++ b/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
@ -5,25 +5,15 @@
 
 static:
 -	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr
-+	${GPRBUILD} -p -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
+	${GPRBUILD} -p -v -XLIBRARY_TYPE=static ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
 
 shared relocatable:
 -	${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr
-+	${GPRBUILD} -p -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
+	${GPRBUILD} -p -v -XLIBRARY_TYPE=relocatable ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
 
 static-pic:
 -	${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr
-+	${GPRBUILD} -p -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
+	${GPRBUILD} -p -v -XLIBRARY_TYPE=static-pic ${GPROPTS} xmlada.gpr -cargs $(ADAFLAGS)
 
 # Rebuild the tests (and not the XML/Ada code itself)
 test: force
--- xmlada-gpl-2016-src/shared.gpr.in.old	2017-03-26 21:48:46.613541125 +0200
-+++ xmlada-gpl-2016-src/shared.gpr.in	2017-03-26 21:49:32.713754025 +0200
-@@ -76,6 +76,7 @@
-          when "profile" =>
-             for Switches ("Ada") use warnings & ("-g", "-pg");
-       end case;
-+      for Driver ("Ada") use External ("ADA", "gcc");
-    end compiler;
- 
-    package binder is
--- a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
@ -162,8 +162,8 @@ src_install() {
 	insopts -m0660 -o firebird -g firebird
 	doins help/help.fdb

-	into /usr/$(get_libdir)/${PN}/intl
-	dolib.so intl/libfbintl.so
+	exeinto /usr/$(get_libdir)/${PN}/intl
+	doexe intl/libfbintl.so
 	dosym libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl.so

 	insinto /usr/$(get_libdir)/${PN}/intl
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild
@ -39,7 +39,7 @@ CDEPEND="${PYTHON_DEPS}
 		>=dev-libs/libxml2-2.6.2:2
 		dev-libs/libzip
 		>=virtual/mysql-5.1
-		dev-libs/libpcre
+		dev-libs/libpcre[cxx]
 		>=sci-libs/gdal-1.11.1-r1[-mdb]
 		virtual/opengl
 		>=dev-lang/lua-5.1:0[deprecated]
@ -75,7 +75,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
 		"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
 		"${FILESDIR}/${PN}-6.3.3-mysql_options4.patch" \
-		"${FILESDIR}/${PN}-6.3.4-cxx11.patch"
+		"${FILESDIR}/${PN}-6.3.4-cxx11.patch" \
+		"${FILESDIR}/${PN}-6.3.4-gtk.patch"

 	sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \
 		modules/db.mysql.sqlparser/CMakeLists.txt
--- a/dev-db/pgbadger/Manifest
+++ b/dev-db/pgbadger/Manifest
@ -1 +1 @@
-DIST v9.1.tar.gz 742409 SHA256 2fd7166d74692cc7d87f00b37cc5c7c1c6eddf156372376d382a40f67d694011 SHA512 e3841516dd56ea0aeae397c8264302881df3b07a86063f7813f593ba817a4f3417559b88e2b9e23fec811d3dfd716589f56092be106960e88d1800a94d3d83c3 WHIRLPOOL 0a29eabf49c9d7f6ea9e5b7d2fd8b2a53dc63dbcfe582d123a528481836f802f6985f48013b5396d9785d06c5ad67c7bd5d4000663f45d3bf5515451b07e1b4c
+DIST pgbadger-9.1.tar.gz 742409 SHA256 2fd7166d74692cc7d87f00b37cc5c7c1c6eddf156372376d382a40f67d694011 SHA512 e3841516dd56ea0aeae397c8264302881df3b07a86063f7813f593ba817a4f3417559b88e2b9e23fec811d3dfd716589f56092be106960e88d1800a94d3d83c3 WHIRLPOOL 0a29eabf49c9d7f6ea9e5b7d2fd8b2a53dc63dbcfe582d123a528481836f802f6985f48013b5396d9785d06c5ad67c7bd5d4000663f45d3bf5515451b07e1b4c
--- a/dev-db/pgbadger/pgbadger-9.1-r1.ebuild
+++ b/dev-db/pgbadger/pgbadger-9.1-r1.ebuild
@ -7,7 +7,7 @@ inherit perl-module

 DESCRIPTION="pgBadger is a PostgreSQL log analyzer."
 HOMEPAGE="http://dalibo.github.io/pgbadger/"
-SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
--- a/dev-erlang/epam/Manifest
+++ b/dev-erlang/epam/Manifest
@ -0,0 +1,2 @@
+DIST epam-1.0.0.tar.gz 44008 SHA256 0febab627700f9570bfafd1a93499a5f43de74d85c7a5bdfda8067c6b75f8f4f SHA512 c0b1fbdc1e910f24b2f39ea34cf6fd5859f3ab0cf762a16cf9ef71b1e49129c8238001151dd9031046049967f31fd2cb3d0c06a7d8bdd46e49f19862c143f374 WHIRLPOOL 9037a749657ea55024a355f2f6f96b906118175be6a68ef8cc0d78a379da1181b01114d739c2d5fc8cee61775d710ac84903a8f5e59ce82bdd9b7bbb5fd405c0
+DIST epam-1.0.2.tar.gz 43720 SHA256 96906817cde9e9a048d6a42e4eae82c5e1c9206c34746e83a71c7f636058d0d5 SHA512 a3fdb379d8c25e56e51dcf1e683d289e9f3d19a537b1a55ca4c09185eb5731fe073a5bf0dd1449f09f8ee5b7d868b0e63f04473c1f3d1b97722dcd9832e4e030 WHIRLPOOL 9e26577ffd5128ad28844f06991182b4a98964d4d5cdeafd7ddb67950e8fb75dc6803531de6d615eee04ba40b40696c0a61be20634c3ab35d99ca0342b497fcd
--- a/dev-erlang/epam/epam-1.0.0-r1.ebuild
+++ b/dev-erlang/epam/epam-1.0.0-r1.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+REBAR_APP_SRC=src/p1_pam.app.src
+
+inherit rebar user
+
+DESCRIPTION="epam for ejabberd to help with PAM authentication support"
+HOMEPAGE="https://github.com/processone/epam"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+pkg_setup() {
+	enewgroup "${PN}"
+}
+
+src_install() {
+	rebar_src_install
+
+	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
+	fowners root:"${PN}" "${epam_path}"
+	fperms 4750 "${epam_path}"
+}
--- a/dev-erlang/p1_pam/p1_pam-1.0.0.ebuild
+++ b/dev-erlang/p1_pam/p1_pam-1.0.0.ebuild
@ -3,14 +3,13 @@

 EAPI=6

-inherit rebar
+REBAR_APP_SRC=src/p1_pam.app.src

-MY_PN="epam"
-MY_P="${MY_PN}-${PV}"
+inherit rebar

 DESCRIPTION="epam for ejabberd to help with PAM authentication support"
 HOMEPAGE="https://github.com/processone/epam"
-SRC_URI="https://github.com/processone/${MY_PN}/archive/${PV}.tar.gz
+SRC_URI="https://github.com/processone/epam/archive/${PV}.tar.gz
 	-> ${P}.tar.gz"

 LICENSE="GPL-2"
@ -22,5 +21,3 @@ DEPEND=">=dev-lang/erlang-17.1
 RDEPEND="${DEPEND}"

 DOCS=( README.md )
-
-S="${WORKDIR}/${MY_P}"
--- a/dev-erlang/epam/epam-1.0.2.ebuild
+++ b/dev-erlang/epam/epam-1.0.2.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar user
+
+DESCRIPTION="epam for ejabberd to help with PAM authentication support"
+HOMEPAGE="https://github.com/processone/epam"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+	sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+pkg_setup() {
+	enewgroup "${PN}"
+}
+
+src_install() {
+	rebar_src_install
+
+	local epam_path="$(get_erl_libs)/${P}/priv/bin/epam"
+	fowners root:"${PN}" "${epam_path}"
+	fperms 4750 "${epam_path}"
+}
--- a/dev-erlang/p1_pam/metadata.xml
+++ b/dev-erlang/p1_pam/metadata.xml
--- a/dev-erlang/jiffy/Manifest
+++ b/dev-erlang/jiffy/Manifest
@ -1,3 +1,4 @@
+DIST jiffy-0.14.11.tar.gz 1878494 SHA256 c555726f592b79894c253ca1dc3c3aec6a5697271d29364d57f8175f387b86f3 SHA512 0530958c04ecd3c479b432d15aa5c8c86ce9e39a828bf4e48eaa096a2a9b9c593b9cf07836346bf82e27ffcbaa6e923bc298e856701460e44c9c62a7c888028e WHIRLPOOL 287efef1e6e0403844f3f38c8b20823fc2cce4006f7cf9e961f1fc767bcd16169014323b2d9b815364eeee3c69781c5c4b565d9a2cfb23be26151d3f530ae034
 DIST jiffy-0.14.7.tar.gz 1856522 SHA256 633e2c19aae9cbd94a4a1bb80f369de4c03ee40bd4744a06a3c6305a4e050461 SHA512 b790b47857a063070da1c06a1c4b94af6085cbe8c70ecf079d8ae36c58844e7055a399f843a78ee92bf4e90320b9c6e53753f109eaa99008df793436fa8d4df1 WHIRLPOOL ea96b7b496b7eae9af5a8a53ea5156fe8fb9dfe4e82cf4af8f9951ce2b0ec53971b0700e98433dbd0beceddf3d048441c06fa2bb612b72012df84d882327d78a
 DIST jiffy-0.14.8.tar.gz 1856737 SHA256 7d1054c475c82c626de3ad57201a7fc51da38667c8a7502149eb751edc6b601d SHA512 c91f39ba877daf845ac80d611fee88310e1e3368c36da722c22af841285dcc0b7fd7712b0107dcb1a60155ac58dd7cc0faa4e4295e4aa9c33d79292c5b2cf045 WHIRLPOOL 19ca8167c3fbbb67cf0e23606577162750f156eb64a64345a0a5fb7e816e8bfcf29e1653927d70a8613c3e06179332fdac528ec7f2617b78d1cfb6e8556486bd
 DIST jiffy-0.14.9.tar.gz 1878413 SHA256 5312475932dcbc0dd804f354ebd6a2f56fb8e7a6bbe08cace96dc5e6632575be SHA512 2c8e7b2ea95c69cb0c6a7d02e341591e6807d0d81577050bf6f884dc7af7335e909f01cf7017ea27fae922d9a50ca4709fe0603b5de282b58d71afe4e06f7813 WHIRLPOOL 3ce8bdf9a48387e2618bba7b7d9f6a64421821a806de0f4c2f29f38c1d89f26df9b62b7e0d91473efd5efa169a0653cdec2c59a5e567bc7b1a6d916803f9fde0
--- a/dev-erlang/jiffy/jiffy-0.14.11.ebuild
+++ b/dev-erlang/jiffy/jiffy-0.14.11.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="JSON NIFs for Erlang"
+HOMEPAGE="https://github.com/davisp/jiffy"
+SRC_URI="https://github.com/davisp/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
--- a/dev-erlang/p1_pam/Manifest
+++ b/dev-erlang/p1_pam/Manifest
@ -1 +0,0 @@
-DIST p1_pam-1.0.0.tar.gz 44008 SHA256 0febab627700f9570bfafd1a93499a5f43de74d85c7a5bdfda8067c6b75f8f4f SHA512 c0b1fbdc1e910f24b2f39ea34cf6fd5859f3ab0cf762a16cf9ef71b1e49129c8238001151dd9031046049967f31fd2cb3d0c06a7d8bdd46e49f19862c143f374 WHIRLPOOL 9037a749657ea55024a355f2f6f96b906118175be6a68ef8cc0d78a379da1181b01114d739c2d5fc8cee61775d710ac84903a8f5e59ce82bdd9b7bbb5fd405c0
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@ -2,3 +2,4 @@ DIST p1_utils-1.0.4.tar.gz 44082 SHA256 3fb5157f1c1cc22c992b2b6541a95cedafbc1a2a
 DIST p1_utils-1.0.5.tar.gz 44167 SHA256 ef1009ea2fd3ffbe46747dd911e2b790621991b07ebbbe66d81893f9f5f8f7ee SHA512 40d030e00eb5d9623035200c0a3650d2e0bc34c2cee3e46f8084c04643649fcaf33d265395d5d7414357e7e052a7be8929d3720e2c7a13a20a1379426fb5a5f2 WHIRLPOOL 628d057f635d4ca30d952c460861fba2f781a9dcee7bb5ce62e60c29668159a051d5a973751f72f66e5c8726d3ff80cfd339125650d3dc8b4a5d7f83f8ae23f8
 DIST p1_utils-1.0.6.tar.gz 46271 SHA256 95814a11fcfb76bca0b9bac7100286000b6cb5ca067febd68a7bdbaa452f8ea9 SHA512 8944e8317358701a4bd5f266b32a8d07ac80e144c768a5118d67dea21321f01bdcc2bd13a8175e306313c8a117ebd8876fdce8fb2b52bc098341cd72ce041c29 WHIRLPOOL 0110c5e60d8656b4553c4d3016df3b7d33a489b270bea3a8e7dcf7d05e76247e524c45ed74308b07f851ca4e67aec9bebf0087f1d273b8354f279ea2d44be3a7
 DIST p1_utils-1.0.7.tar.gz 46312 SHA256 242261beb7450c84458003f9a13f6b8866cf09d9c0ea267e41aa569f6c094954 SHA512 1a60ef061d543e688f22bbccafdd7d0aa749c23646546a55702eee5f8d6c8fa80f0c3b3a0b1054ea0b00bd76eb094473554fafd8d48f4785975e73e9c7dd4fee WHIRLPOOL b52afd06ec7f2ecca4b6b31d0c298863bec415be46d6c520963cc330b61589c72145c4fda966171e802767ce3741efa3588304609559fdddfcc32fd568f45fe3
+DIST p1_utils-1.0.8.tar.gz 53349 SHA256 9b43e025b923221cfe6a6efc76790d97b1c233e3e2db37fc804294d847bcfaa3 SHA512 675439bf8872bc79a603032683eb322636b4c8687ac18d4bde2cd526bd86539c342024ef8aed5717083d9638f69f409bfd2f255d49267f528f67c42d7ad1e43f WHIRLPOOL 4e44463b04da267c5d736481e05a014af67c4ce0bc4ae9204010ac17b7e17e17c018b4b3b2009e894f6de0f65b2e6a3e5fc2922027bd5d3b75a3bee9b3db590d
--- a/dev-erlang/p1_utils/p1_utils-1.0.8.ebuild
+++ b/dev-erlang/p1_utils/p1_utils-1.0.8.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang utility modules from ProcessOne"
+HOMEPAGE="https://github.com/processone/p1_utils"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md  README.md )
--- a/dev-haskell/annotated-wl-pprint/Manifest
+++ b/dev-haskell/annotated-wl-pprint/Manifest
@ -0,0 +1 @@
+DIST annotated-wl-pprint-0.7.0.tar.gz 10338 SHA256 0c262d7fe13a9a50216438ec882c13e25f31236b886a5692e3c35b85cd773d18 SHA512 1e7ea93a63c500ebb23458202c62ed37eee7f462bbc4c390822de37fd0f411983eed49fed4c69ffb32705519f9aa956131d14ad930f21b48b28c5de5d4095f0a WHIRLPOOL 0a4ac97264a4954b85f58e4b180ade3af1421e7294caa2f2df16234e3f547d8a6cc2ad33cdc14c588eb04dc9bfe78c2d5057dd2d69866b678a52b400cdd41ece
--- a/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild
+++ b/dev-haskell/annotated-wl-pprint/annotated-wl-pprint-0.7.0.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The Wadler/Leijen Pretty Printer, with annotation support"
+HOMEPAGE="https://github.com/david-christiansen/annotated-wl-pprint"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.10.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
--- a/dev-haskell/annotated-wl-pprint/metadata.xml
+++ b/dev-haskell/annotated-wl-pprint/metadata.xml
@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This is a modified version of wl-pprint, which was based on Wadler's
+		paper "A Prettier  Printer".  See the haddocks for full info.  This
+		version allows the library user to annotate the text with semantic
+		information, which can later be rendered in a variety of ways.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/attoparsec/Manifest
+++ b/dev-haskell/attoparsec/Manifest
@ -3,3 +3,4 @@ DIST attoparsec-0.11.2.1.tar.gz 36439 SHA256 3ce8f56c0231ddc19e326285acfaca3c144
 DIST attoparsec-0.12.1.5.tar.gz 64844 SHA256 388bf78177d4b8b870db7fb291d103691ccf171d97d2944f09cc62d01516348c SHA512 e861b93bfcdeb284c95e7c96d2a41754e2ad061f169842523bd8680b60743f0d6d300e13237d17b776f60b338152b4fa10679aeb95d1cf0c9d073e093952e9e4 WHIRLPOOL ea6488c08134eebcc3ab86433047a0920bd8fb31e189f864526cd7828265d3edbb682e75ff4235efd6ff9d54c0e4386dda9cca600898a0018648ebfcd17cf45f
 DIST attoparsec-0.13.0.1.tar.gz 66039 SHA256 ce880acb45142eafd872e01d9af57d8dbb95c9f2b9a27f01ca9912ba4e9ef932 SHA512 596a1bda128c116b9e56decf0f5850b01f58c4b0bb81454155a1ee7b4c6b7143476cb9d66f02fba10e6fa5d5fb7a47dead6265dd3d98baeea4d8fa4a9958289c WHIRLPOOL 7b54f3015be2d77b1dcfcb2dd7053de3a2b2a5e13b18c5b61d0a17c6e5dd74261dd1aa3fcf0fdf17df6bcbf92c6c66bc0c1c3b7b04843bda3ae0371ba00dbff1
 DIST attoparsec-0.13.0.2.tar.gz 67669 SHA256 69f7f381f644ba4a6f348bbff9b2b4280b7b602e8e25e59eadb6e30ad5f2ec6a SHA512 3b9453e5e4baca58182c8463b4ff988eb66b3984e93e7f38ea4378d3a6265ed7044cbb896aaa3c797f6389e953f73e8c6994024db1cb7aec1e165f007c010754 WHIRLPOOL 6d3b5cbd2297607b8e3526bda500c06cdcea887a28b808b70a8f38e2b4d7d6a434cb9aaf821b1571c1c56e4be7c4d27cf90d1af67401b370471da83b0baabe91
+DIST attoparsec-0.13.1.0.tar.gz 159512 SHA256 52dc74d4955e457ce4f76f5c9d6dba05c1d07e2cd2a542d6251c6dbc66ce3f64 SHA512 bb66cab56208975b252a418a43eecbe85f3f2f3d16ff53accecade02885bc45828eb5dc5b79565d8d3f2ed955ac0400f9733658eed516aef8bb41b829c747d9e WHIRLPOOL b86c99ae74002f0f7d2baf1515fb741ed9e82bbf363a1b09ebb74fdfc921c13387af94f20f1cfcbacb643f8efadfe2c262536338c148cc3c44b3b7389c3bb6af
--- a/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild
+++ b/dev-haskell/attoparsec/attoparsec-0.13.1.0.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+#hackport: flags: -developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast combinator parsing for bytestrings and text"
+HOMEPAGE="https://github.com/bos/attoparsec"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/scientific-0.3.1:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.16.1:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/text-1.1.1.3:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/quickcheck-2.7
+		dev-haskell/quickcheck-unicode
+		>=dev-haskell/tasty-0.11
+		>=dev-haskell/tasty-quickcheck-0.8
+		dev-haskell/vector )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-developer
+}
--- a/dev-haskell/base-prelude/Manifest
+++ b/dev-haskell/base-prelude/Manifest
@ -0,0 +1 @@
+DIST base-prelude-1.0.1.1.tar.gz 4038 SHA256 dccf0a9a3b45f950bac92b6d87997c0a2a4304e40027204b12d018698b7a31b5 SHA512 6bcb0794488d9b0805f6385257d6d04ef8cbadd2445534e688a66ac18863be4af2878be968c9733fd58a60dc8c7531f6a7cedd193b46342feb43a3f1f023b757 WHIRLPOOL 5bfa9233c6e984b1d64687d61a62da7c60ee7bcbdd44561e44b05ad6c5d8e4d9190d6d1dc44f8b5cb44d0efbbd056b8a9752615e64cced50c0e9a05206e09e1b
--- a/dev-haskell/base-prelude/base-prelude-1.0.1.1.ebuild
+++ b/dev-haskell/base-prelude/base-prelude-1.0.1.1.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The most complete prelude formed solely from the \"base\" package"
+HOMEPAGE="https://github.com/nikita-volkov/base-prelude"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+"
--- a/dev-haskell/base-prelude/metadata.xml
+++ b/dev-haskell/base-prelude/metadata.xml
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A library which aims to reexport all the non-conflicting and
+		most general definitions from the \&quot;base\&quot; package.
+		This includes APIs for applicatives, arrows, monoids, foldables, traversables,
+		exceptions, generics, ST, MVars and STM.
+		
+		This package will never have any dependencies other than \&quot;base\&quot;.
+		
+		/Versioning policy/
+		
+		The versioning policy of this package deviates from PVP in the sense
+		that its exports in part are transitively determined by the version of \&quot;base\&quot;.
+		Therefore it&#39;s recommended for the users of \&quot;base-prelude\&quot; to specify
+		the bounds of \&quot;base\&quot; as well.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/binary-orphans/Manifest
+++ b/dev-haskell/binary-orphans/Manifest
@ -0,0 +1 @@
+DIST binary-orphans-0.1.6.0.tar.gz 5320 SHA256 e0e1dc7e5f00feb225efde400988d5e0e199cc910446f05a40fecba7d55684a5 SHA512 646410b79d92a20ef7b6d6583fca38da672e7fe072d2d5a7a9d50bacd1fb3da20efd9ab42e74029279dcd5a2c4b80218b860ae8e45bef348a692b23bcc8ea351 WHIRLPOOL 35b7f84e08f5fd643082764a096ccd7945d9ef28287d58b975f11b3191851442af2eceb109531249a31ee3e39266c59901370eb9e81e5786636cabd69dcc1910
--- a/dev-haskell/binary-orphans/binary-orphans-0.1.6.0-r1.ebuild
+++ b/dev-haskell/binary-orphans/binary-orphans-0.1.6.0-r1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Orphan instances for binary"
+HOMEPAGE="https://github.com/phadej/binary-orphans#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.6:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
+	>=dev-haskell/case-insensitive-1.2.0.4:=[profile?] <dev-haskell/case-insensitive-1.2.1:=[profile?]
+	>=dev-haskell/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/scientific-0.3.3.8:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.16.2.2:=[profile?]
+	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-0.8.6:=[profile?]
+	>=dev-haskell/text-1.2.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/text-binary-0.1.0:=[profile?] <dev-haskell/text-binary-0.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2.5.1:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10.12.3:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/vector-binary-instances-0.2.1.0:=[profile?] <dev-haskell/vector-binary-instances-0.3:=[profile?]
+	>=dev-haskell/void-0.7:=[profile?] <dev-haskell/void-0.8:=[profile?]
+	>=dev-lang/ghc-7.6.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	test? ( >=dev-haskell/quickcheck-2.7 <dev-haskell/quickcheck-2.9.3
+		>=dev-haskell/quickcheck-instances-0.3.11 <dev-haskell/quickcheck-instances-0.3.13
+		>=dev-haskell/tasty-0.10.1.2 <dev-haskell/tasty-0.12
+		>=dev-haskell/tasty-quickcheck-0.8.3.2 <dev-haskell/tasty-quickcheck-0.9 )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'semigroups               >=0.16.2.2  && <0.18.3' 'semigroups               >=0.16.2.2'
+}
--- a/dev-haskell/binary-orphans/metadata.xml
+++ b/dev-haskell/binary-orphans/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		`binary-orphans` defines orphan instances for types in some popular packages.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/binary-tagged/Manifest
+++ b/dev-haskell/binary-tagged/Manifest
@ -0,0 +1 @@
+DIST binary-tagged-0.1.4.2.tar.gz 9318 SHA256 311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784 SHA512 381ac0833c13c9b50174d2c5d3695e4af9955631dbaa20719556084ce013973ea37993cb86ac4880f41044fbf178dabe6f100cc53c2d982037a2ca9826878706 WHIRLPOOL 94cff52e6b0601ee18f4dc7a7316cfbfb2d65e366857b85b3c39bb46c01d543eadeaf4f2252a7acc5dffa32b181c4ad8f667e26d0f671fa697c30d0df53c6774
--- a/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild
+++ b/dev-haskell/binary-tagged/binary-tagged-0.1.4.2-r1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Tagged binary serialisation"
+HOMEPAGE="https://github.com/phadej/binary-tagged#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.8:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1.1.6:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/generics-sop-0.1:=[profile?]
+	>=dev-haskell/hashable-1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/nats-1:=[profile?] <dev-haskell/nats-1.2:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/semigroups-0.16:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-0.9:=[profile?]
+	>=dev-haskell/text-1.2:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/bifunctors
+		>=dev-haskell/binary-orphans-0.1.1
+		dev-haskell/quickcheck-instances
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'generics-sop             >=0.1  && <0.3' 'generics-sop             >=0.1'
+}
--- a/dev-haskell/binary-tagged/metadata.xml
+++ b/dev-haskell/binary-tagged/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Check &lt;https://github.com/phadej/binary-tagged#readme README on Github&gt;
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/bitarray/Manifest
+++ b/dev-haskell/bitarray/Manifest
@ -0,0 +1 @@
+DIST bitarray-0.0.1.1.tar.gz 3701 SHA256 b27f6f1065053a0e8e24fbf9382b7060af9962d8d150b631c682c0c58469d802 SHA512 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 WHIRLPOOL 18357b0aee98e40fc1245266e6d1a5a1fbb941d4c014649e95a539881ce8eb700ed326e6ad8a488bb8579b550c4d4eed4c5035b22ebd21da0f18fcdfd6a94ec1
--- a/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild
+++ b/dev-haskell/bitarray/bitarray-0.0.1.1.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Mutable and immutable bit arrays"
+HOMEPAGE="http://code.haskell.org/~bkomuves/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
--- a/sys-firmware/amdgpu-ucode/metadata.xml
+++ b/sys-firmware/amdgpu-ucode/metadata.xml
@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="legacy">Install firmware for older chipsets which are optionally supported by AMDGPU</flag>
-	</use>
+	<longdescription>
+		Mutable and immutable bit arrays.
+	</longdescription>
 </pkgmetadata>
--- a/dev-haskell/bytedump/Manifest
+++ b/dev-haskell/bytedump/Manifest
@ -0,0 +1 @@
+DIST bytedump-1.0.tar.gz 3812 SHA256 ae17b5040f0423eec792505f14d1d3e53f5ff81ddf83524f1c5dc7a16c0dc0dd SHA512 3bea638bc926fe8dc34d5ac20b5609a8b169562f266ccbaf73a9d95caf49ee368d5c516a0f52937bf6c48bbb585c8ad2819264e4109a57cebed0f836126705fe WHIRLPOOL 6abecf3c86497b75bf2e4476d686585c923e2c73eeca17bb5c44f1d8e20647945a16767f30997b792ac8f6ca21119390f34394d6ee25f32d3be67eef206a51fd
--- a/dev-haskell/bytedump/bytedump-1.0.ebuild
+++ b/dev-haskell/bytedump/bytedump-1.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Flexible byte dump helpers for human readers"
+HOMEPAGE="https://github.com/vincenthz/hs-bytedump"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable)
+}
--- a/dev-haskell/bytedump/metadata.xml
+++ b/dev-haskell/bytedump/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		A set of helpers to dump bytes with lots of different output formats
+		easy to read for humans eyes.
+	</longdescription>
+	<use>
+		<flag name="executable">build executable file</flag>
+	</use>
+</pkgmetadata>
--- a/dev-haskell/cereal-vector/Manifest
+++ b/dev-haskell/cereal-vector/Manifest
@ -0,0 +1 @@
+DIST cereal-vector-0.2.0.1.tar.gz 3337 SHA256 ff0685a6c39e7aae32f8b4165e2ae06f284c867298ad4f7b776c1c1b2859f933 SHA512 8e54e349b61e7e8f56e1f2029afd03e5b6677afaf79756771efdeb1b01364befa5a170b5caea445dae7342d71cc51f8fd3bf4300b0707252535e2e4d31213f00 WHIRLPOOL 938078d219ac562ef27ccd2de78afad8a16ec55f54883e7d3ea3aac1a366ed1dd82e6b015b8c6ee5434476a2a14b2efed4bd9fd5aae5095e689a38367d838ec4
--- a/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild
+++ b/dev-haskell/cereal-vector/cereal-vector-0.2.0.1.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Serialize instances for Data.Vector types"
+HOMEPAGE="https://github.com/acfoltzer/cereal-vector"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cereal-0.3:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/quickcheck )
+"
--- a/dev-haskell/cereal-vector/metadata.xml
+++ b/dev-haskell/cereal-vector/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Serialize instances for Data.Vector types.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/cryptohash/Manifest
+++ b/dev-haskell/cryptohash/Manifest
@ -1,4 +1,5 @@
 DIST cryptohash-0.10.0.tar.gz 63901 SHA256 58fd9af060cf2b74f8e22f5e0d0d3fc81ddf717a08dcaa2785cc04d75be8fb6b SHA512 14a58c7d35feea846fc14821e532bd26046844a5d34274a46fcfd9cbc5100d414f980c95b64ef7ed5431993fb558962d6f7e262adc7297a54987dfa32cc4da2a WHIRLPOOL 7e1dd2d0f3709c4dd71360a44b462d37137a476c0cdba60bb85f9c7c99bcdb9bef3a53f2ea4d7f7bc56ae2bb455b0fbec954ada0bccb3e77686dbf8029f0781d
 DIST cryptohash-0.11.1.tar.gz 64985 SHA256 be76351650517042e390887069af3dc047ed5621e1e2c96fa8a04444675c8773 SHA512 eb2da3e2c8a523354b81200b7ab3f36d29690d5f3311008ac24a5abaefe288551b67d7637b662f5a2b2b46bc5ef548ff6eae4f59ed9f1231ab9d8b0e6d039551 WHIRLPOOL 405e10f66f257bdfe5af153010ec9f7e8549dcd07f65919199e037a9a3b9b02c562762add7f8a9c1ca338d99205cd6a8c661196de6205ab020296d2f790cd190
 DIST cryptohash-0.11.6.tar.gz 65798 SHA256 da382334857a88f3e94ce0fb83f425f0a0787b0644100913c61f6e94bb62df37 SHA512 a6d3bd33104eb3b71d836323b330636cdce84165daa7e3b908296980468828c624a96db58cf9f953581986e090e53b78b10e15e361d354a00c9e9b49843a6956 WHIRLPOOL 4d5fd2e21f200880f30d21dc5b253e6a08e841478a2da29b0bc54c62bf5256a0f4c01c6addc60d75a2d04d9345d2e0efecf055c6e74298f52a9edc817583530d
+DIST cryptohash-0.11.9.tar.gz 25762 SHA256 c28f847fc1fcd65b6eea2e74a100300af940919f04bb21d391f6a773968f22fb SHA512 d0eb07f59ae893df1a92a4dc45a98142e507ba3da25057ae4acf781b1b6200a2fb68dd2a19f1ba5f9395217bc81e7be1311a479dc3dcb4ec5338518a2f5239af WHIRLPOOL 20825aaed7bd3312a5856ba0cf5f8a12815098f0e5380c13a443100fd03de47dfbe603a50e548125d2b3b53e5c8731ebed08fa3b83b403afa950b8b2182d7b14
 DIST cryptohash-0.9.1.tar.gz 64991 SHA256 e0276e96dc06062b91ade9aa25009571c598136f4203a83513332425db209298 SHA512 773a16c1e16f8d2b48f4c107d22f14d439a15ffe9e92e43886538ee15e9349fdf53d1e15d20f888eaeac4fcaa07eb907b92de6f436b6655925a617f5139ac298 WHIRLPOOL 5e499e584e817630131f00870df4b0956a16287e71683b26c736a26e1fa89825e500a5239b2b0fdf7cbbef40e6b49e85f24bbe770418a91c8174706d4c078cf4
--- a/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
+++ b/dev-haskell/cryptohash/cryptohash-0.11.9.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="collection of crypto hashes, fast, pure and practical"
+HOMEPAGE="https://github.com/vincenthz/hs-cryptohash"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/byteable:=[profile?]
+	>=dev-haskell/cryptonite-0.13:=[profile?]
+	dev-haskell/memory:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		>=dev-haskell/quickcheck-2
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
--- a/dev-haskell/filelock/Manifest
+++ b/dev-haskell/filelock/Manifest
@ -0,0 +1 @@
+DIST filelock-0.1.0.1.tar.gz 5884 SHA256 ad8c63f27fec6396ac83981a67d5a799b6b614c119a35ebdf2d82b379795d763 SHA512 73cc119bcca61b040692738aefcc779debef8815182a9f74e9e0700d9b1e5de0e12812f573f9daa8a127d99269f69e3cfc572cd5cd104d1fddb04ec8d4bf0c97 WHIRLPOOL 8b561fba28c20676323aed11ee5348b633f3a06a1585535d652ef04ea7f7687111042c4eee2838ad4c0847adda83f14e448e282a660d7497c582e500e407790c
--- a/dev-haskell/filelock/filelock-0.1.0.1.ebuild
+++ b/dev-haskell/filelock/filelock-0.1.0.1.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Portable interface to file locking (flock / LockFileEx)"
+HOMEPAGE="https://github.com/takano-akio/filelock"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.14.0
+"
--- a/dev-haskell/filelock/metadata.xml
+++ b/dev-haskell/filelock/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		This package provides an interface to Windows and Unix
+		file locking functionalities.
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/getopt-generics/Manifest
+++ b/dev-haskell/getopt-generics/Manifest
@ -0,0 +1 @@
+DIST getopt-generics-0.13.0.1.tar.gz 27772 SHA256 6902d7e366dea566f533be6b40ce219b010f1e9fcbc089285da3d4ecca524e83 SHA512 df27c67bd92047b5213404220389200cf72c79d20a761c390120d13a82fb126aa38ef5afbb826ae2be0fe65941f4fe5be42bb49301fabd6343e8b0c8a7f3e707 WHIRLPOOL 809a4d23feac8d38a1eb62d67a346319c715f886936019ac5e7c56689122e18ff07b3b15d5cf1354382a4c7a8f47722a51541b2bb52f89f427b1789034322913
--- a/dev-haskell/getopt-generics/getopt-generics-0.13.0.1.ebuild
+++ b/dev-haskell/getopt-generics/getopt-generics-0.13.0.1.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Create command line interfaces with ease"
+HOMEPAGE="https://github.com/soenkehahn/getopt-generics#readme"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-compat-0.8:=[profile?]
+	dev-haskell/base-orphans:=[profile?]
+	>=dev-haskell/generics-sop-0.1:=[profile?] <dev-haskell/generics-sop-0.4:=[profile?]
+	dev-haskell/tagged:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/hspec-2.1.8
+		dev-haskell/quickcheck
+		dev-haskell/safe
+		dev-haskell/silently )
+"
--- a/dev-haskell/getopt-generics/metadata.xml
+++ b/dev-haskell/getopt-generics/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Create command line interfaces with ease
+	</longdescription>
+</pkgmetadata>
--- a/dev-haskell/hit/Manifest
+++ b/dev-haskell/hit/Manifest
@ -0,0 +1 @@
+DIST hit-0.6.3.tar.gz 38690 SHA256 db86b3712029a4e40d1306dd6cc9ca2c9f4c77fe65a2b74106f1cbd2de26e471 SHA512 82ccfeb77a439caa1792f1ae29535636764be9e6e94f75973f37a86db6627a492e57da835954384ef8468799de9f0897e20905f65dad256fe3547a4248d5fffc WHIRLPOOL e90e0d842666b027be5c3996a233e66385c9cb62d694a8dd923ca20cfadeedabc892dc25c5a6367310cf9d3892e731563234fe49330e48cd1a46346095388c0c
--- a/dev-haskell/hit/hit-0.6.3.ebuild
+++ b/dev-haskell/hit/hit-0.6.3.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Git operations in haskell"
+HOMEPAGE="https://github.com/vincenthz/hit"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug executable"
+
+RDEPEND=">=dev-haskell/attoparsec-0.10.1:=[profile?]
+	dev-haskell/byteable:=[profile?]
+	dev-haskell/cryptohash:=[profile?]
+	>=dev-haskell/hourglass-0.2:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/parsec-3:=[profile?]
+	dev-haskell/patience:=[profile?]
+	dev-haskell/random:=[profile?]
+	dev-haskell/system-fileio:=[profile?]
+	dev-haskell/system-filepath:=[profile?]
+	dev-haskell/unix-compat:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	dev-haskell/vector:=[profile?]
+	dev-haskell/zlib:=[profile?]
+	>=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	executable? ( >=dev-haskell/hashable-1.2:=[profile?]
+			dev-haskell/hashtables:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/bytedump-1.0
+		dev-haskell/tasty
+		dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag debug debug) \
+		$(cabal_flag executable executable)
+}
--- a/dev-haskell/hit/metadata.xml
+++ b/dev-haskell/hit/metadata.xml
@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+	    <email>haskell@gentoo.org</email>
+	    <name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		
+		An haskell implementation of git storage operations, allowing users
+		to manipulate git repositories (read and write).
+		
+		This implementation is fully interoperable with the main C implementation.
+		
+		This is stricly only manipulating the git store (what's inside the .git directory),
+		and doesn't do anything with the index or your working directory files.
+		
+	</longdescription>
+	<use>
+	    <flag name="executable">Build the executable</flag>
+	</use>
+</pkgmetadata>
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST buttersink-0.6.8.tar.gz 51784 SHA256 12dc5683256bc6aab5ce6db5ae40c8f565b9ad7c3da944bdba46182ae89f21d3 SHA512 52898140d983bcc6776497504191f0c1c727b24fa9543f5a5997a54ced26301ca492518094ca8770fce8064bc99dc6d3f6760e986eb66f08a758985a7a85ffff WHIRLPOOL 48e487b498cc8d827a3a5b54c5fdf019ffa5719dd925830a5f3c331344fd72e75a665a48c3cea0dc755add973f162c77916af65036ae8eef67af613eeab319ff`
				`@ -1 +0,0 @@`
				`DIST p1_pam-1.0.0.tar.gz 44008 SHA256 0febab627700f9570bfafd1a93499a5f43de74d85c7a5bdfda8067c6b75f8f4f SHA512 c0b1fbdc1e910f24b2f39ea34cf6fd5859f3ab0cf762a16cf9ef71b1e49129c8238001151dd9031046049967f31fd2cb3d0c06a7d8bdd46e49f19862c143f374 WHIRLPOOL 9037a749657ea55024a355f2f6f96b906118175be6a68ef8cc0d78a379da1181b01114d739c2d5fc8cee61775d710ac84903a8f5e59ce82bdd9b7bbb5fd405c0`
				`@ -0,0 +1 @@`
				`DIST annotated-wl-pprint-0.7.0.tar.gz 10338 SHA256 0c262d7fe13a9a50216438ec882c13e25f31236b886a5692e3c35b85cd773d18 SHA512 1e7ea93a63c500ebb23458202c62ed37eee7f462bbc4c390822de37fd0f411983eed49fed4c69ffb32705519f9aa956131d14ad930f21b48b28c5de5d4095f0a WHIRLPOOL 0a4ac97264a4954b85f58e4b180ade3af1421e7294caa2f2df16234e3f547d8a6cc2ad33cdc14c588eb04dc9bfe78c2d5057dd2d69866b678a52b400cdd41ece`
				`@ -0,0 +1 @@`
				`DIST base-prelude-1.0.1.1.tar.gz 4038 SHA256 dccf0a9a3b45f950bac92b6d87997c0a2a4304e40027204b12d018698b7a31b5 SHA512 6bcb0794488d9b0805f6385257d6d04ef8cbadd2445534e688a66ac18863be4af2878be968c9733fd58a60dc8c7531f6a7cedd193b46342feb43a3f1f023b757 WHIRLPOOL 5bfa9233c6e984b1d64687d61a62da7c60ee7bcbdd44561e44b05ad6c5d8e4d9190d6d1dc44f8b5cb44d0efbbd056b8a9752615e64cced50c0e9a05206e09e1b`
				`@ -0,0 +1 @@`
				`DIST binary-orphans-0.1.6.0.tar.gz 5320 SHA256 e0e1dc7e5f00feb225efde400988d5e0e199cc910446f05a40fecba7d55684a5 SHA512 646410b79d92a20ef7b6d6583fca38da672e7fe072d2d5a7a9d50bacd1fb3da20efd9ab42e74029279dcd5a2c4b80218b860ae8e45bef348a692b23bcc8ea351 WHIRLPOOL 35b7f84e08f5fd643082764a096ccd7945d9ef28287d58b975f11b3191851442af2eceb109531249a31ee3e39266c59901370eb9e81e5786636cabd69dcc1910`
				`@ -0,0 +1 @@`
				`DIST binary-tagged-0.1.4.2.tar.gz 9318 SHA256 311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784 SHA512 381ac0833c13c9b50174d2c5d3695e4af9955631dbaa20719556084ce013973ea37993cb86ac4880f41044fbf178dabe6f100cc53c2d982037a2ca9826878706 WHIRLPOOL 94cff52e6b0601ee18f4dc7a7316cfbfb2d65e366857b85b3c39bb46c01d543eadeaf4f2252a7acc5dffa32b181c4ad8f667e26d0f671fa697c30d0df53c6774`
				`@ -0,0 +1 @@`
				`DIST bitarray-0.0.1.1.tar.gz 3701 SHA256 b27f6f1065053a0e8e24fbf9382b7060af9962d8d150b631c682c0c58469d802 SHA512 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 WHIRLPOOL 18357b0aee98e40fc1245266e6d1a5a1fbb941d4c014649e95a539881ce8eb700ed326e6ad8a488bb8579b550c4d4eed4c5035b22ebd21da0f18fcdfd6a94ec1`
				`@ -0,0 +1 @@`
				`DIST bytedump-1.0.tar.gz 3812 SHA256 ae17b5040f0423eec792505f14d1d3e53f5ff81ddf83524f1c5dc7a16c0dc0dd SHA512 3bea638bc926fe8dc34d5ac20b5609a8b169562f266ccbaf73a9d95caf49ee368d5c516a0f52937bf6c48bbb585c8ad2819264e4109a57cebed0f836126705fe WHIRLPOOL 6abecf3c86497b75bf2e4476d686585c923e2c73eeca17bb5c44f1d8e20647945a16767f30997b792ac8f6ca21119390f34394d6ee25f32d3be67eef206a51fd`
				`@ -0,0 +1 @@`
				`DIST cereal-vector-0.2.0.1.tar.gz 3337 SHA256 ff0685a6c39e7aae32f8b4165e2ae06f284c867298ad4f7b776c1c1b2859f933 SHA512 8e54e349b61e7e8f56e1f2029afd03e5b6677afaf79756771efdeb1b01364befa5a170b5caea445dae7342d71cc51f8fd3bf4300b0707252535e2e4d31213f00 WHIRLPOOL 938078d219ac562ef27ccd2de78afad8a16ec55f54883e7d3ea3aac1a366ed1dd82e6b015b8c6ee5434476a2a14b2efed4bd9fd5aae5095e689a38367d838ec4`
				`@ -0,0 +1 @@`
				`DIST filelock-0.1.0.1.tar.gz 5884 SHA256 ad8c63f27fec6396ac83981a67d5a799b6b614c119a35ebdf2d82b379795d763 SHA512 73cc119bcca61b040692738aefcc779debef8815182a9f74e9e0700d9b1e5de0e12812f573f9daa8a127d99269f69e3cfc572cd5cd104d1fddb04ec8d4bf0c97 WHIRLPOOL 8b561fba28c20676323aed11ee5348b633f3a06a1585535d652ef04ea7f7687111042c4eee2838ad4c0847adda83f14e448e282a660d7497c582e500e407790c`