Moved 2.24 ebuild to EAPI-5. Synced 9999 ebuild with 2.24 version

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 43 insertions, 24 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 149b1a1cb722..6ae92ef39b35 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
 # 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.439 2013/10/28 22:13:54 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.440 2013/10/29 20:25:08 polynomial-c Exp $
+
+  29 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> util-linux-2.24.ebuild,
+  util-linux-9999.ebuild:
+  Moved 2.24 ebuild to EAPI-5. Synced 9999 ebuild with 2.24 version.
 
 *util-linux-2.24 (28 Oct 2013)
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index f0efb929cc71..fe28cfca7099 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -43,24 +43,24 @@ EBUILD util-linux-2.23.2-r1.ebuild 3453 SHA256 dd8f1438d0f30a369df1414f7fe8f8972
 EBUILD util-linux-2.23.2-r2.ebuild 3564 SHA256 e89186a72e09d92b1b2bada7234abe8c23294b65e550383c84737f091641b8cb SHA512 18e02c2c0037d53b74ccaf26c57560ece78dded55ece1a0ec4e310d0faa931def8c0c7fc2da4807f1200c76cd185a860884c0be92d3d1cea186b64b33ac49b75 WHIRLPOOL 6689802b39541053297a1adb76ee50a4a6a4eee3913db6411bee16bba96d430c16f1586c0e07e86cf106ca7dac0ef7343a77dbf97225eeeb418917b2bd8c12f7
 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-2.24.ebuild 3741 SHA256 f786c3e75fc5e6f0dd65b7478c79d1dc6929f798c7831345fee444d62b732c60 SHA512 591046128db9e8027e2c392ae5b88f0f8db92c241b9598c1368a90b5ce411b3d772dc236e82f18d98462ba23b2df1d3047d84cb2aebdcc3e2de69ef6c99b45af WHIRLPOOL b9c60a209248043b7dcba8b415fa273742572d9f812d862885b0170670310b46947ed39cc5c7ebf383bff56318b845c5d936e726a879db92bac1b2b790b82c37
-EBUILD util-linux-9999.ebuild 3363 SHA256 c9925be39c42052756cd401ba1b5479a974553ab4b59894a00d9b69f5e03a68b SHA512 74cf6f2cd7c1c59fcc750e062a12d1982bad7fbaf4b2eac15b8663f19bc89f0e24fa7a88ed661249be1fd2b47283cff27f4b9905f94657b1a6ad01228d8cead3 WHIRLPOOL 02d40661b8e6d067b1fe550ebaa821ce25563428c41ceadd292e24074f50a4f03603ab86adfb1584ba0b7b4a4ae55397ddc8fdd91a5b03ea231ce11023e4d382
-MISC ChangeLog 67653 SHA256 c40ca2aae7f2b43907b63ea471ee8d21e75474ef179d05af6e60ea9c06d1b7dd SHA512 31ef516b86024f7bea4228b848e4bf94e4d982286410da701f23b1c90288c46fffa78c27645d12acd5a3c130900a786973969ee004765cc9f70a76831dcf5aaa WHIRLPOOL edc60e92c3bc66ef632feab333c1aa0969e1a2673baea02313b228e5e2e360113eac8433e9c7c71de07d8a92bb6b583a663e079ac462387bb0f1932d58894cc1
+EBUILD util-linux-2.24.ebuild 3741 SHA256 f6e3161897fd920a8628acd64d348b8b846369ef83b5c50631d018b0c6f279c8 SHA512 47ccbf7f7e9edc557796bca53fc481034ee170f38468b22744b121179636f81caea6d1eb182999007bfedd6d29f34842ce205fa7b2333e3f62c0619d5ff9fa4f WHIRLPOOL 9b4ccce87c4291c196fa6ef93141b3014423f42499e8ebb12bd307f5cb78905c5e5685b77ca772a64265f50db12d9fe6bc171008053760ff8491a48b413c63fc
+EBUILD util-linux-9999.ebuild 3742 SHA256 f2faba25647f086250a64f1a1b83a7454ce858bb478638132f82d70566813e6e SHA512 93bd85462de24c7069edd5f4a1756a6b3eb1dcc543ce0fafeda3edf5fd6a7bbaec4730ad1ffd47f73b94963896ead4729794a2cb7321721c2af4181e3abcaa0d WHIRLPOOL e6db53c8319066c8b2a99dc58a942c4f715b39768b75e2a4851f67baa94fa7b8f7266b946a54c07a40db07eec34aefecf7ec6e5dd02698cfa9ea9b8344bcd4e4
+MISC ChangeLog 67827 SHA256 c68113bf09d1afeee98a9663371009519edb538935881cd9cf1b404dd6198c0d SHA512 428692cf5ae4a99334a57c314893bb6e14e20d8e2c3d4d940dbd4c41f6a1054584b249ff0e03c59dc9321b485d188723dd450e469f3679e3e29164fdd36d27bc WHIRLPOOL 6d9534301c4684a0d7d81470bb504359886291c796e0d27bdec74b5bd091e0916aabc319a8a51f6c2252fddd42444f4a9989759167ed999b1258f4a9de27d3e4
 MISC metadata.xml 1089 SHA256 cc475077acdfbdd9bb9d7ce99e844f5befcbd5a0939b35c032c8e79a1ea951a6 SHA512 33929335a39c373fc37768e44986d14571f7af1fb6cbade3847dd14adf09e7f0c62b16bcc5906283558fe50fe9e141a5b8562961045c83bacc9c3d1707744b06 WHIRLPOOL 7cacbfb5283ee9600da67d5c284db8a96d49a01ba2bf884bcb9ea056f4fa75b2296b5804dcd88c5832f1f6aacd4c7c1f498ffa1d4a8ede963c184c2b7097905f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSbuGjAAoJEPiazRVxLXTFWucP/3LDTZO8g9nl1Q0BpSU/GtNZ
-ruSZRQdn3OHuTZD/jyW/2IQBbWpBialajxjixKDDcZS/skp/68usKMve1/wj8GcO
-RzaTPAfU8KhwbtUU97+U7186+ruN5o7dCtk7zEtFeRTu2DdwnolLBrlwXdnCvgDB
-daG5G8Ov5iv2m55U2oin033byUx1LzdNpNkHPk4ifGOthCYuuY/FWyK/nj2KE8GL
-Sks0F0Hg4118k0JlORLu0/k2IxzLzmxyfmXsx/iaqy4jftHLLGyPSwwRhhruXOtX
-7ljeK1sikoT238dOBbvxFukm8ZprU/sQgbBcO1eWRp0il5h6OckPznlIJ2gcUiRl
-+nnwcezWzJKdWNmAk0aT0xEbHBM154Um0hUQJzYFgpIQnYHkb8MCMmlXPFb+X6Z0
-1Xe8rJW2+lj24SJD1oWRBjOO3JjV+ue8WrfIFADU0Gp3wD1wWVArNnJWDhfKh750
-ThYr8VdsH06WMXKEokBHRmp2sYrenOCvVdPzqKxkj9Lnm3Lg/tHLKOjAOW2hCCN4
-B0MlUs+OoS0douqFlnWVLjjKImEqD6afVg/ie6nRFdugA74CyNxbPeaT6HdsyFKL
-7cvOMkCSW6yW6l5U5DOMBPLK8ecdLgOqvc33rvcQMWp/RShpL5UtoTzf9pwSKIXc
-/GYMq8t/Bm9j2mZtA8/u
-=mjOY
+iQIcBAEBCAAGBQJScBmmAAoJEPiazRVxLXTFCjYP+wRd6zcDIcz5PAeAaIL0O0BB
+DLc2Y1JwNYtNa8aa8AnnZywvzGGxGPVcAhwYUQmNnQ69G/0pGKsxCx5NUw3ZWuer
++uA2wyweWqMw+efSz72wF1fXMMRj/DLesx4T4dw8FIfmkFixLkDr54RH1lbeLQlM
+Vp3c6TCuImVZKZNjALbYVesDbBJJC++Ll51V3uu8Bvd01ODz1BWbgX639sYaKJmG
+vtMqzn5KVkza/grb2KComeLhmJwyEgammc8q0foabbR13XkTrN6FYtsIzfRk9f60
+8iUgQORDJfxM2hGs1I7GVvqZSI7kW4Oi+mRLMabyVcac2x0q7LQnKWgss/JkZyte
+m8e5Un2esDpjC8CyrqfPDpI4H7fXScT1UcosHle/BnfgM1loxBje+84+Hn3nF/qd
+ZY0I9j2+pOj4+l7mnlX0pNkGYlRJzoeIilwHHFmMPS8rQZKjZvST/SRGW5GnlxAo
+QG5bszdwLlj/4eG+Lu2HfKi2mB5MXsz2tvP/R9UVyFFitJhHEZXu7FLHoE0109/H
+nQztkEqTBa2DEfNBEv+IJVrBhmeWCBs7+SwGAOssYx1Vl7QrZsHkC5bTxMbIpvFV
+HkFY0bG/OSyw66WAPU0JAZ+CV+hRQt/1DbBNJ544Q8/KTFsbZ9gDWW0xzQyDyM77
+shxTJVW9RXFwGn3FiykY
+=dZQT
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.24.ebuild b/sys-apps/util-linux/util-linux-2.24.ebuild
index 70fccfc84976..3464adf04278 100644
--- a/sys-apps/util-linux/util-linux-2.24.ebuild
+++ b/sys-apps/util-linux/util-linux-2.24.ebuild
@@ -1,8 +1,8 @@
 # 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-2.24.ebuild,v 1.1 2013/10/28 22:13:54 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.24.ebuild,v 1.2 2013/10/29 20:25:08 polynomial-c Exp $
 
-EAPI=4
+EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_{2,3} )
 
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 91933ef91f51..799e4b88ed50 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,9 +1,12 @@
 # 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.46 2013/08/07 22:49:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.47 2013/10/29 20:25:08 polynomial-c Exp $
 
-EAPI="4"
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{2,3} )
+
+inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -21,7 +24,7 @@ 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"
+IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
@@ -33,6 +36,8 @@ RDEPEND="!sys-process/schedutils
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
 	selinux? ( sys-libs/libselinux )
 	slang? ( sys-libs/slang )
 	udev? ( virtual/udev )"
@@ -42,6 +47,8 @@ DEPEND="${RDEPEND}
 	test? ( sys-devel/bc )
 	virtual/os-headers"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
@@ -67,6 +74,7 @@ lfs_fallocate_test() {
 
 src_configure() {
 	lfs_fallocate_test
+	export ac_cv_header_security_pam_misc_h=$(usex pam) #485486
 	econf \
 		--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
 		$(use_enable nls) \
@@ -77,13 +85,14 @@ src_configure() {
 		$(use_enable cramfs) \
 		$(use_enable cytune) \
 		$(use_enable fdformat) \
-		$(use_enable old-linux elvtune) \
 		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
 		--disable-kill \
 		--disable-last \
 		--disable-login \
 		$(use_enable tty-helpers mesg) \
+		--disable-nologin \
 		--enable-partx \
+		$(use_with python) \
 		--enable-raw \
 		--enable-rename \
 		--disable-reset \
@@ -104,6 +113,8 @@ src_install() {
 	default
 	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
 
+	use python && python_optimize
+
 	# need the libs in /
 	gen_usr_ldscript -a blkid mount uuid
 
@@ -112,6 +123,10 @@ src_install() {
 }
 
 pkg_postinst() {
+	if ! use tty-helpers; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
 	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."