gentoo resync : 29.08.2018

9 files changed, 10 insertions, 121 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index fd36678c3f28..ad7738f2f56d 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index 89a3864658b8..50a7e902ece2 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,4 +1,4 @@
 DIST dislocker-0.7.1.tar.gz 103194 BLAKE2B 05421b0d3e7686480e40a41e67086017c454b76e0852fef78a7b5d10134cf388b4bf7b9669d87b867418f4c074cc023ea9b0260dbdbc837322d04f217aa40b28 SHA512 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226
-EBUILD dislocker-0.7.1-r1.ebuild 1216 BLAKE2B 731292c36953f9094a48f90e9e4510d174804269a1ddc81f15e34fed77a8fca73e8ef32e3bcec0dbd43ed6dee741160155ab2e6118f6985c5ae79016eb8ef64c SHA512 584dc19550c0f3bb4d1fcd456478562cd8c6e74ce7c46ced408a196e7f3a4c9d07236c12b440221060447b9e54031d583e0c2337a57b32d3c4e34218a5a9ba24
-EBUILD dislocker-9999.ebuild 1216 BLAKE2B 731292c36953f9094a48f90e9e4510d174804269a1ddc81f15e34fed77a8fca73e8ef32e3bcec0dbd43ed6dee741160155ab2e6118f6985c5ae79016eb8ef64c SHA512 584dc19550c0f3bb4d1fcd456478562cd8c6e74ce7c46ced408a196e7f3a4c9d07236c12b440221060447b9e54031d583e0c2337a57b32d3c4e34218a5a9ba24
+EBUILD dislocker-0.7.1-r1.ebuild 1191 BLAKE2B f79cb810f7911e23d3aeb3c171aa3f2e7a2d2f4d591123efcde5dd47ec531945f6b61c4590073fe145518751b1cecd77d4a1af1929ef074af6ed1b3e1e299506 SHA512 70f2be9bceef29bd0e3f7b02a57314d8039263605cf8befe26fc4ef4f0415ce525c966ab38b0def3049f1a535d28a2c3d3d777f69f85fcbf71377b3d03d01006
+EBUILD dislocker-9999.ebuild 1191 BLAKE2B f79cb810f7911e23d3aeb3c171aa3f2e7a2d2f4d591123efcde5dd47ec531945f6b61c4590073fe145518751b1cecd77d4a1af1929ef074af6ed1b3e1e299506 SHA512 70f2be9bceef29bd0e3f7b02a57314d8039263605cf8befe26fc4ef4f0415ce525c966ab38b0def3049f1a535d28a2c3d3d777f69f85fcbf71377b3d03d01006
 MISC metadata.xml 343 BLAKE2B edbbbf3c98bb40a48d9b39f6fbe579a306f44539eb9415585c3e8045f4bfa2c2b7864be18313f2dd50aa73c14aacb5e446d4eb94f4c7116a7c0407ec651f3d02 SHA512 479da4294232d9c49530e2ed2c936c824c697b08d722309addb64bc77dd083365b0d4ce063dd331e4dbd13a0185885dca7bf5d62a6a09dfc6e7a38fd7e25f448
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
index 7c81c7f8a1ce..6c245bbb7f6c 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="ruby"
 
 DEPEND="sys-fs/fuse:*
 	net-libs/mbedtls
-	ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) )"
+	ruby? ( dev-lang/ruby:2.3 )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index 7c81c7f8a1ce..6c245bbb7f6c 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -22,7 +22,7 @@ IUSE="ruby"
 
 DEPEND="sys-fs/fuse:*
 	net-libs/mbedtls
-	ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) )"
+	ruby? ( dev-lang/ruby:2.3 )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/sys-fs/fuse4bsd/Manifest b/sys-fs/fuse4bsd/Manifest
index 8b0d488622d5..4e6b0fb76a03 100644
--- a/sys-fs/fuse4bsd/Manifest
+++ b/sys-fs/fuse4bsd/Manifest
@@ -2,5 +2,5 @@ AUX fuse4bsd-0.3.9_pre1-fbsd91.patch 508 BLAKE2B c8b61e8cb6a4337657a6ae4c1d25d38
 AUX fuse4bsd-0.3.9_pre1-ports.patch 12209 BLAKE2B 2a0bfd4c2028b30d82d82787b1a444302d2a89f14cf68ccc33f20694bd27ae0ff07488401bf99eae424cbbbfb291ea5f4e5e0dff2c505d9e57dc44f7738f683b SHA512 0d149e517bfa2b0260e86bda7f1d3f06c6328dd1803f72a1e823e91bb596e5f0a0bcf4fd00a70f574935eb96c515049001d8e7c42bc0893d81fb2e371fcef67c
 DIST 498acaef33b0.tar.gz 116035 BLAKE2B f5f7b3ded2e65422c9df771a62590e71803884ac8fbba5aabc67d1ddf7e2309e4b20d37ae43a64ca0ce46100963e68c57131c263291d0f747fe849ed65b05c0e SHA512 6427d888cea5b1519c4ae92ec8ec640535692c59dd8ca987a32574050239c9ff4cb92a4cf6b34f3c1363becdd9fd75c031f5db4bda34b298898466066740845a
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
-EBUILD fuse4bsd-0.3.9_pre1.ebuild 1880 BLAKE2B cb84caa4d1beec93af3e9c43dfb0ae7532bbf2743f6c525acd744e6ea0f1ae024abcf1ff51b42128454151dafc464d6d3c1add6ca335069dd6332657bd2f058e SHA512 3ef2aabe3fbdaee4dbd8fff11434101cb0759025f9e90146b3d9dae2bd37e8e239f000b3819de0f9878015963aa31e248f67539326362ea8c4a534878d2b6730
+EBUILD fuse4bsd-0.3.9_pre1.ebuild 1562 BLAKE2B 2ef815e85053f87657db41ffc390d580cfe543855a29e5b5d59490b014c813e927142b302980c620cd8f5a23b34fa10a9c341ba1b311ef3226fb0fdf2db84658 SHA512 3db2aac1a7b08d310752458e1be3724c3ded4d504768d0853ae0b3505cba0cb0a5ac0b0ba0d095a87ca41580ba034c073540edaa3fdf600b7a2ca05b776c2847
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-fs/fuse4bsd/fuse4bsd-0.3.9_pre1.ebuild b/sys-fs/fuse4bsd/fuse4bsd-0.3.9_pre1.ebuild
index 7b0dbafe770a..93edde20b245 100644
--- a/sys-fs/fuse4bsd/fuse4bsd-0.3.9_pre1.ebuild
+++ b/sys-fs/fuse4bsd/fuse4bsd-0.3.9_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,11 +16,10 @@ S="${WORKDIR}/fuse4bsd-498acaef33b0"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86-fbsd"
-IUSE="doc"
+IUSE=""
 
 DEPEND=">=sys-freebsd/freebsd-sources-9.1
-	virtual/pmake
-	doc? ( app-text/deplate )"
+	virtual/pmake"
 RDEPEND="sys-fs/fuse"
 
 QA_TEXTRELS="boot/modules/fuse.ko"
@@ -30,8 +29,6 @@ src_prepare() {
 	cp "${WORKDIR}/sbin/mount/getmntopts.c" mount_fusefs/ || die
 	epatch "${FILESDIR}"/${P}-ports.patch
 	epatch "${FILESDIR}"/${P}-fbsd91.patch
-	sed -i -e "s:^DEPLATE=.*:DEPLATE=${EPREFIX}/usr/bin/deplate:" \
-		doc/Makefile || die
 }
 
 src_compile() {
@@ -48,11 +45,6 @@ src_compile() {
 		KMODDIR=/boot/modules BINDIR=/usr/sbin MANDIR=/usr/share/man/man \
 		MOUNT="${WORKDIR}/sbin/mount" \
 		|| die "$(get_bmake) failed"
-
-	if use doc; then
-		cd "${S}"/doc
-		$(get_bmake) all || die "$(get_bmake) failed"
-	fi
 }
 
 src_install() {
@@ -63,9 +55,4 @@ src_install() {
 		|| die "$(get_bmake) failed"
 
 	dodoc doc/{CREDITS,README}
-	if use doc; then
-		dodoc doc/plaintext_out/* doc/pdf_out/*.pdf
-		docinto html
-		dodoc doc/html_chunked_out/*
-	fi
 }
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index e86271d0e271..23f839254fc1 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -4,11 +4,9 @@ AUX xfsprogs-4.15.0-sharedlibs.patch 3022 BLAKE2B cfa23520a55750af375ada8c35fb9f
 AUX xfsprogs-4.7.0-libxcmd-link.patch 880 BLAKE2B 5c9911aed7bd1579d17aac75f74ff41221e9e7c1d1c2139af4785d570ac612bb338cdcfa246ba690a60a2244ad14d7aa4885bf3d1306cecbf9326c2ff048604f SHA512 4484570c4bb387b6dfde5f31d8527f2222d33e120c365e3cbc6f488403b9e9d969d3f2a883ffcb145a11d57ace70c76fb1ba4a8ed75533f2089a197d463c8dd9
 AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7
 DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506
-DIST xfsprogs-4.15.1.tar.xz 1188964 BLAKE2B 7b4d1d2f71a0678f9246045e576262d6f3b3c59322e0b33b37dc46d84cdf5407a4b2fd6f2b99dd7647e9bfe9fe312fefe8162013dec9162f3a071421323aa52d SHA512 4ec3f0438f33322f0ff6e5acb27cbb554ab48df3ae0ef11071992b085016f84b49ca7bdbaf3a6859427877ea9c419bcd37ac3058914d67409ba2d65e586508ee
-DIST xfsprogs-4.16.1.tar.xz 1199632 BLAKE2B 26448ce8ec691d117c0b41aebcb692994ad5a65418ac5af9631eab75191201a265ec9bce92d4076049a4182a879741329f20e5f54343afeef826cf1dfbfcf0d1 SHA512 d3cf3b07e07864341c351a078736ff7c721d86c177e65f131dc6e023cade74a5e07fecbc435d69946d76d587b138e66cddcd763954e15ed0dd17c056a83e2a19
 DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e SHA512 996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400
+DIST xfsprogs-4.18.0.tar.xz 1214480 BLAKE2B 78db41319e53be1f03b66f85ecc7c50e0c6658fa3fd8ddd8539bac04e656614a5cb54dc930a324d9df6afe4024c2be10259b903e1ca0ccd0ffb340e7410692c2 SHA512 0629400f8824620138928a7d72908b7a852408814238a55e11d6eb3b2da42cd56273960430d3ea729a9bce95f605d225607940d4728b68c468c39eb5a9a590be
 EBUILD xfsprogs-4.14.0.ebuild 2655 BLAKE2B 8aa62f0b2a4aecaebf4842edf8c636f0dddee92b2635ff8355f26e6cd95ff5b328e613e325463cb3dc22d1a7dad376b0ff3ef8840da0bfa9e9dbf775ee8a7d9d SHA512 a9bd435a3d8ec8f6ca2c3b1408cff7eb5c8f5bfeba876d4fad81c7ec6bf1f2cb35c2380badea5fc556ac386f933c8764521cfa35fa5c8ce5e2cd2f3bec57bd22
-EBUILD xfsprogs-4.15.1.ebuild 2774 BLAKE2B f043cc030b481eec290acca613349ade3157a44f54225fb023d14f0e1e87fd65513250c2fcfafa14dbaa11a7d03243020ea63a7353a3c960374bd4b0a558b062 SHA512 b4f44545aa76cd46f2011dac25c021a4925edf6a03e5abbdaed98eae5d254eeb0b3c0d01e114300ea1b0a40c6005f88c3f50205b154bdd4f41fe75f82baa91fb
-EBUILD xfsprogs-4.16.1-r1.ebuild 2887 BLAKE2B e17dfa5a76155525edf9a5bfae7ddf2d869a8c16a846bc5e2db122c327b3214a9ce59b91429eed89f5cc179fe7549c796933640ac85c8072dc97e40037068f39 SHA512 8599b45f034314a0e9f48e97551bf4d8efbbc50aa2b72a86975ee5788362c507d904b45a69eeacc9b31eabbe80177f0d7ed7d3600de6c9024519dd7ea5da48c6
 EBUILD xfsprogs-4.17.0-r1.ebuild 2887 BLAKE2B e17dfa5a76155525edf9a5bfae7ddf2d869a8c16a846bc5e2db122c327b3214a9ce59b91429eed89f5cc179fe7549c796933640ac85c8072dc97e40037068f39 SHA512 8599b45f034314a0e9f48e97551bf4d8efbbc50aa2b72a86975ee5788362c507d904b45a69eeacc9b31eabbe80177f0d7ed7d3600de6c9024519dd7ea5da48c6
+EBUILD xfsprogs-4.18.0.ebuild 2887 BLAKE2B e17dfa5a76155525edf9a5bfae7ddf2d869a8c16a846bc5e2db122c327b3214a9ce59b91429eed89f5cc179fe7549c796933640ac85c8072dc97e40037068f39 SHA512 8599b45f034314a0e9f48e97551bf4d8efbbc50aa2b72a86975ee5788362c507d904b45a69eeacc9b31eabbe80177f0d7ed7d3600de6c9024519dd7ea5da48c6
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild
deleted file mode 100644
index 4ea572db8e0f..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-4.15.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib systemd
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	readline? ( sys-libs/readline:0=[static-libs(+)] )
-	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	static? (
-		${LIB_DEPEND}
-		readline? ( sys-libs/ncurses:0=[static-libs] )
-	)
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
-	"${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
-	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
-)
-
-pkg_setup() {
-	if use readline && use libedit ; then
-		ewarn "You have USE='readline libedit' but these are exclusive."
-		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# LLDFLAGS is used for programs, so apply -all-static when USE=static is enabled.
-	# Clear out -static from all flags since we want to link against dynamic xfs libs.
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e "1iLLDFLAGS += $(usex static '-all-static' '')" \
-		include/builddefs.in || die
-	find -name Makefile -exec \
-		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-
-	# TODO: Write a patch for configure.ac to use pkg-config for the uuid-part.
-	if use static && use readline ; then
-		sed -i \
-			-e 's|-lreadline|& -lncurses|' \
-			-e 's|-lblkid|& -luuid|' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-
-	local myconf=(
-		--with-crond-dir="${EPREFIX}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		$(use_enable nls gettext)
-		$(use_enable readline)
-		$(usex readline --disable-editline $(use_enable libedit editline))
-	)
-	if use static || use static-libs ; then
-		myconf+=( --enable-static )
-	else
-		myconf+=( --disable-static )
-	fi
-
-	econf "${myconf[@]}"
-
-	MAKEOPTS+=" V=1"
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install
-	# parallel install fails on this target for >=xfsprogs-3.2.0
-	emake -j1 DIST_ROOT="${ED}" install-dev
-
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a handle xcmd xfs xlog frog
-	# removing unnecessary .la files if not needed
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-4.16.1-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.18.0.ebuild
index 273db91aea0b..273db91aea0b 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.16.1-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.18.0.ebuild