[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2024-04-17 Thread Sam James 
commit: c073d0c3b74d459d90f786662e44b28203c1131c
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 17 23:02:10 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 17 23:02:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c073d0c3

sys-fs/xfsprogs: add 6.7.0

Signed-off-by: Sam James  gentoo.org>

 sys-fs/xfsprogs/Manifest   |   1 +
 .../files/xfsprogs-6.7.0-fix-porting-to-6.7.patch  | 157 +
 sys-fs/xfsprogs/xfsprogs-6.7.0.ebuild  | 100 +
 3 files changed, 258 insertions(+)

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index c3982fdd5599..5371f002e574 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,2 +1,3 @@
 DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 
566a80a1fa90520c6cc2b20c8e8cde41eb83a48f0b6d4a978f9e5d43960e99b54cab3e0c2cd4147a3d8f4944e50876063fc571441c8239d6deaaa01604843a6b
 SHA512 
831e7747640bc2964b182226d8bb6f637610b123aeec9b3cb97a5de5d5b65bde30c6b40ad2e78de6a5214e823dd75de3a2bdfddd8ab1638f5c7340a760c91b3f
 DIST xfsprogs-6.6.0.tar.xz 1351792 BLAKE2B 
a479126ed19389c057af28ac3564893826a6d27859984cfadb28b17663759d8f19b1796031d43f294bf8001f5ddda8854b6b0d90d0229092bd31fbdf6e5d1554
 SHA512 
89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da
+DIST xfsprogs-6.7.0.tar.xz 1349748 BLAKE2B 
e16db682cafbd35266e9130a64943c19304174ebd501e30aa32fb8f0d1904286ccdef62c0820480541c7272575d770eea7e73e7dc83c0b452eb5fb2a3a7085ca
 SHA512 
4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74

diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch 
b/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch
new file mode 100644
index ..fcc30d170a8c
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch
@@ -0,0 +1,157 @@
+https://lore.kernel.org/linux-xfs/171142126323.2211955.1239989461209318080.stgit@frogsfrogsfrogs/
+
+From mboxrd@z Thu Jan  1 00:00:00 1970
+Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org 
[10.30.226.201])
+   (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+   (No client certificate requested)
+   by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80EBA128387
+   for ; Tue, 26 Mar 2024 02:59:42 + (UTC)
+Authentication-Results: smtp.subspace.kernel.org; arc=none 
smtp.client-ip=10.30.226.201
+ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
+   t=1711421982; cv=none; 
b=BWaXePO42YIrz9dUA7DXc3SL5MWIoC+liDfJkd/1AM/cv7gR6JRGHa5e5W3sXZFsI6S6pH/fKSEijUigTR0kiRGPFWbeCiDWEGQdq6y4AChFbZMTfQSg4Jei7pONholMK08CyBQ/K4UutICyqbos2cdxAGKKjNPTIOtdQdkiHdc=
+ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
+   s=arc-20240116; t=1711421982; c=relaxed/simple;
+   bh=qfMP8tvVLZAoDkRmqI3ZwhMEx6csbe2+Xclngz+n+GI=;
+   h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References:
+MIME-Version:Content-Type; 
b=O5h4CVWF9TsE/Yho55MGUjmR7zhvoPO0EhXK59BWm/HSUFB3D7vD+ozThDlpENzz0iLrKzdR6aPYBS78cRpOzAszO4ZnMf0HPbFlLmlsIHK/ha5XFPO2qrmLgOGUkKKZepgXIROIA9knDYpxuvlWHnOptPf9birJvyR0gztAEyw=
+ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit 
key) header.d=kernel.org header.i=@kernel.org header.b=dkgsPgmY; arc=none 
smtp.client-ip=10.30.226.201
+Authentication-Results: smtp.subspace.kernel.org;
+   dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org 
header.b="dkgsPgmY"
+Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A482C433C7;
+   Tue, 26 Mar 2024 02:59:42 + (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
+   s=k20201202; t=1711421982;
+   bh=qfMP8tvVLZAoDkRmqI3ZwhMEx6csbe2+Xclngz+n+GI=;
+   h=Date:Subject:From:To:Cc:In-Reply-To:References:From;
+   b=dkgsPgmYjqxxC1yEflpaDSaicJ6J1MpL6wH2GNkbwb7jHMXma/nM8+TuJ7ITuHQGY
+WXTMKAQFvTq29s+IWJaQZtuCfgH6cDQ3JTkRcjvg/OgSTo0X+aqxadBBnAjO4AP5/P
+hX4gszw3hlZ8oDjMvW9Wl6nLyDmR82rshZOTF4hZfQ8mkbU3Vzcsg2QiPQQzzKgfon
+3c/GxXIQ7V2jg37MBrPpNRYPvqBXWn1X/EkR0wuFiUtw9fTJ6Wyt0Vr6/vemAf2U+S
+gwHkISopsTOE3k8cCYYf7LXqmtU3PLOOqWBDol6TkWe6OgIOMSljoytIkFq1up/zhz
+LHrtnfD5yRlLg==
+Date: Mon, 25 Mar 2024 19:59:41 -0700
+Subject: [PATCH 01/13] libxfs: fix incorrect porting to 6.7
+From: "Darrick J. Wong" 
+To: c...@kernel.org, djw...@kernel.org
+Cc: Christoph Hellwig , Bill O'Donnell ,
+ linux-...@vger.kernel.org
+Message-ID: <171142126323.2211955.1239989461209318080.stgit@frogsfrogsfrogs>
+In-Reply-To: <171142126291.2211955.14829143192552278353.stgit@frogsfrogsfrogs>
+References: <171142126291.2211955.14829143192552278353.stgit@frogsfrogsfrogs>
+User-Agent: StGit/0.19
+Precedence: bulk
+X-Mailing-List: linux-...@vger.kernel.org
+List-Id: 
+List-Subscribe:

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2024-02-05 Thread Sam James 
commit: d64e0a8bf2551bcd233b11faca7cc49d01b10bc2
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  5 23:27:53 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  5 23:28:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d64e0a8b

sys-fs/xfsprogs: add 6.6.0

Closes: https://bugs.gentoo.org/907039
Signed-off-by: Sam James  gentoo.org>

 sys-fs/xfsprogs/Manifest   |   1 +
 .../0001-Remove-use-of-LFS64-interfaces.patch  | 652 +
 .../files/0002-io-Adapt-to-64-bit-time_t.patch |  37 ++
 ...uild-Request-64-bit-time_t-where-possible.patch |  31 +
 sys-fs/xfsprogs/xfsprogs-6.6.0.ebuild  | 100 
 5 files changed, 821 insertions(+)

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 2e91e41c605e..c87fd8809494 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,3 +1,4 @@
 DIST xfsprogs-6.3.0.tar.xz 1328452 BLAKE2B 
47a4ec45c88f26b32debd52283602d8244f996c071853b6bf7cf905f917436b1324bc9b58338346c8255201629d69e771d6c3bfd81f33f4f3c3907251d0a6c8c
 SHA512 
dbb3e77d0d9cf184a0e647b8231350401a7549a23a0bfd9121cf2a1b48e85f71d98329dff440fc6e984bcecfdcc2a72f0f27c4989560f3c55359f21f3fb434bb
 DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 
566a80a1fa90520c6cc2b20c8e8cde41eb83a48f0b6d4a978f9e5d43960e99b54cab3e0c2cd4147a3d8f4944e50876063fc571441c8239d6deaaa01604843a6b
 SHA512 
831e7747640bc2964b182226d8bb6f637610b123aeec9b3cb97a5de5d5b65bde30c6b40ad2e78de6a5214e823dd75de3a2bdfddd8ab1638f5c7340a760c91b3f
 DIST xfsprogs-6.5.0.tar.xz 1348452 BLAKE2B 
40d578bf5bf3da93c608d2a1c5af02f0ac3a99c695b8003f684b75ce01b8d89dc197620e724e5461da174e050068c352eff622e970ea748e53685ab942cc2e92
 SHA512 
0a2db9c3df8209b2b6d264b7ef87f4c101f5129dfa14cb09159dbef181c09508fa8460eb1f4293300f24696ce236ca49065e47068cebdee00ee8ab9e2b75211c
+DIST xfsprogs-6.6.0.tar.xz 1351792 BLAKE2B 
a479126ed19389c057af28ac3564893826a6d27859984cfadb28b17663759d8f19b1796031d43f294bf8001f5ddda8854b6b0d90d0229092bd31fbdf6e5d1554
 SHA512 
89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da

diff --git a/sys-fs/xfsprogs/files/0001-Remove-use-of-LFS64-interfaces.patch 
b/sys-fs/xfsprogs/files/0001-Remove-use-of-LFS64-interfaces.patch
new file mode 100644
index ..a0b32f714d9c
--- /dev/null
+++ b/sys-fs/xfsprogs/files/0001-Remove-use-of-LFS64-interfaces.patch
@@ -0,0 +1,652 @@
+https://lore.kernel.org/linux-xfs/20240205232343.2162947-1-...@gentoo.org/
+
+From a162f061dc8c2145ae006461d661a03e986c4bf7 Mon Sep 17 00:00:00 2001
+From: Violet Purcell 
+Date: Sat, 22 Jul 2023 21:12:59 -0400
+Subject: [PATCH 1/3] Remove use of LFS64 interfaces
+
+LFS64 interfaces are non-standard and are being removed in the upcoming musl
+1.2.5. Setting _FILE_OFFSET_BITS=64 (which is currently being done) makes all
+interfaces on glibc 64-bit by default, so using the LFS64 interfaces is
+redundant. This commit replaces all occurences of off64_t with off_t,
+stat64 with stat, and fstat64 with fstat.
+
+Link: https://bugs.gentoo.org/907039
+Cc: Felix Janda 
+Reviewed-by: Darrick J. Wong 
+Reviewed-by: Christoph Hellwig 
+Signed-off-by: Violet Purcell 
+Signed-off-by: Sam James 
+--- a/copy/xfs_copy.c
 b/copy/xfs_copy.c
+@@ -881,7 +881,7 @@ main(int argc, char **argv)
+   }
+   } else  {
+   char*lb = memalign(wbuf_align, XFS_MAX_SECTORSIZE);
+-  off64_t off;
++  off_t   off;
+   ssize_t len;
+ 
+   /* ensure device files are sufficiently large */
+--- a/fsr/xfs_fsr.c
 b/fsr/xfs_fsr.c
+@@ -1148,7 +1148,7 @@ packfile(char *fname, char *tname, int fd,
+   struct dioattr  dio;
+   static xfs_swapext_t   sx;
+   struct xfs_flock64  space;
+-  off64_t cnt, pos;
++  off_t   cnt, pos;
+   void*fbuf = NULL;
+   int ct, wc, wc_b4;
+   charffname[SMBUFSZ];
+--- a/io/bmap.c
 b/io/bmap.c
+@@ -257,7 +257,7 @@ bmap_f(
+ #define   FLG_BSW 010 /* Not on begin of stripe width */
+ #define   FLG_ESW 001 /* Not on end   of stripe width */
+   int agno;
+-  off64_t agoff, bbperag;
++  off_t agoff, bbperag;
+   int foff_w, boff_w, aoff_w, tot_w, agno_w;
+   charrbuf[32], bbuf[32], abuf[32];
+   int sunit, swidth;
+@@ -267,8 +267,8 @@ bmap_f(
+   if (is_rt)
+   sunit = swidth = bbperag = 0;
+   else {
+-  bbperag = (off64_t)fsgeo.agblocks *
+-(off64_t)fsgeo.blocksize / BBSIZE;
++  bbperag = (off_t)fsgeo.agblocks *
++(off_t)fsgeo.blocksize / BBSIZE;
+   sunit = (fsgeo.sunit *

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2023-06-26 Thread David Seifert 
commit: 751f7a13042434b58b3d9bb5930f6bc64e91e50b
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jun 26 09:12:37 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jun 26 09:12:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=751f7a13

sys-fs/xfsprogs: fix gettext 0.22 breakage

* gettext-0.22 validates format strings now:
  https://savannah.gnu.org/bugs/index.php?64332#comment1

Closes: https://bugs.gentoo.org/908864
Signed-off-by: David Seifert  gentoo.org>

 sys-fs/xfsprogs/files/xfsprogs-6.3.0-gettext-0.22.patch | 11 +++
 sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.3.0-gettext-0.22.patch 
b/sys-fs/xfsprogs/files/xfsprogs-6.3.0-gettext-0.22.patch
new file mode 100644
index ..f94085ae73c3
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-6.3.0-gettext-0.22.patch
@@ -0,0 +1,11 @@
+--- a/po/de.po
 b/po/de.po
+@@ -3084,7 +3084,7 @@
+ #: .././estimate/xfs_estimate.c:191
+ #, c-format
+ msgid "%s will take about %.1f megabytes\n"
+-msgstr "%s wird etwa %.lf Megabytes einnehmen\n"
++msgstr "%s wird etwa %.1f Megabytes einnehmen\n"
+ 
+ #: .././estimate/xfs_estimate.c:198
+ #, c-format

diff --git a/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild 
b/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild
index f9a26d57b3d1..412d486c3314 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild
@@ -26,6 +26,7 @@ RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
 PATCHES=(
"${FILESDIR}"/${PN}-5.3.0-libdir.patch
"${FILESDIR}"/${PN}-5.18.0-docdir.patch
+   "${FILESDIR}"/${PN}-6.3.0-gettext-0.22.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2022-06-04 Thread Sam James 
commit: 874e98802f7fb77954102a09a80c00a5d97c132b
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  4 21:13:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  4 21:13:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=874e9880

sys-fs/xfsprogs: add 5.18.0

Signed-off-by: Sam James  gentoo.org>

 sys-fs/xfsprogs/Manifest   |  1 +
 sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch | 11 +++
 sys-fs/xfsprogs/xfsprogs-5.18.0.ebuild | 94 ++
 3 files changed, 106 insertions(+)

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 8a1ffbddce25..f9043109ed1b 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -2,3 +2,4 @@ DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 
8caaa0ca8a94480f131d36b383afcf732b3a
 DIST xfsprogs-5.14.2.tar.xz 1308912 BLAKE2B 
04083bf7952015d64f16e1aec0fa74be1957543e2264914f69defe45a3dc9f2524d941abc064a25a2fd760ebd6dcdcdc2404fd305e08fff7f6be6c5fc11d4d2f
 SHA512 
cb9794247a2eed8bd9f10ff811d38f97e4adbed97bad334b0fa8a26503ec224237eddd92fd78892584a153967417ab2009fb2fc8bab6ef12cd53fd20bdba1b4e
 DIST xfsprogs-5.15.0.tar.xz 1303080 BLAKE2B 
e2d60eb554d206b2d2910d07e20051fb0abd71723186bcdfa07f1ebd2c10c0a7ae387ea5f41e1be008d8e8cede97371581da06505e1675aa210fc3ac242d0782
 SHA512 
be7ee319fd13c103d88c7fc939277594a386d88d65349594a33eea2899ec4f28115b4ea53b64176cacbd52f3c801e103a085388e3539fc445a4ecd2775766438
 DIST xfsprogs-5.16.0.tar.xz 1306100 BLAKE2B 
da328fe0c146a7b8ba866c5872f26ce95010939e05da51c73ed6374f00474605a81f4a822d65b60a132a4de47fff286e9f5f1ac809c1aa29420633f573b61aef
 SHA512 
949ddb42d37523d6494aa33d1f73757a6379ee661147b9bb84372bdc3ccf60cdf07580f5337b2f0aebdc5d9c2b7de37cc05d010a2b094d1119d900225fc5b711
+DIST xfsprogs-5.18.0.tar.xz 1310008 BLAKE2B 
a2a2835d53ee6ac55279636f3f3cdcecab8757911ce5c1ea5f350a4da9ff4c1ca64b2aba1c0e5424c0c0a01fd0504396d5fecca12e4689c372ed5bb76b9ac24e
 SHA512 
47d035a33367edae7357e34c70bdb0fe9219231153fb4c4f418ed1462d137dd77338c12a199eb71cd70e88903e5fc11e1e4fb595c622183786e87346e2f65739

diff --git a/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch 
b/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch
new file mode 100644
index ..480f44cf6079
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch
@@ -0,0 +1,11 @@
+--- a/scrub/Makefile
 b/scrub/Makefile
+@@ -25,7 +25,7 @@
+ CRONTABS = xfs_scrub_all.cron
+ OPTIONAL_TARGETS += $(CRONTABS)
+ # Don't enable the crontab by default for now
+-CROND_DIR = $(PKG_LIB_SCRIPT_DIR)/$(PKG_NAME)
++CROND_DIR = $(PKG_DOC_DIR)
+ endif
+ 
+ endif # scrub_prereqs

diff --git a/sys-fs/xfsprogs/xfsprogs-5.18.0.ebuild 
b/sys-fs/xfsprogs/xfsprogs-5.18.0.ebuild
new file mode 100644
index ..b9facc52f475
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.18.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd usr-ldscript
+
+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 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+IUSE="icu libedit nls selinux"
+
+RDEPEND="dev-libs/inih
+   dev-libs/userspace-rcu:=
+   >=sys-apps/util-linux-2.17.2
+   icu? ( dev-libs/icu:= )
+   libedit? ( dev-libs/libedit )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.3.0-libdir.patch
+   "${FILESDIR}"/${PN}-5.18.0-docdir.patch
+)
+
+src_prepare() {
+   default
+
+   # Fix doc dir
+   sed -i \
+   -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+   include/builddefs.in || die
+
+   # Don't install compressed docs
+   sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+   # include/builddefs.in will add FCFLAGS to CFLAGS which will
+   # unnecessarily clutter CFLAGS (and fortran isn't used)
+   unset FCFLAGS
+
+   # If set in user env, this breaks configure
+   unset PLATFORM
+
+   export DEBUG=-DNDEBUG
+
+   # Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
+   # However, we have to provide an empty value to avoid default
+   # flags.
+   export OPTIMIZER=" "
+
+   # Avoid automagic on libdevmapper (bug #709694)
+   export ac_cv_search_dm_task_create=no
+
+   # Build fails with -O3 (bug #712698)
+   replace-flags -O3 -O2
+
+   # Upstream does NOT support --disable-static anymore,
+   # https://www.spinics.net/lists/linux-xfs/msg30185.html
+   # https://www.spinics.net/lists/linux-xfs/msg30272.html
+   local myconf=(
+   --enable-blkid
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2019-11-18 Thread Thomas Deutschmann 
commit: 40f3e79bc23323817848b83571ad91ba3393d100
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Nov 18 19:11:20 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Nov 18 19:11:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f3e79b

sys-fs/xfsprogs: bump to v5.3.0

Closes: https://bugs.gentoo.org/694886
Closes: https://bugs.gentoo.org/692596
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-fs/xfsprogs/Manifest  |   1 +
 sys-fs/xfsprogs/files/xfsprogs-5.3.0-libdir.patch |  28 ++
 sys-fs/xfsprogs/xfsprogs-5.3.0.ebuild | 107 ++
 3 files changed, 136 insertions(+)

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index fbd18b36784..b2f941827bf 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,2 +1,3 @@
 DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 
2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775
 SHA512 
a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58
 DIST xfsprogs-5.2.1.tar.xz 1227012 BLAKE2B 
af6c25d88d0a50fc82ecb2d9d00545ffdf906d6e85361360130b5a2b0d362e566c097f15be04a61023bd5c7815b77d0bab6258d8f188c5afe68098c51ae26ee0
 SHA512 
a2ecd8e2ae8a4e7357b4133beaeffeae4d6c9d0ece9855d9780a84c2d4072e3d4e0b8ffa3baa995862ec38dcbc5dd74205f7f4456676826082c4811867508a43
+DIST xfsprogs-5.3.0.tar.xz 1247636 BLAKE2B 
0f8b2eafa1b1c91ff8bbcf8f79f61a8bea47123b859ec7a181dea37891ca0345a79a0cc714f003fbe560b00c0c2fc76e6bf6a3a1465f51c44b2df3a3dcbe6415
 SHA512 
308202eba3765e416c43877ad68d528f6c7d03ca024b89709aa3ca818f6c6692e3b90a809cbb81ff886624300c0e548925e70b34c30c47bac8dcfe4bb9c18857

diff --git a/sys-fs/xfsprogs/files/xfsprogs-5.3.0-libdir.patch 
b/sys-fs/xfsprogs/files/xfsprogs-5.3.0-libdir.patch
new file mode 100644
index 000..f943817df48
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-5.3.0-libdir.patch
@@ -0,0 +1,28 @@
+In Gentoo we install libs to /usr/lib* and let gen_usr_ldscript
+handle /lib*.
+
+--- a/include/buildmacros
 b/include/buildmacros
+@@ -57,9 +57,10 @@ endif
+ ifeq ($(ENABLE_SHARED),yes)
+ INSTALL_LTLIB = \
+   cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-  ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+-  ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai 
$(PKG_ROOT_LIB_DIR); \
+-  ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)
++  ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
++  ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
++  ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR); \
++  ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR)
+ endif
+ 
+ # Libtool thinks the static and shared libs should be in the same dir, so
+@@ -68,7 +69,7 @@ endif
+ # Other things want the shared libs to appear in /usr/lib, else they'll
+ # link with the static libs there.  So, another symlink to get the .so into
+ # /usr/lib.
+-ifeq ($(ENABLE_SHARED),yes)
++ifeq ($(ENABLE_SHARED_HANDLED_BY_gen_usr_ldscript),yes)
+ INSTALL_LTLIB_DEV = \
+   cd $(TOPDIR)/$(LIBNAME)/.libs; \
+   ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \

diff --git a/sys-fs/xfsprogs/xfsprogs-5.3.0.ebuild 
b/sys-fs/xfsprogs/xfsprogs-5.3.0.ebuild
new file mode 100644
index 000..6058992139d
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.3.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs systemd usr-ldscript
+
+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="icu libedit nls readline"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+   icu? ( dev-libs/icu:=[static-libs(+)] )
+   readline? ( sys-libs/readline:0=[static-libs(+)] )
+   !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
+   !https://www.spinics.net/lists/linux-xfs/msg30185.html
+   # https://www.spinics.net/lists/linux-xfs/msg30272.html
+   local myconf=(
+   --enable-blkid
+   --with-crond-dir="${EPREFIX}/etc/cron.d"
+   --with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+   $(use_enable icu libicu)
+   $(use_enable nls gettext)
+   $(use_enable readline)
+   $(usex readline --disable-editline $(use_enable libedit 
editline))
+   )
+
+   if is-flagq -fno-lto ; then
+   einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
+   myconf+=( --disable-lto )
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2018-12-30 Thread Andreas K. Hüttel 
commit: 08d972ab1cc5219ad66dc4195dd4ff3264f58671
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Dec 30 09:19:14 2018 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Dec 30 09:19:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08d972ab

sys-fs/xfsprogs: Remove old

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 sys-fs/xfsprogs/Manifest   |  1 -
 .../files/xfsprogs-4.12.0-sharedlibs.patch | 81 ---
 .../files/xfsprogs-4.7.0-libxcmd-link.patch| 30 ---
 sys-fs/xfsprogs/xfsprogs-4.14.0.ebuild | 94 --
 4 files changed, 206 deletions(-)

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 2ab39b4d018..a244970c926 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,4 +1,3 @@
-DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B 
b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e
 SHA512 
69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506
 DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 
46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e
 SHA512 
996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400
 DIST xfsprogs-4.18.0.tar.xz 1214480 BLAKE2B 
78db41319e53be1f03b66f85ecc7c50e0c6658fa3fd8ddd8539bac04e656614a5cb54dc930a324d9df6afe4024c2be10259b903e1ca0ccd0ffb340e7410692c2
 SHA512 
0629400f8824620138928a7d72908b7a852408814238a55e11d6eb3b2da42cd56273960430d3ea729a9bce95f605d225607940d4728b68c468c39eb5a9a590be
 DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 
2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775
 SHA512 
a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58

diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch 
b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch
deleted file mode 100644
index cb59d44a46b..000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch
+++ /dev/null
@@ -1,81 +0,0 @@
 xfsprogs-4.12.0/include/buildmacros
-+++ xfsprogs-4.12.0/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
--  cd $(TOPDIR)/$(LIBNAME)/.libs; \
--  ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
--  ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
--  ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
--  ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
--  ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
--  if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
--   "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
--  ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a 
$(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
--  ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la 
$(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
--  ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so 
$(PKG_LIB_DIR)/$(LIBNAME).so; \
--  fi
-+  set -e; cd $(TOPDIR)/$(LIBNAME); \
-+  $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+  env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la 
$(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
 xfsprogs-4.12.0/libhandle/Makefile
-+++ xfsprogs-4.12.0/libhandle/Makefile
-@@ -24,7 +24,6 @@
- include $(BUILDRULES)
- 
- install: default
--  $(INSTALL_LTLIB)
- 
- install-dev: default
-   $(INSTALL_LTLIB_DEV)
 xfsprogs-4.12.0/libxcmd/Makefile
-+++ xfsprogs-4.12.0/libxcmd/Makefile
-@@ -34,6 +34,9 @@
- 
- include $(BUILDRULES)
- 
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+  $(INSTALL_LTLIB_DEV)
- 
- -include .ltdep
 xfsprogs-4.12.0/libxfs/Makefile
-+++ xfsprogs-4.12.0/libxfs/Makefile
-@@ -151,6 +151,7 @@
- 
- install-dev: install
-   $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
-+  $(INSTALL_LTLIB_DEV)
- 
- # We need to install the headers before building the dependencies.  If we
- # include the .ltdep file, the makefile decides that it needs to build the
 xfsprogs-4.12.0/libxlog/Makefile
-+++ xfsprogs-4.12.0/libxlog/Makefile
-@@ -19,6 +19,9 @@
- 
- include $(BUILDRULES)
- 
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+  $(INSTALL_LTLIB_DEV)
- 
- -include .ltdep
 xfsprogs-4.12.0/Makefile
-+++ xfsprogs-4.12.0/Makefile
-@@ -89,6 +89,8 @@
- copy: libxlog
- mkfs: libxcmd
- spaceman: libxcmd
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
- 
- ifeq ($(HAVE_BUILDDEFS), yes)

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2018-05-14 Thread Lars Wendler 
commit: 0c15a67228687ff2f1c1f0c0cf307e17f14fa9bf
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May 14 08:22:32 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May 14 08:23:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c15a672

sys-fs/xfsprogs: Removed old.

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 sys-fs/xfsprogs/Manifest   |   2 -
 .../xfsprogs/files/xfsprogs-4.7.0-sharedlibs.patch |  81 
 .../files/xfsprogs-4.9.0-cross-compile.patch   | 143 -
 sys-fs/xfsprogs/xfsprogs-4.16.0.ebuild |  96 --
 sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild  |  95 --
 5 files changed, 417 deletions(-)

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 76a39dfdb47..5dec96944b7 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,5 +1,3 @@
 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.0.tar.xz 1199088 BLAKE2B 
1de05747164eb695c10644f05845507b0a2daf55563af13b3177588af4114d40c0e72bbfee4cc47aaf86840f648d4fc34837797975aed3490321a1122f86e277
 SHA512 
0ca0cb3347ccc103f92f496016beaf5e5742fea2a4ca8515f6e340537e446df09483d9d30ce159789eb05a73430f8d517e57d1a8548029f1e73c108484b4e6e8
 DIST xfsprogs-4.16.1.tar.xz 1199632 BLAKE2B 
26448ce8ec691d117c0b41aebcb692994ad5a65418ac5af9631eab75191201a265ec9bce92d4076049a4182a879741329f20e5f54343afeef826cf1dfbfcf0d1
 SHA512 
d3cf3b07e07864341c351a078736ff7c721d86c177e65f131dc6e023cade74a5e07fecbc435d69946d76d587b138e66cddcd763954e15ed0dd17c056a83e2a19
-DIST xfsprogs-4.9.0.tar.xz 1087940 BLAKE2B 
f896a1248e978b4d7c879c91e73f16fd5894cb95c22143e2f805ab2f54b75cafef63cd574fbf3ccbaebb59914b3759a1f8b3a49790c8c05df145d01416723c62
 SHA512 
990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7

diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-sharedlibs.patch 
b/sys-fs/xfsprogs/files/xfsprogs-4.7.0-sharedlibs.patch
deleted file mode 100644
index b5395ffaed6..000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.7.0-sharedlibs.patch
+++ /dev/null
@@ -1,81 +0,0 @@
 xfsprogs-4.7.0/include/buildmacros
-+++ xfsprogs-4.7.0/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
--  cd $(TOPDIR)/$(LIBNAME)/.libs; \
--  ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
--  ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
--  ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
--  ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
--  ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
--  if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
--   "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
--  ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a 
$(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
--  ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la 
$(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
--  ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so 
$(PKG_LIB_DIR)/$(LIBNAME).so; \
--  fi
-+  set -e; cd $(TOPDIR)/$(LIBNAME); \
-+  $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+  env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la 
$(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
 xfsprogs-4.7.0/libhandle/Makefile
-+++ xfsprogs-4.7.0/libhandle/Makefile
-@@ -24,7 +24,6 @@
- include $(BUILDRULES)
- 
- install: default
--  $(INSTALL_LTLIB)
- 
- install-dev: default
-   $(INSTALL_LTLIB_DEV)
 xfsprogs-4.7.0/libxcmd/Makefile
-+++ xfsprogs-4.7.0/libxcmd/Makefile
-@@ -34,6 +34,9 @@
- 
- include $(BUILDRULES)
- 
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+  $(INSTALL_LTLIB_DEV)
- 
- -include .ltdep
 xfsprogs-4.7.0/libxfs/Makefile
-+++ xfsprogs-4.7.0/libxfs/Makefile
-@@ -138,6 +138,7 @@
- 
- install-dev: install
-   $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
-+  $(INSTALL_LTLIB_DEV)
- 
- # We need to install the headers before building the dependencies.  If we
- # include the .ltdep file, the makefile decides that it needs to build the
 xfsprogs-4.7.0/libxlog/Makefile
-+++ xfsprogs-4.7.0/libxlog/Makefile
-@@ -19,6 +21,9 @@
- 
- include $(BUILDRULES)
- 
--install install-dev: default

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2017-07-21 Thread Lars Wendler 
commit: 93d3fdda6c9f6225d83e952f12d4c070c9eaaa55
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jul 21 07:34:31 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jul 21 07:35:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93d3fdda

sys-fs/xfsprogs: Bump to version 4.12.0

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sys-fs/xfsprogs/Manifest   |  1 +
 .../files/xfsprogs-4.12.0-sharedlibs.patch | 81 +++
 sys-fs/xfsprogs/xfsprogs-4.12.0.ebuild | 94 ++
 3 files changed, 176 insertions(+)

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 1bfb6196753..e53813498e6 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,5 +1,6 @@
 DIST xfsprogs-4.10.0.tar.xz 1091648 SHA256 
d8cb9ab2c686699d37914354ce3992b4aff3677093cbce06ad18bf798da8a8a7 SHA512 
a29b5e714320d5fcbda7df6e8d81a07bdcba92d7d528ce1c354f1c1b41cb3719443a98cb37ca052f566eb3a08967bcf45492d0b9d95460da90b8a070a7a032e8
 WHIRLPOOL 
cc2ed46749c6840ccc6521c6ef5d1ca79156245faf18ef2b03b7a0f86ac460a0f011d828caa51f57db6ad8445f8cc218f30b1d0ab557db290935fd9d0a941ef0
 DIST xfsprogs-4.11.0.tar.xz 1113480 SHA256 
c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2 SHA512 
2db59553e4442c999a718ccf712b01de80b1e3acd1c3e5f9f7f5dc59e6c9180aa1a42085363303fe454d441bc2f886e118fc2958320afa49c7a8886fcfb5d72c
 WHIRLPOOL 
df267970bbcbc3c8a05d02a5e334bdeb686acea74e647dee6e874bc083a64cecef7c45072619edfd4841856cf0b7c91056504207bbcd5f021b1a1b452ef794da
+DIST xfsprogs-4.12.0.tar.xz 1128400 SHA256 
b330ad8d737f4152ae511580102e2fc49212bb51dfb4b614084344abae46d0df SHA512 
1dc4a0a5f40baf1d6398c8f07b4cb3ab796cf052c34b811d60b08c60a4700c2ced8d4d1adb878f8b85ba58cf3e1276db1477109de538fd427d3e359a52f59d4a
 WHIRLPOOL 
c18d3c9dfab8ccb877eb6fa9fa05be3c614a587c6cb616a9f18b52debb8ecacbd22056cb397ff9e69407c66e105d034458b41f0ba4275352f31398e64d303c02
 DIST xfsprogs-4.5.0.tar.gz 1524382 SHA256 
e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8 SHA512 
19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314
 WHIRLPOOL 
54d742635df024a63181da76c3220671610068363af85be2677521f20342595a5cebb2fd169945572351901ee2c9384f79f54a381ab3620dde22d863aa66d469
 DIST xfsprogs-4.8.0.tar.xz 1088376 SHA256 
82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9 SHA512 
9c83763ae4925980969e66827edef41774e4dc09ae42637630167b5e0329675517ea7b50de751fcb9485fbcf8e470d24dd20b51475bcb56723dae6ee9fb140c7
 WHIRLPOOL 
dc9f9b5c0b4e9b61f023fb972137126f22909c77908990e1beb391689fe6512a7810d9bd1ccfc0cfe4cd5379d99c123ddc9d0b6194e0a81e946e2304f964f180
 DIST xfsprogs-4.9.0.tar.xz 1087940 SHA256 
f1e60a9a54583dba82fa506dd9b59bdec110a968f80f507bf5f93b263af7a4df SHA512 
990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7
 WHIRLPOOL 
a9b582a42967ce1e314cd0ac3518792c2e10f7bb1370151a68a09a8e21e40cc6818b9778dfdd248961c3a1a08a70424f0150219488a18bc5d60e5669702c472f

diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch 
b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch
new file mode 100644
index 000..cb59d44a46b
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.12.0-sharedlibs.patch
@@ -0,0 +1,81 @@
+--- xfsprogs-4.12.0/include/buildmacros
 xfsprogs-4.12.0/include/buildmacros
+@@ -70,18 +70,9 @@
+ # /usr/lib.
+ ifeq ($(ENABLE_SHARED),yes)
+ INSTALL_LTLIB_DEV = \
+-  cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-  ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+-  ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
+-  ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
+-  ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+-  ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+-  if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
+-   "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
+-  ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a 
$(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
+-  ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la 
$(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
+-  ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so 
$(PKG_LIB_DIR)/$(LIBNAME).so; \
+-  fi
++  set -e; cd $(TOPDIR)/$(LIBNAME); \
++  $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
++  env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la 
$(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
+ endif
+--- xfsprogs-4.12.0/libhandle/Makefile
 xfsprogs-4.12.0/libhandle/Makefile
+@@ -24,7 +24,6 @@
+ include $(BUILDRULES)
+ 
+ install: default
+-  $(INSTALL_LTLIB)
+ 
+ install-dev: default
+   $(INSTALL_LTLIB_DEV)
+--- xfsprogs-4.12.0/libxcmd/Makefile
 xfsprogs-4.12.0/libxcmd/Makefile
+@@ -34,6 +34,9 @@
+ 
+ include $(BUILDRULES)
+

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2017-01-12 Thread Justin Lecher 
commit: b931c4bb60647a80cd0748e4b3dd7ed3e20fc440
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Jan 12 20:32:59 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Jan 12 20:33:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b931c4bb

sys-fs/xfsprogs: Add fix for underlinking detected by ld.gold

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher  gentoo.org>

 .../files/xfsprogs-4.9.0-underlinking.patch| 30 ++
 sys-fs/xfsprogs/metadata.xml   |  8 +++---
 sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild  |  1 +
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch 
b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch
new file mode 100644
index ..e6904a5
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch
@@ -0,0 +1,30 @@
+ libxfs/Makefile  | 2 +-
+ libxlog/Makefile | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libxfs/Makefile b/libxfs/Makefile
+index 6499731..00447c4 100644
+--- a/libxfs/Makefile
 b/libxfs/Makefile
+@@ -113,7 +113,7 @@ LSRCFILES += gen_crc32table.c
+ 
+ FCFLAGS = -I.
+ 
+-LTLIBS = $(LIBPTHREAD) $(LIBRT)
++LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID)
+ 
+ # don't try linking xfs_repair with a debug libxfs.
+ DEBUG = -DNDEBUG
+diff --git a/libxlog/Makefile b/libxlog/Makefile
+index 3417eed..fda1343 100644
+--- a/libxlog/Makefile
 b/libxlog/Makefile
+@@ -12,6 +12,8 @@ LT_AGE = 0
+ 
+ CFILES = xfs_log_recover.c util.c
+ 
++LTLIBS = $(LIBUUID)
++
+ # don't want to link xfs_repair with a debug libxlog.
+ DEBUG = -DNDEBUG
+ 

diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
index 56c1244..4eb20a0 100644
--- a/sys-fs/xfsprogs/metadata.xml
+++ b/sys-fs/xfsprogs/metadata.xml
@@ -1,8 +1,8 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   base-sys...@gentoo.org
-   Gentoo Base System
-
+   
+   base-sys...@gentoo.org
+   Gentoo Base System
+   
 

diff --git a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild 
b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
index 7227b27..907d464 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.7.0-sharedlibs.patch
"${FILESDIR}"/${PN}-4.7.0-libxcmd-link.patch
"${FILESDIR}"/${PN}-4.9.0-cross-compile.patch
+   "${FILESDIR}"/${P}-underlinking.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2017-01-08 Thread Lars Wendler 
commit: d81ef91b89702ac906c332565b3e6682e28a9b5f
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jan  8 20:20:54 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jan  8 20:21:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d81ef91b

sys-fs/xfsprogs: Bump to version 4.9.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-fs/xfsprogs/Manifest   |   1 +
 .../files/xfsprogs-4.9.0-cross-compile.patch   | 143 +
 sys-fs/xfsprogs/xfsprogs-4.9.0.ebuild  |  95 ++
 3 files changed, 239 insertions(+)

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 318a5f4..4ef4635 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -2,3 +2,4 @@ DIST xfsprogs-3.2.4.tar.gz 1482424 SHA256 
dde65ead82d3cbfa9b4ded9796b6d22095d7d7
 DIST xfsprogs-4.5.0.tar.gz 1524382 SHA256 
e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8 SHA512 
19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314
 WHIRLPOOL 
54d742635df024a63181da76c3220671610068363af85be2677521f20342595a5cebb2fd169945572351901ee2c9384f79f54a381ab3620dde22d863aa66d469
 DIST xfsprogs-4.7.0.tar.gz 1534909 SHA256 
88580bb3e6847c3edef436703a4fae403fc19b20739db4c31166ee4b256178d7 SHA512 
5184f1dbc3989f3c1f1b103d5cbd70462db107cfe113424166581ebcfaad4041c9c78f5d038f4bd4728ff99a2f9705219582ba9bfd10745354a1cab0b7dfe613
 WHIRLPOOL 
8157b2e8df5946acacc22ed761e38b382ef464f4984971148069b2f215418f4e23ac142721394439c041c236cbd460e0b56ff071d1c10e343070147709f42af3
 DIST xfsprogs-4.8.0.tar.xz 1088376 SHA256 
82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9 SHA512 
9c83763ae4925980969e66827edef41774e4dc09ae42637630167b5e0329675517ea7b50de751fcb9485fbcf8e470d24dd20b51475bcb56723dae6ee9fb140c7
 WHIRLPOOL 
dc9f9b5c0b4e9b61f023fb972137126f22909c77908990e1beb391689fe6512a7810d9bd1ccfc0cfe4cd5379d99c123ddc9d0b6194e0a81e946e2304f964f180
+DIST xfsprogs-4.9.0.tar.xz 1087940 SHA256 
f1e60a9a54583dba82fa506dd9b59bdec110a968f80f507bf5f93b263af7a4df SHA512 
990946f0a34381f57afb39bcda0ff539e18af4de2ecc19c833ffd4fb7c22c25b501091c1f0953db103a62204d952c9eecba21f22f3c5910286456da65fb09fa7
 WHIRLPOOL 
a9b582a42967ce1e314cd0ac3518792c2e10f7bb1370151a68a09a8e21e40cc6818b9778dfdd248961c3a1a08a70424f0150219488a18bc5d60e5669702c472f

diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch 
b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch
new file mode 100644
index ..f4232b3
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-cross-compile.patch
@@ -0,0 +1,143 @@
+--- xfsprogs-4.9.0/configure
 xfsprogs-4.9.0/configure
+@@ -861,6 +861,7 @@
+ enable_blkid
+ enable_gettext
+ enable_shared
++BUILD_CFLAGS
+ BUILD_CC
+ CPP
+ OTOOL64
+@@ -960,7 +961,9 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP'
++CPP
++BUILD_CC
++BUILD_CFLAGS'
+ 
+ 
+ # Initialize some variables set by options.
+@@ -1616,6 +1619,9 @@
+   CPPFLAGSC/C++/Objective C preprocessor flags, e.g. -I if
+   you have headers in a nonstandard directory 
+   CPP C preprocessor
++  BUILD_CCC compiler for build tools
++  BUILD_CFLAGS
++  C compiler flags for build tools
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -6,11 +11122,12 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-if test $cross_compiling = no; then
+-  BUILD_CC="$CC"
+ 
+-else
+-  for ac_prog in gcc cc
++if test "${BUILD_CC+set}" != "set"; then
++  if test $cross_compiling = no; then
++BUILD_CC="$CC"
++  else
++for ac_prog in gcc cc
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with 
args.
+ set dummy $ac_prog; ac_word=$2
+@@ -11162,6 +11169,15 @@
+   test -n "$BUILD_CC" && break
+ done
+ 
++  fi
++fi
++
++if test "${BUILD_CFLAGS+set}" != "set"; then
++  if test $cross_compiling = no; then
++BUILD_CFLAGS="$CFLAGS"
++  else
++BUILD_CFLAGS="-g -O2"
++  fi
+ fi
+ 
+ # Check whether --enable-shared was given.
+--- xfsprogs-4.9.0/configure.ac
 xfsprogs-4.9.0/configure.ac
+@@ -9,11 +9,21 @@
+ AC_PROG_LIBTOOL
+ 
+ AC_PROG_CC
+-if test $cross_compiling = no; then
+-  BUILD_CC="$CC"
+-  AC_SUBST(BUILD_CC)
+-else
+-  AC_CHECK_PROGS(BUILD_CC, gcc cc)
++AC_ARG_VAR(BUILD_CC, [C compiler for build tools])
++if test "${BUILD_CC+set}" != "set"; then
++  if test $cross_compiling = no; then
++BUILD_CC="$CC"
++  else
++AC_CHECK_PROGS(BUILD_CC, gcc cc)
++  fi
++fi
++AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools])
++if test "${BUILD_CFLAGS+set}" != "set"; then
++  if test $cross_compiling = no; then
++BUILD_CFLAGS="$CFLAGS"
++  else
++BUILD_CFLAGS="-g -O2"
++  fi
+ fi
+ 
+ AC_ARG_ENABLE(shared,
+---

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2017-01-08 Thread Lars Wendler 
commit: 743bdcf27df692d54fa1d879b25e51384777c39e
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jan  8 20:21:44 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jan  8 20:22:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=743bdcf2

sys-fs/xfsprogs: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-fs/xfsprogs/Manifest   |   1 -
 .../xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch | 108 -
 sys-fs/xfsprogs/xfsprogs-3.2.4.ebuild  |  98 ---
 3 files changed, 207 deletions(-)

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 4ef4635..19da7ac 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,4 +1,3 @@
-DIST xfsprogs-3.2.4.tar.gz 1482424 SHA256 
dde65ead82d3cbfa9b4ded9796b6d22095d7d759a22d41ae6f1a4ec458bb0465 SHA512 
fb1ea5beb933b86970cac198fa4e296457f0f5b30bd72fda54452644730277929dee28f11f35a154910e4a19857455ecffdd21b3df456023e0da95e2fd0aa0eb
 WHIRLPOOL 
dec87905b5a5af053e71e88f1670470c00b94a758dbb3adbc601db61b4efaaba306f344a4334b11680973d5153fcc7f8b5d59c4698f21d654570e8355fe9
 DIST xfsprogs-4.5.0.tar.gz 1524382 SHA256 
e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8 SHA512 
19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314
 WHIRLPOOL 
54d742635df024a63181da76c3220671610068363af85be2677521f20342595a5cebb2fd169945572351901ee2c9384f79f54a381ab3620dde22d863aa66d469
 DIST xfsprogs-4.7.0.tar.gz 1534909 SHA256 
88580bb3e6847c3edef436703a4fae403fc19b20739db4c31166ee4b256178d7 SHA512 
5184f1dbc3989f3c1f1b103d5cbd70462db107cfe113424166581ebcfaad4041c9c78f5d038f4bd4728ff99a2f9705219582ba9bfd10745354a1cab0b7dfe613
 WHIRLPOOL 
8157b2e8df5946acacc22ed761e38b382ef464f4984971148069b2f215418f4e23ac142721394439c041c236cbd460e0b56ff071d1c10e343070147709f42af3
 DIST xfsprogs-4.8.0.tar.xz 1088376 SHA256 
82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9 SHA512 
9c83763ae4925980969e66827edef41774e4dc09ae42637630167b5e0329675517ea7b50de751fcb9485fbcf8e470d24dd20b51475bcb56723dae6ee9fb140c7
 WHIRLPOOL 
dc9f9b5c0b4e9b61f023fb972137126f22909c77908990e1beb391689fe6512a7810d9bd1ccfc0cfe4cd5379d99c123ddc9d0b6194e0a81e946e2304f964f180

diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch 
b/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch
deleted file mode 100644
index 118874a..
--- a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-use libtool to do all installing.  do not use the manual file install as
-that'll copy files directly from the .libs/ subdir which might have rpaths
-that we do not want.
-
 xfsprogs-3.2.2/include/buildmacros
-+++ xfsprogs-3.2.2/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
--  cd $(TOPDIR)/$(LIBNAME)/.libs; \
--  ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
--  ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
--  ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
--  ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
--  ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
--  if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
--   "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))"; ]; then \
--  ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a 
$(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
--  ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la 
$(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
--  ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so 
$(PKG_LIB_DIR)/$(LIBNAME).so; \
--  fi
-+  set -e; cd $(TOPDIR)/$(LIBNAME); \
-+  $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+  env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la 
$(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
 xfsprogs-3.2.2/libdisk/Makefile
-+++ xfsprogs-3.2.2/libdisk/Makefile
-@@ -31,6 +31,7 @@
- install: default
- 
- install-dev: default
-+  $(INSTALL_LTLIB_DEV)
- 
- install-qa: install-dev
- 
 xfsprogs-3.2.2/libhandle/Makefile
-+++ xfsprogs-3.2.2/libhandle/Makefile
-@@ -20,7 +20,6 @@
- include $(BUILDRULES)
- 
- install: default
--  $(INSTALL_LTLIB)
- 
- install-dev: default
-   $(INSTALL_LTLIB_DEV)
 xfsprogs-3.2.2/libxcmd/Makefile
-+++ xfsprogs-3.2.2/libxcmd/Makefile
-@@ -34,6 +34,11 @@
- 
- include $(BUILDRULES)
- 
--install install-dev install-qa: default
-+install: default
-+
-+ install-dev: default
-+  $(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
- 
- -include .ltdep
 xfsprogs-3.2.2/libxfs/Makefile
-+++ xfsprogs-3.2.2/libxfs/Makefile
-@@ -86,6 +86,7 @@
- install: default
- 
- install-dev: default
-+  $(INSTALL_LTLIB_DEV)
- 
- install-qa: default
- 
 xfsprogs-3.2.2/libxlog/Makefile
-+++ xfsprogs-3.2.2/libxlog/Makefile
-@@

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2016-08-09 Thread Mike Frysinger 
commit: 70a8ffef42b679303defdd6c05bcfd920d800771
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Aug  9 15:15:03 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Aug  9 15:15:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a8ffef

sys-fs/xfsprogs: drop some older versions

 sys-fs/xfsprogs/Manifest   |   4 -
 .../files/xfsprogs-3.1.10-sharedlibs.patch | 120 -
 .../files/xfsprogs-3.1.11-sharedlibs.patch | 106 --
 .../xfsprogs/files/xfsprogs-4.2.0-sharedlibs.patch |  80 --
 sys-fs/xfsprogs/xfsprogs-3.1.10.ebuild |  96 -
 sys-fs/xfsprogs/xfsprogs-3.1.11-r1.ebuild  |  96 -
 sys-fs/xfsprogs/xfsprogs-4.2.0.ebuild  |  97 -
 sys-fs/xfsprogs/xfsprogs-4.3.0.ebuild  |  97 -
 8 files changed, 696 deletions(-)

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index ea7c845..5a40814 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,7 +1,3 @@
-DIST xfsprogs-3.1.10.tar.gz 1375721 SHA256 
9ec8dc77bf3bc114c3ba89f87316a32e3097efb3e7fc44df23421614bb21aa6c SHA512 
c5ff72978e13fc74e4b0e5294d2a7e2efffda088051cd39c7f71629bbc5f9f4c694c4aff6b50e57d60d3bd0c15a90ddd18afc3697336cd8d2429939cc82554bb
 WHIRLPOOL 
9c0f9b36de3314e8add80a20a227ec36cd582cf4f98eafaf55ad5fe14521eceaf9d202c9ac46968f73ce1c97233cbec45d8c421127ff31819f72bf0f9f18276a
-DIST xfsprogs-3.1.11.tar.gz 1399833 SHA256 
adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be SHA512 
6de16f0904709e53e6ceea8239e23b7e109375733fd712fd97bfbbf74ec7f1376147e61d1fbe498f1d5be2148bf8ca233c0577d5b88e9201bfd4bb87e696c28a
 WHIRLPOOL 
d52f177d172940e46c813575459917d73042739629f83537932eff38b28a524956484ad6ebbbd2d5d698f1a4b60c1a0f127ca1dd22bba86dcd74c5b94bf51962
 DIST xfsprogs-3.2.4.tar.gz 1482424 SHA256 
dde65ead82d3cbfa9b4ded9796b6d22095d7d759a22d41ae6f1a4ec458bb0465 SHA512 
fb1ea5beb933b86970cac198fa4e296457f0f5b30bd72fda54452644730277929dee28f11f35a154910e4a19857455ecffdd21b3df456023e0da95e2fd0aa0eb
 WHIRLPOOL 
dec87905b5a5af053e71e88f1670470c00b94a758dbb3adbc601db61b4efaaba306f344a4334b11680973d5153fcc7f8b5d59c4698f21d654570e8355fe9
-DIST xfsprogs-4.2.0.tar.gz 1487831 SHA256 
3deab1ad0f4635e54053aa45add27bd48cd87a188c16ac60f4789e01730e5260 SHA512 
1bafa9b8eeb834126d02e6e4d582e3ac637ca81c3dc262e3cd742fcc43679ac11a8aa160964264267bc2793822b6af8de87cc7a09c8a9e28826458b17b430620
 WHIRLPOOL 
a608a1b5cad9d22deb26836432730b47ec7a270bbb0e7ff1e41e5a169b5bae5baf143d63129a0ea1936d73a9c479e8787701f9437fdcea2680a41097d64a3437
-DIST xfsprogs-4.3.0.tar.gz 1496635 SHA256 
3e570ad51153e4be3792f42b2c805ddbd46b55d166eba3102ec87d5006d4cb5c SHA512 
c19c07497eb78dd2beb6dc35b8c21abf5fa3ac164eed32f7b95b71d460c8f08bba5550ecc156fafe412bf1b5452e40180e6fcd439d289a660afd594477f209d2
 WHIRLPOOL 
99661abf6bc31c2ab2e504cdfbcceea2e86b55faed02ec3da0c9d31830b213ae9eb42dc1bcf2612dbbfe2866b538f05f7bb97a60a9ed24a36af0846981825fde
 DIST xfsprogs-4.5.0.tar.gz 1524382 SHA256 
e49beb314984efbd0d758abb5c6137db3bb60a88e59e1e94c00defb536cf89f8 SHA512 
19c95551dc91ec46916f9a7e3d7976907664d32dd5fdc26af0ca62ca74c4b3c10f9e843aac8214ea9d1c0bf140c9f4e321d059808af01a623abedd5067011314
 WHIRLPOOL 
54d742635df024a63181da76c3220671610068363af85be2677521f20342595a5cebb2fd169945572351901ee2c9384f79f54a381ab3620dde22d863aa66d469
 DIST xfsprogs-4.7.0.tar.gz 1534909 SHA256 
88580bb3e6847c3edef436703a4fae403fc19b20739db4c31166ee4b256178d7 SHA512 
5184f1dbc3989f3c1f1b103d5cbd70462db107cfe113424166581ebcfaad4041c9c78f5d038f4bd4728ff99a2f9705219582ba9bfd10745354a1cab0b7dfe613
 WHIRLPOOL 
8157b2e8df5946acacc22ed761e38b382ef464f4984971148069b2f215418f4e23ac142721394439c041c236cbd460e0b56ff071d1c10e343070147709f42af3

diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.1.10-sharedlibs.patch 
b/sys-fs/xfsprogs/files/xfsprogs-3.1.10-sharedlibs.patch
deleted file mode 100644
index 5c07a1b..000
--- a/sys-fs/xfsprogs/files/xfsprogs-3.1.10-sharedlibs.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-ripped from PLD Linux
-
 xfsprogs-3.1.2/libdisk/Makefile
-+++ xfsprogs-3.1.2/libdisk/Makefile
-@@ -25,8 +25,10 @@
- include $(BUILDRULES)
- 
- install: default
-+  $(INSTALL_LTLIB)
- 
- install-dev: default
-+  $(INSTALL_LTLIB_DEV)
- 
- install-qa: install-dev
- 
 xfsprogs-3.1.2/libxcmd/Makefile
-+++ xfsprogs-3.1.2/libxcmd/Makefile
-@@ -32,6 +32,12 @@
- 
- include $(BUILDRULES)
- 
--install install-dev install-qa: default
-+install: default
-+  $(INSTALL_LTLIB)
-+
-+install-dev: default
-+  $(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
- 
- -include .dep
 xfsprogs-3.1.2/libxfs/Makefile
-+++ xfsprogs-3.1.2/libxfs/Makefile
-@@ -41,7 +41,9 @@
- include $(BUILDRULES)
- 
- install: default
-+  $(INSTALL_LTLIB_ROOT)
- 
- install-dev: default
-+  $(INSTALL_LTLIB_DEV)
- 
- install-qa: default
 xfsprogs-3.1.2/libxlog/Makefile
-+++

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2016-06-03 Thread Mike Frysinger 
commit: 8806f22bf65d99348770bbb6207d199c74fd96c5
Author: Gwendal Grignou  chromium  org>
AuthorDate: Fri Jun  3 19:21:18 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Jun  3 19:21:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8806f22b

sys-fs/xfsprogs: fix cross-compiling with build tools

 .../files/xfsprogs-4.3.0-cross-compile.patch   | 181 +
 sys-fs/xfsprogs/xfsprogs-4.5.0.ebuild  |   1 +
 2 files changed, 182 insertions(+)

diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch 
b/sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch
new file mode 100644
index 000..c545664
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.3.0-cross-compile.patch
@@ -0,0 +1,181 @@
+From 1a366eedc0eb4da46da48e9f6e2da27c7b5d2076 Mon Sep 17 00:00:00 2001
+From: Gwendal Grignou 
+Date: Fri, 3 Jun 2016 09:17:28 -0700
+Subject: [PATCH] Allow compiling xfsprogs in a cross compile environment.
+
+Without this patch, we are using the same compiler and options for the host
+compiler (BUILD_CC) and the target compiler (CC), and we would get error
+messages at compilation:
+x86_64-pc-linux-gnu-gcc -O2 -O2 -pipe -march=armv7-a -mtune=cortex-a15 ...
+x86_64-pc-linux-gnu-gcc.real: error: unrecognized command line option
+'-mfpu=neon'
+'-mfloat-abi=hard'
+'-clang-syntax'
+'-mfpu=neon'
+'-mfloat-abi=hard'
+'-clang-syntax'
+
+Add BUILD_CC and BUILD_CFLAGS as precious variables to allow setting it up
+from the ebuild.
+
+Signed-off-by: Gwendal Grignou 
+---
+ configure| 26 +-
+ configure.ac | 20 +++-
+ include/builddefs.in |  6 --
+ libxfs/Makefile  |  4 ++--
+ 4 files changed, 42 insertions(+), 14 deletions(-)
+
+diff --git a/configure b/configure
+index 325081f..863a447 100755
+--- a/configure
 b/configure
+@@ -700,6 +700,7 @@ libreadline
+ enable_blkid
+ enable_gettext
+ enable_shared
++BUILD_CFLAGS
+ BUILD_CC
+ CPP
+ LT_SYS_LIBRARY_PATH
+@@ -806,7 +807,9 @@ LDFLAGS
+ LIBS
+ CPPFLAGS
+ LT_SYS_LIBRARY_PATH
+-CPP'
++CPP
++BUILD_CC
++BUILD_CFLAGS'
+ 
+ 
+ # Initialize some variables set by options.
+@@ -1456,6 +1459,9 @@ Some influential environment variables:
+   LT_SYS_LIBRARY_PATH
+   User-defined run-time library search path.
+   CPP C preprocessor
++  BUILD_CCC compiler for build tools
++  BUILD_CFLAGS
++  C compiler flags for build tools
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -11957,11 +11963,12 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS 
conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-if test $cross_compiling = no; then
+-  BUILD_CC="$CC"
+ 
+-else
+-  for ac_prog in gcc cc
++if test "${BUILD_CC+set}" != "set"; then
++  if test $cross_compiling = no; then
++BUILD_CC="$CC"
++  else
++for ac_prog in gcc cc
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with 
args.
+ set dummy $ac_prog; ac_word=$2
+@@ -12003,6 +12010,15 @@ fi
+   test -n "$BUILD_CC" && break
+ done
+ 
++  fi
++fi
++
++if test "${BUILD_CFLAGS+set}" != "set"; then
++  if test $cross_compiling = no; then
++BUILD_CFLAGS="$CFLAGS"
++  else
++BUILD_CFLAGS="-g -O2"
++  fi
+ fi
+ 
+ # Check whether --enable-shared was given.
+diff --git a/configure.ac b/configure.ac
+index d44438f..fc286b3 100644
+--- a/configure.ac
 b/configure.ac
+@@ -9,11 +9,21 @@ AC_PREFIX_DEFAULT(/usr)
+ AC_PROG_LIBTOOL
+ 
+ AC_PROG_CC
+-if test $cross_compiling = no; then
+-  BUILD_CC="$CC"
+-  AC_SUBST(BUILD_CC)
+-else
+-  AC_CHECK_PROGS(BUILD_CC, gcc cc)
++AC_ARG_VAR(BUILD_CC, [C compiler for build tools])
++if test "${BUILD_CC+set}" != "set"; then
++  if test $cross_compiling = no; then
++BUILD_CC="$CC"
++  else
++AC_CHECK_PROGS(BUILD_CC, gcc cc)
++  fi
++fi
++AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools])
++if test "${BUILD_CFLAGS+set}" != "set"; then
++  if test $cross_compiling = no; then
++BUILD_CFLAGS="$CFLAGS"
++  else
++BUILD_CFLAGS="-g -O2"
++  fi
+ fi
+ 
+ AC_ARG_ENABLE(shared,
+diff --git a/include/builddefs.in b/include/builddefs.in
+index c2ca4cb..9ca57a6 100644
+--- a/include/builddefs.in
 b/include/builddefs.in
+@@ -27,6 +27,7 @@ MALLOCLIB = @malloc_lib@
+ LOADERFLAGS = @LDFLAGS@
+ LTLDFLAGS = @LDFLAGS@
+ CFLAGS = @CFLAGS@
++BUILD_CFLAGS = @BUILD_CFLAGS@
+ 
+ LIBRT = @librt@
+ LIBUUID = @libuuid@
+@@ -150,7 +151,7 @@ PCFLAGS+= -DENABLE_BLKID
+ endif
+ 
+ 
+-GCFLAGS = $(OPTIMIZER) $(DEBUG) \
++GCFLAGS = $(DEBUG) \
+ -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\"  \
+ -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include -I$(TOPDIR)/libxfs
+ 
+@@ -158,8 +159,9 @@ ifeq ($(ENABLE_GETTEXT),yes)

[gentoo-commits] repo/gentoo:master commit in: sys-fs/xfsprogs/, sys-fs/xfsprogs/files/

2015-11-23 Thread Lars Wendler 
commit: 583631a15d2ebc41d58009434f60897281bcc9c7
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Nov 23 21:24:11 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Nov 23 21:24:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=583631a1

sys-fs/xfsprogs: Bump to version 4.3.0

Package-Manager: portage-2.2.25
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/xfsprogs/Manifest   |  1 +
 .../xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch | 80 ++
 sys-fs/xfsprogs/xfsprogs-4.3.0.ebuild  | 97 ++
 3 files changed, 178 insertions(+)

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 514ee0e..a60ce64 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -2,3 +2,4 @@ DIST xfsprogs-3.1.10.tar.gz 1375721 SHA256 
9ec8dc77bf3bc114c3ba89f87316a32e3097e
 DIST xfsprogs-3.1.11.tar.gz 1399833 SHA256 
adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be SHA512 
6de16f0904709e53e6ceea8239e23b7e109375733fd712fd97bfbbf74ec7f1376147e61d1fbe498f1d5be2148bf8ca233c0577d5b88e9201bfd4bb87e696c28a
 WHIRLPOOL 
d52f177d172940e46c813575459917d73042739629f83537932eff38b28a524956484ad6ebbbd2d5d698f1a4b60c1a0f127ca1dd22bba86dcd74c5b94bf51962
 DIST xfsprogs-3.2.4.tar.gz 1482424 SHA256 
dde65ead82d3cbfa9b4ded9796b6d22095d7d759a22d41ae6f1a4ec458bb0465 SHA512 
fb1ea5beb933b86970cac198fa4e296457f0f5b30bd72fda54452644730277929dee28f11f35a154910e4a19857455ecffdd21b3df456023e0da95e2fd0aa0eb
 WHIRLPOOL 
dec87905b5a5af053e71e88f1670470c00b94a758dbb3adbc601db61b4efaaba306f344a4334b11680973d5153fcc7f8b5d59c4698f21d654570e8355fe9
 DIST xfsprogs-4.2.0.tar.gz 1487831 SHA256 
3deab1ad0f4635e54053aa45add27bd48cd87a188c16ac60f4789e01730e5260 SHA512 
1bafa9b8eeb834126d02e6e4d582e3ac637ca81c3dc262e3cd742fcc43679ac11a8aa160964264267bc2793822b6af8de87cc7a09c8a9e28826458b17b430620
 WHIRLPOOL 
a608a1b5cad9d22deb26836432730b47ec7a270bbb0e7ff1e41e5a169b5bae5baf143d63129a0ea1936d73a9c479e8787701f9437fdcea2680a41097d64a3437
+DIST xfsprogs-4.3.0.tar.gz 1496635 SHA256 
3e570ad51153e4be3792f42b2c805ddbd46b55d166eba3102ec87d5006d4cb5c SHA512 
c19c07497eb78dd2beb6dc35b8c21abf5fa3ac164eed32f7b95b71d460c8f08bba5550ecc156fafe412bf1b5452e40180e6fcd439d289a660afd594477f209d2
 WHIRLPOOL 
99661abf6bc31c2ab2e504cdfbcceea2e86b55faed02ec3da0c9d31830b213ae9eb42dc1bcf2612dbbfe2866b538f05f7bb97a60a9ed24a36af0846981825fde

diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch 
b/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch
new file mode 100644
index 000..a39af0d
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-4.3.0-sharedlibs.patch
@@ -0,0 +1,80 @@
+--- xfsprogs-4.3.0/include/buildmacros
 xfsprogs-4.3.0/include/buildmacros
+@@ -70,18 +70,9 @@
+ # /usr/lib.
+ ifeq ($(ENABLE_SHARED),yes)
+ INSTALL_LTLIB_DEV = \
+-  cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-  ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+-  ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
+-  ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
+-  ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+-  ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+-  if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
+-   "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
+-  ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a 
$(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
+-  ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la 
$(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
+-  ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so 
$(PKG_LIB_DIR)/$(LIBNAME).so; \
+-  fi
++  set -e; cd $(TOPDIR)/$(LIBNAME); \
++  $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
++  env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la 
$(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
+ else
+ INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
+ endif
+--- xfsprogs-4.3.0/libxcmd/Makefile
 xfsprogs-4.3.0/libxcmd/Makefile
+@@ -34,6 +34,9 @@
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev: default
++install: default
++
++install-dev: default
++  $(INSTALL_LTLIB_DEV)
+ 
+ -include .ltdep
+--- xfsprogs-4.3.0/libxfs/Makefile
 xfsprogs-4.3.0/libxfs/Makefile
+@@ -138,6 +138,7 @@
+ 
+ install-dev: install
+   $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
++  $(INSTALL_LTLIB_DEV)
+ 
+ # We need to install the headers before building the dependencies.  If we
+ # include the .ltdep file, the makefile decides that it needs to build the
+--- xfsprogs-4.3.0/libxlog/Makefile
 xfsprogs-4.3.0/libxlog/Makefile
+@@ -12,6 +12,8 @@
+ 
+ CFILES = xfs_log_recover.c util.c
+ 
++LTLIBS = $(LIBUUID) $(LIBXFS)
++
+ # don't want to link xfs_repair with a debug libxlog.
+ DEBUG = -DNDEBUG
+ 
+@@ -19,6 +21,9 @@
+ 
+ include $(BUILDRULES)
+ 
+-install install-dev: default
++install: default
++
++install-dev: default
++  $(INSTALL_LTLIB_DEV)
+ 
+ -include .ltdep
+---