Pass --docdir to configure, bug 519904.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 189 insertions, 5 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index c79cba2bcaaa..9af645ef0036 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.487 2015/01/02 12:21:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.488 2015/01/17 23:21:08 floppym Exp $
+
+*util-linux-2.25.2-r2 (17 Jan 2015)
+
+  17 Jan 2015; Mike Gilbert <floppym@gentoo.org> +util-linux-2.25.2-r2.ebuild:
+  Pass --docdir to configure, bug 519904.
 
 *util-linux-2.25.2-r1 (02 Jan 2015)
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a2e8759099e6..052f9a057314 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -18,14 +18,15 @@ EBUILD util-linux-2.24.2.ebuild 5375 SHA256 5af9c1b4a3640be7b95a2f1887ba1a91aded
 EBUILD util-linux-2.25.1-r1.ebuild 5180 SHA256 069440697216f05545dc8ee0d368a1c2902a32a9d0c32fe68b699dcc4cb822ef SHA512 874e950ee71142d56e09dfbc773982626d04902fb99f7273118784c63ab9d71c20a6cbc51efe8fc45ef434ba461ee38bd4a3359413f5a5cce88baaef915d261c WHIRLPOOL 0e682cc5e2d54c2d83c11e2bb253cb0830d31b5480d12cb583c37906c1129fefc48eb84ce3ce180896a756a40a056bc80aa45e8fbd03e7d2f3c756e203b324f8
 EBUILD util-linux-2.25.1.ebuild 5134 SHA256 93cfb99c65d2b23dfd6fb62a3c85436b5a619d66785772c4fccc0e55e00c701c SHA512 31c3ba27d508c6af1e98707d7d947b061e284f2bde6e66100eed7f784550b63f0a7382fa1cc3c5e8d8588f1d1520c2f207c003eb4ce1d10ec422b86b8fdab5ef WHIRLPOOL f9f31106611ae0d6150a215e169619d0f066551802a4a78a0a9e283acc7ab6b770e4bd932089277b91d795d196e3efa8d1b292f4ba48a914fc5ed3a3248182e8
 EBUILD util-linux-2.25.2-r1.ebuild 5376 SHA256 cc51d80f0466920bed9ceb4b981c3e1b49833f9dca54b81fdaf137c5b3cdc0a8 SHA512 2131c24958e3b7a7333f28d477d6292cb952c056427807d5c90d62dea1cb867b4e8dabcb39fe232352946c21e8d0adbf56440450a90daaf1dcb32cb456136a97 WHIRLPOOL a329d5d343e1ba85dd7bc336df445cd93fe2bc02351196c17db720657b1aa6fb85dbfb92e9e158781747750195f70b3d44f07adad669c5263e59e56f169cbd76
+EBUILD util-linux-2.25.2-r2.ebuild 5418 SHA256 5e56a0e692760758c472e2844c4eaa53d6d12fcd4c80e95d7219836d6d1d74e8 SHA512 5b563db8854f2722ba54d4c4faf4453fade82370565ad45a95d5fca0f2c052bac4dd323f0a9b3e6cc1c9efa7d2c656e05fc948bb1a56bbc5d6692639a32d99a2 WHIRLPOOL 970fa5b21dd4bfd0616706acea41fba3dc8748f38d43ce2a3fb3e30dce9f9433f5e2fd2ab934538a0dd106f143b571eaeef12544b3d5f618bd650f1754cf8c9a
 EBUILD util-linux-2.25.2.ebuild 5193 SHA256 006f4fc3622bee17f83295935f70cdfe83188f26d7d7f03df25cd8a74aa60960 SHA512 fd3696513b1ed63aad0bd9f17c58be9e43f2a60d841224fade979d6a42a28778d8073466b25efdea720255e0ecd7aa0cd0fca2ad1e9ec00eb364e724db0c3158 WHIRLPOOL c462238d7554fe1f48796b51c40042a337e6ec8955e7babfb8eb326cb74e2711b8a1e86cee0bc86968cff8502f918cfa918e4a31a85c25a700a001720bec441b
 EBUILD util-linux-9999.ebuild 4817 SHA256 1dfdff0873657ec613df499fe166d0ea59bf7d91a5ee546f8f771fd7ccbbbb93 SHA512 2fb77a7414e89b578e9b546da06642ce6d1202a03b16dc169f2389b2df57fc909fc17edc30cb15882e2b2a46fbaae5045603464f9a32160a113229a6f7339360 WHIRLPOOL 64c4629ec7bb1788e8a4ae4bbc796d2026889441cee15e4673636b0e58cda5a3ece1390b1bbdd68171bbcece65d217e230ffd7103bd1778cbf45b21a352d60d4
-MISC ChangeLog 75900 SHA256 5d4b028ff9d854422940e41268f18e0cac35377fa212034fef40695f065293be SHA512 1fc1ed03b7da8be74e06de0ba4b8620716a7008277459a5567f40354e6c7ceb600e560f79672cd3916c26251ac80e6d56b12652b5a647f4b63301d37fe38da40 WHIRLPOOL 737d854a05bce22ad60a1999a65f69c2388adc7bba245d12e24752c6f496f6e436ae5d731a89a31cc61468d4cece5209656baeb85e00783f48dac0217046e706
+MISC ChangeLog 76061 SHA256 dc9246e94e1242f64f5b42ca6d078d68e5b7e61d84fe832e892dd66c93caec4f SHA512 ddecafadc589fe01febafdc1d63df6cd47d893e65f1fcc82d01deafa618d718f8caba9e6764092e099c5847878ec5c21c833b8975a41afd60b79ac064c699814 WHIRLPOOL fb9c9e154891b26181d1e105324a1f43a21706e28e494f5703779a6bd76410b2b94ab80a72211083becf7eb5dd3819fdecd72c7874eff8ae1804a53a56d786e4
 MISC metadata.xml 892 SHA256 c7f34ab09b97ea7896c5923c219b1431f9488cf15b27c245d4be880ccce87d65 SHA512 33ad8d44583605e115fd9866ff71324c70b71f1937273cc64c89221d8499b9ad620e272dbe37cd28098ffe2d19c9b414448d8979fd7b216ac5c9bba7a1a4d5f6 WHIRLPOOL cb6496cf00c218a0581a8114d82df6e5fdf90293d634d6c1eb12513d25cb9652d1c55bb035d5c48d58901fdcd67b3e23ece8681cefbe5a8015ab4c91bf299b4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSmjTUACgkQCaWpQKGI+9Q9RgCfYOZPiMIWDvTqVQ/613Fjcikq
-i50An0MhPM2oQMbrW1mKpRSXKVBOknZW
-=7jAJ
+iF4EAREIAAYFAlS67mYACgkQC77qH+pIQ6RvxQEAjsK6qv2veFGjIp9RcJlfFWlh
++yvR54KPvuGHSPCSoqMBAMPZm3GcW7pIP7ztSs15utSixRR2GrW1oopAwSYHTSQM
+=w20I
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.25.2-r2.ebuild b/sys-apps/util-linux/util-linux-2.25.2-r2.ebuild
new file mode 100644
index 000000000000..7988abdcd102
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.25.2-r2.ebuild
@@ -0,0 +1,178 @@
+# 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.25.2-r2.ebuild,v 1.1 2015/01/17 23:21:08 floppym Exp $
+
+EAPI="4"
+
+PYTHON_COMPAT=( python2_7 python3_{2,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/udev )
+	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() {
+	epatch "${FILESDIR}"/${P}-runuser-bash-completion.patch #522288
+	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
+	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
+}