old

Package-Manager: portage-2.2_pre5

7 files changed, 3 insertions, 333 deletions

diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index b28b21aa1e14..99ad8aed8c1f 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX dosfstools-2.10-2.6.headers.patch 740 RMD160 6a6a12403a73dca6d23ccc2ca0b93bf5613ad546 SHA1 86f8c75d93696559f46d4fb481dccdb12e465bcc SHA256 11f08c1f6f56f0cbb017a92825c6de03df94cf736da01683fe7e6f261d385b16
-AUX dosfstools-2.10-lseek64.patch 5650 RMD160 14732171e0e66200b3e457ea08be9fada452740e SHA1 21e429fa50435c15e8d5d73790f0aba88251425d SHA256 7a69a7e66935bb03c2613eae82ed30c984cd7be39d3aebf41b8c696d08678b50
 AUX dosfstools-2.11-build.patch 417 RMD160 ab742b6c75c4da972c083992b5da3b6988aee2e1 SHA1 d7f1ebe4d2571530ed5dfee7b19eaead85c45c5f SHA256 e596839e876e1fdfebae48c800261c50f1490462d4a10a596c6fc1b3b18b38dd
 AUX dosfstools-2.11-fat32size.patch 1428 RMD160 7434905b76773c0e955285677af4c6ed3ca21f54 SHA1 66544b700ba7105d1fc8912064d38a50651e5162 SHA256 f2d205fbfbf6a6cb7efb97886e11644b7413a5683b0af154128e496679a1f061
 AUX dosfstools-2.11-preen.patch 1052 RMD160 4166936091f103c6f85c731078d5ea2139fbfa61 SHA1 05b6f0283df868bf17f2c10d67af2240bc157cb1 SHA256 2da7e1698fdd75a10d2f39cdfa647ef40fea96d165bbab070153278f1aacfba9
 AUX dosfstools-2.11-verify-double-count-fix.patch 1089 RMD160 c18dc1ba44b89e76c880528d96e8523f2e6ea72c SHA1 166d02922083f093c177c703619a401e0d44809d SHA256 d1fb2fc64776469378735c737235b1916d2ae1d150967b42a46594c75b4310bf
-AUX errno.patch 257 RMD160 7a278839bea6fd5db6949953241990b1f2c9b496 SHA1 99fb75b936c3f91a76b6ced9e05a4094035a8357 SHA256 52c50cc822a0e14bb257970051c85af7b81953734920939cb1828d98403dc9c5
 DIST dosfstools-2.11.src.tar.gz 68346 RMD160 0336d407319ccbf8d4c4bf16a2330e713ab6b0ab SHA1 b0d8714475ca7c7a96a46adf7c4839d69ce2f412 SHA256 0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484
-EBUILD dosfstools-2.11-r1.ebuild 1161 RMD160 2ca9e1813a477d71882c486c21a264efbbd70668 SHA1 59acf566d93e7a3bd31a0a9fb9c9fde88210fe9d SHA256 7b0defc5c305ecfed58abc38134bfe1d412914492e37dddd82f2451a25553c22
-EBUILD dosfstools-2.11-r2.ebuild 1228 RMD160 fb3f16000563418d6e2ab9ed930360888fb8a7b6 SHA1 dd39eca00c0ffc3fdede4ad877741fdb53181eaa SHA256 deb04fae69512eff0857f601eb501c673ca8ee795e6e41a8a5105dc6e731d84c
 EBUILD dosfstools-2.11-r3.ebuild 1267 RMD160 2b3848e1e5d33b8294f90828368f8639bc6b7338 SHA1 b8fe57492d82d009c45f3d75a5c65a438dd9ef33 SHA256 fb4564840a04a945be3340f80d378cf5b5d3dc2f9ce89e8e43af7dae2a00b042
-EBUILD dosfstools-2.11.ebuild 1068 RMD160 547079e5d69bd3397f4342960d13245bae06b2f6 SHA1 9bac027013e7d5565959a6c2203c8af8dec8dbec SHA256 07e3778b5897871c2678a366d19f8cd894e8feccd73e566f45d6727be615b38f
 MISC ChangeLog 6644 RMD160 54057f4a21128be87f627ca0e1b2bb05877b9573 SHA1 b031999a2dce5d3e0d87b25f76a47d68c71fc5cd SHA256 77dc683775c9e89449555d6698950a565f073abb456260c0cb62647ecc325c0c
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH3N0Tj9hvisErhMIRAl0uAKDM4zxxw7rmn472zRQr3jJ2Gd2YwwCfUGdc
-kYmrctzwznGB/5vdP0HRRFA=
-=3Zk5
+iD8DBQFH9sPkj9hvisErhMIRAqbbAJ9XMZQsgsmWk4dwqu/XUJ4/FnHxbwCdFgPB
+3O7NUJ6HRVM9MZnEkq8/ojU=
+=5Nkr
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/dosfstools/dosfstools-2.11-r1.ebuild b/sys-fs/dosfstools/dosfstools-2.11-r1.ebuild
deleted file mode 100644
index 4e194f26595c..000000000000
--- a/sys-fs/dosfstools/dosfstools-2.11-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.11-r1.ebuild,v 1.12 2006/10/04 16:32:53 dang Exp $
-
-inherit eutils
-
-DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
-HOMEPAGE="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/^PREFIX/s:=:=/usr:' \
-		-e '/^MANDIR/s:/usr:/share:' \
-		Makefile || die "sed Makefile"
-	epatch "${FILESDIR}"/dosfstools-2.11-fat32size.patch
-}
-
-src_compile() {
-	# this package does *not* play well with optimisations
-	# please dont change to: make OPTFLAGS="${CFLAGS}"
-	emake -j1 || die
-}
-
-src_install() {
-	make PREFIX="${D}"/usr install || die
-	dodoc CHANGES TODO
-	newdoc dosfsck/README README.dosfsck
-	newdoc dosfsck/CHANGES CHANGES.dosfsck
-	newdoc mkdosfs/README README.mkdosfs
-	newdoc mkdosfs/ChangeLog ChangeLog.mkdosfs
-}
diff --git a/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild b/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild
deleted file mode 100644
index c8fb6d5f598e..000000000000
--- a/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.11-r2.ebuild,v 1.2 2006/12/14 05:47:34 vapier Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
-HOMEPAGE="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/^PREFIX/s:=:=/usr:' \
-		-e '/^MANDIR/s:/usr:/share:' \
-		Makefile || die "sed Makefile"
-	epatch "${FILESDIR}"/dosfstools-2.11-fat32size.patch
-	epatch "${FILESDIR}"/dosfstools-2.11-verify-double-count-fix.patch
-	epatch "${FILESDIR}"/dosfstools-2.11-build.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake -j1 || die
-}
-
-src_install() {
-	emake PREFIX="${D}"/usr install || die
-	dodoc CHANGES TODO
-	newdoc dosfsck/README README.dosfsck
-	newdoc dosfsck/CHANGES CHANGES.dosfsck
-	newdoc mkdosfs/README README.mkdosfs
-	newdoc mkdosfs/ChangeLog ChangeLog.mkdosfs
-}
diff --git a/sys-fs/dosfstools/dosfstools-2.11.ebuild b/sys-fs/dosfstools/dosfstools-2.11.ebuild
deleted file mode 100644
index 37f3dcf0492d..000000000000
--- a/sys-fs/dosfstools/dosfstools-2.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.11.ebuild,v 1.4 2006/06/16 20:42:01 corsair Exp $
-
-DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
-HOMEPAGE="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/^PREFIX/s:=:=/usr:' \
-		-e '/^MANDIR/s:/usr:/share:' \
-		Makefile || die "sed Makefile"
-}
-
-src_compile() {
-	# this package does *not* play well with optimisations
-	# please dont change to: make OPTFLAGS="${CFLAGS}"
-	make || die
-}
-
-src_install() {
-	make PREFIX="${D}"/usr install || die
-	dodoc CHANGES TODO
-	newdoc dosfsck/README README.dosfsck
-	newdoc dosfsck/CHANGES CHANGES.dosfsck
-	newdoc mkdosfs/README README.mkdosfs
-	newdoc mkdosfs/ChangeLog ChangeLog.mkdosfs
-}
diff --git a/sys-fs/dosfstools/files/dosfstools-2.10-2.6.headers.patch b/sys-fs/dosfstools/files/dosfstools-2.10-2.6.headers.patch
deleted file mode 100644
index 025e40f46981..000000000000
--- a/sys-fs/dosfstools/files/dosfstools-2.10-2.6.headers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur dosfsck/boot.org dosfsck/boot.c
---- dosfsck/boot.org   2004-03-04 06:45:51.368946816 +0000
-+++ dosfsck/boot.c   2004-03-04 06:45:24.838979984 +0000
-@@ -14,6 +14,10 @@
- #include "io.h"
- #include "boot.h"
- 
-+#ifndef MSDOS_FAT12
-+#define MSDOS_FAT12 MAX_FAT12
-+#endif // !MSDOS_FAT12
-+
- #define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0)
-     /* don't divide by zero */ 
- 
-diff -ur mkdosfs/mkdosfs.c mkdosfs/mkdosfs.c
---- mkdosfs/mkdosfs.c	2005-04-14 17:14:59.000000000 +0100
-+++ mkdosfs/mkdosfs.c	2005-04-14 17:16:05.000000000 +0100
-@@ -54,6 +54,7 @@
- #include <linux/hdreg.h>
- #include <linux/fs.h>
- #include <linux/fd.h>
-+#include <linux/types.h>
- #include <endian.h>
- #include <mntent.h>
- #include <signal.h>
diff --git a/sys-fs/dosfstools/files/dosfstools-2.10-lseek64.patch b/sys-fs/dosfstools/files/dosfstools-2.10-lseek64.patch
deleted file mode 100644
index ea99c3fbb0d2..000000000000
--- a/sys-fs/dosfstools/files/dosfstools-2.10-lseek64.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-diff -Naur dosfstools-2.10-orig/Makefile dosfstools-2.10/Makefile
---- dosfstools-2.10-orig/Makefile	2003-05-15 19:00:27.000000000 +0000
-+++ dosfstools-2.10/Makefile	2004-06-28 05:00:45.000000000 +0000
-@@ -7,7 +7,7 @@
- OPTFLAGS = -O2 -fomit-frame-pointer
- WARNFLAGS = -Wall
- DEBUGFLAGS = 
--CFLAGS = $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
-+CFLAGS = -D_GNU_SOURCE $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
- LDFLAGS =
- 
- PREFIX = 
-diff -Naur dosfstools-2.10-orig/dosfsck/io.c dosfstools-2.10/dosfsck/io.c
---- dosfstools-2.10-orig/dosfsck/io.c	2003-06-14 20:03:20.000000000 +0000
-+++ dosfstools-2.10/dosfsck/io.c	2004-06-28 04:59:45.000000000 +0000
-@@ -39,32 +39,6 @@
- 
- unsigned device_no;
- 
--/* Use the _llseek system call directly, because there (once?) was a bug in
-- * the glibc implementation of it. */
--#include <linux/unistd.h>
--#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__
--/* On alpha, the syscall is simply lseek, because it's a 64 bit system. */
--static loff_t llseek( int fd, loff_t offset, int whence )
--{
--    return lseek(fd, offset, whence);
--}
--#else
--# ifndef __NR__llseek
--# error _llseek system call not present
--# endif
--static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo,
--		  loff_t *, res, uint, wh );
--
--static loff_t llseek( int fd, loff_t offset, int whence )
--{
--    loff_t actual;
--
--    if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0)
--	return (loff_t)-1;
--    return actual;
--}
--#endif
--
- 
- void fs_open(char *path,int rw)
- {
-@@ -86,7 +60,7 @@
-     CHANGE *walk;
-     int got;
- 
--    if (llseek(fd,pos,0) != pos) pdie("Seek to %lld",pos);
-+    if (lseek64(fd,pos,0) != pos) pdie("Seek to %lld",pos);
-     if ((got = read(fd,data,size)) < 0) pdie("Read %d bytes at %lld",size,pos);
-     if (got != size) die("Got %d bytes instead of %d at %lld",got,size,pos);
-     for (walk = changes; walk; walk = walk->next) {
-@@ -106,7 +80,7 @@
-     void *scratch;
-     int okay;
- 
--    if (llseek(fd,pos,0) != pos) pdie("Seek to %lld",pos);
-+    if (lseek64(fd,pos,0) != pos) pdie("Seek to %lld",pos);
-     scratch = alloc(size);
-     okay = read(fd,scratch,size) == size;
-     free(scratch);
-@@ -121,7 +95,7 @@
- 
-     if (write_immed) {
- 	did_change = 1;
--	if (llseek(fd,pos,0) != pos) pdie("Seek to %lld",pos);
-+	if (lseek64(fd,pos,0) != pos) pdie("Seek to %lld",pos);
- 	if ((did = write(fd,data,size)) == size) return;
- 	if (did < 0) pdie("Write %d bytes at %lld",size,pos);
- 	die("Wrote %d bytes instead of %d at %lld",did,size,pos);
-@@ -144,7 +118,7 @@
-     while (changes) {
- 	this = changes;
- 	changes = changes->next;
--	if (llseek(fd,this->pos,0) != this->pos)
-+	if (lseek64(fd,this->pos,0) != this->pos)
- 	    fprintf(stderr,"Seek to %lld failed: %s\n  Did not write %d bytes.\n",
- 	      this->pos,strerror(errno),this->size);
- 	else if ((size = write(fd,this->data,this->size)) < 0)
-diff -Naur dosfstools-2.10-orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs.c
---- dosfstools-2.10-orig/mkdosfs/mkdosfs.c	2003-06-14 20:07:08.000000000 +0000
-+++ dosfstools-2.10/mkdosfs/mkdosfs.c	2004-06-28 05:00:16.000000000 +0000
-@@ -93,30 +93,6 @@
- 
- #endif /* __BIG_ENDIAN */
- 
--/* Use the _llseek system call directly, because there (once?) was a bug in
-- * the glibc implementation of it. */
--#include <linux/unistd.h>
--#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__
--/* On alpha, the syscall is simply lseek, because it's a 64 bit system. */
--static loff_t llseek( int fd, loff_t offset, int whence )
--{
--    return lseek(fd, offset, whence);
--}
--#else
--# ifndef __NR__llseek
--# error _llseek system call not present
--# endif
--static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo,
--		  loff_t *, res, uint, wh );
--static loff_t llseek( int fd, loff_t offset, int whence )
--{
--    loff_t actual;
--
--    if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0)
--	return (loff_t)-1;
--    return actual;
--}
--#endif
- 
- /* Constant definitions */
- 
-@@ -423,7 +399,7 @@
- {
-   long got;
- 
--  if (llseek (dev, (loff_t)current_block * BLOCK_SIZE, SEEK_SET) /* Seek to the correct location */
-+  if (lseek64 (dev, (loff_t)current_block * BLOCK_SIZE, SEEK_SET) /* Seek to the correct location */
-       != (loff_t)current_block * BLOCK_SIZE)
-     die ("seek failed during testing for blocks");
- 
-@@ -542,7 +518,7 @@
- {
-   char ch;
- 
--  if (llseek (fd, offset, SEEK_SET) < 0)
-+  if (lseek64 (fd, offset, SEEK_SET) < 0)
-     return FALSE;
-   if (read (fd, &ch, 1) < 1)
-     return FALSE;
-@@ -565,7 +541,7 @@
-     }
- 
-   /* first try SEEK_END, which should work on most devices nowadays */
--  if ((low = llseek(fd, 0, SEEK_END)) <= 0) {
-+  if ((low = lseek64(fd, 0, SEEK_END)) <= 0) {
-       low = 0;
-       for (high = 1; valid_offset (fd, high); high *= 2)
- 	  low = high;
-@@ -1310,7 +1286,7 @@
- #define seekto(pos,errstr)						\
-   do {									\
-     loff_t __pos = (pos);						\
--    if (llseek (dev, __pos, SEEK_SET) != __pos)				\
-+    if (lseek64 (dev, __pos, SEEK_SET) != __pos)			\
- 	error ("seek to " errstr " failed whilst writing tables");	\
-   } while(0)
- 
-@@ -1667,11 +1643,11 @@
- 	die("unable to create %s");
-       /* seek to the intended end-1, and write one byte. this creates a
-        * sparse-as-possible file of appropriate size. */
--      if (llseek( dev, offset, SEEK_SET ) != offset)
-+      if (lseek64( dev, offset, SEEK_SET ) != offset)
- 	die( "seek failed" );
-       if (write( dev, &null, 1 ) < 0)
- 	die( "write failed" );
--      if (llseek( dev, 0, SEEK_SET ) != 0)
-+      if (lseek64( dev, 0, SEEK_SET ) != 0)
- 	die( "seek failed" );
-   }
-   
diff --git a/sys-fs/dosfstools/files/errno.patch b/sys-fs/dosfstools/files/errno.patch
deleted file mode 100644
index 9142c5993b20..000000000000
--- a/sys-fs/dosfstools/files/errno.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mkdosfs/mkdosfs.c.orig	2003-02-27 01:46:48.000000000 -0500
-+++ mkdosfs/mkdosfs.c	2003-02-27 01:47:00.000000000 -0500
-@@ -49,6 +49,7 @@
- 
- #include "../version.h"
- 
-+#include <errno.h>
- #include <fcntl.h>
- #include <linux/hdreg.h>
- #include <linux/fs.h>