EAPI bump, bug #543176.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 205 insertions, 9 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 20e799822bf3..de445653a634 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.494 2015/03/16 04:59:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.495 2015/03/21 09:37:17 mgorny Exp $
+
+*util-linux-2.26.1-r1 (21 Mar 2015)
+
+  21 Mar 2015; Michał Górny <mgorny@gentoo.org> +util-linux-2.26.1-r1.ebuild,
+  util-linux-9999.ebuild:
+  EAPI bump, bug #543176.
 
   16 Mar 2015; Jeroen Roovers <jer@gentoo.org> util-linux-2.25.2-r2.ebuild:
   Stable for HPPA (bug #536906).
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index cd822c0b53a5..c9b18d306789 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -22,15 +22,28 @@ EBUILD util-linux-2.25.1.ebuild 5134 SHA256 93cfb99c65d2b23dfd6fb62a3c85436b5a61
 EBUILD util-linux-2.25.2-r1.ebuild 5376 SHA256 cc51d80f0466920bed9ceb4b981c3e1b49833f9dca54b81fdaf137c5b3cdc0a8 SHA512 2131c24958e3b7a7333f28d477d6292cb952c056427807d5c90d62dea1cb867b4e8dabcb39fe232352946c21e8d0adbf56440450a90daaf1dcb32cb456136a97 WHIRLPOOL a329d5d343e1ba85dd7bc336df445cd93fe2bc02351196c17db720657b1aa6fb85dbfb92e9e158781747750195f70b3d44f07adad669c5263e59e56f169cbd76
 EBUILD util-linux-2.25.2-r2.ebuild 5415 SHA256 99a69bb31004790937610430397584f63d4d65a6ad0b4f67aad24a5ff665ce5a SHA512 9112b16bf299a8882c9163e477b7e5c18d3bd771d67fc93779e1365a0d289c3e402746dc25254f39b0ccb78aae3ba603f54317e26cbf359675a5aae91c73d0dd WHIRLPOOL c5b887dffcfc2d659b662cfabee439a29c73e54d7cc850b3ae2edb13901ba606d9c4c712f14ad1fc08b6989d840a1ab8c157b4937a8f07d229fb5db1934259b8
 EBUILD util-linux-2.25.2.ebuild 5193 SHA256 006f4fc3622bee17f83295935f70cdfe83188f26d7d7f03df25cd8a74aa60960 SHA512 fd3696513b1ed63aad0bd9f17c58be9e43f2a60d841224fade979d6a42a28778d8073466b25efdea720255e0ecd7aa0cd0fca2ad1e9ec00eb364e724db0c3158 WHIRLPOOL c462238d7554fe1f48796b51c40042a337e6ec8955e7babfb8eb326cb74e2711b8a1e86cee0bc86968cff8502f918cfa918e4a31a85c25a700a001720bec441b
+EBUILD util-linux-2.26.1-r1.ebuild 5384 SHA256 dfebbea5a881960762ed0f015deac3f59f015053f0f3274f0c3e8342f704b6f7 SHA512 f3836167cb908399d64334e701b4b45609c940c56d3dad8a88aa24f410e3583f15cbf9c03c44eb8da4c94d5b1c6c39d73cc2ae9661939179afeb6b6a23c27f0f WHIRLPOOL 0e1045f70a5bed85a774a79ec385d12ba53788fba4ff652e3e31ca70e57fbeac6d19a886ee31d3147cbaf85bead37aff88f5d1006b51a00070152c9f1d66b262
 EBUILD util-linux-2.26.1.ebuild 5383 SHA256 f0907bf47e19909078dee426424b94bd9dd35601dccf20e1621858b7a0c6d030 SHA512 2ec9630718013c7d0345678bf4eb64a890092885cc7d07406bf386ac16e7f0610de9b9735e60f4dd325dd5f833b6806c9ca1b444d70de10910e9b2ac7209a5ad WHIRLPOOL e01833c583a52fb0a1a797a3e15969d36f0f52f43bf8bcf1438f9da4e0aa8e00ce2fa6c1103f032b31ef67e10bb406ddd95a71590c7d78f0f341a393163d38ea
 EBUILD util-linux-2.26.ebuild 5381 SHA256 3e88d5379f9d0bb0304fa7786e30f1f275d1920481be814c87b651f7cd3cc725 SHA512 1291b3bc7c8f0c99b844929562ea6515076ff7cc18c838c688bf696e74cb323fc2bcaf6bef558217473e2fbdabe5cb28d827d71e3f13e0c281ef50bd47d4af35 WHIRLPOOL db97d85983a26156378e7b57c714c1f7027853af33f4fc234755f0bba462717b91cb92b52e4f405eb902ab746e30e079b5082cbc6f342dfc9fd7330999f7b4da
-EBUILD util-linux-9999.ebuild 5382 SHA256 c9ebd41fd29d3b095de51eb2e7342f54636b3f701ad023712e747134c68cfa56 SHA512 73b3f0a959541c453e599e94563e9f5ef319ab150e2b16df6813676e615721c85f294e0431bc5b843161074e0c8495aac33f6a74aed01d086a6d45920ad79db3 WHIRLPOOL 6c8e5b050ddf6200057cab374406ba593f57a315b282b3c3b27078599d2654356613e112f429c1a5147ff9763d1a318564b259baf2f32aa491945796ab480708
-MISC ChangeLog 76895 SHA256 5e43030598e1f7987d16c6f4cb64db4e915e21ee6c82ec93c056b7fc3776db3d SHA512 77eed6f61b34698fc8834abdae74fd1643b00746e9e767a28cd66048133e546d68c44c8fa8b31b09f0d7333b146a8e1c7c9fc6c9a8acb2b3565d6226538fc23f WHIRLPOOL f519fbb71560a8ee1ca923f6eb1a15bef98a34f603b51e19c3d789ccdcdacbaf4d41f4b72ab51188b9be51d6a4558dd751fec880f6802b6385fcdd5423c1d719
+EBUILD util-linux-9999.ebuild 5380 SHA256 ce22515e1a03715d781573e96f9d1d0218e7d394e592d98ceda884cca67c9ef3 SHA512 1fbe99a1bf01cfdfe9340b8590a767d8f5ca34de7e02e69154ad52642106a09232cd54ddcb3d1c24a2b2052317cba7624802145c5bd8d94d2b6bd2e8055bbb3a WHIRLPOOL ca1f3042a94785618eb08b6170843a50cbb5789a94456b7dfad814484cca85f1fcf2b041c176b8be7af9201ba0a771ac7d3c37f82b41ddb487ecffb73f5e53dc
+MISC ChangeLog 77068 SHA256 d396fdb197702f44fe085ab0eac8beb80b083e662b8a54cd1bea320572e88719 SHA512 c0a25993c872ce440e3df2f41822cab95c408d407e713a8ef90d2d8957fc5c643aaa442448e782c9edbbbbbd071e214aa1232927356f1aacd0d623a0868d8b48 WHIRLPOOL 8b259c28d1aecfafea31b982acb53c009d1c11faab0bbde755c5c969021afa3cc12df3bf03c6cf66c0b75bed3cd1764fec6d960245b27515fa6a1b4c34814f52
 MISC metadata.xml 892 SHA256 c7f34ab09b97ea7896c5923c219b1431f9488cf15b27c245d4be880ccce87d65 SHA512 33ad8d44583605e115fd9866ff71324c70b71f1937273cc64c89221d8499b9ad620e272dbe37cd28098ffe2d19c9b414448d8979fd7b216ac5c9bba7a1a4d5f6 WHIRLPOOL cb6496cf00c218a0581a8114d82df6e5fdf90293d634d6c1eb12513d25cb9652d1c55bb035d5c48d58901fdcd67b3e23ece8681cefbe5a8015ab4c91bf299b4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUGY0cACgkQVWmRsqeSphO0dgCeOJMQGaq84EjyG3r+bXqmxH+i
-OJEAniswy/t0tmzvgyvLng8b3NLNxL2R
-=iaH7
+iQJ8BAEBCABmBQJVDTvQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOEgsP/0OFJLQnXACE8TWaRdLehFWe
+9YznBoQSkeVytrvBD6he0vzjMpE/RzCbbltZoY3I7959dExkHqiteOh3HE+y4Yqv
+eR8Z6m6NUai1V/qhL0GIoATw5hbLfMeTuZ97o1C1KraAEAlrR7/3ajToRvjO9y9v
+g0NCMkchGeGdq+INGKUCXu8/N+MaIaHGFREcX6Yxv7AYw0ueu7vAg/ICBCptmFq9
+aPecpKeFa93ZbVBuOaO5w1/vnW2tDHf9d5AZ3sRqgh4EbNP2ITghkNLNSBGewddv
+aSWtcK8Z/YZXW+eeJNh5t0clKC8WLflc/oHCKrxLAAH51u7yLW6qH6Tr+Mh45WwZ
+U8KsoHxWA/rKf+R1dgj/MFdagk8lEQSC15cAUTGRKOCpNbRIC/jSXKpHWC+UpFb9
+jjJpblaitO7n30HckkSA3QiueyzbWNG/1/8L4IDrmEnxEQw5sTmR7Svm5tSEHSsk
+/l0MpOuwf51n1ilhoIl5zvRmuJ+wp+dnEvUvDOeaT1CkkbYd6z9OhOrWNFCL9dgd
+Gde1GYG1HqS0yrkWqKqZ9EN0fxS7zIVK1732lQcJ1N8NYfikf7MqgwN9a5lmN7Jq
+/H1Wos9vuEk5s2hRUYzegW9U9z8ApDmS8K2ivwhQS7gSK3ITKZTu0l7WN8rpC3dI
+dyAYuMKG7csnouXVDDWk
+=1o5E
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild
new file mode 100644
index 000000000000..246cbe93de3b
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.26.1-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 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.26.1-r1.ebuild,v 1.1 2015/03/21 09:37:17 mgorny Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+	python-single-r1 multilib-minimal systemd
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+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 ~arm64 ~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 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode"
+
+RDEPEND="!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r7
+	!sys-block/eject
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-1.3-r2
+	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-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	systemd? ( sys-apps/systemd )
+	udev? ( virtual/libudev )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+	virtual/os-headers"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.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.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	# We manually set --libdir to the default since on prefix, econf will set it to
+	# a value which the configure script does not recognize.  This makes it set the
+	# usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
+		--libdir='${prefix}/'"$(get_libdir)" \
+		--docdir='${datarootdir}'/doc/${PF} \
+		$(multilib_native_use_enable nls) \
+		--enable-agetty \
+		--with-bashcompletiondir="$(get_bashcompdir)" \
+		--enable-bash-completion \
+		$(multilib_native_use_enable caps setpriv) \
+		--disable-chfn-chsh \
+		$(multilib_native_use_enable cramfs) \
+		$(multilib_native_use_enable fdformat) \
+		--with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
+		--disable-kill \
+		--disable-login \
+		$(multilib_native_use_enable tty-helpers mesg) \
+		--disable-nologin \
+		--enable-partx \
+		$(multilib_native_use_with python) \
+		--enable-raw \
+		--enable-rename \
+		--disable-reset \
+		--enable-schedutils \
+		--disable-su \
+		$(multilib_native_use_enable tty-helpers wall) \
+		$(multilib_native_use_enable tty-helpers write) \
+		$(multilib_native_use_enable suid makeinstall-chown) \
+		$(multilib_native_use_enable suid makeinstall-setuid) \
+		$(use_with selinux) \
+		$(multilib_native_use_with slang) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with systemd) \
+		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \
+		$(multilib_native_use_with udev) \
+		$(tc-has-tls || echo --disable-tls)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		# build libraries only
+		emake -f Makefile -f - mylibs \
+			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
+			install-pkgconfigDATA install-uuidincHEADERS \
+			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
+			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
+	fi
+
+	if multilib_is_native_abi; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid mount smartcols uuid
+
+		use python && python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	prune_libtool_files
+}
+
+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."
+	fi
+}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 1cc6a6ac8c7d..5c7435494ae4 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 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.61 2015/03/12 21:53:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.62 2015/03/21 09:37:17 mgorny Exp $
 
-EAPI="4"
+EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{2,3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 
 inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
 	python-single-r1 multilib-minimal systemd