update partclone and correct bug in nvidia-docker

Signed-off-by: Samuel Bernardo <samuelbernardo.mail@gmail.com>

4 files changed, 163 insertions, 136 deletions

diff --git a/sys-block/partclone/Manifest b/sys-block/partclone/Manifest
index 6ffd7e7..85cd913 100644
--- a/sys-block/partclone/Manifest
+++ b/sys-block/partclone/Manifest
@@ -1,5 +1,5 @@
-DIST partclone-0.2.69.tar.gz 566531 SHA256 2248b1e0387e9d44c45be091dd3fb29e2f0d079f42023b713e6cc19b54587f55 SHA512 70c5056fe31fbe1099e0f9603efa35ea7729d1af9efab692493a8e3e93b64c4b23c69d943185c62b4574089ed1320aedf67b93fab93c212e048eaaefb0905847 WHIRLPOOL ae33f335e69d7eba1a85a741705fbb93f300da963a9c0871980d3c0971035692c1583f6bb3976ddb145d5d61315e2c0965d1be54bbc776544537d0984d5d8894
-DIST partclone-0.2.88.tar.gz 1024941 SHA256 01acaab3f8f7a393ed930cebec8a77623f6598cc26239a78240d2a48d8544f36 SHA512 f05480363ee5604b3e3ea7dbb28dbb3dbec9e4fbf8350f69c88be1392e84a7de248a9b786faa59bdcce2b82a16e7108c5cb9a37aa07a35cd5cf1d06d230a55f9 WHIRLPOOL bd36b6d4c3cf15b8dba1ad144bbc77d7a0bbec0a684c778ab58fc5478fd570d5558e474c5b57713fa7dd09d6d146bdc49fd5abe30eedd0ce4d803d4c615eb39e
-EBUILD partclone-0.2.69.ebuild 2270 SHA256 6904cea5e97259285b0aca68301a181db04828e4dc054a7293fc1a76dee23339 SHA512 d035e6ac4eef65f8368517530f8cab89b15c2dbc8d4ff4c35f0adf0421de70ce386baac4f3e44efb0a1e3f96a0dad7ae925407f00da2e10122732b0df243135c WHIRLPOOL eccbadcf8a54e52158341168b039a7d4860575515d85cca8e478806cf2347acb6c5b28eb6d0b09ff323e2236cd2ec7dd508728be2e0dede391c11cc33ad528b1
-EBUILD partclone-0.2.88.ebuild 2985 SHA256 810de8ac6f6946aee1bb56fd736bea83576d8af7fb080008773dffa86a542b2c SHA512 456c3dbd988a7b3675522eee1779002aff78ba4b3020efd60431b5dc58a05e5cd8d8221422e7c73a2a0c8c372f959f25ec796fb7661cdd9c470eabd929612e8d WHIRLPOOL ecad42015dbcb0bff753ab185058878d567a12f0c9d26c4e36154e410be149c94a62b726099259684eddf10213a59d51ebf8026939cb6c297076d185cf2c0a9e
-EBUILD partclone-9999.ebuild 1694 SHA256 3a15b1d5576b298c2ce0d1d38f3a973d1cf0c088d5494448e5d233cee79b0e11 SHA512 62158878ed0dd0dd8eb4023e79fbd45402b0202becfebd8c7b1a3affd35b383d20e57a16a5456d310c88fb6f621095218f2d54af3b6cc5589fd409e0c1469807 WHIRLPOOL 2b60ee28435936b8006dfecb3061986ead97acc55b6fa7187983ba241a00f77145862c72e7aec908ef71540e099fb30e48a330044dfef13fb922e82b4efbc6cd
+DIST partclone-0.2.88.tar.gz 1024941 BLAKE2B 5a67fb32631166c91c8ccc6f3733d8cf1f12a773fee2b42cd20f8fbd1de00ad43ba54473244929ca2bc64c528dd4ac0ef805401609b16c3d5811565e6ba42bd0 SHA512 f05480363ee5604b3e3ea7dbb28dbb3dbec9e4fbf8350f69c88be1392e84a7de248a9b786faa59bdcce2b82a16e7108c5cb9a37aa07a35cd5cf1d06d230a55f9
+DIST partclone-0.3.12.tar.gz 1066511 BLAKE2B f9778aea7b0804df98f5dbef821ebc626ebcad0981b9beef940c162f5c2d68ce94cee67df88ff3ff857a16c828d1658707b7d18d16f7ff25337ac0dd5ee122d8 SHA512 72ff450ab1ca9c30a5c2404cd2f92110ec298f1cfab79610cbcd5272ded72e8e9cb758a980f4d6d05f848dde9058753748bdb6616b2f9bf7c1742a3c65f19500
+EBUILD partclone-0.2.88.ebuild 2985 BLAKE2B ef4b3b087d10bf10e11048354db865c01d379b46ea92668d6185b674c6d111da09d8c1c6506f77f5d94e9caced602aacf372cf1cb81de54f02ac07837a833df1 SHA512 456c3dbd988a7b3675522eee1779002aff78ba4b3020efd60431b5dc58a05e5cd8d8221422e7c73a2a0c8c372f959f25ec796fb7661cdd9c470eabd929612e8d
+EBUILD partclone-0.3.12.ebuild 1962 BLAKE2B d1fa164e457c43215bca9d16745dc6a7ceec2d18f658428b1127c5c25271c2994dcd1ba362289bee0ce6c618fac0b2d8ee880744e7e1e316355f1bb402f24c1c SHA512 4e64de694f4889ae15c936591656b1c484b5591720138f0de472f122052def05919cd63be6a8949e1a5c3010ae776755bb75d4701f28bd22b13cf09c9e448721
+EBUILD partclone-9999.ebuild 1962 BLAKE2B d1fa164e457c43215bca9d16745dc6a7ceec2d18f658428b1127c5c25271c2994dcd1ba362289bee0ce6c618fac0b2d8ee880744e7e1e316355f1bb402f24c1c SHA512 4e64de694f4889ae15c936591656b1c484b5591720138f0de472f122052def05919cd63be6a8949e1a5c3010ae776755bb75d4701f28bd22b13cf09c9e448721
diff --git a/sys-block/partclone/partclone-0.2.69.ebuild b/sys-block/partclone/partclone-0.2.69.ebuild
deleted file mode 100644
index 39b4e3e..0000000
--- a/sys-block/partclone/partclone-0.2.69.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Partition cloning tool"
-HOMEPAGE="http://partclone.org"
-SRC_URI="http://sourceforge.net/projects/partclone/files/stable/${PV}/partclone_${PV}.orig.tar.gz/download -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="btrfs reiserfs reiser4 hfs fat minix ntfs jfs static vmfs xfs"
-
-# xfsprogs, see https://bugs.gentoo.org/show_bug.cgi?id=486514
-RDEPEND="${common_depends}
-	sys-fs/e2fsprogs
-	btrfs? ( sys-fs/btrfs-progs )
-	fat? ( sys-fs/dosfstools )
-	ntfs? ( sys-fs/ntfs3g )
-	hfs? ( sys-fs/hfsutils )
-	jfs? ( sys-fs/jfsutils )
-	reiserfs? ( sys-fs/progsreiserfs )
-	reiser4? ( sys-fs/reiser4progs )
-	xfs? ( >=sys-fs/xfsprogs-3.1.11-r1 )
-	static? ( sys-fs/e2fsprogs[static-libs]
-			sys-libs/e2fsprogs-libs[static-libs]
-			sys-fs/xfsprogs[static-libs]
-			sys-libs/ncurses[static-libs]
-			sys-fs/ntfs3g[static-libs]
-		)"
-DEPEND=""
-
-src_unpack()
-{
-	unpack ${A}
-	#epatch "${FILESDIR}/${PN}-xfslib.patch"
-	cd ${S}
-}
-
-src_compile() 
-{
-	local myconf
-	myconf="${myconf} --enable-extfs --enable-ncursesw --enable-fs-test"
-	use xfs && myconf="${myconf} --enable-xfs"
-	use reiserfs && myconf="${myconf} --enable-reiserfs"
-	use reiser4 && myconf="${myconf} --enable-reiser4"
-	use hfs && myconf="${myconf} --enable-hfsp"
-	use fat && myconf="${myconf} --enable-fat --enable-exfat"
-	use ntfs && myconf="${myconf} --enable-ntfs"
-	use minix && myconf="${myconf} --enable-minix"
-	use jfs && myconf="${myconf} --enable-jfs"
-	use btrfs && myconf="${myconf} --enable-btrfs"
-	use vmfs && myconf="${myconf} --enable-vmfs"
-	use static && myconf="${myconf} --enable-static"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install()
-{
-	#emake install || die "make install failed"
-	#emake DIST_ROOT="${D}" install || die "make install failed"
-	cd ${S}/src
-	dosbin partclone.dd partclone.restore partclone.chkimg
-	dosbin partclone.extfs
-	use xfs && dosbin partclone.xfs
-	use reiserfs && dosbin partclone.reiserfs
-	use reiser4 && dosbin partclone.reiser4
-	use hfs && dosbin partclone.hfsp
-	use fat && dosbin partclone.fat
-	use ntfs && dosbin partclone.ntfs
-	use ntfs && dosbin partclone.ntfsfixboot
-}
-
diff --git a/sys-block/partclone/partclone-0.3.12.ebuild b/sys-block/partclone/partclone-0.3.12.ebuild
new file mode 100644
index 0000000..f551aa5
--- /dev/null
+++ b/sys-block/partclone/partclone-0.3.12.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+if [[ -z ${PV%%*9999} ]]; then
+	EGIT_REPO_URI="https://github.com/Thomas-Tsai/${PN}.git"
+	inherit git-r3
+else
+	inherit vcs-snapshot
+	MY_PV="5e00059"
+	[[ -n ${PV%%*_p*} ]] && MY_PV="${PV}"
+	SRC_URI="
+		mirror://githubcl/Thomas-Tsai/${PN}/tar.gz/${MY_PV} -> ${P}.tar.gz
+	"
+	RESTRICT="primaryuri"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Partition cloning tool"
+HOMEPAGE="https://partclone.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="
+apfs btrfs +e2fs exfat f2fs fat fuse hfs minix ncurses nilfs2 ntfs reiser4
+reiserfs static xfs
+"
+
+RDEPEND="
+	dev-libs/openssl:*
+	e2fs? ( sys-fs/e2fsprogs )
+	btrfs? ( sys-apps/util-linux )
+	fuse? ( sys-fs/fuse:0 )
+	ncurses? ( sys-libs/ncurses:0 )
+	nilfs2? ( sys-fs/nilfs-utils )
+	ntfs? ( sys-fs/ntfs3g )
+	reiserfs? ( sys-fs/progsreiserfs )
+	reiser4? ( sys-fs/reiser4progs )
+	xfs? ( sys-apps/util-linux )
+	static? (
+		dev-libs/openssl:*[static-libs]
+		e2fs? (
+			sys-fs/e2fsprogs[static-libs]
+			sys-libs/e2fsprogs-libs[static-libs]
+		)
+		btrfs? ( sys-apps/util-linux[static-libs] )
+		fuse? ( sys-fs/fuse:0[static-libs] )
+		ncurses? ( sys-libs/ncurses:0[static-libs] )
+		nilfs2? ( sys-fs/nilfs-utils[static-libs] )
+		ntfs? ( sys-fs/ntfs3g[static-libs] )
+		reiserfs? ( sys-fs/progsreiserfs[static-libs] )
+		reiser4? ( sys-fs/reiser4progs[static-libs] )
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( AUTHORS ChangeLog HACKING NEWS README.md TODO )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable e2fs extfs)
+		$(use_enable apfs)
+		$(use_enable btrfs)
+		$(use_enable exfat)
+		$(use_enable f2fs)
+		$(use_enable fat)
+		$(use_enable fuse)
+		$(use_enable hfs hfsp)
+		$(use_enable minix)
+		$(use_enable ncurses ncursesw)
+		$(use_enable nilfs2)
+		$(use_enable ntfs)
+		$(use_enable reiserfs)
+		$(use_enable reiser4)
+		$(use_enable static)
+		$(use_enable xfs)
+	)
+	econf "${myconf[@]}"
+}
diff --git a/sys-block/partclone/partclone-9999.ebuild b/sys-block/partclone/partclone-9999.ebuild
index 18d7537..f551aa5 100644
--- a/sys-block/partclone/partclone-9999.ebuild
+++ b/sys-block/partclone/partclone-9999.ebuild
@@ -1,68 +1,87 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools
+if [[ -z ${PV%%*9999} ]]; then
+	EGIT_REPO_URI="https://github.com/Thomas-Tsai/${PN}.git"
+	inherit git-r3
+else
+	inherit vcs-snapshot
+	MY_PV="5e00059"
+	[[ -n ${PV%%*_p*} ]] && MY_PV="${PV}"
+	SRC_URI="
+		mirror://githubcl/Thomas-Tsai/${PN}/tar.gz/${MY_PV} -> ${P}.tar.gz
+	"
+	RESTRICT="primaryuri"
+	KEYWORDS="~amd64 ~x86"
+fi
 
-inherit autotools-utils git-2
-
-DESCRIPTION="Back up and restore used-blocks of a partition"
-HOMEPAGE="http://partclone.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/Thomas-Tsai/partclone"
-EGIT_BRANCH="release"
+DESCRIPTION="Partition cloning tool"
+HOMEPAGE="https://partclone.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="+extfs +fat exfat hfsp jfs +ntfs reiserfs reiser4 ufs xfs f2fs nilfs2 minix vmfs btrfs"
+IUSE="
+apfs btrfs +e2fs exfat f2fs fat fuse hfs minix ncurses nilfs2 ntfs reiser4
+reiserfs static xfs
+"
 
-DEPEND="reiserfs? ( sys-fs/progsreiserfs )
-	exfat? ( sys-fs/exfat-utils )
+RDEPEND="
+	dev-libs/openssl:*
+	e2fs? ( sys-fs/e2fsprogs )
+	btrfs? ( sys-apps/util-linux )
+	fuse? ( sys-fs/fuse:0 )
+	ncurses? ( sys-libs/ncurses:0 )
+	nilfs2? ( sys-fs/nilfs-utils )
 	ntfs? ( sys-fs/ntfs3g )
-	extfs? ( sys-libs/e2fsprogs-libs )
-	reiser4? ( sys-fs/reiser4progs )
 	reiserfs? ( sys-fs/progsreiserfs )
-	xfs? ( sys-fs/xfsprogs )
-	ufs? ( sys-fs/ufsutils )
-	jfs? ( sys-fs/jfsutils )
-	btrfs? ( sys-fs/btrfs-progs )
-	nilfs2? ( >=sys-fs/nilfs-utils-2.1.5-r1 )
-	f2fs? ( >=sys-libs/e2fsprogs-libs-1.42.13 )"
-	# sys-libs/ncurses[tinfo]
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-my_use_enable() {
-	use $1 && echo --enable-$1
-}
+	reiser4? ( sys-fs/reiser4progs )
+	xfs? ( sys-apps/util-linux )
+	static? (
+		dev-libs/openssl:*[static-libs]
+		e2fs? (
+			sys-fs/e2fsprogs[static-libs]
+			sys-libs/e2fsprogs-libs[static-libs]
+		)
+		btrfs? ( sys-apps/util-linux[static-libs] )
+		fuse? ( sys-fs/fuse:0[static-libs] )
+		ncurses? ( sys-libs/ncurses:0[static-libs] )
+		nilfs2? ( sys-fs/nilfs-utils[static-libs] )
+		ntfs? ( sys-fs/ntfs3g[static-libs] )
+		reiserfs? ( sys-fs/progsreiserfs[static-libs] )
+		reiser4? ( sys-fs/reiser4progs[static-libs] )
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( AUTHORS ChangeLog HACKING NEWS README.md TODO )
 
 src_prepare() {
-	sed -i '/SUBDIRS/s/tests//' "${S}/Makefile.am" || die
-	sed -i 's/sizeof(badsector_magic)/(strlen(badsector_magic) + 1)/' "${S}/src/partclone.c" || die
-	autotools-utils_src_prepare
+	default
+	eautoreconf
 }
 
 src_configure() {
-	local myeconfargs=(
-		$(my_use_enable extfs)
-		$(my_use_enable fat)
-		$(my_use_enable hfsp)
-		$(my_use_enable jfs)
-		$(my_use_enable ntfs)
-		$(my_use_enable reiserfs)
-		$(my_use_enable reiser4)
-		$(my_use_enable ufs)
-		$(my_use_enable xfs)
-		$(my_use_enable f2fs)
-		$(my_use_enable nilfs2)
-		$(my_use_enable minix)
-		$(my_use_enable vmfs)
-		$(my_use_enable btrfs)
-		)
-	autotools-utils_src_configure
+	local myconf=(
+		$(use_enable e2fs extfs)
+		$(use_enable apfs)
+		$(use_enable btrfs)
+		$(use_enable exfat)
+		$(use_enable f2fs)
+		$(use_enable fat)
+		$(use_enable fuse)
+		$(use_enable hfs hfsp)
+		$(use_enable minix)
+		$(use_enable ncurses ncursesw)
+		$(use_enable nilfs2)
+		$(use_enable ntfs)
+		$(use_enable reiserfs)
+		$(use_enable reiser4)
+		$(use_enable static)
+		$(use_enable xfs)
+	)
+	econf "${myconf[@]}"
 }