Version bump (bug #357807 by Matt McAdoo and Lars Wendler). Update to EAPI 2 and other minor cleanups.

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

4 files changed, 45 insertions, 64 deletions

diff --git a/sys-fs/jfsutils/ChangeLog b/sys-fs/jfsutils/ChangeLog
index 483ccb85ba4d..025751082fbb 100644
--- a/sys-fs/jfsutils/ChangeLog
+++ b/sys-fs/jfsutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/jfsutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/ChangeLog,v 1.58 2011/02/06 10:55:28 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/ChangeLog,v 1.59 2011/03/08 05:54:58 radhermit Exp $
+
+*jfsutils-1.1.15 (08 Mar 2011)
+
+  08 Mar 2011; Tim Harder <radhermit@gentoo.org>
+  -files/jfsutils-1.1.11-double-close.patch,
+  -files/jfsutils-1.1.11-fsck-n.patch, +jfsutils-1.1.15.ebuild:
+  Version bump (bug #357807 by Matt McAdoo and Lars Wendler). Update to EAPI 2
+  and other minor cleanups.
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org> jfsutils-1.1.8.ebuild:
   Drop to ~mips
diff --git a/sys-fs/jfsutils/files/jfsutils-1.1.11-double-close.patch b/sys-fs/jfsutils/files/jfsutils-1.1.11-double-close.patch
deleted file mode 100644
index 77f3f607cec7..000000000000
--- a/sys-fs/jfsutils/files/jfsutils-1.1.11-double-close.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Fix double close of journal file descriptor
-
-Index: libfs/logform.c
-===================================================================
-RCS file: /cvsroot/jfs/jfsutils/libfs/logform.c,v
-retrieving revision 1.19
-diff -u -p -r1.19 logform.c
---- libfs/logform.c	22 Nov 2005 20:43:55 -0000	1.19
-+++ libfs/logform.c	20 Mar 2007 14:08:51 -0000
-@@ -289,10 +289,7 @@ int jfs_logform(FILE *fp,		/* this is a 
- 		}
- 	}
- 
--	if (!inlinelog) {
--		ujfs_flush_dev(fp);
--		fclose(fp);
--	}
-+	ujfs_flush_dev(fp);
- 
- 	return (0);
- 
-Index: mkfs/mkfs.c
-===================================================================
-RCS file: /cvsroot/jfs/jfsutils/mkfs/mkfs.c,v
-retrieving revision 1.45
-diff -u -p -r1.45 mkfs.c
---- mkfs/mkfs.c	5 Jun 2006 19:31:41 -0000	1.45
-+++ mkfs/mkfs.c	20 Mar 2007 14:08:51 -0000
-@@ -1036,7 +1036,7 @@ format_journal:
- 			rc = ENOSPC;
- 			message_user(MSG_OSO_FORMAT_FAILED, NULL, 0, OSO_MSG);
- 			DBG_ERROR(("Internal error: Format failed rc=%x\n", rc))
--			    fclose(dev_handle);
-+			fclose(dev_handle);
- 			return (rc);
- 		}
- 
-@@ -1049,7 +1049,7 @@ format_journal:
- 		if (rc != 0) {
- 			message_user(MSG_OSO_FORMAT_FAILED, NULL, 0, OSO_MSG);
- 			DBG_ERROR(("Internal error: Format failed rc=%x\n", rc))
--			    fclose(dev_handle);
-+			fclose(dev_handle);
- 			return (rc);
- 		}
- 	}
diff --git a/sys-fs/jfsutils/files/jfsutils-1.1.11-fsck-n.patch b/sys-fs/jfsutils/files/jfsutils-1.1.11-fsck-n.patch
deleted file mode 100644
index d56a66d84886..000000000000
--- a/sys-fs/jfsutils/files/jfsutils-1.1.11-fsck-n.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur a/fsck/xchkdsk.c b/fsck/xchkdsk.c
---- a/fsck/xchkdsk.c	2006-06-05 20:31:40.000000000 +0100
-+++ b/fsck/xchkdsk.c	2007-05-02 15:31:24.000000000 +0100
-@@ -3028,8 +3028,13 @@
- 		}
- 		break;
- 	default:
-+		/* This is disabled as it's silly, we should be able to force
-+		 * a read only check of the disk.
- 		fsck_send_msg(fsck_PRMMUTEXCLLEVELS);
- 		return (FSCK_FAILED);
-+		*/
-+		agg_recptr->parm_options[UFS_CHKDSK_LEVEL2] = 0;
-+		break;
- 	}
- 	/*
- 	 * the parms are valid.  record the messaging level they imply.
diff --git a/sys-fs/jfsutils/jfsutils-1.1.15.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15.ebuild
new file mode 100644
index 000000000000..8cc567d56974
--- /dev/null
+++ b/sys-fs/jfsutils/jfsutils-1.1.15.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.15.ebuild,v 1.1 2011/03/08 05:54:58 radhermit Exp $
+
+EAPI=2
+
+inherit flag-o-matic
+
+DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
+HOMEPAGE="http://jfs.sourceforge.net/"
+SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static"
+
+DEPEND="virtual/libc"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	use static && append-ldflags -static
+	econf --sbindir=/sbin
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+
+	rm -f "${D}"/sbin/{mkfs,fsck}.jfs
+	dosym /sbin/jfs_mkfs /sbin/mkfs.jfs
+	dosym /sbin/jfs_fsck /sbin/fsck.jfs
+}