From cfba1f3475da112737671b92102ea7d0a70dbed2 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 20 Oct 2011 13:37:01 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64 --- sys-apps/util-linux/ChangeLog | 7 +- sys-apps/util-linux/Manifest | 10 +- sys-apps/util-linux/util-linux-2.20.1.ebuild | 122 +++++++++++++++++++ 3 files changed, 134 insertions(+), 5 deletions(-) create mode 100644 sys-apps/util-linux/util-linux-2.20.1.ebuild diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 3573f986446a..3cd70a21852f 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-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.355 2011/10/20 00:36:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.356 2011/10/20 13:37:01 vapier Exp $ + +*util-linux-2.20.1 (20 Oct 2011) + + 20 Oct 2011; Mike Frysinger +util-linux-2.20.1.ebuild: + Version bump. 20 Oct 2011; Mike Frysinger util-linux-2.20-r1.ebuild, util-linux-9999.ebuild: diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 217808a7f9be..f7e8c9daf001 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -16,6 +16,7 @@ DIST util-linux-2.19.1-20110510.diff.bz2 47865 RMD160 0983ac7a48031e4b3e0ddce213 DIST util-linux-2.19.1.tar.bz2 4396543 RMD160 e4763d21a3a32029ccc525a0222e271f0946a4fd SHA1 96af5d4a37c42296dae5365ba533316216a6b347 SHA256 d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d DIST util-linux-2.19.tar.bz2 4376791 RMD160 a1b6bf38106c95f68929de49941c577d77cbd337 SHA1 7e08c8b5d8011b1144ff32019638fa743daf8700 SHA256 d8189ba6dfb508d5c36f50103a7b84943d893e51e6d7a314155a82f68efb33b6 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-ng-2.17.1-20100308.diff.bz2 57867 RMD160 26584b886ac8db1ec723690a685a442615366f2c SHA1 f76a2deb4b4012e98d82517d84dfb09725533a51 SHA256 c7478553e03ba7cbe28ddb066361966567d97b0746a13396bff12a83183014a0 DIST util-linux-ng-2.17.2.tar.bz2 3815657 RMD160 398aa54c6001acc16bc2d049ccbdb62824776ba3 SHA1 69275de84f7dabb7a5d90d0046c3a6b861c16a1d SHA256 c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f @@ -27,14 +28,15 @@ EBUILD util-linux-2.19.1-r1.ebuild 3292 RMD160 e60069276a615ea83e2c180cd2f0160a3 EBUILD util-linux-2.19.1.ebuild 3162 RMD160 dd57955b2e9ebbc7717d2b8ce12cbdceb64e2e8d SHA1 567fcdf55eb499143aef82e34aa8cf620e5abe77 SHA256 70630679959a63448654b9152d67a2ed5a05c251f5bd08bf3a1ac77bfc6ebcad EBUILD util-linux-2.19.ebuild 3059 RMD160 29645f9660d0caf38bd2eb3d7a97d1d0ba544e94 SHA1 e3df015f117c4867f04abc3b8b1e1be82d8cbea5 SHA256 224395e264f11496a12b8f150022bf408428fbac16b893106dbddca5d77e1724 EBUILD util-linux-2.20-r1.ebuild 3603 RMD160 94c708f72542f798267b09359d06b8af5e7acd2a SHA1 236b5845513a733fa0ee9e2f88fabcad76abcb58 SHA256 6493ca8bd8a1b2d73b0481b1b31a370968fb631a05deca11d9d542b0d629088c +EBUILD util-linux-2.20.1.ebuild 3511 RMD160 14aa2bf1198cfd271159372e40c65e180af408fb SHA1 8fac03e38d238e106a2129c6d2bf9e0fe3dccf1c SHA256 f132471fcac5c1d0a5285a7f04d0bd16134a395113fcaba16d268e8fbc800655 EBUILD util-linux-2.20.ebuild 3366 RMD160 d8185e3b3ab8524448105a7975a54690ac17d99a SHA1 4ab44773dc2cc452da27e1e80d9d6b59727bddc0 SHA256 98a183811b923cc453d7b406117d95ab271b8e5dbb50deeda698becfabf65994 EBUILD util-linux-9999.ebuild 3448 RMD160 21727d169154d7fe78d202456f3b64419eefb7ef SHA1 784f68b5c0ef9f02f0f705c15b69c1f3ead84164 SHA256 8cc2b05c9faacb2f85f7f28d5bff329c7d6c32df5f83ae8efec6f2cc4b86d167 -MISC ChangeLog 53981 RMD160 46c8e648421abd23caf6ed95303ae3f1bca636db SHA1 d8ecea2a3ae7fe89352db75f898e394bbfaf2b5a SHA256 ea6a985e0cfc136fb5c295a42e8e23073760e717c1e443579abab0a379765406 +MISC ChangeLog 54109 RMD160 0269c80ea0c296c11570f035df9c29acbed4efc3 SHA1 4c0ed5ad2244a83d723e26014601933ac19e92be SHA256 1b4b327ca3356e440ab37cc26a448ca541351336aad10fc87a04e16bbc9d8a70 MISC metadata.xml 581 RMD160 0177cde9a7c9906f5d14fbefec5d689b0271a95e SHA1 9275f30ed4bc6a340dfa3b5d88e1ab1715e23a42 SHA256 869450d739d36b4731860f8fa357276b3f9f30be37cbecd1aec0048f667d643f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6fbRwACgkQaC/OocHi7JYGmQD5AfUpgW355T0ouJatcZjXEG4X -nX2XX9DC7aFMP58B6LwA/0IKEOxTZ4R8JO91lzeQIeJ7gAnqjeXJTxynokVORxGP -=Mfao +iF4EAREIAAYFAk6gJAMACgkQaC/OocHi7JZFEAD/Z0QJhL5O5hQMEt/SAV9eRgiV +AN/rFOJRnu1fip8LPiEA/17JGd88u5y4bX9MwEKzSHzyIDqoRS5Mfih2k7dZ7Nfb +=gSS4 -----END PGP SIGNATURE----- diff --git a/sys-apps/util-linux/util-linux-2.20.1.ebuild b/sys-apps/util-linux/util-linux-2.20.1.ebuild new file mode 100644 index 000000000000..5737ad5a35fc --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.20.1.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2011 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.20.1.ebuild,v 1.1 2011/10/20 13:37:01 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 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.bz2 + 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" +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-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 + 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 +} + +usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; } +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 \ + --without-pam \ + $(use_with selinux) \ + $(use_with slang) \ + $(use_enable static-libs static) \ + $(tc-has-tls || echo --disable-tls) +} + +src_install() { + emake install DESTDIR="${D}" || die "install failed" + dodoc AUTHORS NEWS README* TODO docs/* + use ddate || find "${ED}"/usr/share/man -name 'ddate.1*' -delete + + 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 uuid + # e2fsprogs-libs didnt install .la files, and .pc work fine + rm -f "${ED}"/usr/$(get_libdir)/*.la + + 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." +} -- 2.26.2