Map -p to -a for baselayout-2, #177514.

(Portage version: 2.1.2.7)

4 files changed, 80 insertions, 2 deletions

diff --git a/sys-fs/dosfstools/ChangeLog b/sys-fs/dosfstools/ChangeLog
index a8df819ddee4..00a988e3b71e 100644
--- a/sys-fs/dosfstools/ChangeLog
+++ b/sys-fs/dosfstools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/dosfstools
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.36 2006/12/14 05:47:33 vapier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/ChangeLog,v 1.37 2007/05/12 15:38:56 uberlord Exp $
+
+*dosfstools-2.11-r3 (12 May 2007)
+
+  12 May 2007; Roy Marples <uberlord@gentoo.org>
+  +files/dosfstools-2.11-preen.patch, +dosfstools-2.11-r3.ebuild:
+  Map -p to -a for baselayout-2, #177514.
 
   14 Dec 2006; Mike Frysinger <vapier@gentoo.org>
   +files/dosfstools-2.11-build.patch, dosfstools-2.11-r2.ebuild:
diff --git a/sys-fs/dosfstools/dosfstools-2.11-r3.ebuild b/sys-fs/dosfstools/dosfstools-2.11-r3.ebuild
new file mode 100644
index 000000000000..366d5872057e
--- /dev/null
+++ b/sys-fs/dosfstools/dosfstools-2.11-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-2.11-r3.ebuild,v 1.1 2007/05/12 15:38:56 uberlord 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
+	epatch "${FILESDIR}"/dosfstools-2.11-preen.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/files/digest-dosfstools-2.11-r3 b/sys-fs/dosfstools/files/digest-dosfstools-2.11-r3
new file mode 100644
index 000000000000..00e5fa079ba2
--- /dev/null
+++ b/sys-fs/dosfstools/files/digest-dosfstools-2.11-r3
@@ -0,0 +1,3 @@
+MD5 407d405ade410f7597d364ab5dc8c9f6 dosfstools-2.11.src.tar.gz 68346
+RMD160 0336d407319ccbf8d4c4bf16a2330e713ab6b0ab dosfstools-2.11.src.tar.gz 68346
+SHA256 0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484 dosfstools-2.11.src.tar.gz 68346
diff --git a/sys-fs/dosfstools/files/dosfstools-2.11-preen.patch b/sys-fs/dosfstools/files/dosfstools-2.11-preen.patch
new file mode 100644
index 000000000000..d408ef5cccd2
--- /dev/null
+++ b/sys-fs/dosfstools/files/dosfstools-2.11-preen.patch
@@ -0,0 +1,26 @@
+diff -ur a/dosfsck/dosfsck.c b/dosfsck/dosfsck.c
+--- a/dosfsck/dosfsck.c	2007-05-07 18:39:13.000000000 +0100
++++ b/dosfsck/dosfsck.c	2007-05-07 19:50:10.000000000 +0100
+@@ -40,6 +40,7 @@
+     fprintf(stderr,"  -f       salvage unused chains to files\n");
+     fprintf(stderr,"  -l       list path names\n");
+     fprintf(stderr,"  -n       no-op, check non-interactively without changing\n");
++    fprintf(stderr,"  -p       same as -a, for compat with other *fsck\n");
+     fprintf(stderr,"  -r       interactively repair the file system\n");
+     fprintf(stderr,"  -t       test for bad clusters\n");
+     fprintf(stderr,"  -u path  try to undelete that (non-directory) file\n");
+@@ -91,12 +92,13 @@
+     interactive = 1;
+     check_atari();
+ 
+-    while ((c = getopt(argc,argv,"Aad:flnrtu:vVwy")) != EOF)
++    while ((c = getopt(argc,argv,"Aad:flnprtu:vVwy")) != EOF)
+ 	switch (c) {
+ 	    case 'A': /* toggle Atari format */
+ 	  	atari_format = !atari_format;
+ 		break;
+ 	    case 'a':
++	    case 'p':
+ 	    case 'y':
+ 		rw = 1;
+ 		interactive = 0;