public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/musl:master commit in: sys-fs/dosfstools/files/, sys-fs/dosfstools/
@ 2018-12-29 20:15 Anthony G. Basile
  0 siblings, 0 replies; only message in thread
From: Anthony G. Basile @ 2018-12-29 20:15 UTC (permalink / raw
  To: gentoo-commits

commit:     d8c680e2c01a20ca85a6e0e5666e201f6cf60b7f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 20:15:41 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 20:15:41 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=d8c680e2

sys-fs/dosfstools: in tree version works

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 sys-fs/dosfstools/Manifest                         |  1 -
 sys-fs/dosfstools/dosfstools-4.0-r1.ebuild         | 48 ----------------------
 .../dosfstools-4.0-fix-path-max-with-musl.patch    | 11 -----
 .../dosfstools/files/dosfstools-4.0-udevlibs.patch | 36 ----------------
 sys-fs/dosfstools/metadata.xml                     | 14 -------
 5 files changed, 110 deletions(-)

diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
deleted file mode 100644
index e5891d7..0000000
--- a/sys-fs/dosfstools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dosfstools-4.0.tar.xz 157564 SHA256 9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf SHA512 81acf54dc87e1a8b436848b0c8c596c8b9a2f334c5b3e5496547feb243b70ef320a621a9b5afaa8b054f45a5c2184fae9ae167019f2f83aba417a10954a23a58 WHIRLPOOL eb6de4523ff2fbc7161bd75e0983148faf85d700489647ad8792abd4fb41503b85b2b2b6feb684a14d37c0c04d0307a5d885f5010f8ba386037a8e9eea512f85

diff --git a/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild b/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild
deleted file mode 100644
index 7293e0d..0000000
--- a/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools toolchain-funcs flag-o-matic
-
-DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
-HOMEPAGE="https://github.com/dosfstools/dosfstools"
-SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~sh ~sparc ~x86"
-IUSE="compat +udev"
-
-CDEPEND="udev? ( virtual/libudev )"
-DEPEND="${CDEPEND}
-	udev? ( virtual/pkgconfig )"
-RDEPEND="${CDEPEND}"
-
-RESTRICT="test" # there is no test target #239071
-
-PATCHES=(
-	"${FILESDIR}/${P}-udevlibs.patch"
-	"${FILESDIR}/${PN}-4.0-fix-path-max-with-musl.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable compat compat-symlinks) \
-		$(use_with udev)
-}
-
-src_install() {
-	default
-	if ! use compat; then
-		# Keep fsck -t vfat and mkfs -t vfat working, bug 584980.
-		dosym fsck.fat /usr/sbin/fsck.vfat
-		dosym mkfs.fat /usr/sbin/mkfs.vfat
-	fi
-}

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
deleted file mode 100644
index f1fbefa..0000000
--- a/sys-fs/dosfstools/files/dosfstools-4.0-fix-path-max-with-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/device_info.c.orig
-+++ src/device_info.c
-@@ -17,6 +17,7 @@
- */
- 
- 
-+#include <limits.h>
- #include <stdint.h>
- #include <stdbool.h>
- #include <sys/types.h>
-

diff --git a/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch b/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch
deleted file mode 100644
index 2320477..0000000
--- a/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7538785afd751de509cd00740adf57fc6d730e33 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 10 May 2016 09:47:57 +0200
-Subject: [PATCH] Don't link to udev via LDFLAGS. There's LDADD for such a
- task.
-
-See also:
-https://www.gnu.org/software/automake/manual/html_node/Linking.html
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3d22ba7..a15e6e7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -34,12 +34,12 @@ mkfs_common_sources = device_info.c device_info.h \
- mkfs_fat_SOURCES  = mkfs.fat.c msdos_fs.h $(mkfs_common_sources)
- mkfs_fat_CPPFLAGS = -I$(srcdir)/blkdev
- mkfs_fat_CFLAGS   = $(AM_CFLAGS) $(UDEV_CFLAGS)
--mkfs_fat_LDFLAGS  = $(UDEV_LIBS)
-+mkfs_fat_LDADD    = $(UDEV_LIBS)
- 
- testdevinfo_SOURCES  = testdevinfo.c $(mkfs_common_sources)
- testdevinfo_CPPFLAGS = -I$(srcdir)/blkdev
- testdevinfo_CFLAGS   = $(AM_CFLAGS) $(UDEV_CFLAGS)
--testdevinfo_LDFLAGS  = $(UDEV_LIBS)
-+testdevinfo_LDADD    = $(UDEV_LIBS)
- 
- 
- if COMPAT_SYMLINKS
--- 
-2.8.2
-

diff --git a/sys-fs/dosfstools/metadata.xml b/sys-fs/dosfstools/metadata.xml
deleted file mode 100644
index ffedbfb..0000000
--- a/sys-fs/dosfstools/metadata.xml
+++ /dev/null
@@ -1,14 +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>
-<upstream>
-	<remote-id type="github">dosfstools/dosfstools</remote-id>
-</upstream>
-<use>
-	<flag name="compat">Install symlinks for legacy names of the tools</flag>
-</use>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2018-12-29 20:15 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-29 20:15 [gentoo-commits] proj/musl:master commit in: sys-fs/dosfstools/files/, sys-fs/dosfstools/ Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox