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/dosfstools/files/, sys-fs/dosfstools/
Date: Sat, 29 Dec 2018 20:15:58
Message-Id: 1546114541.d8c680e2c01a20ca85a6e0e5666e201f6cf60b7f.blueness@gentoo
1 commit: d8c680e2c01a20ca85a6e0e5666e201f6cf60b7f
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 29 20:15:41 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 29 20:15:41 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d8c680e2
7
8 sys-fs/dosfstools: in tree version works
9
10 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11
12 sys-fs/dosfstools/Manifest | 1 -
13 sys-fs/dosfstools/dosfstools-4.0-r1.ebuild | 48 ----------------------
14 .../dosfstools-4.0-fix-path-max-with-musl.patch | 11 -----
15 .../dosfstools/files/dosfstools-4.0-udevlibs.patch | 36 ----------------
16 sys-fs/dosfstools/metadata.xml | 14 -------
17 5 files changed, 110 deletions(-)
18
19 diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
20 deleted file mode 100644
21 index e5891d7..0000000
22 --- a/sys-fs/dosfstools/Manifest
23 +++ /dev/null
24 @@ -1 +0,0 @@
25 -DIST dosfstools-4.0.tar.xz 157564 SHA256 9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf SHA512 81acf54dc87e1a8b436848b0c8c596c8b9a2f334c5b3e5496547feb243b70ef320a621a9b5afaa8b054f45a5c2184fae9ae167019f2f83aba417a10954a23a58 WHIRLPOOL eb6de4523ff2fbc7161bd75e0983148faf85d700489647ad8792abd4fb41503b85b2b2b6feb684a14d37c0c04d0307a5d885f5010f8ba386037a8e9eea512f85
26
27 diff --git a/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild b/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild
28 deleted file mode 100644
29 index 7293e0d..0000000
30 --- a/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild
31 +++ /dev/null
32 @@ -1,48 +0,0 @@
33 -# Copyright 1999-2016 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI="5"
37 -
38 -inherit autotools toolchain-funcs flag-o-matic
39 -
40 -DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
41 -HOMEPAGE="https://github.com/dosfstools/dosfstools"
42 -SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.tar.xz"
43 -
44 -LICENSE="GPL-3"
45 -SLOT="0"
46 -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
47 -IUSE="compat +udev"
48 -
49 -CDEPEND="udev? ( virtual/libudev )"
50 -DEPEND="${CDEPEND}
51 - udev? ( virtual/pkgconfig )"
52 -RDEPEND="${CDEPEND}"
53 -
54 -RESTRICT="test" # there is no test target #239071
55 -
56 -PATCHES=(
57 - "${FILESDIR}/${P}-udevlibs.patch"
58 - "${FILESDIR}/${PN}-4.0-fix-path-max-with-musl.patch"
59 -)
60 -
61 -src_prepare() {
62 - epatch "${PATCHES[@]}"
63 - eautoreconf
64 -}
65 -
66 -src_configure() {
67 - econf \
68 - --docdir="${EPREFIX}"/usr/share/doc/${PF} \
69 - $(use_enable compat compat-symlinks) \
70 - $(use_with udev)
71 -}
72 -
73 -src_install() {
74 - default
75 - if ! use compat; then
76 - # Keep fsck -t vfat and mkfs -t vfat working, bug 584980.
77 - dosym fsck.fat /usr/sbin/fsck.vfat
78 - dosym mkfs.fat /usr/sbin/mkfs.vfat
79 - fi
80 -}
81
82 diff --git a/sys-fs/dosfstools/files/dosfstools-4.0-fix-path-max-with-musl.patch b/sys-fs/dosfstools/files/dosfstools-4.0-fix-path-max-with-musl.patch
83 deleted file mode 100644
84 index f1fbefa..0000000
85 --- a/sys-fs/dosfstools/files/dosfstools-4.0-fix-path-max-with-musl.patch
86 +++ /dev/null
87 @@ -1,11 +0,0 @@
88 ---- src/device_info.c.orig
89 -+++ src/device_info.c
90 -@@ -17,6 +17,7 @@
91 - */
92 -
93 -
94 -+#include <limits.h>
95 - #include <stdint.h>
96 - #include <stdbool.h>
97 - #include <sys/types.h>
98 -
99
100 diff --git a/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch b/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch
101 deleted file mode 100644
102 index 2320477..0000000
103 --- a/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch
104 +++ /dev/null
105 @@ -1,36 +0,0 @@
106 -From 7538785afd751de509cd00740adf57fc6d730e33 Mon Sep 17 00:00:00 2001
107 -From: Lars Wendler <polynomial-c@g.o>
108 -Date: Tue, 10 May 2016 09:47:57 +0200
109 -Subject: [PATCH] Don't link to udev via LDFLAGS. There's LDADD for such a
110 - task.
111 -
112 -See also:
113 -https://www.gnu.org/software/automake/manual/html_node/Linking.html
114 -
115 -Signed-off-by: Lars Wendler <polynomial-c@g.o>
116 ----
117 - src/Makefile.am | 4 ++--
118 - 1 file changed, 2 insertions(+), 2 deletions(-)
119 -
120 -diff --git a/src/Makefile.am b/src/Makefile.am
121 -index 3d22ba7..a15e6e7 100644
122 ---- a/src/Makefile.am
123 -+++ b/src/Makefile.am
124 -@@ -34,12 +34,12 @@ mkfs_common_sources = device_info.c device_info.h \
125 - mkfs_fat_SOURCES = mkfs.fat.c msdos_fs.h $(mkfs_common_sources)
126 - mkfs_fat_CPPFLAGS = -I$(srcdir)/blkdev
127 - mkfs_fat_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS)
128 --mkfs_fat_LDFLAGS = $(UDEV_LIBS)
129 -+mkfs_fat_LDADD = $(UDEV_LIBS)
130 -
131 - testdevinfo_SOURCES = testdevinfo.c $(mkfs_common_sources)
132 - testdevinfo_CPPFLAGS = -I$(srcdir)/blkdev
133 - testdevinfo_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS)
134 --testdevinfo_LDFLAGS = $(UDEV_LIBS)
135 -+testdevinfo_LDADD = $(UDEV_LIBS)
136 -
137 -
138 - if COMPAT_SYMLINKS
139 ---
140 -2.8.2
141 -
142
143 diff --git a/sys-fs/dosfstools/metadata.xml b/sys-fs/dosfstools/metadata.xml
144 deleted file mode 100644
145 index ffedbfb..0000000
146 --- a/sys-fs/dosfstools/metadata.xml
147 +++ /dev/null
148 @@ -1,14 +0,0 @@
149 -<?xml version="1.0" encoding="UTF-8"?>
150 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
151 -<pkgmetadata>
152 -<maintainer type="project">
153 - <email>base-system@g.o</email>
154 - <name>Gentoo Base System</name>
155 -</maintainer>
156 -<upstream>
157 - <remote-id type="github">dosfstools/dosfstools</remote-id>
158 -</upstream>
159 -<use>
160 - <flag name="compat">Install symlinks for legacy names of the tools</flag>
161 -</use>
162 -</pkgmetadata>