Version bump.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 9af645ef00360e453b52aaff549a45a16980cd17..1933cafed799887cd2562ba5694892f2424729dd 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.488 2015/01/17 23:21:08 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.489 2015/02/19 17:51:23 vapier Exp $
+
+*util-linux-2.26 (19 Feb 2015)
+
+  19 Feb 2015; Mike Frysinger <vapier@gentoo.org> +util-linux-2.26.ebuild,
+  util-linux-9999.ebuild:
+  Version bump.
 
 *util-linux-2.25.2-r2 (17 Jan 2015)
 

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 052f9a0573146910adea3905bb41047c524453e8..eb4d405ed235f34472ee6f44363c721769315495 100644 (file)
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -12,6 +12,7 @@ DIST util-linux-2.24.1.tar.xz 3543692 SHA256 835eb6232cfab0118ef2e4fd649de0ba9f5
 DIST util-linux-2.24.2.tar.xz 3586580 SHA256 1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0 SHA512 a0c03876ef19fa09e434e3e5362fb3f3e0a254b3b39a623ac7a9a207d06afce00366792244ed0fac86931f8340c046620660f33c3444a07a12037182fc191240 WHIRLPOOL 4b8185e1832145c050a8aa0761ae017d846ed58cd7e07710e4c32bf92a8f6e530bddb56dab70c8025eddb4cafafed79e658b0aced3a190b61b508078a438a9ed
 DIST util-linux-2.25.1.tar.xz 3695172 SHA256 4701305ae22790c3a92ce48e50794fa05b7ee01f4227f419a171c100d08986e8 SHA512 a670cb4318beed0a455efb339ebea6ec7c5d672e15877e7e25cae2ec9c0795fbe4275b6c85a590467c3de92ab2f64cdcd0427c9a2a6e4c6b76f563592fb7be8d WHIRLPOOL 44c17bd3ad0b05c47bb955b934011b460c3992ea5d5b43977d2001b245820b775e16bedbaa10ff9c223d59b0809674884c76f0dc34d707864d17b49b4deaab9d
 DIST util-linux-2.25.2.tar.xz 3703644 SHA256 e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 SHA512 cf8c5bde78f844425150c2a81bdecb87aa57bcd5cebd177a78160835627f58037fa2cfe4db26fd8f35eedb3beb499a91492a297a27d065465e2ea0c6218dc387 WHIRLPOOL dd1685f2e694bf3de95acc3ba3170d231426c18c3395a867c815bbd3ab5ee0f07567b49d0ae083ce669c89db711e39fd2b990bc7321985ec2279d78816ec5258
+DIST util-linux-2.26.tar.xz 3847960 SHA256 a23c6f39dea0ed215ccd589509ffc7bb6f706f6e1a04760f493fb0fd7e93c489 SHA512 af07d49a433fce683da7bdf9aea5693ad108aa16166e0147716175bd779fe5090029617dd7db153bc0f5efcf7bdd377761a616efd4cca90a87bf317132ede88c WHIRLPOOL 4f7c9463bfe1523819671824de26e051c496c86884ca34b25208762179345c799fe61e566228ebfcbca2f2b63163539e37b06e438a58f562cf7b53f954564150
 EBUILD util-linux-2.24.1-r2.ebuild 4130 SHA256 a2bc50f994ff17185a3680841110ab1a320f51b3ff96291ac28b4d0440761895 SHA512 1253cb5bb86ad131ae32817bc45924804a8e48819a45314f75117fb1035f24100edd2b61a9241cb9bea0855c2877fd6fa51d56ae8dd8014ccac711efe9d04172 WHIRLPOOL 7b98c36037379421ed154c0e86f5fe308c0dc8458df01b9d87dc0110f4053292b16ce6d96949e2f5f3f315dea1a5d538b8e713ac52e2eca40cffabe75f3b7976
 EBUILD util-linux-2.24.1-r3.ebuild 5146 SHA256 b267e31c6af27737f9296dba6891324dc615d1865f6793f9b993bcb6bd5cb0a7 SHA512 14c1e66758666a3b9080f750267d23fd27d2fd7b8975af2dd1c94231d908f62c7de4466a222e496b95c2cee3a53617b84fd77f1b363e205d7515719438a17d1d WHIRLPOOL 43c7b5baecd9f7fba2821de43aeeadefec6a5c11084a8acb6d13c37c21d683d148801a39c36af597809791f4be696130ad51c512ad6ad6efd7230b817bcf1fc1
 EBUILD util-linux-2.24.2.ebuild 5375 SHA256 5af9c1b4a3640be7b95a2f1887ba1a91adedca40640fb48d59e6811f5175675d SHA512 da6bc520af433922219a1c3f99a0b7cff7c41bbee9f798ecbeec687440605115fc52bc2a2ae95a718bd6cc300c6ece6b9ba37b011beda86c8dd6279ff308a27e WHIRLPOOL c167ea926c6f1abba491dafd5a5e1445b5f90a312bc24c5a4bc34ac872924bba23d71269e79927347c005deb9edd9b4ff8599d82d63d42a80fa48cd772d03fe7
@@ -20,13 +21,24 @@ 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 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 76061 SHA256 dc9246e94e1242f64f5b42ca6d078d68e5b7e61d84fe832e892dd66c93caec4f SHA512 ddecafadc589fe01febafdc1d63df6cd47d893e65f1fcc82d01deafa618d718f8caba9e6764092e099c5847878ec5c21c833b8975a41afd60b79ac064c699814 WHIRLPOOL fb9c9e154891b26181d1e105324a1f43a21706e28e494f5703779a6bd76410b2b94ab80a72211083becf7eb5dd3819fdecd72c7874eff8ae1804a53a56d786e4
+EBUILD util-linux-2.26.ebuild 5347 SHA256 bd0b36d3943081664f8bfc36e9e75db6800d23a9cd3fecd849c099191ff76bc3 SHA512 7b11d937d1bad9551a2b38008a8733bb51f05dbd0ffa5d7d9ea2f52286fb8959a870f9d3a8e1662a67eaab480db5ab3bcd50e3aa9dad8c9fcfb0dc72a51fcc2b WHIRLPOOL 3233348c9a2dc51b76060465c4591bb60b11b661b43c690ee88adb5b383864b4a296bfdc0aa9613e538c2aef601760d02bcfab2507bb6ec4f15a30dcdbb429c8
+EBUILD util-linux-9999.ebuild 5348 SHA256 32dc42def39d834bcf5a4b2afad2fa5e867ba5cb8269425bab0ed43bcf520ac2 SHA512 3e0cdfca4047fdf541839e2cdedfe5cce3277d802bc1f549bce23c2419e0daf49c77deb89aa0dea1975d0cc97975dd98adc81da640bf4dcbde2ce25c15ea6f2e WHIRLPOOL 4db227416aa0fce0239fe292aca8d3692f97166496bc2e42be1378ec021451723ab0ca3cd31455de851f84215eed4203f74588e770bf2e1ee1a1a51b9b51adf1
+MISC ChangeLog 76210 SHA256 abec4eb9571bedb844edcd8ef5795ceb0ef089a64c98258dafb5e91a7c6ec092 SHA512 7f4fa187a3061660bb88e331c85647e150561d20cf9c9dbb9a389730b2302022b2881acdde836889f5d9b5e5522e4a91e06e0e7a95125814f722ed1ba42cc436 WHIRLPOOL aca06f13ff1a9ffa48eb2d0db06fb5ed9a3d70ec06c80cd0786c3ea96be4ea302bfc07a0a53950c9bae6d9763f029add047953398f793050b93c0fcf7433865f
 MISC metadata.xml 892 SHA256 c7f34ab09b97ea7896c5923c219b1431f9488cf15b27c245d4be880ccce87d65 SHA512 33ad8d44583605e115fd9866ff71324c70b71f1937273cc64c89221d8499b9ad620e272dbe37cd28098ffe2d19c9b414448d8979fd7b216ac5c9bba7a1a4d5f6 WHIRLPOOL cb6496cf00c218a0581a8114d82df6e5fdf90293d634d6c1eb12513d25cb9652d1c55bb035d5c48d58901fdcd67b3e23ece8681cefbe5a8015ab4c91bf299b4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlS67mYACgkQC77qH+pIQ6RvxQEAjsK6qv2veFGjIp9RcJlfFWlh
-+yvR54KPvuGHSPCSoqMBAMPZm3GcW7pIP7ztSs15utSixRR2GrW1oopAwSYHTSQM
-=w20I
+iQIcBAEBCAAGBQJU5iKdAAoJEPGu1DbS6WIAhKYP/1d+mZ1F3DdGZ1N3PqUdq+dL
+m8OXB7wOo49uvW7rcBKmNCZvQX+fbB5YmQftf3Kmk4MHxkMIwepMqkGbKwzEA76U
+iYBR+ENYT7Ma6YSTBLkQtJd5hRyNuyuJ3GrRJt+RKLf7OrORV0PSWKr+3Td/4UqN
+ixkXxpXCpTqh8D5cga1xeWuM3a6hlGjsaQkC8dkHCrcH+vKPfaXJlYnycFO+sLcP
+O9JQp32VmgL2H4q5z5YjcQ9ucVD57a7Tgna/4N6n0ICSLhWOFI9sSS8AbAiNihxf
+cQb2mxd8yyebf4mOmI5oxEZTZPoBf/tsisroGLmlTlR61DMDX6Wklnd/KqCdSFga
+7TqN5hT5VL2hrJbmxR2NBRgPeNdE39eWK/Pl9fBpPduE1rrY6/V8+ajxaz/4BkQW
+kpwsP1lyJnf3DMZv0tKpt5VN4HN4Kgtxjp24EA0vDprAGjX5uXd93OOxo09EtkLx
+nnkCXFa8gj6fYmEvr7cnAWuDFseI7tourY92glT+YITDzfCVSJpfY555LtHlX2tj
+c57Qz5K0RDA6KcTnUeg0o4WYadIhn2OV9ZHVMqpNazsXA5T0ixL4FkFN3Qb/Vo5u
+oTJ+wb0Ie/R1Wwyw+1KN6iX7Bh+zaY0mR6lUM0nwqeosF2QVRnpH9cI6Xp5XuZ4Z
+qTBQscopHzR0RW5j1bD8
+=j62k
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/util-linux/util-linux-2.26.ebuild b/sys-apps/util-linux/util-linux-2.26.ebuild
new file mode 100644 (file)
index 0000000..136aefa
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.26.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.ebuild,v 1.1 2015/02/19 17:51:23 vapier 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() {
+       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
+}

diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index ac16c4e9269848db8bce9b87559b0f2f0a973311..b26c1c40e2eafc24a52ac228bf81f3025a534f9c 100644 (file)
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.58 2014/08/26 19:59:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.59 2015/02/19 17:51:23 vapier 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
+       python-single-r1 multilib-minimal systemd
 
 MY_PV=${PV/_/-}
 MY_P=${PN}-${MY_PV}
@@ -25,7 +25,7 @@ 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 test tty-helpers udev unicode"
+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
@@ -41,6 +41,7 @@ RDEPEND="!sys-process/schedutils
        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
@@ -84,9 +85,14 @@ lfs_fallocate_test() {
 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=/usr/sbin:/bin:/usr/bin \
+               --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)" \
@@ -114,6 +120,8 @@ multilib_src_configure() {
                $(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)
 }