1 |
commit: ed7c540e253521a1e5bea9e471bc20c46d3678d0 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 1 08:34:26 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 1 08:34:42 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed7c540e |
7 |
|
8 |
sys-fs/btrfs-progs: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.68, Repoman-2.3.16 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-fs/btrfs-progs/Manifest | 1 - |
14 |
sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild | 129 --------------------- |
15 |
.../files/btrfs-progs-5.1-LDFLAGS.patch | 37 ------ |
16 |
3 files changed, 167 deletions(-) |
17 |
|
18 |
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest |
19 |
index 0224fefa314..49c78a4d2ca 100644 |
20 |
--- a/sys-fs/btrfs-progs/Manifest |
21 |
+++ b/sys-fs/btrfs-progs/Manifest |
22 |
@@ -7,5 +7,4 @@ DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b09 |
23 |
DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a |
24 |
DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5 |
25 |
DIST btrfs-progs-v5.1.1.tar.xz 2041940 BLAKE2B ca032cf17e78e5892788b677b5a0fead7cf1108fd464facb48e713b259c8c75f8b7714377f75e7b9e595c7c8fa5927fa37d11f43f51e4d898698f9fc5d26a808 SHA512 0f7582893e76d73ac7c0061dd43f65c465ca6308d3447a4e12f95397edcf3b74cc4dd3fad4a139739322650a0d228c4b2d43eb6eb9a09eb92f8fa2a5ef1519cd |
26 |
-DIST btrfs-progs-v5.1.tar.xz 2042196 BLAKE2B 1a0ccc04dc55f66c639a64e4c6c4f8683376fa2e273217ea2fd544d7e3b666e95bbaaf35809e25bdc84e92b1430af698d8bb57ab2c5f8ce4899920e1e71b7c05 SHA512 45a42b2c64b8120eb4ce6fe9e37571e197bd142403223e96af758adb00c116086d6790c9ab7f9707b4784f7b67af18b50ccf990b0d8d79571e04b81b11859154 |
27 |
DIST btrfs-progs-v5.2-rc1.tar.xz 2045772 BLAKE2B 5b5510fab39bb3c6c33f8c3af2f443fe2f7fdb681ae04f13821b099422a9f60736956f2463769d9129c9178680444e6e4c951622b8cdede8c7f8e8bdda330d32 SHA512 b78fb8461af81e9bd2aa2fb4f900d09eb77733bcb83c12d5b4b817188710b7b49dfb27a521136319c26cdde940e48b409a5a0f9f69be4213d11df3ffa8fc0de1 |
28 |
|
29 |
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index 033e0ad66d1..00000000000 |
32 |
--- a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,129 +0,0 @@ |
35 |
-# Copyright 1999-2019 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-PYTHON_COMPAT=( python3_{5,6,7} ) |
41 |
- |
42 |
-inherit bash-completion-r1 python-single-r1 |
43 |
- |
44 |
-libbtrfs_soname=0 |
45 |
- |
46 |
-if [[ ${PV} != 9999 ]]; then |
47 |
- MY_PV="v${PV/_/-}" |
48 |
- [[ "${PV}" = *_rc* ]] || \ |
49 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
50 |
- SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" |
51 |
- S="${WORKDIR}/${PN}-${MY_PV}" |
52 |
-else |
53 |
- WANT_LIBTOOL=none |
54 |
- inherit autotools git-r3 |
55 |
- EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" |
56 |
- EGIT_BRANCH="devel" |
57 |
-fi |
58 |
- |
59 |
-DESCRIPTION="Btrfs filesystem utilities" |
60 |
-HOMEPAGE="https://btrfs.wiki.kernel.org" |
61 |
- |
62 |
-LICENSE="GPL-2" |
63 |
-SLOT="0/${libbtrfs_soname}" |
64 |
-IUSE="+convert doc python reiserfs static static-libs +zstd" |
65 |
- |
66 |
-RESTRICT=test # tries to mount repared filesystems |
67 |
- |
68 |
-RDEPEND=" |
69 |
- dev-libs/lzo:2= |
70 |
- sys-apps/util-linux:0=[static-libs(+)?] |
71 |
- sys-libs/zlib:0= |
72 |
- convert? ( |
73 |
- sys-fs/e2fsprogs:0= |
74 |
- sys-libs/e2fsprogs-libs:0= |
75 |
- reiserfs? ( |
76 |
- >=sys-fs/reiserfsprogs-3.6.27 |
77 |
- ) |
78 |
- ) |
79 |
- python? ( ${PYTHON_DEPS} ) |
80 |
- zstd? ( app-arch/zstd:0= ) |
81 |
-" |
82 |
-DEPEND="${RDEPEND} |
83 |
- convert? ( sys-apps/acl ) |
84 |
- python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) |
85 |
- static? ( |
86 |
- dev-libs/lzo:2[static-libs(+)] |
87 |
- sys-apps/util-linux:0[static-libs(+)] |
88 |
- sys-libs/zlib:0[static-libs(+)] |
89 |
- convert? ( |
90 |
- sys-fs/e2fsprogs:0[static-libs(+)] |
91 |
- sys-libs/e2fsprogs-libs:0[static-libs(+)] |
92 |
- reiserfs? ( |
93 |
- >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] |
94 |
- ) |
95 |
- ) |
96 |
- zstd? ( app-arch/zstd:0[static-libs(+)] ) |
97 |
- ) |
98 |
-" |
99 |
-BDEPEND=" |
100 |
- doc? ( |
101 |
- || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) |
102 |
- app-text/docbook-xml-dtd:4.5 |
103 |
- app-text/xmlto |
104 |
- ) |
105 |
-" |
106 |
- |
107 |
-if [[ ${PV} == 9999 ]]; then |
108 |
- DEPEND+=" sys-devel/gnuconfig" |
109 |
-fi |
110 |
- |
111 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
112 |
- |
113 |
-PATCHES=( |
114 |
- "${FILESDIR}"/${PN}-5.1-LDFLAGS.patch |
115 |
-) |
116 |
- |
117 |
-pkg_setup() { |
118 |
- use python && python-single-r1_pkg_setup |
119 |
-} |
120 |
- |
121 |
-src_prepare() { |
122 |
- default |
123 |
- if [[ ${PV} == 9999 ]]; then |
124 |
- AT_M4DIR=m4 eautoreconf |
125 |
- mkdir config || die |
126 |
- local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" |
127 |
- [[ -e ${automakedir} ]] || die "Could not locate automake directory" |
128 |
- ln -s "${automakedir}"/install-sh config/install-sh || die |
129 |
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die |
130 |
- ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die |
131 |
- fi |
132 |
-} |
133 |
- |
134 |
-src_configure() { |
135 |
- local myeconfargs=( |
136 |
- --bindir="${EPREFIX}"/sbin |
137 |
- $(use_enable convert) |
138 |
- $(use_enable doc documentation) |
139 |
- $(use_enable elibc_glibc backtrace) |
140 |
- $(use_enable python) |
141 |
- $(use_enable static-libs static) |
142 |
- $(use_enable zstd) |
143 |
- --with-convert=ext2$(usex reiserfs ',reiserfs' '') |
144 |
- ) |
145 |
- econf "${myeconfargs[@]}" |
146 |
-} |
147 |
- |
148 |
-src_compile() { |
149 |
- emake V=1 all $(usev static) |
150 |
-} |
151 |
- |
152 |
-src_install() { |
153 |
- local makeargs=( |
154 |
- $(usex python install_python '') |
155 |
- $(usex static install-static '') |
156 |
- ) |
157 |
- emake V=1 DESTDIR="${D}" install "${makeargs[@]}" |
158 |
- newbashcomp btrfs-completion btrfs |
159 |
- use python && python_optimize |
160 |
- |
161 |
- # install prebuilt subset of manuals |
162 |
- use doc || doman Documentation/*.[58] |
163 |
-} |
164 |
|
165 |
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch b/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch |
166 |
deleted file mode 100644 |
167 |
index fa1fe7a5ede..00000000000 |
168 |
--- a/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch |
169 |
+++ /dev/null |
170 |
@@ -1,37 +0,0 @@ |
171 |
-https://github.com/kdave/btrfs-progs/pull/172 |
172 |
-https://bugs.gentoo.org/686284 |
173 |
- |
174 |
-From 7cdb5de31e954416e740886d46809e4883c31ddc Mon Sep 17 00:00:00 2001 |
175 |
-From: Sergei Trofimovich <slyfox@g.o> |
176 |
-Date: Sun, 19 May 2019 08:51:28 +0100 |
177 |
-Subject: [PATCH] Makefile: apply LDFLAGS to libbtrfsutil.so |
178 |
-MIME-Version: 1.0 |
179 |
-Content-Type: text/plain; charset=UTF-8 |
180 |
-Content-Transfer-Encoding: 8bit |
181 |
- |
182 |
-libbtrfs.so already has user's LDFLAGS applied. |
183 |
-The change also applies those to libbtrfsutil.so. |
184 |
- |
185 |
-Reported-by: Michał Górny |
186 |
-Bug: https://bugs.gentoo.org/686284 |
187 |
-Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
188 |
---- |
189 |
- Makefile | 2 +- |
190 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
191 |
- |
192 |
-diff --git a/Makefile b/Makefile |
193 |
-index e25e256f..4c67d187 100644 |
194 |
---- a/Makefile |
195 |
-+++ b/Makefile |
196 |
-@@ -424,7 +424,7 @@ libbtrfsutil/%.o: libbtrfsutil/%.c |
197 |
- |
198 |
- libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects) |
199 |
- @echo " [LD] $@" |
200 |
-- $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) \ |
201 |
-+ $(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) $(LDFLAGS) \ |
202 |
- -shared -Wl,-soname,libbtrfsutil.so.$(libbtrfsutil_major) -o $@ |
203 |
- |
204 |
- libbtrfsutil.a: $(libbtrfsutil_objects) |
205 |
--- |
206 |
-2.21.0 |
207 |
- |