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

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

5 files changed, 62 insertions, 67 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/Manifest b/sys-fs/jfsutils/Manifest
index 26b72f285240..b0fdef0571c5 100644
--- a/sys-fs/jfsutils/Manifest
+++ b/sys-fs/jfsutils/Manifest
@@ -1,12 +1,26 @@
-AUX jfsutils-1.1.11-double-close.patch 1291 RMD160 50288d2026a535a0f5d389b71716afbd47dfce42 SHA1 94dcd5c17b1daa3d1b8317d128b69a1df01d8cdb SHA256 89b8de5c75b9cd5a9e990fba6f2870faca0035c1a990eb195d4de8d53c5fabe5
-AUX jfsutils-1.1.11-fsck-n.patch 517 RMD160 432e3818fbad253becf0122d9805977eba679309 SHA1 f74e243e839ab3be41ce3cb7ff7b7635d66d0b46 SHA256 30776d168b5550f8d7e8232fcb2f80c41a0adaab1bf50d94a6c0e61044d4656e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST jfsutils-1.1.12.tar.gz 518971 RMD160 12b95598275aeb8bf6498c050fe78c76a14ea30f SHA1 73ac34af3776ca9acf43653405550c1fce58652e SHA256 0d0a204d1c78a060b47df7aa5b5ed08f686dae4bcfdd3e65991548901e6d7813
 DIST jfsutils-1.1.13.tar.gz 525471 RMD160 671c835c1add68c6764db7bc3b7987ddd2877f3a SHA1 a3ccc9c2c63779c069b000285fb858b25f833bf3 SHA256 668ac8bbef3c153efa9bdaaea3228de93142e7e1cff6b8793b0c8970a62ad2ec
 DIST jfsutils-1.1.14.tar.gz 527808 RMD160 591e0ac4546fa79d765889e7fba4c5ff7bf3f3ad SHA1 ed37d8eb1b2239e5c6b0c546f07a500a9643fcfa SHA256 524b81a03524bfd04691c4f760cb92608887067e8c1de6fac05bf272e7e90699
+DIST jfsutils-1.1.15.tar.gz 539148 RMD160 b353f86c0680f257bcc0fae43c0154933cf96f8b SHA1 291e8bd9d615cf3d27e4000117c81a3602484a50 SHA256 244a15f64015ce3ea17e49bdf6e1a0fb4f9af92b82fa9e05aa64cb30b5f07a4d
 DIST jfsutils-1.1.8.tar.gz 513641 RMD160 0636f2395bbe7839cc7969ef759c7ce6a06df109 SHA1 20b15b786aa5b67eee88d78bfa8eaf1c6fb29b7a SHA256 a43ddbe0990eb8820846090d97108bffeba6f6bbbd4e701a7229fdd9b555ec69
 EBUILD jfsutils-1.1.12.ebuild 990 RMD160 d4baab98701c5d70407443a454d4a6c1c0701593 SHA1 daa7dbcc810535f205594184864f29f2a73d199f SHA256 cedddbc73d39cd15c721a8eede9837f529d2e8178f84e09c7951119be19d613c
 EBUILD jfsutils-1.1.13.ebuild 977 RMD160 e31ded2ea8c60310623ede728468c2901535339f SHA1 66e048c765909b8be72163a0cc4f6481326716d6 SHA256 347472da37d900d1e501c97691ea05209794d51d8e886a24d35289d05ae6bfce
 EBUILD jfsutils-1.1.14.ebuild 977 RMD160 4102d9e842da24cbcbbdbd846489119369fc9b14 SHA1 af3f9d7d450a67cc2337259998c3d3301172b4be SHA256 a2be84d7b0e79b3c3a2eff243c20acf36bed30e8e948d3b4dd5a91d893bfc217
+EBUILD jfsutils-1.1.15.ebuild 985 RMD160 34a47f9717ac31cebc45f2e2bab22809b3a6083c SHA1 b32e85bcf98816fc7f0e3cf3dbfa206a9b75233c SHA256 e7c4b758bb90d7b619ecc0cd86f9bc83359cf4372762d863c303bfd83b62931d
 EBUILD jfsutils-1.1.8.ebuild 787 RMD160 6753b3afb5ede469ca034965ab017ee5346f35d6 SHA1 a67e69968884c2d7dbd4845105a09cd1568bfa78 SHA256 6eb734694220f5901451c1c88a63a65a5948d75d0c7cf5b01b5850358ae67abe
-MISC ChangeLog 10488 RMD160 79a4cd6a6e8b86ae6be9d1e8218fe28df6df0961 SHA1 3ec3d88ba1bc58dfdbd6713386d6fbacd496dc80 SHA256 d0c1aa2963a0693657c1f56b22f79843564fc91599985c234e674cfcb1d28cdf
+MISC ChangeLog 10791 RMD160 bc320644d303c69c2ba5c78f8445ed91cf5bce48 SHA1 fef32db8334daab1072968e6cc19389541b4668f SHA256 37887403b27522cbe03d59da1bbcb77b89f01ef33807e349c6b454c9a91fd742
 MISC metadata.xml 262 RMD160 df347ac5853a8f560ff0f5c02ce8317f4d3bbb4a SHA1 e0e125cf19aaf5f81b314a9f19d0e98615f7685f SHA256 adf3f9badc5b8533930b52fb0547fd1b6d4218c0412771c1041c6c27adb05ab4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNdcS7AAoJEEqz6FtPBkyjvCwH/j0CX8O0l1uAQQ+0MDxqhMF1
+A7GWCaeM/nyDRjWVaRUKSb2Riw+IJ9AgE0i5lOTOYgPcbFhTTtortwtXLL4bPSD2
+AW/4Z6Gd3dmmqIs1VdKNVsp/vbJLEvFeto8I2WQnkF/yK9Z56195pKdgzDChF20j
+YmApOd5N0pLxHZ7W0ANv9g7wUgbGo49v367AWDXpUx1d1remeSGt+nN+aL/lsHB0
+dZaBvKrGsuiKylgBYVUJXULafe0djZ3FU1jNMj1BB2dLJY0+qCsse99AmUETgt7Z
+1grh+PcUNmW2DmtwFLi7HWCVTe/0eGEAwFBtnvCMkh+gjOXi86G5FHgcszIosi0=
+=fc1b
+-----END PGP SIGNATURE-----
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
+}