Version bump based on work by Manuel Rüger #434938. Convert to EAPI=4. Add hack for embedded systems.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 75 insertions, 5 deletions

diff --git a/sys-fs/dosfstools/ChangeLog b/sys-fs/dosfstools/ChangeLog
index 615969e27a23..c7a5e19a28c4 100644
--- a/sys-fs/dosfstools/ChangeLog
+++ b/sys-fs/dosfstools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/dosfstools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.92 2012/09/11 15:47:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.93 2012/09/14 18:44:39 vapier Exp $
+
+*dosfstools-3.0.13 (14 Sep 2012)
+
+  14 Sep 2012; Mike Frysinger <vapier@gentoo.org> +dosfstools-3.0.13.ebuild,
+  +files/dosfstools-3.0.13-reserved-sectors-hack.patch:
+  Version bump based on work by Manuel Rüger #434938.  Convert to EAPI=4.  Add
+  hack for embedded systems.
 
   11 Sep 2012; Raúl Porcel <armin76@gentoo.org> dosfstools-3.0.12.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #432330
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index 7853b4ebed36..0d531c598b09 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -3,20 +3,33 @@ Hash: SHA256
 
 AUX dosfstools-3.0.11-name-ext.patch 803 SHA256 72c3c217e6060107fb5d05485ae7efac7e2d005ab72165be1e695749bfd78965 SHA512 22ed95a7a45ae0b243fa78fde5c900e61e089c98f549c0f242da3a2d5e35acdccbeb461a4712e39fb9786625be9649b7ee5a968714cd6b9f2f6f3af3112ee88f WHIRLPOOL f5e7dd171688e2dc64e7d885e94195996d293b1cce8f8bf62c93254cb8b4f78def8e93c2a7f4707bee39603e362d27a4904803f59a3e7f544bdf6b30be23dfff
 AUX dosfstools-3.0.12-name-ext.patch 807 SHA256 1b5fcf7c2b67498ea4de67a0053146441caf53e5fc5e9bd314b827bd91e4b9db SHA512 b9ee446e828701411f63903b1460369b8ea159685b910fbe70c1ed81234c34344f7dc989efa156c083a8a4c3ea64690f7bc42d69185e67efbecb2ae14d106098 WHIRLPOOL 50aa81bc07989695985b95d45fe669b76cdc1a99bb2bdad6f4f56a71ba21923f5f5e66b8ed999ca684d6bcc370fb339b4b06bdb2175d5b1ed4f7ef6d02354fc6
+AUX dosfstools-3.0.13-reserved-sectors-hack.patch 629 SHA256 37ea823a8ced9054ec70a57ad2681ad8606f5002814f7d0383174a62ba87c499 SHA512 4b2a0de0ee01cb41391f78f482a180dacfa0e8671ddfbdc7774fcd5ade440c9f2bf4a5e3320ca5befc9cf79bbc2622131a49430ac9876af0f2826e4b77998950 WHIRLPOOL e5974b046b471e88e2ba420743b4270abb4ace88f814fc309cb1deb662ba801388d9ff7c427ea88ae699038e55d084c1d6236642504aff77949d424cef4553ec
 DIST dosfstools-3.0.10.tar.bz2 69718 SHA256 c8f6155c329c90e6bffdb339d702301316aeb6b365d95dcebd1cdc9968ad9162 SHA512 72899d1d2dd94913ba38c7f3e5c4f25801c47e61a61fca88928dd3e08eec89aa599ab49748abaddc2841d893df3cc5e996de5e514d7945d4bc25eee66fca9b0c WHIRLPOOL bef2e6f6df97f4ad9801d8d00de488672720c505714b36d3efcb56ef1eac2afcd31a2068ca8b24090e764e3e79d7e26207fdb58792c0191f9c2e5851006a15cf
 DIST dosfstools-3.0.11.tar.bz2 70039 SHA256 94b27a0f53f4aa86b0c049eb26df7a681ec6c31bc352c57d3ac53881bcfcd9a8 SHA512 e65154218d1b0374334ee1c23022c833440d840d87ca3f81202149d200643755181f0ae13830a5c6c4f5739041f549dd49cbf5464ec68bb65c211975e18f2df7 WHIRLPOOL 65f67ca69f6177e928a85a2acbcc47e1019f1d1b86ca0da56af0cdb06c11b7e50d6371d6c0d5f15ea24ebb141c0c5012b0bac22c0e5d26f753e44574e3cff911
 DIST dosfstools-3.0.12.tar.gz 82117 SHA256 5ee889083baf755ae54b9fcfdce30c3dab8038652bd8acc6f2b7382c5fe261e4 SHA512 14e58cbc0fa8eb6a4b0e8184d8331b01c524a3522c6d3cafa1b8d63b8d076adad71ae65930cd8632ba56d8f9b633a3dd3c8a0bbab32e2937759ce8bf1bb21903 WHIRLPOOL e8d38c19b0731ba228318199f57f2dd9fdb0f467bd2bd34637b412bd2d5eef5a4c898ad0efccab233ebd507e0754b06f596497e79409d101576bd7a125adecb4
+DIST dosfstools-3.0.13.tar.bz2 70362 SHA256 42ce760d4a7e1acc3831dee890f2fa2ab814ad895f0cc097727f38cc281aafae SHA512 a6d4261f1976366fe898759bde2ce345b7a18384ba1b6057e2105aa358c3b8afa01e92757dc6db744c4d71cbedd5a6076b340123a9dbe5b0b18301d1ef352999 WHIRLPOOL 7cef93455f073709d43c15346f873b36b2ab779568de4c2f7b83eafd8cb4cc334c83cb02cfb965d7fc01241807fe7cd448573fa8d272a2bf87343fa9da64394b
 DIST dosfstools-3.0.9.tar.bz2 69186 SHA256 3f63676faeac507e909d84c8920ddb6597da1eb688577c2fc9c756b821d0458f SHA512 d552e9065a5e9315542969eded9872c44c17fd5f3ec901c1341a67040156b2f8288ceb1a940fd91a317ebcf8b48929ce5a5ca32dfe2e7fc8f67b91db2a95c031 WHIRLPOOL 0a26a6d2ff3954ab01a9424f9a384b1f0b670d15c4da9507c0b3e56777e108acceb37d9da47f2fcf25d72788136892911fd30e53cbf2cb13499e9a5fd3085e7a
 EBUILD dosfstools-3.0.10.ebuild 973 SHA256 fbb1b9d8232135ebec6e57dabb9fd666a57bfa1a0a3a7aecd624d687fa856895 SHA512 23901a1a0cc492b58c87202a48f3a15b27fa0c4375bb511afe1b82f360ca29a81c3207e89aa46b59a980f0cb76a9aedeecae6a304d38868c5c7c8591a5e30206 WHIRLPOOL ce42a8ab02a48c7eed5968d17df75981ad7ecacf536d6062e45400acd68704e2f49db5888cbabb1f3b180640f812eadf6b1c91482b6e28b47f536937fb7e720f
 EBUILD dosfstools-3.0.11.ebuild 1056 SHA256 d579d894be0d0e8377deffa3adaf9f83876f1ec770ed99afe91d2acc363c6720 SHA512 5f90facf08e1828158c602e6b2d6be8718da834c92f6c4b6bc40330b7dc496cc7c3268a8657697eebcd09d43b82450bc80c5913d008b6bad0a2cf5d6536a4c1a WHIRLPOOL a3a08a0736351c43e4ef4e109d2fb132bd2c8f48cf4154c9c4f03719bd4c5877a6c9ee32ff868d20ce0c83bceeda4879cd08b95102eb81f0d18237a67caa532c
 EBUILD dosfstools-3.0.12.ebuild 1077 SHA256 dafb5f556dff2584b497c74a4c1b11bd3bc22341256a80bc60227890b30d48f0 SHA512 f23748be1bcc756ade8f712556cb6dfeda8bca2ca4657ae9326ce108936884e10597e2ca33ff4dd68a043e2f20a04ff1986ac3f80a9b287f010363be45761fb1 WHIRLPOOL 45c16f07424c9e78ff20b42a7e2c2fd7f27fe19fb6f9e51f9a8d7d5d0858a6c8da42e87f11d10817682836b935b094fab6c2274db09f7cb786f1b8fbba19bf1f
+EBUILD dosfstools-3.0.13.ebuild 1021 SHA256 47617ccfbc2f757658c5aecb3d7275cd7d7c69b512cabac74b7203c46048316e SHA512 bc0850145fc72cf94f83e4767c3a3215d361944bc504f334d05a140a8ae91ee26bf66b8b96d1f6348affcb87f852ceaf0a5b492380fdba50f2e5bc02b61e27ce WHIRLPOOL a6945a7bf49e7b7df62972f6b1ffee0e71a6dbe0638ddc1742ab2c151476018e93ffd9bba48811deb6322eac7599e7dc3fe61bdec419b55d1dad48c8f3318c74
 EBUILD dosfstools-3.0.9.ebuild 965 SHA256 c053648fee64c914d9945817c704cb1e5a85c651010ba0fbb70072bbf2312dec SHA512 7cf73bf58ea04ec5d85bd0162d3ec2b1a3db205ef2cb9f2ed441b596e533feb592a42447a0add17c9555725b72f7d4bb2f8553ff61901a553d0b92a479c1ccff WHIRLPOOL e1badde8f1ab7b21fc9bc205f9f714abcaa40c21852620b86fcc492094b9dc81e1c36caef1845f7bf814f19a3d251f0129c33abc5627acff352bdc101be7d700
-MISC ChangeLog 12391 SHA256 4c5be0c55d97e00f5651797c821d3d78bf4b1ed4a5c2b07d1c7efc493231419e SHA512 3970818b1737aaf260a40b84bbd2af3ce22b12a66ca9d1fdf803a64cf32920ceff080639baf71d140988e5de56cc99ef7e9e442e9965dcaec790a58d8f3d3412 WHIRLPOOL 9b20787868b2a5e47d43e4fd8cefade2cd0b6620beca6a24f245f85189051b101f5ea48a8bf44136d739793fd768c9b074e47effaf1744d062aca24f2359d567
+MISC ChangeLog 12667 SHA256 d2ebfe930641ff2c5545d3b018f1e4de38d01200326a1b45cd9324adf7333e49 SHA512 7ec18baf63c63d5d9366583b2aed0591563226ee194f8441423e414f570bf266233f77b3337c74f1f24c83e0d6f28bbf43064f6a17b0130cd6ece5f6b732b0fe WHIRLPOOL 49c7fbeffb557236f52831f9385f016a447e5514bc7f0f8e8c3c0c0f0761412e128bf16f2c1ea3bb463778e713e3a72205ff3c886794a663d192fbaeeb5792db
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBPXQIACgkQuQc30/atMkApfQCeJVEopFqK/s3UuAm8yIlkHTFD
-8AAAn36KwdwfUr8doZfnp5XHZtX593u4
-=gDZY
+iQIcBAEBCAAGBQJQU3u9AAoJELEHsLL7fEFWy5cP/32T2lRg1m8KEZHpnAfMWi8d
+jsj57QZM4YVkb66i31EV+XwbDbcloSdA+8kLYfnZCCJhp1pTZU0rngRitjL3B54o
+mUPShW26u9l4kN7rYa2zTmPp4zG3GGPQV9P9zGsxMAM1eJKk/7ICvATFw26JPVCm
+9hE/SzCdhz1w5eyFzg+raX3RDjY1JoQASlq+JgaY0K8a7nYjpuJB5L4KdL9GfRMs
+ZJ5X9zhbF0vG/5cZZSRir5LZ4R/Q4btOBIH1VmpzzWTjT0lIIV2ggsgMdp8ZwJsP
+IdAHCCDeoVZKbYo9FGU8IMMK8I24BHLlDZiOiUfPaDUD/LJ5FuJLrnGtuOzrkhGK
+ylkZ5vSenubp9jO/iwjF4yGGfwDBXmrYdiYJTR3yLgCcEBQAktW6vBcAIKjsnzfO
+tUXV+cLKAuyipFviBLU6eZ0bTECV4SYxSZzKxr5rMtghGzvM66oti/5fEk4az8+E
+pAfY10wgmkKv0dQydIawTfTMJ89kCsNgjLH55SJLeD5szBy7trZLYUf6HALgi8+q
+quSDXhxhwpNlA2iIWj4LHdP2JB6f6VmwWMB20widJYiQmAaVstKs1H5vuHrwfLkj
+85ulxz8Dia3CSKIFOXssscqAIM/XPyP4nn4NFHxGFJFbCUW7vwBscIsApMpp0BFm
+BgCrIcQuwMWfkTuxVAv8
+=K5X5
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/dosfstools/dosfstools-3.0.13.ebuild b/sys-fs/dosfstools/dosfstools-3.0.13.ebuild
new file mode 100644
index 000000000000..4be34c27f622
--- /dev/null
+++ b/sys-fs/dosfstools/dosfstools-3.0.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-3.0.13.ebuild,v 1.1 2012/09/14 18:44:39 vapier Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
+HOMEPAGE="http://www.daniel-baumann.ch/software/dosfstools/"
+SRC_URI="http://www.daniel-baumann.ch/software/dosfstools/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RESTRICT="test" # there is no test target #239071
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.12-name-ext.patch
+	epatch "${FILESDIR}"/${PN}-3.0.13-reserved-sectors-hack.patch #434938
+	sed -i \
+		-e "/^PREFIX/s:=.*:= ${EPREFIX:-/usr}:" \
+		-e '/^OPTFLAGS/d' \
+		Makefile || die
+	append-lfs-flags
+	tc-export CC
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/share/doc/{${PN},${PF}} || die
+}
diff --git a/sys-fs/dosfstools/files/dosfstools-3.0.13-reserved-sectors-hack.patch b/sys-fs/dosfstools/files/dosfstools-3.0.13-reserved-sectors-hack.patch
new file mode 100644
index 000000000000..4c561d491f13
--- /dev/null
+++ b/sys-fs/dosfstools/files/dosfstools-3.0.13-reserved-sectors-hack.patch
@@ -0,0 +1,17 @@
+https://bugs.launchpad.net/ubuntu/+source/dosfstools/+bug/746262
+
+hack to use just 1 sector for embedded devices.  should be made into a
+flag, but this shouldn't break normal systems ...
+
+--- a/src/mkdosfs.c
++++ b/src/mkdosfs.c
+@@ -1012,7 +1012,8 @@
+ 	}
+ 
+ 	/* Adjust the reserved number of sectors for alignment */
+-	reserved_sectors = align_object(reserved_sectors, bs.cluster_size);
++	/* Wrong rounding for reserved_sectors */
++	/* reserved_sectors = align_object(reserved_sectors, bs.cluster_size); */
+ 	bs.reserved = CT_LE_W(reserved_sectors);
+ 
+ 	/* Adjust the number of root directory entries to help enforce alignment */