From: Pacho Ramos Date: Fri, 2 Jan 2015 12:21:09 +0000 (+0000) Subject: Prevent automagic dependency on systemd (#533726 by nzqr) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=db14f8bb16e6f17b6e4874310bb2e8c717de6327;p=gentoo.git Prevent automagic dependency on systemd (#533726 by nzqr) Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog index 7b2731a08bc3..c79cba2bcaaa 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-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.486 2014/10/24 16:27:07 vapier Exp $ +# 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 $ + +*util-linux-2.25.2-r1 (02 Jan 2015) + + 02 Jan 2015; Pacho Ramos +util-linux-2.25.2-r1.ebuild: + Prevent automagic dependency on systemd (#533726 by nzqr) *util-linux-2.25.2 (24 Oct 2014) diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 03a446ae270b..a2e8759099e6 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -17,24 +17,15 @@ EBUILD util-linux-2.24.1-r3.ebuild 5146 SHA256 b267e31c6af27737f9296dba6891324dc EBUILD util-linux-2.24.2.ebuild 5375 SHA256 5af9c1b4a3640be7b95a2f1887ba1a91adedca40640fb48d59e6811f5175675d SHA512 da6bc520af433922219a1c3f99a0b7cff7c41bbee9f798ecbeec687440605115fc52bc2a2ae95a718bd6cc300c6ece6b9ba37b011beda86c8dd6279ff308a27e WHIRLPOOL c167ea926c6f1abba491dafd5a5e1445b5f90a312bc24c5a4bc34ac872924bba23d71269e79927347c005deb9edd9b4ff8599d82d63d42a80fa48cd772d03fe7 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.ebuild 5193 SHA256 006f4fc3622bee17f83295935f70cdfe83188f26d7d7f03df25cd8a74aa60960 SHA512 fd3696513b1ed63aad0bd9f17c58be9e43f2a60d841224fade979d6a42a28778d8073466b25efdea720255e0ecd7aa0cd0fca2ad1e9ec00eb364e724db0c3158 WHIRLPOOL c462238d7554fe1f48796b51c40042a337e6ec8955e7babfb8eb326cb74e2711b8a1e86cee0bc86968cff8502f918cfa918e4a31a85c25a700a001720bec441b EBUILD util-linux-9999.ebuild 4817 SHA256 1dfdff0873657ec613df499fe166d0ea59bf7d91a5ee546f8f771fd7ccbbbb93 SHA512 2fb77a7414e89b578e9b546da06642ce6d1202a03b16dc169f2389b2df57fc909fc17edc30cb15882e2b2a46fbaae5045603464f9a32160a113229a6f7339360 WHIRLPOOL 64c4629ec7bb1788e8a4ae4bbc796d2026889441cee15e4673636b0e58cda5a3ece1390b1bbdd68171bbcece65d217e230ffd7103bd1778cbf45b21a352d60d4 -MISC ChangeLog 75727 SHA256 584a8fb1d4b7a3de9b2f3040b69bcb6c38969a8fe4b4f1c43b6bb5a4ffe23da3 SHA512 a8b00df3a13ac5ed07245d2f522b769179c26f13c13d7e8bf725dfc76e5db2893455b186b0030bbafda30373173044c37db2fb3c5b8dc0b6041fad5346460fcd WHIRLPOOL 9b7b4cc274dfe4f9debdcb5d7664c542cb24d9e9b1761f75fffbf54e14e7498878f881af09c627e3082559a2746e827c3df44945cc66649fd7b694385e3e068b +MISC ChangeLog 75900 SHA256 5d4b028ff9d854422940e41268f18e0cac35377fa212034fef40695f065293be SHA512 1fc1ed03b7da8be74e06de0ba4b8620716a7008277459a5567f40354e6c7ceb600e560f79672cd3916c26251ac80e6d56b12652b5a647f4b63301d37fe38da40 WHIRLPOOL 737d854a05bce22ad60a1999a65f69c2388adc7bba245d12e24752c6f496f6e436ae5d731a89a31cc61468d4cece5209656baeb85e00783f48dac0217046e706 MISC metadata.xml 892 SHA256 c7f34ab09b97ea7896c5923c219b1431f9488cf15b27c245d4be880ccce87d65 SHA512 33ad8d44583605e115fd9866ff71324c70b71f1937273cc64c89221d8499b9ad620e272dbe37cd28098ffe2d19c9b414448d8979fd7b216ac5c9bba7a1a4d5f6 WHIRLPOOL cb6496cf00c218a0581a8114d82df6e5fdf90293d634d6c1eb12513d25cb9652d1c55bb035d5c48d58901fdcd67b3e23ece8681cefbe5a8015ab4c91bf299b4b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUSn3cAAoJEPGu1DbS6WIAarMP/04Fa+ZmxdPRFhtZOnYwIiu0 -905Q1ZbZlgNoaauke0wuIzlLAaGJWj6MAKuC71Wi2kQKfndZqng1f5tgooXWeSkI -6vBjzDpHdKxL4zrD2wgmFLsMadS2Dq+rt9MLanwjJfVkjjeXIuKznWENMzhWKv7f -eqJEB8ALKBuyMy/u4PQX6E+/AW+pn9Zghpsm0ssMDHQRb2FGMfSnqhe2V2cWiOP8 -2aurYLKBoIqcGqBQ/FkOXizX2r4xXevmf/dfHcGf1DocZFz7aJiCy/8dkdt/3EmP -EbCEfyufarHRSQZiOkLWj34sAlV2PObo9T4O1e9vXXuY5UN15UjBLS8Q4E+YruXQ -JM1VLZpTanRq8sUWDFTnF9PZ5J1pNs9qv0JrpsT1wPdzY8tNeQICSjzlnGLidY2b -mN3Ge0yO6vTzQkmbCMvqduWjpLkIAahXioNNoF6pHfl7KdfOG3h46gpJ7eGLiv3G -HCsZbSBMG0Fm42ic0lkMJsBEGIZMruRn7TSo0izZwb3RkOYcNx3Ni6Hu2XpY8qgD -edPP+rNlxwFk00wn22Y1aNWMC/ytZKCded5GBiyJeap0i0ldxgOSBWW1THDkdThc -RDnNR2nPRN0OSUD703wRYRP8r8x6A6DlmWHUs78j+rWUoUUjAIsUTphdTYjNmm1j -33EzBs/EZ4pLaNzZyrmR -=jFLV +iEYEAREIAAYFAlSmjTUACgkQCaWpQKGI+9Q9RgCfYOZPiMIWDvTqVQ/613Fjcikq +i50An0MhPM2oQMbrW1mKpRSXKVBOknZW +=7jAJ -----END PGP SIGNATURE----- diff --git a/sys-apps/util-linux/util-linux-2.25.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.25.2-r1.ebuild new file mode 100644 index 000000000000..17735113826e --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.25.2-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.25.2-r1.ebuild,v 1.1 2015/01/02 12:21:08 pacho 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-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 + 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)" \ + $(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 +}