Update live ebuild.

Package-Manager: portage-2.2.0_alpha194/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 36 insertions, 33 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index d12155071a31..c5ce03d63ac2 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.434 2013/08/07 22:40:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.435 2013/08/07 22:49:56 radhermit Exp $
+
+  07 Aug 2013; Tim Harder <radhermit@gentoo.org> util-linux-9999.ebuild:
+  Update live ebuild.
 
 *util-linux-2.23.2 (07 Aug 2013)
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index dbc29492de2b..88c7e0802726 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -40,17 +40,17 @@ EBUILD util-linux-2.22.ebuild 3147 SHA256 67fa123550783ffe22964256ddbdb927fce64b
 EBUILD util-linux-2.23.1.ebuild 3405 SHA256 debf3ace7e3341920dcb14979ebfa65e7ee7a5af7aad8800d153e2cf7adbc7ae SHA512 721282e9184bef7bf149a9aa95a8aead46e9c90b5a26474c4d9fde6c362b52f2f31b2b48d457e4c65eeff3a6ff044ab9b86e218ac8799a60dd0f5c48b92343bd WHIRLPOOL 1045408e0a59eee4cbe03aa60c0afbe3fbe9a5ea9933dc48f3b20711cb74b61b1a81b68a319ea8f1defd465934f444e5a2a8950e16d970619601f374dea0b388
 EBUILD util-linux-2.23.2.ebuild 3364 SHA256 89ab236da7f29d87ff603e1d8e978c155da0f0da8dd9160a3a564e950e26a5fb SHA512 17bb2ed953edb9b1e28108bb60f5f98134b0fd5abce0426d5f860ce4a340410aa7bb9d4e25bc8903a6fce1044bde1cb5f796a9a9b2e70e166049c077f8191eeb WHIRLPOOL cc7942713f0acd969e2eeebb889813f4016e2e4a0b7d030980abf002031a4eb881c7a08220f892a16e89943e1173d4e73f3e3e7fbe628138a69266fdafc377b9
 EBUILD util-linux-2.23.ebuild 3393 SHA256 b4a256fb297c657c06b7708848f887a7cc6238ac87b6f1afea990bfc993c3de7 SHA512 9e6081da539ee17ed8f47b5913b22b5cfbbe6689893f2fcc8dc3f69a2e3c19c145ac54227db43b5e56bb5374f63cf625b910f71df953bc974eee3a4439056dbd WHIRLPOOL 0e2b2223c56b278a1d62189e5325171d5846d0b4ce916544600551808ffd9071e12af8ed4d8a2ef412c49f46fcaaabd7a8f19f3b1e705dfee01b5269a2bad4cd
-EBUILD util-linux-9999.ebuild 3404 SHA256 ecb04f363121fb2bfb26155e1a93b366f923db92a80c4a8415dd1b279837fc39 SHA512 dc60f3ef3423500047dd332109a390d374bd1f87b9b2d8328139cc3be2f11afbfe525bdd0a8ce44f6b24dd46dc1301410aa073718869636cf34387f0310e5b5d WHIRLPOOL 46045e1750747ea85afd3745b4099d7d7ed392988f2e06753c10e5fbba83fa5405b6a9e243d6c1e325a28a77825c64cb9a0a96872b158dd8ba5d97cb42e69337
-MISC ChangeLog 66826 SHA256 0d8b298470b26374f8a674690b784bc78395594e4a084cc7b964b53542b35f3e SHA512 1a5d7e0969fdcbda6df7d1bb95e60126cae6ad1575bd9e1ea4ddfcd584b1730302c244f20dd12e30f15cea2adbc7f66aae26302915c44cca610d8862311211f0 WHIRLPOOL 7505e3b165cecba6370e38c6156f67c6e798c8b079f77f84f676392dfdeb246aa6f1fa839f5b968a0b2974e716adb8489c2b1115cb0dc094c49c11b61c9ca3a8
+EBUILD util-linux-9999.ebuild 3363 SHA256 c9925be39c42052756cd401ba1b5479a974553ab4b59894a00d9b69f5e03a68b SHA512 74cf6f2cd7c1c59fcc750e062a12d1982bad7fbaf4b2eac15b8663f19bc89f0e24fa7a88ed661249be1fd2b47283cff27f4b9905f94657b1a6ad01228d8cead3 WHIRLPOOL 02d40661b8e6d067b1fe550ebaa821ce25563428c41ceadd292e24074f50a4f03603ab86adfb1584ba0b7b4a4ae55397ddc8fdd91a5b03ea231ce11023e4d382
+MISC ChangeLog 66922 SHA256 96a998a0dcf3b4a14bff34695064d5569823cac35d0c8e98b55e8bb5a6f0be6f SHA512 3ec63cd176909a983213157557e1b0f7e720d0825e3e5a84419270d297315a6be9ed918e85f8c25f33241e8a094f710cddecb9fa35ebca41206327faa1afa841 WHIRLPOOL ad3d56b30984f26898ceeae0ef0af8ede346a4e48b706f52de1bd1d83a1a7b15b626028a3f397b0a92f36570a3b6d8618dbd3d992374b3fe031ebfbd88fcc984
 MISC metadata.xml 1043 SHA256 5f87995cffbbf75bf971619094abf33f4b41ec04127960d30e3a7ce670e95fc1 SHA512 68bbb4efb492c6476a4df2943acc17d12fbeb4d92c9f073ee9336e64bd0c9992ed67fc766685a669e00f6731af04ac65b7241728cb2c38cebeb9870c54ea417d WHIRLPOOL 21b5b709760b43acc6315565fb4fd9a3a3a058cb9bedf2c0f7fbac32508b03a35b1ca22ab3d56d410b623b42a406ffde28d8346985d3c4001fc4893cfb50c3ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSAszJAAoJEEqz6FtPBkyjDlsH/2CkbJDaNte/DDHzlsbfC51h
-Zn9eAuRnquiyKmzbtooHA5PjjB6qfklXbzPAe/LFUj5XAGewZhJYpLx04HEaMao9
-wWeWn86K7060S63+lugMAfaT4PdzR2ovVSYsCDm0J4FtVOZK4bf4nIdsHJe1m7Lp
-lWG2XVPRIvyttOyyotPckOC4206dwksMlpX7jPpkISt+z/C+s69Y6blq7j1lfg6T
-kdMJMlb97+pka35/tf9oB27oArGVn3GQlIreQU1heAd6j7ZraXeGpzWrslynzUyr
-jKNE05XTa3UP6CDQZvsu1j1YdvVvEa1forB6sqrozIvt2FJRDyw8VajKBk6JbrU=
-=2dTX
+iQEcBAEBCAAGBQJSAs8VAAoJEEqz6FtPBkyjWTwH/R7PSjyDHecDMmGeyzy05In3
+VpnfXPgTdtLhaCXUyFsnlU/75pV9jkAPNgQZIyL8HGu82OV0uoV9kN3SoM77tze/
+GtxHyVXwAQmeAyffF2OIhVk2ZZFXRBZgfN/m1O5SJ2YLf6GmtG1qdrrfBFp3z1rg
+woPVaOtKAm8s21RmEX62v2F8myplL8B4gXi3I/kvLUSjV6VUfmgKyVzN0WBuO8qG
+s+O+dH2lNxD4mY+vnTV45N+p1bISXS/NOTk8mvcMfHX5JjAfgAYSsvN3mylzQ3Ol
+Ad095chr+3dCnHN+2T59+Fel/GUm/TSFf3R7pnwbVNhKNaB8n9X2OVlU1SLpxfo=
+=dalV
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 6a601bc9a15d..91933ef91f51 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,30 +1,24 @@
 # Copyright 1999-2013 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.45 2013/07/16 01:23:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.46 2013/08/07 22:49:56 radhermit Exp $
 
-EAPI="3"
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+EAPI="4"
 inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2 autotools
-	#KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
 
 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=""
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-2 autotools
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
+
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
 IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls old-linux selinux slang static-libs +suid test tty-helpers udev unicode"
@@ -43,12 +37,15 @@ RDEPEND="!sys-process/schedutils
 	slang? ( sys-libs/slang )
 	udev? ( virtual/udev )"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	test? ( sys-devel/bc )
 	virtual/os-headers"
 
+S=${WORKDIR}/${MY_P}
+
 src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
 	fi
@@ -58,9 +55,9 @@ src_prepare() {
 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); }
+		#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 \
@@ -104,16 +101,19 @@ src_configure() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	default
 	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
 
 	# 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
+	prune_libtool_files
 }
 
 pkg_postinst() {
-	elog "The agetty util now clears the terminal by default.  You"
-	elog "might want to add --noclear to your /etc/inittab lines."
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
 }