* [gentoo-commits] proj/musl:master commit in: sys-fs/xfsdump/files/, sys-fs/xfsdump/
@ 2017-03-18 17:11 Aric Belsito
0 siblings, 0 replies; 2+ messages in thread
From: Aric Belsito @ 2017-03-18 17:11 UTC (permalink / raw
To: gentoo-commits
commit: b2dfc2b284bfc48dde2efa5269eff08d5b0b83ae
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sat Mar 18 17:11:18 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sat Mar 18 17:11:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b2dfc2b2
sys-fs/xfsdump: version bump to 3.1.6
sys-fs/xfsdump/Manifest | 5 ++--
sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch | 32 ++++++++++++++++++++++
...sdump-3.1.4-r99.ebuild => xfsdump-3.1.6.ebuild} | 31 +++++++++++++--------
3 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 8e429bf..7fc20d0 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -1,6 +1,7 @@
AUX xfsdump-3.0.4-no-symlink.patch 721 SHA256 b3ccccfce2b7f36263a8b3611724560ae768a3371dcc6e19045abae8df8052a3 SHA512 8b8feddfbdd76bebe61a8d06e174f5bef6edd05d0ce3b96731c234f58f36c73182e411a6f7b30f4e2bbc48b13b675edaf9ba30434e414b2bf2c7dbf431c1b819 WHIRLPOOL 576a5f0324ac20b80fe946f1b0390b9e70860b9f350811e41c7ccbbbb06ef8439ca1946b4d7db88b2d106ad4d67b9bf82cb46636e52d362b304c6d78bb35f142
AUX xfsdump-3.0.5-prompt-overflow.patch 333 SHA256 80684664bae903256dd1b6355da9e88b727b8b42a559a6131aa2d24a6ce08428 SHA512 73f2a2f29b1f0e8585f49ac510b4da18deebbb799e428519fedf936f46dbd602c1cf6d300fd4e416ae4e6af1e6ce726798dec710c01d73c263782cb01ab21ba2 WHIRLPOOL 33e53b9b2690791df7374e8c7b9ff893850e076f936be86c2164798ae98ba33b35d9f2955c060d487688cb6dc9818591a05e1a74ce0792c40afd5d5989e514c7
AUX xfsdump-3.1.4-compat-musl.patch 1023 SHA256 2983ea5405e6ebee2a595345b7c519f48f1202d8d557daff6f709ced65759801 SHA512 350638c7a214f565ea1ffbe7753ed01e8d6cee873f73a45c58fc99d49122099d6e83c55fe2966b5595bcffcc2bdb895d765dfa6874f02d2b4d0d1b75e75904f7 WHIRLPOOL 34178b7e079d6125031e677e2090a7409695ab3dccfdfa76b98c7111c3ab16687fc6e6f92aeef85157644ea04815eab3070deb4c87f49360cebc3f06d50eeb72
-DIST xfsdump-3.1.4.tar.gz 848188 SHA256 570eafd0721515bdd79cb0e295b701d49cdf81e71a0a0ff0df6d4c5cc1960943 SHA512 e82885ad6b3f1d81c1cdeff56714b73651e1c74eb4ce71574875ec0bb69b3fe707b40f85f0766b21ba589d13364ecfc0bad657a9b15c428cf821f926c3d66b25 WHIRLPOOL 5677000929f260b391743207a865c7529b788db46806a62c62bb6917025194913609cc804ead23314988f44853abc57f3c86ee22d2bde365697a35b0a7e3b607
-EBUILD xfsdump-3.1.4-r99.ebuild 1039 SHA256 fb5153e073b71fdc2ada1755e2a978d792327cd3b18c198002c7a7c0326e2f24 SHA512 61d616a66f0f0245fcfab6f5aaeb4818895089bedfca0a60246f355325d6da2bbf8679b824c53b2c3f6396ca2c35e73b1883a448fafb134529db485fbe41cb39 WHIRLPOOL 8f7655959ec2ab41f14e7f7fe6b23b2060b69b747efbfe64931ade60bfa9e02a1c1c10a451dcc42f2a5984e415d3eed5e7afd867ecec7eb6240bc1d491f056b8
+AUX xfsdump-3.1.6-linguas.patch 975 SHA256 16152976e972f32921a4b34636736f041d49d656111b43aee31b9c83da582992 SHA512 2fe49c6985eca950890d952b6e33c7f9d7687dfaeb52077895e92994d930f0026bb8fdc31ad3f31d072b8a5023a9e0e3d99c301cb34802d7657a93b964aa6c8e WHIRLPOOL c2c8d255fe0d01407bf1f5282c9f854794a521d165945944cbf092517745a94907fab1de7c5a11dcb7090eaac6aed5fc020574aa81d03f222c2df87a74c90320
+DIST xfsdump-3.1.6.tar.gz 848698 SHA256 7f78c11ca527477d90e5e62b0778f3ad96f2b71c19173044e9aca9515fff42d0 SHA512 6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7 WHIRLPOOL 87182e97a5676be6ad36cf74e37d9ca312d742d20eb5396917a156842fe62a23c582e16862fb384fe7706097d9f0c7a6a8faced06fec0a999ac06ceb426eb7e3
+EBUILD xfsdump-3.1.6.ebuild 1500 SHA256 25b81f03d481458ac1eadbe986611b39e5d925eea5efb10baf2489413b0e75b1 SHA512 b38a8c0c176ff7278c14bfd9de5550739c871c73dd61d2abffcf4963f7cbfbd8dc298989381f58f88c3b7c61778e4d954ea31168358583b0eecc8fedc86743df WHIRLPOOL 7d3bfe0f5c108cff713ab3b45cdfbabfbf80e073a01e91c1b851f56f201aedc2449d467d856892be432b08f1a317639b597e7c6b24d745f1b31376a801e54344
MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch b/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch
new file mode 100644
index 0000000..5d5e54e
--- /dev/null
+++ b/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch
@@ -0,0 +1,32 @@
+From e12813b9d0883e02cc121ea503f4bff5fb67e9ef Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 8 Apr 2016 16:41:31 -0400
+Subject: [PATCH xfsdump] po: respect LINGUAS build setting
+
+It is common gettext practice to limit the translations a particular
+package will include by setting the LINGUAS environment variable.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ po/Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/po/Makefile b/po/Makefile
+index 6d40324..48a19c1 100644
+--- a/po/Makefile
++++ b/po/Makefile
+@@ -6,7 +6,10 @@ TOPDIR = ..
+ include $(TOPDIR)/include/builddefs
+
+ POTHEAD = $(PKG_NAME).pot
+-LINGUAS = de pl
++# If the user has requested a specific set of translations, only build those.
++SUPPORTED_LINGUAS = $(patsubst %.po,%,$(wildcard *.po))
++LINGUAS ?= $(SUPPORTED_LINGUAS)
++LINGUAS := $(filter $(SUPPORTED_LINGUAS),$(LINGUAS))
+ LSRCFILES = $(LINGUAS:%=%.po)
+ LDIRT = $(POTHEAD)
+
+--
+2.7.4
+
diff --git a/sys-fs/xfsdump/xfsdump-3.1.4-r99.ebuild b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
similarity index 52%
rename from sys-fs/xfsdump/xfsdump-3.1.4-r99.ebuild
rename to sys-fs/xfsdump/xfsdump-3.1.6.ebuild
index 29996fb..5807035 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.4-r99.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="4"
+EAPI="5"
-inherit multilib eutils
+inherit multilib eutils flag-o-matic toolchain-funcs
DESCRIPTION="xfs dump/restore utilities"
HOMEPAGE="http://oss.sgi.com/projects/xfs"
@@ -13,23 +12,32 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE=""
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 -sparc x86"
+IUSE="ncurses nls"
-RDEPEND="sys-fs/e2fsprogs
+RDEPEND="ncurses? ( sys-libs/ncurses:0= )
+ sys-fs/e2fsprogs
>=sys-fs/xfsprogs-3.2.0
sys-apps/dmapi
>=sys-apps/attr-2.4.19"
DEPEND="${RDEPEND}
- sys-devel/gettext"
+ nls? (
+ sys-devel/gettext
+ elibc_uclibc? ( dev-libs/libintl )
+ )"
src_prepare() {
sed -i \
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
include/builddefs.in \
|| die
+ sed -i \
+ -e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \
+ -e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \
+ configure || die #605852
epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
+ epatch "${FILESDIR}"/${PN}-3.1.6-linguas.patch #561664
epatch "${FILESDIR}"/${PN}-3.1.4-compat-musl.patch #549116
}
@@ -39,7 +47,8 @@ src_configure() {
export DEBUG=-DNDEBUG
econf \
- --libdir=/$(get_libdir) \
- --libexecdir=/usr/$(get_libdir) \
- --sbindir=/sbin
+ $(use_enable nls gettext) \
+ --libdir="${EPREFIX}/$(get_libdir)" \
+ --libexecdir="${EPREFIX}/usr/$(get_libdir)" \
+ --sbindir="${EPREFIX}/sbin"
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-fs/xfsdump/files/, sys-fs/xfsdump/
@ 2018-12-29 20:21 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2018-12-29 20:21 UTC (permalink / raw
To: gentoo-commits
commit: 3e787df9bd9b16bfb6be217a4707e0b34cd3a603
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 20:21:38 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 20:21:38 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3e787df9
sys-fs/xfsdump: in tree version works
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
sys-fs/xfsdump/Manifest | 2 -
.../xfsdump/files/xfsdump-3.0.4-no-symlink.patch | 22 -----
.../files/xfsdump-3.0.5-prompt-overflow.patch | 14 ----
sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch | 32 --------
sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch | 82 -------------------
sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch | 94 ----------------------
sys-fs/xfsdump/metadata.xml | 8 --
sys-fs/xfsdump/xfsdump-3.1.6.ebuild | 54 -------------
sys-fs/xfsdump/xfsdump-3.1.8.ebuild | 68 ----------------
9 files changed, 376 deletions(-)
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
deleted file mode 100644
index f073dac..0000000
--- a/sys-fs/xfsdump/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST xfsdump-3.1.6.tar.gz 848698 BLAKE2B c87738640f2d5f424d8e8e9df50a75b2424c1f2741a47cd94f1e63d18b460946f1cb0ff362d2a00345db8fcc8e3518faa720e6495b138aaa51fe4e8d2d1bd24a SHA512 6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7
-DIST xfsdump-3.1.8.tar.xz 603304 BLAKE2B 8f923ca267f648e88e4e964bcafcfd3bfde0fdb4e6753a9c21bbb8a1ae0f63e868cdad3da4eed5e95ffda861278eaaad49758701384681f3b0a19b93e07a232d SHA512 84720c83627647c75b42c59d180bb31cbb6e064568bef18b73641cf821fa7d39e6f7e0df4a6c7ffd36fba63296ab88cb83f0effdb1f6aa98f4b593ca0e658e0b
diff --git a/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch b/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch
deleted file mode 100644
index 014ca33..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/311881
-
---- xfsdump-3.0.4/dump/Makefile
-+++ xfsdump-3.0.4/dump/Makefile
-@@ -102,7 +102,6 @@
- $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
- $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
- install-dev:
-
- $(COMMINCL) $(COMMON):
---- xfsdump-3.0.4/restore/Makefile
-+++ xfsdump-3.0.4/restore/Makefile
-@@ -114,7 +114,6 @@
- $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
- $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
- install-dev:
-
- $(COMMINCL) $(COMMON):
diff --git a/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch b/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch
deleted file mode 100644
index bd7fb3f..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://oss.sgi.com/bugzilla/show_bug.cgi?id=876
-https://bugs.gentoo.org/335115
-
---- a/dump/content.c
-+++ b/dump/content.c
-@@ -6460,7 +6460,7 @@
- Media_prompt_erase( drive_t *drivep )
- {
- fold_t fold;
-- char question[ 100 ];
-+ char question[ 200 ];
- char *preamblestr[ PREAMBLEMAX ];
- size_t preamblecnt;
- char *querystr[ QUERYMAX ];
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch b/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch
deleted file mode 100644
index 5d5e54e..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.1.6-linguas.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e12813b9d0883e02cc121ea503f4bff5fb67e9ef Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 8 Apr 2016 16:41:31 -0400
-Subject: [PATCH xfsdump] po: respect LINGUAS build setting
-
-It is common gettext practice to limit the translations a particular
-package will include by setting the LINGUAS environment variable.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- po/Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/po/Makefile b/po/Makefile
-index 6d40324..48a19c1 100644
---- a/po/Makefile
-+++ b/po/Makefile
-@@ -6,7 +6,10 @@ TOPDIR = ..
- include $(TOPDIR)/include/builddefs
-
- POTHEAD = $(PKG_NAME).pot
--LINGUAS = de pl
-+# If the user has requested a specific set of translations, only build those.
-+SUPPORTED_LINGUAS = $(patsubst %.po,%,$(wildcard *.po))
-+LINGUAS ?= $(SUPPORTED_LINGUAS)
-+LINGUAS := $(filter $(SUPPORTED_LINGUAS),$(LINGUAS))
- LSRCFILES = $(LINGUAS:%=%.po)
- LDIRT = $(POTHEAD)
-
---
-2.7.4
-
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch b/sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch
deleted file mode 100644
index 12ca39e..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.1.6-musl.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur xfsdump-3.1.6.orig/common/drive.c xfsdump-3.1.6/common/drive.c
---- xfsdump-3.1.6.orig/common/drive.c 2017-03-18 10:15:09.015308629 -0700
-+++ xfsdump-3.1.6/common/drive.c 2017-03-18 10:19:56.248906871 -0700
-@@ -17,6 +17,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <sys/stat.h>
- #include <time.h>
-diff -Naur xfsdump-3.1.6.orig/common/main.c xfsdump-3.1.6/common/main.c
---- xfsdump-3.1.6.orig/common/main.c 2017-03-18 10:15:09.012308611 -0700
-+++ xfsdump-3.1.6/common/main.c 2017-03-18 10:20:21.938159790 -0700
-@@ -55,6 +55,10 @@
- #include "content.h"
- #include "inventory.h"
-
-+#ifndef RLIM64_INFINITY
-+#define RLIM64_INFINITY (~0ULL)
-+#endif
-+
- #ifdef DUMP
- /* main.c - main for dump
- */
-@@ -2225,7 +2229,10 @@
- {SIGTERM, "SIGTERM"},
- {SIGUSR1, "SIGUSR1"},
- {SIGUSR2, "SIGUSR2"},
-+ {SIGCHLD, "SIGCHLD"},
-+#ifdef SIGCLD
- {SIGCLD, "SIGCLD"},
-+#endif
- {SIGPWR, "SIGPWR"},
- {SIGURG, "SIGURG"},
- {SIGPOLL, "SIGPOLL"},
-diff -Naur xfsdump-3.1.6.orig/common/types.h xfsdump-3.1.6/common/types.h
---- xfsdump-3.1.6.orig/common/types.h 2017-03-18 10:15:09.011308605 -0700
-+++ xfsdump-3.1.6/common/types.h 2017-03-18 10:19:43.429780663 -0700
-@@ -47,6 +47,9 @@
- /* integers
- */
- typedef uint32_t size32_t;
-+#ifndef __uint32_t
-+#define __uint32_t uint32_t
-+#endif
- typedef uint64_t size64_t;
- typedef char char_t;
- typedef unsigned char u_char_t;
-diff -Naur xfsdump-3.1.6.orig/dump/content.c xfsdump-3.1.6/dump/content.c
---- xfsdump-3.1.6.orig/dump/content.c 2017-03-18 10:15:09.036308756 -0700
-+++ xfsdump-3.1.6/dump/content.c 2017-03-18 10:20:21.940159810 -0700
-@@ -37,6 +37,7 @@
- #include <xfs/jdm.h>
- #ifdef linux
- #include <xfs/xqm.h>
-+#include <linux/limits.h>
- #endif
-
- #include <attr/attributes.h>
-diff -Naur xfsdump-3.1.6.orig/dump/var.c xfsdump-3.1.6/dump/var.c
---- xfsdump-3.1.6.orig/dump/var.c 2017-03-18 10:15:09.036308756 -0700
-+++ xfsdump-3.1.6/dump/var.c 2017-03-18 10:23:04.657759448 -0700
-@@ -16,6 +16,7 @@
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-+#include <limits.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <sys/stat.h>
-diff -Naur xfsdump-3.1.6.orig/invutil/invidx.c xfsdump-3.1.6/invutil/invidx.c
---- xfsdump-3.1.6.orig/invutil/invidx.c 2017-03-18 10:15:09.029308713 -0700
-+++ xfsdump-3.1.6/invutil/invidx.c 2017-03-18 10:16:19.135769322 -0700
-@@ -19,6 +19,7 @@
- #include <xfs/xfs.h>
- #include <xfs/jdm.h>
-
-+#include <fcntl.h>
- #include <stdio.h>
- #include <unistd.h>
- #include <stdlib.h>
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch b/sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch
deleted file mode 100644
index de6caa1..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.1.8-musl.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 1fb0b21870179c3ab5350b29217e0c01cd77c13e Mon Sep 17 00:00:00 2001
-From:
-Date: Sun, 20 May 2018 17:24:30 -0500
-Subject: [PATCH] misc musl fixes
-
----
- common/drive.c | 1 +
- common/main.c | 4 ++++
- common/types.h | 3 +++
- dump/content.c | 1 +
- dump/var.c | 1 +
- invutil/invidx.c | 1 +
- 6 files changed, 11 insertions(+)
-
-diff --git a/common/drive.c b/common/drive.c
-index 5fe6867..9e10b63 100644
---- a/common/drive.c
-+++ b/common/drive.c
-@@ -17,6 +17,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <sys/stat.h>
- #include <time.h>
-diff --git a/common/main.c b/common/main.c
-index d3bdcf3..b6ba0a6 100644
---- a/common/main.c
-+++ b/common/main.c
-@@ -56,6 +56,10 @@
- #include "content.h"
- #include "inventory.h"
-
-+#ifndef RLIM64_INFINITY
-+#define RLIM64_INFINITY (~0ULL)
-+#endif
-+
- #ifdef DUMP
- /* main.c - main for dump
- */
-diff --git a/common/types.h b/common/types.h
-index 424b47a..0c58ab5 100644
---- a/common/types.h
-+++ b/common/types.h
-@@ -47,6 +47,9 @@
- /* integers
- */
- typedef uint32_t size32_t;
-+#ifndef __uint32_t
-+#define __uint32_t uint32_t
-+#endif
- typedef uint64_t size64_t;
- typedef char char_t;
- typedef unsigned char u_char_t;
-diff --git a/dump/content.c b/dump/content.c
-index bee4e65..f9da485 100644
---- a/dump/content.c
-+++ b/dump/content.c
-@@ -38,6 +38,7 @@
- #ifdef linux
- #include <linux/limits.h>
- #include <xfs/xqm.h>
-+#include <linux/limits.h>
- #endif
-
- #include <attr/attributes.h>
-diff --git a/dump/var.c b/dump/var.c
-index 6e3ead0..be2f310 100644
---- a/dump/var.c
-+++ b/dump/var.c
-@@ -16,6 +16,7 @@
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-+#include <limits.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <sys/stat.h>
-diff --git a/invutil/invidx.c b/invutil/invidx.c
-index 82d89d9..dba88fc 100644
---- a/invutil/invidx.c
-+++ b/invutil/invidx.c
-@@ -19,6 +19,7 @@
- #include <xfs/xfs.h>
- #include <xfs/jdm.h>
-
-+#include <fcntl.h>
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
---
-2.17.0
-
diff --git a/sys-fs/xfsdump/metadata.xml b/sys-fs/xfsdump/metadata.xml
deleted file mode 100644
index 56c1244..0000000
--- a/sys-fs/xfsdump/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild b/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
deleted file mode 100644
index cc16e69..0000000
--- a/sys-fs/xfsdump/xfsdump-3.1.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="xfs dump/restore utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
- ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ia64 ~mips ppc -sparc x86"
-IUSE="ncurses nls"
-
-RDEPEND="ncurses? ( sys-libs/ncurses:0= )
- sys-fs/e2fsprogs
- >=sys-fs/xfsprogs-3.2.0
- sys-apps/dmapi
- >=sys-apps/attr-2.4.19"
-DEPEND="${RDEPEND}
- nls? (
- sys-devel/gettext
- elibc_uclibc? ( dev-libs/libintl )
- )"
-
-src_prepare() {
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- include/builddefs.in \
- || die
- sed -i \
- -e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \
- -e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \
- configure || die #605852
- epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
- epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
- epatch "${FILESDIR}"/${PN}-3.1.6-linguas.patch #561664
- epatch "${FILESDIR}"/${PN}-3.1.6-musl.patch #549116
-}
-
-src_configure() {
- unset PLATFORM #184564
- export OPTIMIZER=${CFLAGS}
- export DEBUG=-DNDEBUG
-
- econf \
- $(use_enable nls gettext) \
- --libdir="${EPREFIX}/$(get_libdir)" \
- --libexecdir="${EPREFIX}/usr/$(get_libdir)" \
- --sbindir="${EPREFIX}/sbin"
-}
diff --git a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild b/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
deleted file mode 100644
index c6f035a..0000000
--- a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="xfs dump/restore utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE="ncurses nls"
-
-RDEPEND="
- >=sys-apps/attr-2.4.19
- sys-apps/dmapi
- sys-apps/util-linux
- sys-fs/e2fsprogs
- >=sys-fs/xfsprogs-3.2.0
- ncurses? ( sys-libs/ncurses:0= )
-"
-DEPEND="${RDEPEND}
- nls? (
- sys-devel/gettext
- elibc_uclibc? ( dev-libs/libintl )
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
- "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
- "${FILESDIR}"/${PN}-3.1.6-linguas.patch #561664
- "${FILESDIR}"/${PN}-3.1.8-musl.patch #549116
-)
-
-src_prepare() {
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- include/builddefs.in \
- || die
- sed -i \
- -e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \
- -e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \
- configure || die #605852
-
- default
-}
-
-src_configure() {
- unset PLATFORM #184564
- export OPTIMIZER=${CFLAGS}
- export DEBUG=-DNDEBUG
-
- local myeconfargs=(
- $(use_enable nls gettext)
- --libdir="${EPREFIX}/$(get_libdir)"
- --libexecdir="${EPREFIX}/usr/$(get_libdir)"
- --sbindir="${EPREFIX}/sbin"
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # enable verbose build
- emake V=1
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-29 20:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-29 20:21 [gentoo-commits] proj/musl:master commit in: sys-fs/xfsdump/files/, sys-fs/xfsdump/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2017-03-18 17:11 Aric Belsito
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox