gentoo resync : 29.08.2018

3 files changed, 2 insertions, 100 deletions

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