Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/fsarchiver/, app-backup/fsarchiver/files/
Date: Sat, 16 Feb 2019 09:29:05
Message-Id: 1550309323.b74d50dbc779fe52e11e9d3ca7d97b0e0c5f478a.pacho@gentoo
1 commit: b74d50dbc779fe52e11e9d3ca7d97b0e0c5f478a
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 16 09:24:00 2019 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 16 09:28:43 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74d50db
7
8 app-backup/fsarchiver: Drop old
9
10 Package-Manager: Portage-2.3.58, Repoman-2.3.12
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12
13 app-backup/fsarchiver/Manifest | 1 -
14 .../fsarchiver/files/fsarchiver-0.8.4-xattr.patch | 67 ----------------------
15 app-backup/fsarchiver/fsarchiver-0.8.4.ebuild | 53 -----------------
16 3 files changed, 121 deletions(-)
17
18 diff --git a/app-backup/fsarchiver/Manifest b/app-backup/fsarchiver/Manifest
19 index 44a38bad145..996e63a9f82 100644
20 --- a/app-backup/fsarchiver/Manifest
21 +++ b/app-backup/fsarchiver/Manifest
22 @@ -1,2 +1 @@
23 -DIST fsarchiver-0.8.4.tar.gz 298793 BLAKE2B 706b1ed8a3966703ce8e6b0e16a502645317158478422e0fb999ed277185f83ca9a5a607f189c9bbf6b63c6bf1b4d9589d51fcbf3b256d57b6cd056757156ae3 SHA512 15712e5fdb9695148e8fe42791952acf0c7d34611c3467a0cb2e2631c9c5f1c55a4e839098085e6a72c2d8988b05e6f515ef772bcc5766b57a07da65a5209efd
24 DIST fsarchiver-0.8.5.tar.gz 298502 BLAKE2B 434fbc945bb4999243fe2b6a212c6b04118ae37749b4b14b590cf8269e541a5b09954e75a898126c8a55b5b516f458a1cf1842b4a9f4ead2185c7b5e8c99343c SHA512 bf427dfcc5a73fc799710766dc1c1392ed379565ec68d7cef49e9391da749e08fb655f2b86b4ab4db7cacaf323286b4673a7c3fbebba81ac50d0b66c1f0b91ff
25
26 diff --git a/app-backup/fsarchiver/files/fsarchiver-0.8.4-xattr.patch b/app-backup/fsarchiver/files/fsarchiver-0.8.4-xattr.patch
27 deleted file mode 100644
28 index cbc879008df..00000000000
29 --- a/app-backup/fsarchiver/files/fsarchiver-0.8.4-xattr.patch
30 +++ /dev/null
31 @@ -1,67 +0,0 @@
32 -From 57759f2b1106b6d19f3bc11b21463f4307dfc3d8 Mon Sep 17 00:00:00 2001
33 -From: Lars Wendler <polynomial-c@g.o>
34 -Date: Tue, 20 Feb 2018 10:13:30 +0100
35 -Subject: [PATCH] Replace <attr/xattr.h> with <sys/xattr.h>
36 -
37 -The former has been long deprecated and removed in attr-2.4.48
38 ----
39 - configure.ac | 2 +-
40 - src/oper_restore.c | 3 ++-
41 - src/oper_save.c | 7 ++++++-
42 - 3 files changed, 9 insertions(+), 3 deletions(-)
43 -
44 -diff --git a/configure.ac b/configure.ac
45 -index 66cfbf3..ae9aae8 100644
46 ---- a/configure.ac
47 -+++ b/configure.ac
48 -@@ -114,7 +114,7 @@ PKG_CHECK_MODULES([BLKID], [blkid])
49 - PKG_CHECK_MODULES([UUID], [uuid])
50 -
51 - dnl Check for header files installed with a library
52 --AC_CHECK_HEADER([attr/xattr.h],, [AC_MSG_ERROR([attr/xattr.h not found. you may have to install a package called attr, libattr, libattr-devel])])
53 -+AC_CHECK_HEADER([sys/xattr.h],, [AC_MSG_ERROR([sys/xattr.h not found.])])
54 -
55 - dnl Check for standard header files.
56 - AC_CHECK_HEADERS([malloc.h unistd.h pthread.h])
57 -diff --git a/src/oper_restore.c b/src/oper_restore.c
58 -index dd8af1f..92eb5f6 100644
59 ---- a/src/oper_restore.c
60 -+++ b/src/oper_restore.c
61 -@@ -24,7 +24,8 @@
62 - #include <assert.h>
63 - #include <string.h>
64 - #include <stdlib.h>
65 --#include <attr/xattr.h>
66 -+#include <sys/xattr.h>
67 -+#include <errno.h>
68 - #include <sys/time.h>
69 - #include <sys/stat.h>
70 - #include <gcrypt.h>
71 -diff --git a/src/oper_save.c b/src/oper_save.c
72 -index ce6f194..ff29074 100644
73 ---- a/src/oper_save.c
74 -+++ b/src/oper_save.c
75 -@@ -29,7 +29,8 @@
76 - #include <sys/param.h>
77 - #include <sys/statvfs.h>
78 - #include <sys/stat.h>
79 --#include <attr/xattr.h>
80 -+#include <sys/xattr.h>
81 -+#include <errno.h>
82 - #include <zlib.h>
83 - #include <assert.h>
84 - #include <gcrypt.h>
85 -@@ -59,6 +60,10 @@
86 - #include "error.h"
87 - #include "queue.h"
88 -
89 -+#ifndef ENOATTR
90 -+#define ENOATTR ENODATA
91 -+#endif
92 -+
93 - typedef struct s_savear
94 - { carchwriter ai;
95 - cregmulti regmulti;
96 ---
97 -2.16.2
98 -
99
100 diff --git a/app-backup/fsarchiver/fsarchiver-0.8.4.ebuild b/app-backup/fsarchiver/fsarchiver-0.8.4.ebuild
101 deleted file mode 100644
102 index 392119c19cf..00000000000
103 --- a/app-backup/fsarchiver/fsarchiver-0.8.4.ebuild
104 +++ /dev/null
105 @@ -1,53 +0,0 @@
106 -# Copyright 1999-2018 Gentoo Foundation
107 -# Distributed under the terms of the GNU General Public License v2
108 -
109 -EAPI=6
110 -
111 -inherit autotools
112 -
113 -DESCRIPTION="Flexible filesystem archiver for backup and deployment tool"
114 -HOMEPAGE="http://www.fsarchiver.org"
115 -SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"
116 -
117 -LICENSE="GPL-2"
118 -SLOT="0"
119 -KEYWORDS="amd64 x86"
120 -IUSE="debug lz4 lzma lzo static zstd"
121 -
122 -DEPEND="dev-libs/libgcrypt:0=
123 - >=sys-fs/e2fsprogs-1.41.4
124 - lz4? ( app-arch/lz4 )
125 - lzma? ( >=app-arch/xz-utils-4.999.9_beta )
126 - lzo? ( >=dev-libs/lzo-2.02 )
127 - static? (
128 - lz4? ( app-arch/lz4[static-libs] )
129 - lzma? ( app-arch/xz-utils[static-libs] )
130 - lzo? ( dev-libs/lzo[static-libs] )
131 - zstd? ( app-arch/zstd[static-libs] )
132 - )
133 - zstd? ( app-arch/zstd )
134 -"
135 -RDEPEND="${DEPEND}"
136 -
137 -PATCHES=(
138 - "${FILESDIR}/${P}-xattr.patch"
139 -)
140 -
141 -src_prepare() {
142 - default
143 - sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am \
144 - || die "seding failed"
145 - eautoreconf
146 -}
147 -
148 -src_configure() {
149 - local myeconfargs=(
150 - $(use_enable debug devel)
151 - $(use_enable lz4)
152 - $(use_enable lzma)
153 - $(use_enable lzo)
154 - $(use_enable static)
155 - $(use_enable zstd)
156 - )
157 - econf "${myeconfargs[@]}"
158 -}