Install libmount into / #398055 by Michał Górny.

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

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 067c61d09fa5542ae4b5daee83eb1c89ad4b1a84..5c8ee81034143a6e8a21c73646c002ba3f5a981b 100644 (file)
--- 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.365 2012/01/07 20:57:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.366 2012/01/07 21:33:35 vapier Exp $
+
+*util-linux-2.20.1-r1 (07 Jan 2012)
+
+  07 Jan 2012; Mike Frysinger <vapier@gentoo.org> +util-linux-2.20.1-r1.ebuild,
+  util-linux-9999.ebuild:
+  Install libmount into / #398055 by Michał Górny.
 
   07 Jan 2012; Mike Frysinger <vapier@gentoo.org> -util-linux-2.17.2.ebuild,
   -util-linux-2.18-r1.ebuild, -files/util-linux-2.18-cfdisk-string-len.patch,

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index bfb4998e99e371120d63b28da2c58b4c4a587616..4f5c9f5d47211f555c9b3367acffee5c0ed47608 100644 (file)
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
 AUX util-linux-2.19.1-mount-a-segv.patch 2610 RMD160 67beca8dda0e48a80246c0904329944b978d445a SHA1 8eb682296c0b948a8931d71f0780f446bdd79027 SHA256 c24dc0ed811e6c0ebc69f15c818cf89aeb1dc12b5f2f62163402ad4479d7aec9
@@ -11,7 +14,25 @@ DIST util-linux-2.20.1.tar.bz2 4614302 RMD160 4ab3435dbd8b83a0c353301b6e0f89a91a
 DIST util-linux-2.20.tar.bz2 4615091 RMD160 c293bee7d9b6b03c0f3981c2020de1471d37b560 SHA1 e8cd2c8e968cdbdc097d82cceaf15d536e0254c1 SHA256 c1cffbf5a1a7a32965f2e8e9ce76336310031e10b87c418d0679075724271d4c
 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 3559 RMD160 debf664e343dd57ce0d9ebb7b3c7e7df2d074282 SHA1 6a3fbfa44b9c496b7fdd4b90becd51aac5a07dd4 SHA256 f08f20706aa4a23be4008d98a8fc2663b811b73505dddf0436fec7647fcd40b8
 EBUILD util-linux-2.20.1.ebuild 3547 RMD160 4a1bbfca3a9ef92434a97c67f60a713169b65f8b SHA1 f4dda0c5897a41db10cd99cf05d21c398ec04d94 SHA256 e243573ddec8195c5ce78caba20995751e51fa50cf73166064937bb5456d1e63
-EBUILD util-linux-9999.ebuild 3484 RMD160 381e86fb57869c39428093e97b366aaa3788f0aa SHA1 b40983fbf808fbe10d7947d1560dde8b0b4d8819 SHA256 198e0182c336b73b032b2a4b315308fa84ff7a0edf69bd61e0d632dceaaf6cbd
-MISC ChangeLog 55662 RMD160 289b450b24b8e7461c750c0dfc17fa7ef46ea8df SHA1 69d57d1f73a18f3aad2984d003dff85375678fce SHA256 fe00d6f1000cd6f6cca49f06b83e57242ce71c0a769bfc02769f66a4088ec30c
+EBUILD util-linux-9999.ebuild 3493 RMD160 1983c62d9cdede4f1100fd3fb070a8a45ede19d6 SHA1 a953e50401ac380dc7f15bfa3f66ef04b3d99d04 SHA256 020dc315044af12954f0cc75797dc15e33f1ad560400fe96aec1f6cb6d02754f
+MISC ChangeLog 56258 RMD160 58b0941de27d75bab1ca617da1eb5688c658fd88 SHA1 bfbf64dd0d4ebac3e394b1a4581a95d63915e83c SHA256 0c58810aec4934d0efb08cdcbcd200bafff418b11c1c9783361974e0d2abb5b7
 MISC metadata.xml 581 RMD160 0177cde9a7c9906f5d14fbefec5d689b0271a95e SHA1 9275f30ed4bc6a340dfa3b5d88e1ab1715e23a42 SHA256 869450d739d36b4731860f8fa357276b3f9f30be37cbecd1aec0048f667d643f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPCLo2AAoJELEHsLL7fEFWPccP+gIJIbZJRNIX1W1ksLyexMFP
+2B/BYMLq9PBDOgUFtseuFaOOSQdanR6N8kLLw1ak1bGf/8FyXecaHxBDA+E6+okA
+Eu1h2aYKSbWoYHNCdNs5feJOMGrdibV0UcTsJdXIs0ZaMGPOYCKSKhFzzMQaHR6y
+85pRpOJvA11o1YqGnZbegQ6p9B5UDv9o1eBaF+q64ksk58YB+uxaBu74cDP4QF9A
+sjJM3o78RLFtb5mUD6OIKa3or/8f+rOung5ev+LgYqECD2zgY44Hx1B3I9Ca8kwY
+i6s3nSIIWYuqF8BNdlqnCN88M9r2ChTs0mah0omTSJleMSJnb/BUnkT654h0/ZyE
+U45Ks9wySwlM2uyWuAuKg8RJBxBt0n9Rylim62y25hdSMibkvc02o/03OD7UOxjU
+3wmdf5cUXQbtPcNVVJAHBB5W9oynN9lqGjz709oCtIPF1z3D6HIpxXM4CSQbmVLe
+GsaRhtPLMdT8CeLF+Xd/8RNAq8z9yGNk79K57LSE2fTvqAScVQYLnMuUw5A5nMFE
+CHHZc/144OGhBS/AgwHD1DNvTWyWXKbSa/yu1dTZZL8J6f3Ah4E3xHNqqpvNwX37
+WtydO4GPzrBL8f19iVmig1/wOH2Jx7Q4z7hiOkt1b/5TcZATfYA5O3lxkKRjkol2
+23YqmI2DygVfivbQTZjs
+=Jx/o
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/util-linux/util-linux-2.20.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.20.1-r1.ebuild
new file mode 100644 (file)
index 0000000..a439366
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.20.1-r1.ebuild
@@ -0,0 +1,122 @@
+# 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.20.1-r1.ebuild,v 1.1 2012/01/07 21:33:35 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 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
+}
+
+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 mount 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."
+}

diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index b62f9be35ff14ec57c0f425a408d4c129c25329f..b863c10d023f8cd6f9d30a71063b22b11cb31a7f 100644 (file)
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.26 2011/12/30 19:30:43 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.27 2012/01/07 21:33:35 vapier Exp $
 
 EAPI="3"
 
@@ -105,7 +105,7 @@ src_install() {
        fi
 
        # need the libs in /
-       gen_usr_ldscript -a blkid uuid
+       gen_usr_ldscript -a blkid mount uuid
        # e2fsprogs-libs didnt install .la files, and .pc work fine
        rm -f "${ED}"/usr/$(get_libdir)/*.la