gentoo resync : 17.12.2017

3 files changed, 62 insertions, 18 deletions

diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 62518f5ab3fc..bfb1dbf7f6f8 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,5 @@
-DIST diffoscope-78.tar.gz 466619 BLAKE2B 449cd0f1be9a6740242c9bde4bdd633759dd585093a22367e71b5ed529867641b113b4620c3c56518b49caa4b7f0c8bce923f3f543ff9aefcf6fd0481fc58b5f SHA512 6d83c8297727ebd0dce49805d6cc3dcca1ea5a2c1b8d56097e3c7ef14c9058851f3504aaa2bed0f0ea905796f5c704937320f8bbcd7dad2a73ab940d96f693aa
 DIST diffoscope-87.tar.gz 1026242 BLAKE2B 5055607c21504bf05f71793b112c1452556ac41e4c193c68fc037ab8089745e9b10dddc04b396f2011d22468e00a07392723631021d062f59935a953effd04fa SHA512 9f46ca0ba52ee991547c1b2b2477bab1e0c065cebf96649cecafc0e78983f42fe18b012a1f17de6184decb6cbb49aede91445c75777cfb292c6abe8bdf2dd6b6
-EBUILD diffoscope-78.ebuild 540 BLAKE2B 6ef52c777687d9e5dacd111c6b3da6bd29267e71d5150eb13c23ee6d2907e565ea46b9bee0d9e56d4ddfd532e0f1d4f876face8332a2cb1e74d59196507e0d89 SHA512 89fc9c0d16c9b23c9c151d32d847d6dbf277ffd289c12fbcf4e611fc688cac39522ab6dab57cfb280a919619778642c11c1ec47954873b59224ac77f87d065c5
+DIST diffoscope-88.tar.gz 1027126 BLAKE2B 18d2ebc532f5820fcb3f3a2e96a834a06a0f2adf4c14e17a1aa2d7aabc360f6180af2bf2151aac5b4eb33e38aade36e38b5894afbfd73ffa79e74bc45c085cbf SHA512 0fdb4385a0d842dccacc60c9b48b8720f00185bb4b6a5b30b88454a1f08e6ff7ead8fc392f406d2d2aff8b1b901caaa950a011b674d83e354dda4a01ac39ab1c
 EBUILD diffoscope-87.ebuild 1839 BLAKE2B 7b657e22c0ad93672a6b7a159b68f9233e4a43fd7234c760f387b859d14a5a3b758a2150cccac1a8bd602f81273e740ae5bda92aa5b0c7426d17a1de94db177c SHA512 6fd5e6c29e291c49e79847c948d95928a49166bf4a4093f2a5a97a27766216c6018ff3137e330cdc10e9ca8f54bc3b6fc5e30c5a555eb6c5ef9176004cc31c1d
+EBUILD diffoscope-88.ebuild 1888 BLAKE2B 69baf2192e31e5e2a5fffe66c009d0dbb357cd49c16ce013d1b514ad67803dfd8427b42e2ed2f7b39a4b4469489929cce33500391734678d70a8ec37e554680b SHA512 783c5a85bff69989ea63c42813e2f4498658a367311682763cc45a8f59cc3b9f5cb7312e8964c60fae69026d81b0aa2e1ab498d43aaaefcec2671950954af642
 MISC metadata.xml 2138 BLAKE2B 026602198d2a0adaf2e0e753ae0b11b2de858dd66303531e8d23dce85e871cb7f14b50267c37d52b16390b0892559e1c29f468637149d08b43e4a33be521bd45 SHA512 9f00c504e6ec4cdf5589e8f37d79567ad6fac661740ac482dbef1b3fae8bc60f24b80585eea8d17f18beb1c4c8e40e6f4172193b405be3e51428f027d2545776
diff --git a/dev-util/diffoscope/diffoscope-78.ebuild b/dev-util/diffoscope/diffoscope-78.ebuild
deleted file mode 100644
index 08c32333e499..000000000000
--- a/dev-util/diffoscope/diffoscope-78.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.python.org/pypi/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]"
diff --git a/dev-util/diffoscope/diffoscope-88.ebuild b/dev-util/diffoscope/diffoscope-88.ebuild
new file mode 100644
index 000000000000..2fa2a3eec9c3
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-88.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.python.org/pypi/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg gzip haskell hex imagemagick iso java llvm
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar tcpdump xz zip"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	gzip? ( app-arch/gzip )
+	haskell? ( dev-lang/ghc )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( virtual/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	xz? ( app-arch/xz-utils )
+	zip? ( app-arch/unzip )"