Version bump.

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

3 files changed, 141 insertions, 5 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index c480b6e08608..69083aca8be8 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
 # 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.373 2012/03/03 15:31:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.374 2012/03/30 18:53:06 vapier Exp $
+
+*util-linux-2.21.1 (30 Mar 2012)
+
+  30 Mar 2012; Mike Frysinger <vapier@gentoo.org> +util-linux-2.21.1.ebuild:
+  Version bump.
 
   03 Mar 2012; Markus Meier <maekke@gentoo.org> util-linux-2.20.1-r1.ebuild:
   arm stable, bug #404179
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index ca354b47db74..2bf6bd879f54 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -14,20 +14,32 @@ 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.1.tar.xz 2975120 RMD160 877752a63a0eae362d439b04db06a7be726469ae SHA1 49e130a456516e15c6bb0238f370f2125ad1cfe2 SHA256 6ffaffb46bfb1aa403f83f0c8d2700e5ec35ffcb35a0573adb10404ed16c9004
 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 3553 RMD160 ac25f9648a7a2031b809fc368008bb95191ed303 SHA1 77b95140a55d8c3f243c07e0039fab5427fbfdb6 SHA256 f6af57e96fde274749fd4df4ed4d7bca379b88a70a9a5c15d6423d3f1cbf260d
 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-2.21.1.ebuild 3413 RMD160 91d59a39cb4f98b8bb8c1a247b9d358160fdf60f SHA1 a9ac3d6f123a8ed26634aada283d0e4bdf9264f4 SHA256 980926568947b72264bcce6fe6c650bab8bef0127bcf4c58c9c1cde4c11c19f8
 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 57328 RMD160 fafa52338008b08e139f7f0270f4a4cf4e105b47 SHA1 2daa5b8cf126492af3d8a88e17a6eb1dbebe73ce SHA256 2cbd4131c1d1fcd47491d7f61e5339ba23e45c7515c4cb4ca59bb6ceea370890
+MISC ChangeLog 57456 RMD160 6fe3eec29167304ab7b7cf352177220ac0672287 SHA1 8b2fa377db2ecdc2e99f1cf8fb0dfc12d67954b2 SHA256 e2803e044527b2da32732e53fd5ceeeae7c41eb615630b0216bd7b4779917ea9
 MISC metadata.xml 581 RMD160 0177cde9a7c9906f5d14fbefec5d689b0271a95e SHA1 9275f30ed4bc6a340dfa3b5d88e1ab1715e23a42 SHA256 869450d739d36b4731860f8fa357276b3f9f30be37cbecd1aec0048f667d643f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9SOegACgkQkKaRLQcq0GK1uACfV1U/URHisktJxgLYnefdMNHv
-8zQAnjS622wMqBobZQLqzRa6EPLBXCKK
-=8a4j
+iQIcBAEBAgAGBQJPdgEhAAoJELEHsLL7fEFWrtMQAMCB6T8UMPvZEWGnDEFFqngZ
+XuODR6UFLlEPq9HqIl7XBx5WnbJvFCafOYPbNa1JxmITe820sVU39unaU+QnoJI+
+5b2MFgYVfdUlbdc/MdEXVHvTFAeYuIrfT8LHgmGnIttdCoCNFZmy9G2zMgzs52mZ
+fvLPD7b731YSB80GJ3rXtO5Ml0d4kbKfVS58mrPmR5Lu4azhtOgy5iF2mB87xjrd
+W8TMq924QxC7mD5JZlDy2M5RBq/iPCqsRaqsgSLiCN6m8qiSSkNszxYRyGTFhGGq
+/u75h0ROwQt8V+gME/uIz1e0VU9Qae3G/tu9pZAOQUTrXmNw531DJ0q1DPxaplVU
+mJKM+Qr9WN06ixeJ3ao5iqVfEli5ta3G30Da5aQ3diNlRWbbFDqYhacedoEGRcgw
+Uxx/nvBDQ876eVdz1hHK1z1q+L3H3Sx7nhZMHlrHyadUQ00tnMT14bgEZFAqiqpM
+W56fZar8q9dfRUBbrMRS1CGK3rB/YaVIdyINSzjTsoMUhzKowcJ2kq25AETwTx6l
+saHiI0DhuppP0nMIzcnVl6EVKXSXBn52bHt6I1hqBOkiA9T426l6FahVArUe08c8
+81EeQVvSmRGi4/WhmnXMGmNh84jAPjbSjcm3dJgen1PKBYXvGtIeToLZ8TJWa4H+
+KgJ2T7s60CgoZvfY3q5G
+=94xj
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.21.1.ebuild b/sys-apps/util-linux/util-linux-2.21.1.ebuild
new file mode 100644
index 000000000000..1ca4e407b69a
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.21.1.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.1.ebuild,v 1.1 2012/03/30 18:53:06 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."
+}