Version bump.

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

4 files changed, 150 insertions, 25 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 656a05782b1c..0450e87ffd21 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.371 2012/02/23 11:15:14 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.372 2012/02/24 16:35:39 vapier Exp $
+
+*util-linux-2.21 (24 Feb 2012)
+
+  24 Feb 2012; Mike Frysinger <vapier@gentoo.org> +util-linux-2.21.ebuild,
+  util-linux-9999.ebuild:
+  Version bump.
 
   23 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org>
   util-linux-2.20.1-r1.ebuild:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index da14ab0c36f9..f4651b9f52e7 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
@@ -14,28 +14,30 @@ DIST util-linux-2.19.1.tar.bz2 4396543 RMD160 e4763d21a3a32029ccc525a0222e271f09
 DIST util-linux-2.20-20110905.diff.bz2 47914 RMD160 6ef3f3ae958d9e3856fae3fae8917f4b0a4d25ff SHA1 76ee9dd2411d1b3e4f7028790ec90fbcd7d1fda1 SHA256 7d8f78cda817c745f88fb951fa0e9ab852f215cdb931e97dedb87a623fc042b6
 DIST util-linux-2.20.1.tar.bz2 4614302 RMD160 4ab3435dbd8b83a0c353301b6e0f89a91aa3ca2c SHA1 b5a9468b933743d2f15d41062c19830a5f804f15 SHA256 d16ebcda3e64ab88ed363d9c1242cdb7ccfd5e1f56c83d0c3b0638c23793bbe0
 DIST util-linux-2.20.tar.bz2 4615091 RMD160 c293bee7d9b6b03c0f3981c2020de1471d37b560 SHA1 e8cd2c8e968cdbdc097d82cceaf15d536e0254c1 SHA256 c1cffbf5a1a7a32965f2e8e9ce76336310031e10b87c418d0679075724271d4c
+DIST util-linux-2.21.tar.xz 2954504 RMD160 0e0a5b16ef13fb2e0f238e1332dc31e14e358ea6 SHA1 0ee465519bbe6aad3a22f83bf92221e85c4e2e51 SHA256 5192e8ba7dcf3cf0dc447f07b3d177f6cb3fb49dfae54ac45d6c8c7d86eeab0f
 EBUILD util-linux-2.19.1-r1.ebuild 3558 RMD160 b6024990e9501090a22fa40548aa70e54a061bfa SHA1 966efb8292b03a9a4280941587f7d2b8a90c9b5e SHA256 c1993f3f5e30ea1d30c9331f21e040dac54fd470789a7b059b91488ab54e7f8d
 EBUILD util-linux-2.20-r1.ebuild 3639 RMD160 8dad7cbdd3c818084c42cbbe49a37fbf179a6d41 SHA1 a5046f99c84b287513ff0a21ede079f809b444a5 SHA256 bcc4068e636e22caf5ed3b2736a4925b91f692afdb93bf5f241833b97f6adfe1
 EBUILD util-linux-2.20.1-r1.ebuild 3558 RMD160 700f1262f919e62960135065f50e0ede99a26d55 SHA1 727885ebd8a361baf15111443dde0877843269e2 SHA256 230fd26a582e68ccf234c040286c3e9666ec8db9fe42ebf6873844b223465e75
 EBUILD util-linux-2.20.1-r2.ebuild 3679 RMD160 13ce8cc23225aba2a484058d53866b014412ce52 SHA1 b349423497fe45f477a730e464a004d5535fe635 SHA256 490a3d40e23fb35eea315946fbee9f993b6900c7275b5970c4cebcd3e1e9e1a3
 EBUILD util-linux-2.20.1.ebuild 3547 RMD160 4a1bbfca3a9ef92434a97c67f60a713169b65f8b SHA1 f4dda0c5897a41db10cd99cf05d21c398ec04d94 SHA256 e243573ddec8195c5ce78caba20995751e51fa50cf73166064937bb5456d1e63
-EBUILD util-linux-9999.ebuild 3493 RMD160 1983c62d9cdede4f1100fd3fb070a8a45ede19d6 SHA1 a953e50401ac380dc7f15bfa3f66ef04b3d99d04 SHA256 020dc315044af12954f0cc75797dc15e33f1ad560400fe96aec1f6cb6d02754f
-MISC ChangeLog 57078 RMD160 972c8c2e39e2144bbe4d02731506d94d786b5242 SHA1 099d978169ec106d805c3039174b8598b578b229 SHA256 fb3ef6bf613c622e9ec3d26df6a988005f2f69f2d5abffa6a35e09d39ee01069
+EBUILD util-linux-2.21.ebuild 3411 RMD160 ed4d70258545a7c31f93e0fb3ac9c3cb6e0a2dfd SHA1 bd9299ef48eb1ec29098106834aacefa03ab5334 SHA256 5644161a89b2fc7a10a874bcf9377d60ce47857c229e364533b845e1b73d6e89
+EBUILD util-linux-9999.ebuild 3412 RMD160 7c490b30962ff82c9f55144106222ce72be1d7d2 SHA1 0e7b8c482787a424b0853c5dc8cd20606b123853 SHA256 684a2d6929ba190d3711bdd406ad007e06152461aee2f9528f978ca9e537e835
+MISC ChangeLog 57224 RMD160 362958163daa581dbf8b0f1a65309807ece1a613 SHA1 cec13aa09bfa3a3a7d918b276bd8ddd2bc8aedc5 SHA256 ec82bba8266006f868ce524652c502c13bc8dbf95f36a91d995fa9e72515daba
 MISC metadata.xml 581 RMD160 0177cde9a7c9906f5d14fbefec5d689b0271a95e SHA1 9275f30ed4bc6a340dfa3b5d88e1ab1715e23a42 SHA256 869450d739d36b4731860f8fa357276b3f9f30be37cbecd1aec0048f667d643f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPRh/xAAoJEF0huFKJUZL5piQQAJ3Tex8P5OyPnjAhKPjMFVfI
-eXh3gdU/pmrFhcYCh7Vjp9jn8jwdCr5AkVL/OvyVd7+ZG7v8eQ+ytIf6O3UCE9vn
-4/SHxWm4jajOFV/QGlunJSs3cUz04+nVFUWIpDeKBG6JOCVvOvywslIhaB8aKgoJ
-kybsIkGSb3f+CyW7Nu9q9Q/ANt8siIuYkHsYrn4bgyz7Ko6pnzn40TXQ+xOhQJfM
-EjhhbfvQSEW7XrPXKqLqP46G+8cghKWrM/MlbKvw/3B2KISFw8PBYGDQRaHb4YHt
-4DvrZsF82dw2wZnGQxy5ybYLdplM6xPVSZxrtG48l/a22I0Za1KIRVisFjpU1L6V
-sblgjyRpqpY1ZHzPOSvlmhkJuAMnV4CkXGxXsvos5pOaYGIfYNNqwfOjqvOnVfU7
-2jcBQIFXT2yJaP71tw6I5RLnhh76rInO7fkJCzWvbrB4lqhFmlSvau4kMGL9kWYK
-RBkJipWOGhRaVYZKujXqElZHhHtHciTb8iOhp1/Ikhf2OnnQcqi46M4kc5s6fAGl
-c51JafFudMfYvgZXWn+WkOZln83cj6VUtLcKViI6eTkWJKj4L9/x60aa9LRzAa+5
-OpH1twAVqCSGthQw86dLGNdrNWGDR9eQD0hdpY61xh9JIPbyEitmiIqimGf584m1
-qkuLcwmn80sy8KVQuICH
-=p/U0
+iQIcBAEBAgAGBQJPR7xiAAoJELEHsLL7fEFWRaoQAK8LFctF1yXKzFfF6pYXH6Fv
+uw2z/MpXRpaF7t5t3EU7bwi9R/YciL3UD9eqL4cHgYvABQTRpnRIV+9wRp1nP1Nn
+7R6NC+N65zck7Q1yNLyYFd8P3U/Cp9H6L3/HvnCFySzGfGPUvRkcCLy+wOTQJ2xn
+YgUZpxDkgACpLnxFgEppm8ApeEH/+g033ISHONM7ASVcBVIjnw/QFcnlai69mMA0
+awx0ziNW5lv3R4Tw3HtPpJToP1JcKYswkfW5b1jdQ9dQvCBpMIeZhEKQO2f3Fi9z
+U9Rb7aIjdwtHaOhs+bvI4jV0Ht7RLyQ25Hequu50c40LYzGWPnmyDEA3grxbg3je
+XoTVsBu/EToRleGvoNQSdN8bFpsAFNHKDDuOpVE8y4Q2TtOmCKCeE/XxuuudK/cO
+TIEvZzfomlmn1UEb9f4faFSx+EvQpbZZSTUBaCoRKQ9qdmeJalrWUAH56upCUOdk
+Nv3CX72mLGpK/HwEIB3EqBUnvrV+qNFj8WADTvG5YsHemOl2Y9zJJBo4eCoCJ6mH
+BUWvQJsSqVCCvUAYxNQQzP83qmU8hQfHjIQ+Q5oBmQRMSRjl9WN4Ozp2cOiIfSxx
+PyAbREWLBYG29bK0HgLHuDB4HReNBgq5a/hbor5+drAwToa4AXOpH49s+SrVCc1b
+6yydZjKk7ISuODxXGbAv
+=H1Uj
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.21.ebuild b/sys-apps/util-linux/util-linux-2.21.ebuild
new file mode 100644
index 000000000000..ef5255468054
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.21.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.21.ebuild,v 1.1 2012/02/24 16:35:39 vapier Exp $
+
+EAPI="3"
+
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+inherit eutils toolchain-funcs libtool flag-o-matic
+[[ ${PV} == "9999" ]] && inherit git-2 autotools
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
+		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="+cramfs crypt ddate loop-aes ncurses nls old-linux perl selinux slang static-libs uclibc unicode"
+
+RDEPEND="!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r3
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	cramfs? ( sys-libs/zlib )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
+	perl? ( dev-lang/perl )
+	selinux? ( sys-libs/libselinux )
+	slang? ( sys-libs/slang )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/os-headers"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		po/update-potfiles
+		autopoint --force
+		eautoreconf
+	else
+		use loop-aes && epatch "${WORKDIR}"/util-linux-*.diff
+	fi
+	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.c
+	#define _GNU_SOURCE
+	#include <fcntl.h>
+	main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.c
+}
+
+src_configure() {
+	lfs_fallocate_test
+	econf \
+		--enable-fs-paths-extra=/usr/sbin \
+		$(use_enable nls) \
+		--enable-agetty \
+		$(use_enable cramfs) \
+		$(use_enable ddate) \
+		$(use_enable old-linux elvtune) \
+		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
+		--disable-kill \
+		--disable-last \
+		--disable-mesg \
+		--enable-partx \
+		--enable-raw \
+		--enable-rename \
+		--disable-reset \
+		--disable-login-utils \
+		--enable-schedutils \
+		--disable-wall \
+		--enable-write \
+		$(use_with selinux) \
+		$(use_with slang) \
+		$(use_enable static-libs static) \
+		$(tc-has-tls || echo --disable-tls)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt}
+
+	if ! use perl ; then #284093
+		rm "${ED}"/usr/bin/chkdupexe || die
+		rm "${ED}"/usr/share/man/man1/chkdupexe.1 || die
+	fi
+
+	# need the libs in /
+	gen_usr_ldscript -a blkid mount uuid
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name '*.la' -delete
+
+	if use crypt ; then
+		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die
+		newconfd "${FILESDIR}"/crypto-loop.confd crypto-loop || die
+	fi
+}
+
+pkg_postinst() {
+	elog "The agetty util now clears the terminal by default.  You"
+	elog "might want to add --noclear to your /etc/inittab lines."
+}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index b863c10d023f..131fcd1b8f96 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.27 2012/01/07 21:33:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.28 2012/02/24 16:35:39 vapier Exp $
 
 EAPI="3"
 
@@ -18,8 +18,8 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 	#KEYWORDS=""
 else
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.bz2
-		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.19.1-20110510.diff.bz2 )"
+	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
+		loop-aes? ( http://loop-aes.sourceforge.net/updates/util-linux-2.20-20110905.diff.bz2 )"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
 fi
 
@@ -66,7 +66,6 @@ lfs_fallocate_test() {
 	rm -f "${T}"/fallocate.c
 }
 
-usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
 src_configure() {
 	lfs_fallocate_test
 	econf \
@@ -88,7 +87,6 @@ src_configure() {
 		--enable-schedutils \
 		--disable-wall \
 		--enable-write \
-		--without-pam \
 		$(use_with selinux) \
 		$(use_with slang) \
 		$(use_enable static-libs static) \
@@ -96,8 +94,8 @@ src_configure() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS NEWS README* TODO docs/*
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt}
 
 	if ! use perl ; then #284093
 		rm "${ED}"/usr/bin/chkdupexe || die
@@ -107,7 +105,7 @@ src_install() {
 	# need the libs in /
 	gen_usr_ldscript -a blkid mount uuid
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	rm -f "${ED}"/usr/$(get_libdir)/*.la
+	find "${ED}" -name '*.la' -delete
 
 	if use crypt ; then
 		newinitd "${FILESDIR}"/crypto-loop.initd crypto-loop || die