From a88cb4061390d9cce91aa26fc7cd7e05c11e5e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20V=C3=A4th?= <mvath@google.com>
Date: Sun, 7 Jul 2019 16:51:21 +0200
Subject: fast-syntax-highlighting zsh-autosuggestions squashfs-tools: Version
 bumps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Martin Väth <mvath@google.com>
---
 app-shells/fast-syntax-highlighting/Manifest       |   2 +-
 .../fast-syntax-highlighting-1.5.2.ebuild          |  52 ++++++++++
 .../fast-syntax-highlighting-1.5.ebuild            |  50 ---------
 .../fast-syntax-highlighting-99999999.ebuild       |   4 +-
 app-shells/zsh-autosuggestions/Manifest            |   2 +-
 .../zsh-autosuggestions-0.6.1.ebuild               |  53 ----------
 .../zsh-autosuggestions-0.6.3.ebuild               |  53 ++++++++++
 .../zsh-autosuggestions-99999999.ebuild            |   2 +-
 metadata/pkg_desc_index                            |   6 +-
 sys-fs/squashfs-tools/Manifest                     |   2 +-
 .../squashfs-tools-4.3.1_alpha20190607.ebuild      | 112 ---------------------
 .../squashfs-tools-4.3.1_alpha20190706.ebuild      | 108 ++++++++++++++++++++
 .../squashfs-tools/squashfs-tools-99999999.ebuild  |   6 +-
 13 files changed, 224 insertions(+), 228 deletions(-)
 create mode 100644 app-shells/fast-syntax-highlighting/fast-syntax-highlighting-1.5.2.ebuild
 delete mode 100644 app-shells/fast-syntax-highlighting/fast-syntax-highlighting-1.5.ebuild
 delete mode 100644 app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.1.ebuild
 create mode 100644 app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.3.ebuild
 delete mode 100644 sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190607.ebuild
 create mode 100644 sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190706.ebuild

diff --git a/app-shells/fast-syntax-highlighting/Manifest b/app-shells/fast-syntax-highlighting/Manifest
index 461eb3ec..fe7b45a8 100644
--- a/app-shells/fast-syntax-highlighting/Manifest
+++ b/app-shells/fast-syntax-highlighting/Manifest
@@ -1 +1 @@
-DIST fast-syntax-highlighting-1.5.tar.gz 441231 SHA512 95ac6f57daf7198dda5dc5a600acbf096a5ca607d1a044838edcac71e5f89ef9c530d9b955802ab272c361071ccf8785d58ed78c8405de07cd5a09e232233532
+DIST fast-syntax-highlighting-1.5.2.tar.gz 449057 SHA512 0f4e7fad9e2b00304622d60d6ba78c555a2db941c63b69ed36feda53167c5d1c31a510a75647e4c46a0d85d474ae8ec33c666a44dcf9a036a31298e103e2040a
diff --git a/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-1.5.2.ebuild b/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-1.5.2.ebuild
new file mode 100644
index 00000000..f2c9d0f8
--- /dev/null
+++ b/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-1.5.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2011-2019 Martin V\"ath
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+RESTRICT="mirror"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+case ${PV} in
+99999999*)
+	EGIT_REPO_URI="https://github.com/zdharma/${PN}.git"
+	inherit git-r3
+	PROPERTIES="live"
+	SRC_URI=""
+	KEYWORDS="";;
+*alpha*)
+	EGIT_COMMIT="3361bb62d66540eda6dfa23f3df34125c27d420f"
+	SRC_URI="https://github.com/zdharma/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
+*)
+	myPN=$(ver_rs 2 '')
+	SRC_URI="https://github.com/zdharma/${PN}/archive/v${myPN}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${myPN}";;
+esac
+
+DESCRIPTION="Optimized and extended zsh-syntax-highlighting"
+HOMEPAGE="https://github.com/zdharma/fast-syntax-highlighting/"
+
+LICENSE="HPND"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-shells/zsh"
+DEPEND=""
+
+src_install() {
+	local DISABLE_AUTOFORMATTING DOC_CONTENTS dir
+	dir="/usr/share/zsh/site-contrib/${PN}"
+	DISABLE_AUTOFORMATTING="true"
+	DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
+. ${EPREFIX}${dir}/fast-syntax-highlighting.plugin.zsh"'
+at the end of your ~/.zshrc
+For testing, you can also execute the above command in your zsh.'
+	readme.gentoo_create_doc
+	insinto "${dir}"
+	doins -r *
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-1.5.ebuild b/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-1.5.ebuild
deleted file mode 100644
index 08a7f44f..00000000
--- a/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-1.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2011-2019 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-RESTRICT="mirror"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-case ${PV} in
-99999999*)
-	EGIT_REPO_URI="https://github.com/zdharma/${PN}.git"
-	inherit git-r3
-	PROPERTIES="live"
-	SRC_URI=""
-	KEYWORDS="";;
-*alpha*)
-	EGIT_COMMIT="3361bb62d66540eda6dfa23f3df34125c27d420f"
-	SRC_URI="https://github.com/zdharma/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-*)
-	SRC_URI="https://github.com/zdharma/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz";;
-esac
-
-DESCRIPTION="Optimized and extended zsh-syntax-highlighting"
-HOMEPAGE="https://github.com/zdharma/fast-syntax-highlighting/"
-
-LICENSE="HPND"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-shells/zsh"
-DEPEND=""
-
-src_install() {
-	local DISABLE_AUTOFORMATTING DOC_CONTENTS dir
-	dir="/usr/share/zsh/site-contrib/${PN}"
-	DISABLE_AUTOFORMATTING="true"
-	DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
-. ${EPREFIX}${dir}/fast-syntax-highlighting.plugin.zsh"'
-at the end of your ~/.zshrc
-For testing, you can also execute the above command in your zsh.'
-	readme.gentoo_create_doc
-	insinto "${dir}"
-	doins -r *
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-99999999.ebuild b/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-99999999.ebuild
index 08a7f44f..f2c9d0f8 100644
--- a/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-99999999.ebuild
+++ b/app-shells/fast-syntax-highlighting/fast-syntax-highlighting-99999999.ebuild
@@ -19,7 +19,9 @@ case ${PV} in
 	SRC_URI="https://github.com/zdharma/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
 *)
-	SRC_URI="https://github.com/zdharma/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz";;
+	myPN=$(ver_rs 2 '')
+	SRC_URI="https://github.com/zdharma/${PN}/archive/v${myPN}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${myPN}";;
 esac
 
 DESCRIPTION="Optimized and extended zsh-syntax-highlighting"
diff --git a/app-shells/zsh-autosuggestions/Manifest b/app-shells/zsh-autosuggestions/Manifest
index 56a1fa08..163a28ff 100644
--- a/app-shells/zsh-autosuggestions/Manifest
+++ b/app-shells/zsh-autosuggestions/Manifest
@@ -1 +1 @@
-DIST zsh-autosuggestions-0.6.1.tar.gz 25341 SHA512 bb3990ebafad7ea8ebcfea9de71b8290f855ec4f38f23f79bbb0928e8b10eea4305939d5f16449e1dcfa4023f35d5eb61080457e6e8ad1e9e5ccfe129551dc13
+DIST zsh-autosuggestions-0.6.3.tar.gz 25819 SHA512 bafeca5c6ef3d315310976762fdc5db5ae3db3960c4ac17c1ac139a4d09c2733c24884e7f708881e3f3cacf96c39d9ddeac0b1ca6c8720d2febb41c9894d4ad3
diff --git a/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.1.ebuild b/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.1.ebuild
deleted file mode 100644
index dd999db8..00000000
--- a/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2011-2019 Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-RESTRICT="mirror"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-case ${PV} in
-99999999*)
-	EGIT_REPO_URI="https://github.com/zsh-users/zsh-autosuggestions"
-	EGIT_BRANCH="features/completion-suggestions" # "develop"
-	inherit git-r3
-	PROPERTIES="live"
-	SRC_URI=""
-	KEYWORDS="";;
-*alpha*)
-	EGIT_COMMIT="3a3ff5a80a702d0bd8c6dfbb57f9498d11957136"
-	SRC_URI="https://github.com/zsh-users/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
-*)
-	SRC_URI="https://github.com/zsh-users/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz";;
-esac
-
-DESCRIPTION="Fish-like autosuggestions for zsh"
-HOMEPAGE="https://github.com/zsh-users/zsh-autosuggestions/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-shells/zsh"
-DEPEND=""
-
-src_install() {
-	local DISABLE_AUTOFORMATTING DOC_CONTENTS dir
-	dir="/usr/share/zsh/site-contrib/${PN}"
-	DISABLE_AUTOFORMATTING="true"
-	DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
-. ${EPREFIX}${dir}/zsh-autosuggestions.zsh"'
-at the end of your ~/.zshrc
-For testing, you can also execute the above command in your zsh.'
-	readme.gentoo_create_doc
-	insinto "${dir}"
-	doins *.zsh
-	doins -r spec src
-	dodoc *.md
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.3.ebuild b/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.3.ebuild
new file mode 100644
index 00000000..ae2e3be3
--- /dev/null
+++ b/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2011-2019 Martin V\"ath
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+RESTRICT="mirror"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+case ${PV} in
+99999999*)
+	EGIT_REPO_URI="https://github.com/zsh-users/zsh-autosuggestions"
+	EGIT_BRANCH="develop"
+	inherit git-r3
+	PROPERTIES="live"
+	SRC_URI=""
+	KEYWORDS="";;
+*alpha*)
+	EGIT_COMMIT="3da421aa47fdcb10bf3d19f1c35946b03c1bd90e"
+	SRC_URI="https://github.com/zsh-users/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
+*)
+	SRC_URI="https://github.com/zsh-users/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz";;
+esac
+
+DESCRIPTION="Fish-like autosuggestions for zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-autosuggestions/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-shells/zsh"
+DEPEND=""
+
+src_install() {
+	local DISABLE_AUTOFORMATTING DOC_CONTENTS dir
+	dir="/usr/share/zsh/site-contrib/${PN}"
+	DISABLE_AUTOFORMATTING="true"
+	DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
+. ${EPREFIX}${dir}/zsh-autosuggestions.zsh"'
+at the end of your ~/.zshrc
+For testing, you can also execute the above command in your zsh.'
+	readme.gentoo_create_doc
+	insinto "${dir}"
+	doins *.zsh
+	doins -r spec src
+	dodoc *.md
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-shells/zsh-autosuggestions/zsh-autosuggestions-99999999.ebuild b/app-shells/zsh-autosuggestions/zsh-autosuggestions-99999999.ebuild
index 94ca1b9f..ae2e3be3 100644
--- a/app-shells/zsh-autosuggestions/zsh-autosuggestions-99999999.ebuild
+++ b/app-shells/zsh-autosuggestions/zsh-autosuggestions-99999999.ebuild
@@ -16,7 +16,7 @@ case ${PV} in
 	SRC_URI=""
 	KEYWORDS="";;
 *alpha*)
-	EGIT_COMMIT="e9d8231ba7dfbf7afb3f2a57ae00b803b4ae9f83"
+	EGIT_COMMIT="3da421aa47fdcb10bf3d19f1c35946b03c1bd90e"
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT}";;
 *)
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index b1d00bb6..116fd9e8 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -34,7 +34,7 @@ app-portage/useflags 4.1.3: Print or save the current USE-flag state and compare
 app-portage/world-mv 3.19: Organize your world file and find installed packages or differences to @world
 app-shells/auto-fu-zsh 0.0.1.12-r4 0.0.1.12_p0 99999999: zsh automatic complete-word and list-choices: incremental completion
 app-shells/dash 99999999: Descendant of the NetBSD ash. POSIX compliant except for multibyte characters
-app-shells/fast-syntax-highlighting 1.5 99999999: Optimized and extended zsh-syntax-highlighting
+app-shells/fast-syntax-highlighting 1.5.2 99999999: Optimized and extended zsh-syntax-highlighting
 app-shells/oh-my-zsh 99999999: A ready-to-use zsh configuration with plugins
 app-shells/push 3.1-r3: A POSIX shell function to treat a variable like an array, quoting args
 app-shells/quoter 4.1-r1: Quote arguments or standard input for usage in POSIX shell by eval
@@ -42,7 +42,7 @@ app-shells/runtitle 2.10: Scripts to run commands and set the hard status line (
 app-shells/schily-tools 2019.06.13: Many tools from Joerg Schilling, including a POSIX compliant Bourne Shell
 app-shells/set_prompt 3.1: An intelligent prompt for zsh or bash with status line (window title) support
 app-shells/termcolors-mv 4.7-r1: 256colors sample script and dircolors configuration for standard or 256 colors
-app-shells/zsh-autosuggestions 0.6.1 99999999: Fish-like autosuggestions for zsh
+app-shells/zsh-autosuggestions 0.6.3 99999999: Fish-like autosuggestions for zsh
 app-shells/zsh-syntax-highlighting 0.6.0 0.6.1_alpha20180411 99999999: Fish shell like syntax highlighting for zsh
 app-shells/zshrc-mv 5.1: A zshrc file initializing zsh specific interactive features
 app-text/ispell 3.3.02-r1 3.4.00: fast screen-oriented spelling checker
@@ -107,7 +107,7 @@ sys-block/zram-init 7.1-r2 8.1: Scripts to support compressed swap devices or ra
 sys-boot/grub-cfg-mv 1.7: A grub.cfg library/example for GRUB2
 sys-fs/emount 3.0.4: mount/unmount create/remove dm-crypt filesystems according to your /etc/fstab
 sys-fs/squash_dir 13.14-r1: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist
-sys-fs/squashfs-tools 4.3.1_alpha20190607 99999999: Tool for creating compressed filesystem type squashfs
+sys-fs/squashfs-tools 4.3.1_alpha20190706 99999999: Tool for creating compressed filesystem type squashfs
 sys-fs/squashfuse 0.1.103 0.1.104_alpha20180721: FUSE filesystem to mount squashfs archives
 sys-fs/squashmount 16.1.0-r1 19.1-r1: Keep directories compressed with squashfs. Useful for portage tree, texmf-dist
 sys-kernel/kccmp 0.3-r1: A simple tool for comparing two linux kernel .config files
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index e952b566..e386eab0 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,2 +1,2 @@
-DIST squashfs-tools-4.3.1_alpha20190607.tar.gz 230665 SHA512 662644fd6a0946e3bc4cb48cb5e263e9de65dbe241c2d98cf85bdc77a2eb4a6b1d704c034cd6991831341debb953ef878221dd34258ff5c72c32344858d2d608
+DIST squashfs-tools-4.3.1_alpha20190706.tar.gz 232302 SHA512 5afe06ac511c0930eaf42aaf9d55c83b5dbeb315903a35510edfb0e6d863529d9e7f87ce710ca21ab5e76d08593b7eab0e846572b176f2810746c1bfd2f8d932
 DIST squashfs-tools_4.3-12.debian.tar.xz 27300 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190607.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190607.ebuild
deleted file mode 100644
index 9f8eb45c..00000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190607.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-LIVE=false
-PVm=4.3
-case ${PV} in
-*9999)
-	LIVE=:;;
-esac
-Pm=${PN}-${PVm}
-DEB_VER="12"
-
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="https://github.com/plougher/squashfs-tools/ https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git http://squashfs.sourceforge.net"
-EXTRA_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PVm}-${DEB_VER}.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug lz4 lzma lzo static xattr +xz +zstd"
-
-LIB_DEPEND="sys-libs/zlib:=[static-libs(+)]
-	lz4? ( app-arch/lz4:=[static-libs(+)] )
-	lzma? ( app-arch/xz-utils:=[static-libs(+)] )
-	lzo? ( dev-libs/lzo:=[static-libs(+)] )
-	xattr? ( sys-apps/attr:=[static-libs(+)] )
-	xz? ( app-arch/xz-utils:=[static-libs(+)] )
-	zstd? ( >=app-arch/zstd-1.0:=[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/squashfs${PV}/${PN}"
-
-if ${LIVE}; then
-	PROPERTIES="live"
-	EGIT_REPO_URI="https://github.com/plougher/${PN}"
-	inherit git-r3
-	SRC_URI=${EXTRA_URI}
-	KEYWORDS=""
-	S="${WORKDIR}/${P}/${PN}"
-src_unpack() {
-	default
-	git-r3_src_unpack
-}
-else
-	RESTRICT="mirror"
-	EGIT_COMMIT="832a7b9971053d4d741c3230f52e97afd250e956"
-	SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-${EXTRA_URI}"
-	S="${WORKDIR}/${P}/${PN}"
-src_unpack() {
-	default
-	mv -- "${WORKDIR}/${PN}-${EGIT_COMMIT}" "${WORKDIR}/${P}"
-}
-fi
-
-src_prepare() {
-	local debian
-	debian="${WORKDIR}"/debian/patches
-	eapply -p2 "${debian}"/0001-kfreebsd.patch
-	eapply -p2 "${debian}"/0003-CVE-2015-4645_and_CVE-2015-4646.patch
-	eapply -p2 "${debian}"/0004-unsquashfs-add-support-for-LZMA-magics.patch
-	eapply -p2 "${debian}"/0009-unsquashfs-preserve-symlink-times.patch
-	eapply -p2 "${debian}"/0010-fix_FTBFS_with_glibc_2.28.patch
-	eapply -p2 "${debian}"/0013-use-macros-not-raw-octal-with-chmod.patch
-	eapply -p2 "${debian}"/0014-also-set-stickybit-as-non-root.patch
-	eapply -p2 "${debian}"/0015-numeric-uid-gid_to_unsquashfs.patch
-	eapply -p2 "${debian}"/0016-remove-frag_deflator_thread.patch
-	eapply -p2 "${debian}"/0018-mksquashfs-fix-compressor-initialisation-in-frag_def.patch
-	eapply -p2 "${FILESDIR}"/${Pm}-sysmacros.patch
-	eapply -p2 "${FILESDIR}"/${Pm}-aligned-data.patch
-	eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch
-	eapply "${FILESDIR}"/${Pm}-static-inline.patch
-	eapply "${FILESDIR}"/${Pm}-smallstack.patch
-	default
-}
-
-use10() {
-	usex $1 1 0
-}
-
-src_configure() {
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 xz)
-		ZSTD_SUPPORT=$(use10 zstd)
-	)
-	filter-flags -fno-common
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}"
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs
-	cd ..
-	dodoc CHANGES README RELEASE-README ACKNOWLEDGEMENTS RELEASE-READMEs/*
-	doman "${WORKDIR}"/debian/manpages/*.[0-9]
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190706.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190706.ebuild
new file mode 100644
index 00000000..3abffadf
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.1_alpha20190706.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2019 Gentoo Authors and Martin V\"ath
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+LIVE=false
+PVm=4.3
+case ${PV} in
+*9999)
+	LIVE=:;;
+esac
+Pm=${PN}-${PVm}
+DEB_VER="12"
+
+DESCRIPTION="Tool for creating compressed filesystem type squashfs"
+HOMEPAGE="https://github.com/plougher/squashfs-tools/ https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git http://squashfs.sourceforge.net"
+EXTRA_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PVm}-${DEB_VER}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug lz4 lzma lzo static xattr +xz +zstd"
+
+LIB_DEPEND="sys-libs/zlib:=[static-libs(+)]
+	lz4? ( app-arch/lz4:=[static-libs(+)] )
+	lzma? ( app-arch/xz-utils:=[static-libs(+)] )
+	lzo? ( dev-libs/lzo:=[static-libs(+)] )
+	xattr? ( sys-apps/attr:=[static-libs(+)] )
+	xz? ( app-arch/xz-utils:=[static-libs(+)] )
+	zstd? ( >=app-arch/zstd-1.0:=[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+S="${WORKDIR}/squashfs${PV}/${PN}"
+
+if ${LIVE}; then
+	PROPERTIES="live"
+	EGIT_REPO_URI="https://github.com/plougher/${PN}"
+	inherit git-r3
+	SRC_URI=${EXTRA_URI}
+	KEYWORDS=""
+	S="${WORKDIR}/${P}/${PN}"
+src_unpack() {
+	default
+	git-r3_src_unpack
+}
+else
+	RESTRICT="mirror"
+	EGIT_COMMIT="04ce7e5f4f5a87e4b0fb8b8fa9b4287af2bffd07"
+	SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+${EXTRA_URI}"
+	S="${WORKDIR}/${P}/${PN}"
+src_unpack() {
+	default
+	mv -- "${WORKDIR}/${PN}-${EGIT_COMMIT}" "${WORKDIR}/${P}"
+}
+fi
+
+src_prepare() {
+	local debian
+	debian="${WORKDIR}"/debian/patches
+	eapply -p2 "${debian}"/0001-kfreebsd.patch
+	eapply -p2 "${debian}"/0003-CVE-2015-4645_and_CVE-2015-4646.patch
+	eapply -p2 "${debian}"/0004-unsquashfs-add-support-for-LZMA-magics.patch
+	eapply -p2 "${debian}"/0009-unsquashfs-preserve-symlink-times.patch
+	eapply -p2 "${debian}"/0013-use-macros-not-raw-octal-with-chmod.patch
+	eapply -p2 "${debian}"/0014-also-set-stickybit-as-non-root.patch
+	eapply -p2 "${debian}"/0015-numeric-uid-gid_to_unsquashfs.patch
+	eapply -p2 "${FILESDIR}"/${Pm}-sysmacros.patch
+	eapply -p2 "${FILESDIR}"/${Pm}-aligned-data.patch
+	eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch
+	eapply "${FILESDIR}"/${Pm}-smallstack.patch
+	default
+}
+
+use10() {
+	usex $1 1 0
+}
+
+src_configure() {
+	# set up make command line variables in EMAKE_SQUASHFS_CONF
+	EMAKE_SQUASHFS_CONF=(
+		LZMA_XZ_SUPPORT=$(use10 lzma)
+		LZO_SUPPORT=$(use10 lzo)
+		LZ4_SUPPORT=$(use10 lz4)
+		XATTR_SUPPORT=$(use10 xattr)
+		XZ_SUPPORT=$(use10 xz)
+		ZSTD_SUPPORT=$(use10 zstd)
+	)
+	filter-flags -fno-common
+
+	tc-export CC
+	use debug && append-cppflags -DSQUASHFS_TRACE
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	emake "${EMAKE_SQUASHFS_CONF[@]}"
+}
+
+src_install() {
+	dobin mksquashfs unsquashfs
+	cd ..
+	dodoc CHANGES README RELEASE-README ACKNOWLEDGEMENTS RELEASE-READMEs/*
+	doman "${WORKDIR}"/debian/manpages/*.[0-9]
+}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
index 9f8eb45c..3abffadf 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-99999999.ebuild
@@ -48,7 +48,7 @@ src_unpack() {
 }
 else
 	RESTRICT="mirror"
-	EGIT_COMMIT="832a7b9971053d4d741c3230f52e97afd250e956"
+	EGIT_COMMIT="04ce7e5f4f5a87e4b0fb8b8fa9b4287af2bffd07"
 	SRC_URI="https://github.com/plougher/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
 ${EXTRA_URI}"
 	S="${WORKDIR}/${P}/${PN}"
@@ -65,16 +65,12 @@ src_prepare() {
 	eapply -p2 "${debian}"/0003-CVE-2015-4645_and_CVE-2015-4646.patch
 	eapply -p2 "${debian}"/0004-unsquashfs-add-support-for-LZMA-magics.patch
 	eapply -p2 "${debian}"/0009-unsquashfs-preserve-symlink-times.patch
-	eapply -p2 "${debian}"/0010-fix_FTBFS_with_glibc_2.28.patch
 	eapply -p2 "${debian}"/0013-use-macros-not-raw-octal-with-chmod.patch
 	eapply -p2 "${debian}"/0014-also-set-stickybit-as-non-root.patch
 	eapply -p2 "${debian}"/0015-numeric-uid-gid_to_unsquashfs.patch
-	eapply -p2 "${debian}"/0016-remove-frag_deflator_thread.patch
-	eapply -p2 "${debian}"/0018-mksquashfs-fix-compressor-initialisation-in-frag_def.patch
 	eapply -p2 "${FILESDIR}"/${Pm}-sysmacros.patch
 	eapply -p2 "${FILESDIR}"/${Pm}-aligned-data.patch
 	eapply "${FILESDIR}"/${Pm}-local-cve-fix.patch
-	eapply "${FILESDIR}"/${Pm}-static-inline.patch
 	eapply "${FILESDIR}"/${Pm}-smallstack.patch
 	default
 }
-- 
cgit v1.2.3