From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- sys-fs/dosfstools/Manifest | 5 +-- sys-fs/dosfstools/dosfstools-4.0-r1.ebuild | 47 ---------------------- sys-fs/dosfstools/dosfstools-4.1.ebuild | 2 +- .../dosfstools/files/dosfstools-4.0-udevlibs.patch | 36 ----------------- 4 files changed, 2 insertions(+), 88 deletions(-) delete mode 100644 sys-fs/dosfstools/dosfstools-4.0-r1.ebuild delete mode 100644 sys-fs/dosfstools/files/dosfstools-4.0-udevlibs.patch (limited to 'sys-fs/dosfstools') diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest index 8d49a542328b..a021735267e6 100644 --- a/sys-fs/dosfstools/Manifest +++ b/sys-fs/dosfstools/Manifest @@ -1,6 +1,3 @@ -AUX dosfstools-4.0-udevlibs.patch 1132 BLAKE2B f6d5d052a56a8d997e12cf293bfa7e482b728aa98e8135aa14d34367f045b3c494a0ff1b3ce0242f5645c99e885e8fd66eb76f46eb6ba589d2eebd69ec8f439a SHA512 0ae6fac866f4f634ed733279859c039f789d8420401217c039c06c995cd0be1fc697b24353135ee5c7abf04e4638c810726f0a310979251dd126e70c76739928 -DIST dosfstools-4.0.tar.xz 157564 BLAKE2B 13dd374eb6824b2c5d5ae849dd802a4bb1b85729f4654e3d23ee8c3698a72a45a73e1a7d7cb95ae7cba13ea9737e80e253eb4603b342e49743a8402d7f7ceeba SHA512 81acf54dc87e1a8b436848b0c8c596c8b9a2f334c5b3e5496547feb243b70ef320a621a9b5afaa8b054f45a5c2184fae9ae167019f2f83aba417a10954a23a58 DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78 -EBUILD dosfstools-4.0-r1.ebuild 1117 BLAKE2B a973db2963f44141e73cd3fe8e680ae4ec10564bf3eb2397254d5070a7ad395a4905484d1d61bdc91c89464c02bcb494efa9195cb76608966966101e013a8816 SHA512 f00d35306a1a95d7b3b23fb8e23f5587e16cb8f4e02244f53fc4ddda3b07a704727a7d463bda724015f1e08273102f2aa1f165e4b9bf5be468bc7f9363fda597 -EBUILD dosfstools-4.1.ebuild 994 BLAKE2B 8203419c4de24b235d76e59853cd494948bae42e9a2de715865c1d66040b06387c0f5a84c110ad097692ba748f8c37f0910515baafa5ffe6cd762becd1bec22c SHA512 a5ec100924c99ab2b9af1e10e1c20f5f37a0105e97e674c630c14b35ee01f2cc9e916b653f98dbd9179f0c64709467dc9fcaad1f2621a37a60f5e03867ec2650 +EBUILD dosfstools-4.1.ebuild 993 BLAKE2B 8737bd209b6caf6586a430f84a39a060478a8dfcf079121745a16e0a6901829813e6efd55a0e14a1cc48bec986839fb05dab37d844660dcae2bb16bb3d137348 SHA512 7067f3e6ac9d39dcdbf394abdd2a49f97377d2b17e7e60ef37e34edd0bc2b082bf105119ea0fd566bf2146e0f2900e670ba402864dc05517238d6e8b25c38ff9 MISC metadata.xml 424 BLAKE2B 01d65645ef9a1e617bf40a2d401a5fd3f1444c68f41a3c64e746e445b100ebd7c8af05b48c250f4bd9c679842906dd2e9b679edc298b1001f7dfe5b183f5f77a SHA512 d82795b70fc583b8154a2c3b14b6565cff36924b91fb3888cd2b6c36d8036614be6d67a0ea0fc96f2fa4bfa5516675b8aa74571e578ad8d42c06cb9f503c565d 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 e7201e863037..000000000000 --- a/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 ~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/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild index 5ad335273a1f..a245d461ea34 100644 --- a/sys-fs/dosfstools/dosfstools-4.1.ebuild +++ b/sys-fs/dosfstools/dosfstools-4.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}. LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="compat test +udev" CDEPEND="udev? ( virtual/libudev )" 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 23204770f770..000000000000 --- 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 -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 - -- cgit v1.2.3