Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-fs/f2fs-tools/, sys-fs/f2fs-tools/files/
Date: Sat, 29 Dec 2018 18:47:55
Message-Id: 1546109256.ff4c1fb58831681a7a150f2d38ed5e72ff2e07a3.blueness@gentoo
1 commit: ff4c1fb58831681a7a150f2d38ed5e72ff2e07a3
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 29 18:47:36 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 29 18:47:36 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=ff4c1fb5
7
8 sys-fs/f2fs-tools: moved to tree
9
10 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11
12 sys-fs/f2fs-tools/Manifest | 2 -
13 sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild | 32 ---------------
14 sys-fs/f2fs-tools/f2fs-tools-1.6.1.ebuild | 32 ---------------
15 .../files/f2fs-tools-1.6.1-sysmacros.patch | 45 ----------------------
16 sys-fs/f2fs-tools/metadata.xml | 11 ------
17 5 files changed, 122 deletions(-)
18
19 diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
20 deleted file mode 100644
21 index 307e9b4..0000000
22 --- a/sys-fs/f2fs-tools/Manifest
23 +++ /dev/null
24 @@ -1,2 +0,0 @@
25 -DIST f2fs-tools-1.10.0.tar.xz 342904 BLAKE2B ba4dec55e11959b2dd9461b1b02d173c7766908bfdbca9f6da7aa134b4a3b5cf2bda3c2e380b3fab46afdda0be9181ae5fe85ed9d085f816a1ff96e847e2a836 SHA512 e6e9fc10bd8051db86880c415ceb50900bf0cc919f1d9fe39026b5320de7c93cbcc1d817fab73130817042ed551fc5fd55ef9b589caeca9fca63fd3098f7a853
26 -DIST f2fs-tools-1.6.1.tar.xz 282152 BLAKE2B f8535a5415e012834b749bba2123151d8a39c8fa757905c45be20478d6a795ff64dfbcf0cf9679f2bd70cb1d92717d8df70efb4beb4d749677a6c8758ebdde0e SHA512 108327042079d9e864899a20f2dd94019be1b957fd7ffa295af097c5b93a5065ea9c36de9bae83f84a6412ac496340849fc44de041e24461a2919073eed15cf2
27
28 diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild
29 deleted file mode 100644
30 index f1abec0..0000000
31 --- a/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild
32 +++ /dev/null
33 @@ -1,32 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
40 -HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
41 -SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz"
42 -
43 -LICENSE="GPL-2"
44 -SLOT="0/4"
45 -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
46 -IUSE="selinux"
47 -
48 -RDEPEND="
49 - sys-apps/util-linux
50 - selinux? ( sys-libs/libselinux )
51 - elibc_musl? ( sys-libs/queue )"
52 -DEPEND="$RDEPEND"
53 -
54 -src_configure() {
55 - #This is required to install to /sbin, bug #481110
56 - econf \
57 - --bindir="${EPREFIX}"/sbin \
58 - --disable-static \
59 - $(use_with selinux)
60 -}
61 -
62 -src_install() {
63 - default
64 - find "${D}" -name "*.la" -delete || die
65 -}
66
67 diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.6.1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.6.1.ebuild
68 deleted file mode 100644
69 index 3e45aad..0000000
70 --- a/sys-fs/f2fs-tools/f2fs-tools-1.6.1.ebuild
71 +++ /dev/null
72 @@ -1,32 +0,0 @@
73 -# Copyright 1999-2017 Gentoo Foundation
74 -# Distributed under the terms of the GNU General Public License v2
75 -
76 -EAPI=5
77 -
78 -inherit multilib eutils
79 -
80 -DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
81 -HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/jaegeuk/f2fs-tools.git;a=summary"
82 -SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz"
83 -
84 -LICENSE="GPL-2"
85 -SLOT="0/0"
86 -KEYWORDS="amd64 arm arm64 ~mips ppc x86"
87 -IUSE=""
88 -
89 -DEPEND="elibc_musl? ( sys-libs/queue )"
90 -
91 -src_prepare() {
92 - epatch "${FILESDIR}"/${P}-sysmacros.patch #580338
93 -}
94 -
95 -src_configure() {
96 - #This is required to install to /sbin, bug #481110
97 - econf --prefix=/ --includedir=/usr/include
98 -}
99 -
100 -src_install() {
101 - default
102 - rm -f "${ED}"/$(get_libdir)/libf2fs.{,l}a
103 - rm -f "${ED}"/$(get_libdir)/libf2fs_format.{,l}a
104 -}
105
106 diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.6.1-sysmacros.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.6.1-sysmacros.patch
107 deleted file mode 100644
108 index f5cc4a0..0000000
109 --- a/sys-fs/f2fs-tools/files/f2fs-tools-1.6.1-sysmacros.patch
110 +++ /dev/null
111 @@ -1,45 +0,0 @@
112 -https://bugs.gentoo.org/580338
113 -
114 -From d6abcb38899cd03d59e0f30c49419695f86ae543 Mon Sep 17 00:00:00 2001
115 -From: Mike Frysinger <vapier@g.o>
116 -Date: Mon, 18 Apr 2016 18:18:07 -0400
117 -Subject: [PATCH] fibmap: pull in sys/sysmacros.h for major/minor
118 -
119 -These funcs are provided by sys/sysmacros.h, so include the header
120 -directly. Building with alternative C libraries can fail otherwise
121 -like so:
122 -
123 -fibmap.c: In function 'print_stat':
124 -fibmap.c:36:32: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration]
125 - printf("dev [%d:%d]\n", major(st->st_dev), minor(st->st_dev));
126 - ^
127 -fibmap.c:36:51: warning: implicit declaration of function 'minor' [-Wimplicit-function-declaration]
128 - printf("dev [%d:%d]\n", major(st->st_dev), minor(st->st_dev));
129 - ^
130 -fibmap.o: In function 'print_stat':
131 -tools/fibmap.c:36: undefined reference to 'minor'
132 -tools/fibmap.c:36: undefined reference to 'major'
133 -fibmap.o: In function 'stat_bdev':
134 -tools/fibmap.c:59: undefined reference to 'minor'
135 -tools/fibmap.c:59: undefined reference to 'major'
136 -
137 -Signed-off-by: Mike Frysinger <vapier@g.o>
138 ----
139 - tools/fibmap.c | 1 +
140 - 1 file changed, 1 insertion(+)
141 -
142 -diff --git a/tools/fibmap.c b/tools/fibmap.c
143 -index 224b233..6b092f5 100644
144 ---- a/tools/fibmap.c
145 -+++ b/tools/fibmap.c
146 -@@ -8,6 +8,7 @@
147 - #include <sys/types.h>
148 - #include <sys/ioctl.h>
149 - #include <sys/stat.h>
150 -+#include <sys/sysmacros.h>
151 - #include <libgen.h>
152 - #include <linux/hdreg.h>
153 - #include <linux/types.h>
154 ---
155 -2.7.4
156 -
157
158 diff --git a/sys-fs/f2fs-tools/metadata.xml b/sys-fs/f2fs-tools/metadata.xml
159 deleted file mode 100644
160 index e2b7d57..0000000
161 --- a/sys-fs/f2fs-tools/metadata.xml
162 +++ /dev/null
163 @@ -1,11 +0,0 @@
164 -<?xml version="1.0" encoding="UTF-8"?>
165 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
166 -<pkgmetadata>
167 - <maintainer type="person">
168 - <email>blueness@g.o</email>
169 - <name>Anthony G. Basile</name>
170 - </maintainer>
171 - <upstream>
172 - <remote-id type="sourceforge">f2fs-tools</remote-id>
173 - </upstream>
174 -</pkgmetadata>