From 96f37c9df3ca7a389e0b7277f0e185eea61e2d7f Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 25 Feb 2022 14:47:23 +0100 Subject: [PATCH] sys-fs/dosfstools: Sync with gentoo It's from gentoo commit 42e19e4c85605ef8d6c12ca658def9d7fd3934ab. --- .../portage-stable/sys-fs/dosfstools/Manifest | 9 +--- .../dosfstools/dosfstools-4.0-r1.ebuild | 47 ------------------- .../sys-fs/dosfstools/dosfstools-4.1.ebuild | 37 --------------- .../sys-fs/dosfstools/dosfstools-4.2.ebuild | 39 +++++++++++++++ .../files/dosfstools-4.0-udevlibs.patch | 36 -------------- .../sys-fs/dosfstools/metadata.xml | 3 +- 6 files changed, 42 insertions(+), 129 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/dosfstools-4.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/dosfstools-4.2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/Manifest index 72a32cb333..7981d0a253 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/Manifest @@ -1,8 +1 @@ -AUX dosfstools-4.0-udevlibs.patch 1132 SHA256 5b06733ca41ef9def498cb75c1636f473b2624c6f8cb9334092cbb0c933b712a SHA512 0ae6fac866f4f634ed733279859c039f789d8420401217c039c06c995cd0be1fc697b24353135ee5c7abf04e4638c810726f0a310979251dd126e70c76739928 WHIRLPOOL d6bfebe17ec7741661409fe9e25a353059792d61f1a0698d01d5382062bcf8201833b1c6f642790adea1cd83c9cce45629002a8cf53eb7ac30cf09efe02e9b1e -DIST dosfstools-4.0.tar.xz 157564 SHA256 9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf SHA512 81acf54dc87e1a8b436848b0c8c596c8b9a2f334c5b3e5496547feb243b70ef320a621a9b5afaa8b054f45a5c2184fae9ae167019f2f83aba417a10954a23a58 WHIRLPOOL eb6de4523ff2fbc7161bd75e0983148faf85d700489647ad8792abd4fb41503b85b2b2b6feb684a14d37c0c04d0307a5d885f5010f8ba386037a8e9eea512f85 -DIST dosfstools-4.1.tar.xz 172936 SHA256 e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173 SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78 WHIRLPOOL 6504926aab2d38b03ac70af06d969c1e9576fa6604939e57182d5e3acc692651080e5b5f5af8b2f9a1c27392a0c26a89da7ab02ad0f530dd38399d5a6393d115 -EBUILD dosfstools-4.0-r1.ebuild 1128 SHA256 3fad55ffdea24dacbb79e4def420d2a03921bdbf67584d2c59cca6ce452a40b5 SHA512 846bed50093c29ad3f47948f3b0a6538f9e05dffccf82131af97f0c6092a05e22b3e97b20c12fcaac3ce5c8d2f3e4544a80cbd3a66ad89b00df09dece366571d WHIRLPOOL d0d667a5933ef17ede2c4846f68654bdbc4ae16691b681d6d5d6ab09af314724840a7819a7b1697ee2c9c60b6e4827b8abd1ba9a946c2968ad2ae083dacb28a5 -EBUILD dosfstools-4.1.ebuild 1012 SHA256 504c4c3f01191d6d0ac584651e4027631a352620ab4f9926afb80bfa929953a8 SHA512 dd6dfb8251c5fa3adbd7cd5febcdbd2143d41eb5b68d4c9bd6444965ac2653a1baab730e3ab9a4aeb82ea82c370ea16c4370d9d19914383277acf5a78d166ceb WHIRLPOOL 27338c32a577df0d2e5d7f7f7bb602a17b45889e8de81fb22a4de953727b732fa61c73b0e8cb9d497186f65163e6b7f74e8026dd81a61b5efd907d5df6f9e8e2 -MISC ChangeLog 6980 SHA256 14b7a237967dbfe4a3b2543a8626c69959c2c350095cd78e6ea093b9d164f258 SHA512 a554c37c1bdf9747654b52aed35bec1bcedc7a42cc05cebf212240e90627658f435c01df31ee79d7f2d4ccaba9b937df6d08d3cf448fc7e92b985f9dfc9c5449 WHIRLPOOL 154f1cf5a1d4c2629d41743d6dcebe58336c0d0ccd7de8e67b119e07f15a572f809af049753435c8484789f6401a5779adbf501205520cecf528c1f3c67b39e2 -MISC ChangeLog-2015 20367 SHA256 458f538cee8d13aef12cda3eee347fe40b24687be906909f316c7bdb29d4e61d SHA512 df112e1d37d1e43e264082109220e81acc0298b44a32ece8dd9a452a5c1100f4d81f90c740b12827260ab2853abaf8ee01a4c07d3f28a0fa345122f425eee200 WHIRLPOOL 051b08bfcc74a948c6ba6930d43afc089621c5871b086cc3b54c5c25fb67dceeb56fcade5fe4e2d34404c2f95273d22afcbd9318da4e89414c9056d54a208cd8 -MISC metadata.xml 424 SHA256 821cc5f833e124bfe1fae683127cd2276a69f49870ea3a9748227311aae6cd74 SHA512 d82795b70fc583b8154a2c3b14b6565cff36924b91fb3888cd2b6c36d8036614be6d67a0ea0fc96f2fa4bfa5516675b8aa74571e578ad8d42c06cb9f503c565d WHIRLPOOL 2555be401c8c866a5182345476c65b148f7b8c2d43c380dcbe3b003258895e82dc49741d773ee5613c0e398a91698c16780261b2839ee566a1cc02eb349053a3 +DIST dosfstools-4.2.tar.gz 320917 BLAKE2B c55c7592aa80f1fe39e838c83e147ad7141ddd0f72c9c000ba7708ecb7287c3a92b4b52f72c8d0d1171b0f9609dfb7861bbbe475c5cbd7011151c93c2b1d3d0d SHA512 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild deleted file mode 100644 index 4e41940da9..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/dosfstools-4.0-r1.ebuild +++ /dev/null @@ -1,47 +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="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -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" -) - -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/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/dosfstools-4.1.ebuild deleted file mode 100644 index 36848b2cec..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/dosfstools-4.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="compat test +udev" - -CDEPEND="udev? ( virtual/libudev )" -DEPEND="${CDEPEND} - test? ( app-editors/vim-core ) - udev? ( virtual/pkgconfig )" -RDEPEND="${CDEPEND}" - -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/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/dosfstools-4.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/dosfstools-4.2.ebuild new file mode 100644 index 0000000000..b26ba281f3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/dosfstools-4.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="compat +iconv test" +RESTRICT="!test? ( test )" + +BDEPEND=" + iconv? ( virtual/libiconv ) + test? ( app-editors/vim-core ) +" + +src_configure() { + local myeconfargs=( + $(use_enable compat compat-symlinks) + $(use_with iconv) + ) + + econf "${myeconfargs[@]}" +} + +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/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch b/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch deleted file mode 100644 index 23204770f7..0000000000 --- a/sdk_container/src/third_party/portage-stable/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 -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 ---- - 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/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/metadata.xml index ffedbfb729..2ec1501001 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-fs/dosfstools/metadata.xml @@ -1,11 +1,12 @@ - + base-system@gentoo.org Gentoo Base System + cpe:/a:dosfstools_project:dosfstools dosfstools/dosfstools