diff options
author | 2014-12-14 05:28:05 +0000 | |
---|---|---|
committer | 2014-12-14 05:28:05 +0000 | |
commit | c4e59e7f8aa9f2cbcf1cef40e638ce9f0e1414c8 (patch) | |
tree | 26e8cefe361472b45fa1ad1d6c32124afd9432b7 /sys-apps/systemd | |
parent | Bump parallel to 3.2.0.5 (diff) | |
download | historical-c4e59e7f8aa9f2cbcf1cef40e638ce9f0e1414c8.tar.gz historical-c4e59e7f8aa9f2cbcf1cef40e638ce9f0e1414c8.tar.bz2 historical-c4e59e7f8aa9f2cbcf1cef40e638ce9f0e1414c8.zip |
Version bump.
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'sys-apps/systemd')
-rw-r--r-- | sys-apps/systemd/ChangeLog | 8 | ||||
-rw-r--r-- | sys-apps/systemd/Manifest | 22 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-218.ebuild | 488 | ||||
-rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 32 |
4 files changed, 518 insertions, 32 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index e5afbcf79eb5..74798fea9cfc 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.323 2014/12/07 12:30:33 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.324 2014/12/14 05:27:58 floppym Exp $ + +*systemd-218 (14 Dec 2014) + + 14 Dec 2014; Mike Gilbert <floppym@gentoo.org> +systemd-218.ebuild, + systemd-9999.ebuild: + Version bump. 07 Dec 2014; Agostino Sarubbo <ago@gentoo.org> systemd-215-r3.ebuild: Stable for ppc64/ia64/sparc, wrt bug #517120 diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 27d9ba3558c4..485c14894590 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -11,6 +11,7 @@ DIST systemd-212.tar.xz 2722692 SHA256 652906b43704fe705cb47757ea9bbbf3c1ab4a1d5 DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f19adc32754b69a0945124505 SHA512 58de0bf7c43c309c2f8e4b7af16b46608a4ea39cbb280496fe5d43d76ea25545484f4ef62efce18be487c69134e4a038d8787f2c262484f92f7fc6feb3ae2f11 WHIRLPOOL 07389822b9f09cd91f360f3cbdcd0b5bf46ba1750dd1a4ad44fd2813436ef40b447b954d33582ffe83aebde618ecbeac4d2f3231d8afbf3975caf84f52b1053a DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494 DIST systemd-217.tar.xz 3694524 SHA256 a031e6fbcdc7077b37338bae8074d9428ee2fa98033beb4923a62871890f7498 SHA512 7a0b13330b621ec179499018bfbe9619a91cdbd120ae2067e19cbb9bbc25c80dd0f80aac217d823be1332054439bc9b2153ac78fc1eb231fa0fd55cb3bf7a70f WHIRLPOOL f22674a629b7b928875b6b06b0cffaf5874cdcb90c44787279cd8ff2a798e5bc525c1058f8b2bfe746d100c4d7686e36a6f604276d5735f7554122e4caad6689 +DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b09075010a97c7aa08eee3fd59b SHA512 c183cce8532ccb4716b84587c96a626eea390202a5469b9d89c8cee7f703e40d7c584e05f29501d375b8cd2a1409d011de564df16f54e27f66b3c3007a6e5bd4 WHIRLPOOL 4d0bcf3ddfecd3354d9f4ab13851f8da6baf31e89e64d3b1ac671159f16f23597d88cc2525aece2f867c140fc97e80bce086a5af91f84b8095e2503c13995e6d DIST systemd-gentoo-patches-217-r1.tar.xz 8388 SHA256 09a75238e12f520560de2a0714a0c37f206e25ae2c348cbfbf6ea526307e7a1b SHA512 bf310fa0dbcc82c49d7d537fb0cddd79ab83c836888706b946f110424a35cd71da9c509cc968a2dc3ccbb5ef6947b2d8b45b9d58a64da3c3dea269d8e8cf5fa7 WHIRLPOOL aad35822a2bed9f60a04245bd79434833e6f08331768b3bac2cea59c37e405064c29b5dca2f767eeace723a6daaf456862667aebc1c4b4a47548c817b5721755 DIST systemd-gentoo-patches-217.tar.xz 3976 SHA256 e336df6aef3db56182a6056c793b82d0629daee556503cc3358b453be7a6dd41 SHA512 c2c8bc6ee1388b860a9cea9669fa5e9c34f3febc5dc7b3bbb25b8eba22ae9eb9a378d075af0fc512e2cb0b698747c7904b426a9df2426dcda8513d6fa99b92d8 WHIRLPOOL 0ac0e6a35fb644c6b0b7fe6b884622a28b5339d6ecd43c2155f906a77ee049563158effb4fc9338f31d61bcb44bece6a9cd86e9755e8810410e64700a96bd83e EBUILD systemd-212-r5.ebuild 14286 SHA256 911b093c8c7b8fa5e63537a2cccf62c89e64229724feec69f0454290a284ffb2 SHA512 ac79890c72d21c108e3348b836979a38c861514504fb52d48d54fdf69400cce3786159817a0ca784dc7051d44624adffea4c3252e19a423709fd21b32baa7baf WHIRLPOOL 307098ec61aba2b58ebb65eb86b5b24e98536b32a989b527fd2d3b82251ebca626075a97e93f80a97d55653974722a2b063f8220aa15428ab3b1fea8e74e82b4 @@ -19,23 +20,14 @@ EBUILD systemd-216-r1.ebuild 15637 SHA256 8fbf530eb7d9b02701571c0a3771ff15e4ad36 EBUILD systemd-217-r1.ebuild 15438 SHA256 bb82ff8abef1279ce432ee84e3f59aedfa9dc4031b89ef7537cf6dfcf47de73d SHA512 fded062d65154107f8cf0acafd15214b42712df4ad09fafc8a3c2247f0ec7b813e14de0d37d4c6df0c8eb074eadfea47b0915e0a7dbb6be44417ae96e6f11edd WHIRLPOOL ed6e22d3f55f2b81d2388403a211c2bab69a44e8e8e3d8565dbd015eceac6e8a963d50d7632026a142fd8fdd19b53e3812a1aaf39901f012983e84555f83e571 EBUILD systemd-217-r2.ebuild 15568 SHA256 0565227f8b842e056cabd5c485a59c9dca39ca83519fc1e55461d3709c323c11 SHA512 2cf3b5b7d13e73e6fc9fed7d0ad4674f86aa2a18c2554461712008473477243b0a458b2b8b5cf20d12267bd6a959a1d7d11e0e7e469bf05767320c81d4a2fb75 WHIRLPOOL 7dbaff110c1075399dd8b86bf1a1710ccaf581519d5eedd05ea370d4329c856ad6153c63eeb1f966ddba86ffb51d398de9e5eaec712845288c8c0066e916a214 EBUILD systemd-217-r3.ebuild 15572 SHA256 1e04c7dd56c989efda7546f86f3165be5a68e215ea4f8795fe2237f10b328e09 SHA512 979e61dce72446fb73b325021d662dbdc99f6c63c2d9ce4614cb8c6d3daa1d31c155d53daec2ce3b2c5d4e84916cb631beead049cf0d9c0d73106ca89b8e0ef1 WHIRLPOOL 58f17767fb81f0a459353fbb747f6dd4df2f1cc30d3510aeea8d34ec2182e94c46b6bd3ef916bccba8039471f1f243d9da1b06ae1f7c6b837d384e4665110ed4 -EBUILD systemd-9999.ebuild 15840 SHA256 d64ed971c07fe8a7502047991b3bfcd80af91ee2df9f60b83b1a9689e69ba10d SHA512 0e4b155398655b6725ebdf6c82f26fc1c628591d22eb6c975000fdc1f626f8fd175aaa2d7b9bde92fc28cec5727692fb9b2dbcbf4f59a00f81088302d9ea2d4c WHIRLPOOL 3c2bae5897bf1f0ff3eb78ddba594de3be9ed425b5ed3d984c6c11b083ae2ac964c82e0639d2df9ad3eb985d346ba96d8bd4c008323e5a4fef551931f2f2cd54 -MISC ChangeLog 57826 SHA256 6da18d63ceb92ac822d8cf794286e2106219b037c51b68e5299656eeac931c7f SHA512 7cab9130ea031318af6acfc85d25bd20df3b3986c3ac508792a1d1afc90be63e3760a26c26f5601c038d1db69a2f2d1b255db7f48a376ae1a34e08db5e078a3c WHIRLPOOL caae75d8ac510ab7e99d7f38a475e95d0f0b707d3a84e7f791068760ee1583bda21bf549b1759a362c6354bcf8f1f2f6e4792dc4d83220ccbd6669dba76ff443 +EBUILD systemd-218.ebuild 15327 SHA256 b9473874da691aa8edea4e8584659c64e761c075f3654c274d2e1593a00e5cf5 SHA512 8097310bcb4d8b53b889c0ce56573a341d32ade09a0fd764c5bd28bf3d691a7f829648f982252ad264f8f981784720dea72568b74a1d16ec055ddd0c0979284a WHIRLPOOL ad9343724e81ff37f646d8f840b50ed65aaeb7b12e637623e4c371fbcdc5a779ba32def8202b1e0a70442c93757282b428230a7982f60e6ce4c248ceea501789 +EBUILD systemd-9999.ebuild 15841 SHA256 b8bcfb9979e54a92b89241087c0976762971d13e3e1612e1b5f9a62bcdc931a4 SHA512 6ef98aa855e0242a8bba759a199b30e196c598383c8ce00843e8a42ad0635a23565c28f65b90ad2372ebcf225bf8e46cdf251e0b48db210ac2a3352a28977104 WHIRLPOOL e11cd67b3153d243d72eebbfcee9f38a790fa08f97c01ed44f77bdf9d05e3ad069940c59c626077a4cd44b459e7a3a611bedeff61e578c02c5f3e007c08eb102 +MISC ChangeLog 57968 SHA256 74be175cb4dcc3c2875b65150abc2c7c3d13aa95f06467487667af3af5fa620e SHA512 12b8828f324c882779fa5f9c9ee8c2810116d67528026dabd85f10f79146ad38379b6e4e86e7a2d519a93eb963dd8cb6f7c7b5769f25ce7b799dd8d6feb448ac WHIRLPOOL aa41f3f06f80f6fb1c8df0beac6b35f9010b33499133429fbac7bbc5c8ce6ad6fb3cbae46a71c0ce2512d8639ea726cd5e828c66d7cf3600e412123804ef7380 MISC metadata.xml 1418 SHA256 e70d15f72262fbf2d21a78b533ef912f0bcb4d67ed4a3f26642a81545c8eaf53 SHA512 1109ea23a2241beffb5536ea289a5153200c2b0ff4bd9c1dd2335c3fa2d2df5bfd7f6aba575bf8225d6d8b8690505d183cd9e5664f956eeebb0f02808c2e2ce2 WHIRLPOOL 3765a3abbbf46911cac9812a6f99c3fbaf4f9e9e492cfc4647382a73740cef1a62f72c16473103749efa64ebf8d03266844d27db2c85d3e7546239cc92425f90 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUhEhqAAoJELp701BxlEWfVsoQAKx49ARRz7EDzdkrPAtp1q+3 -gJttuc09hR0ULWxJPIqbxb1tmmxEpvJmji9lQVTB8G6i+/1Xzaxjax6anYI+v4rU -1PNQZY/HGDWclUUWzbiP753waAMaGgu+n4m+jbHkRxO++gKh28u/L772XEzCulZS -fgG3VVMzW58LM1+JZOI8td9Uu/2vWrpByOdl1aSJJ9MZbag4saBkP0Jv9pue5kJc -qz7DVYT5HrEkQYdhoj0bdFDHWq0WccB2wd92ysZrzjVfI5pxxQnJWWt+TUWu+eFa -0bibJ+cLOrN+wBW2xs97AU5PTsm5FhQeSioESWwOPvYFZWQ9PIqOeNDH7PGoWNpN -CtGzHVcGlV+GRT5TRo5TFf1FYS+bPgGCJwixkHqo6rgGRX1fZ9K3UK4awXuikhrF -XPxF50qRB+BX7tyWsfI98P/+LxOxP2sW7XGB8grSLS8vVAli07+kKWi7f6UmCYIH -vS3qpdXHnSh9TiG+u2U+Lqt0pchv//sg9C00oR/yIpDmFmNv/nwli6QTUN+FDi8L -VavuJKK2owUpsZ6sk/XC0LwTnzSHV0NqY9CnYUQEoJENYpe4Y/JVI5EarfN854Gf -5BQZLL1906UpWSy/OFyCz9/Ow+KeaAUdFV62rhet1l96To19CIvjFe1pOqUfwny6 -X/1U6EFkn86e5tIurmCt -=cXWv +iF4EAREIAAYFAlSNH0AACgkQC77qH+pIQ6TgVwEAoWHkBifz8fblrCU4UYOVD+Xv +YKoHjR8081qm1kNxWHQBAKkLnAYuLMwqXiOBHOJNkYZ6/ZEx2YC7PK/6uFCwVJfH +=oJYc -----END PGP SIGNATURE----- diff --git a/sys-apps/systemd/systemd-218.ebuild b/sys-apps/systemd/systemd-218.ebuild new file mode 100644 index 000000000000..7a3ef19f8be6 --- /dev/null +++ b/sys-apps/systemd/systemd-218.ebuild @@ -0,0 +1,488 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218.ebuild,v 1.1 2014/12/14 05:27:58 floppym Exp $ + +EAPI=5 + +AUTOTOOLS_PRUNE_LIBTOOL_FILES=all +PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) +inherit autotools-utils bash-completion-r1 linux-info multilib \ + multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \ + user + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" +SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" + +LICENSE="GPL-2 LGPL-2.1 MIT public-domain" +SLOT="0/2" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http + idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp + selinux ssl terminal test vanilla" + +MINKV="3.8" + +COMMON_DEPEND=">=sys-apps/util-linux-2.25:0= + sys-libs/libcap:0= + acl? ( sys-apps/acl:0= ) + apparmor? ( sys-libs/libapparmor:0= ) + audit? ( >=sys-process/audit-2:0= ) + cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) + curl? ( net-misc/curl:0= ) + elfutils? ( >=dev-libs/elfutils-0.158:0= ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) + gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] ) + http? ( + >=net-libs/libmicrohttpd-0.9.33:0= + ssl? ( >=net-libs/gnutls-3.1.4:0= ) + ) + idn? ( net-dns/libidn:0= ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) + kmod? ( >=sys-apps/kmod-15:0= ) + lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) + pam? ( virtual/pam:= ) + python? ( ${PYTHON_DEPS} ) + qrcode? ( media-gfx/qrencode:0= ) + seccomp? ( sys-libs/libseccomp:0= ) + selinux? ( sys-libs/libselinux:0= ) + terminal? ( dev-libs/libevdev:0= + >=x11-libs/libxkbcommon-0.4:0= + x11-libs/libdrm:0= ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" + +# baselayout-2.2 has /run +RDEPEND="${COMMON_DEPEND} + >=sys-apps/baselayout-2.2 + !sys-auth/nss-myhostname + !<sys-libs/glibc-2.14 + !sys-fs/eudev + !sys-fs/udev" + +# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) +PDEPEND=">=sys-apps/dbus-1.6.8-r1:0[systemd] + >=sys-apps/hwids-20130717-r1[udev] + >=sys-fs/udev-init-scripts-25 + policykit? ( sys-auth/polkit ) + !vanilla? ( sys-apps/gentoo-systemd-integration )" + +# Newer linux-headers needed by ia64, bug #480218 +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils:0 + dev-util/gperf + >=dev-util/intltool-0.50 + >=sys-apps/coreutils-8.16 + >=sys-devel/binutils-2.23.1 + >=sys-devel/gcc-4.6 + >=sys-kernel/linux-headers-${MINKV} + ia64? ( >=sys-kernel/linux-headers-3.9 ) + virtual/pkgconfig + doc? ( >=dev-util/gtk-doc-1.18 ) + python? ( dev-python/lxml[${PYTHON_USEDEP}] ) + test? ( >=sys-apps/dbus-1.6.8-r1:0 )" + +pkg_pretend() { + local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID + ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS + ~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR + ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 + ~!GRKERNSEC_PROC ~!FW_LOADER_USER_HELPER" + + use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" + kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" + + if linux_config_exists; then + local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) + if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then + ewarn "It's recommended to set an empty value to the following kernel config option:" + ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" + fi + fi + + if [[ ${MERGE_TYPE} != binary ]]; then + if [[ $(gcc-major-version) -lt 4 + || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]] + then + eerror "systemd requires at least gcc 4.6 to build. Please switch the active" + eerror "gcc version using gcc-config." + die "systemd requires at least gcc 4.6" + fi + fi + + if [[ ${MERGE_TYPE} != buildonly ]]; then + if kernel_is -lt ${MINKV//./ }; then + ewarn "Kernel version at least ${MINKV} required" + fi + + check_extra_config + fi +} + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # Bug 463376 + sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die + + autotools-utils_src_prepare +} + +src_configure() { + # Keep using the one where the rules were installed. + MY_UDEVDIR=$(get_udevdir) + # Fix systems broken by bug #509454. + [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev + + multilib-minimal_src_configure +} + +multilib_native_enable() { + if multilib_is_native_abi; then + echo "--enable-${1}" + else + echo "--disable-${1}" + fi +} + +multilib_src_configure() { + local myeconfargs=( + # disable -flto since it is an optimization flag + # and makes distcc less effective + cc_cv_CFLAGS__flto=no + + # Workaround for bug 516346 + --enable-dependency-tracking + + --disable-maintainer-mode + --localstatedir=/var + --with-pamlibdir=$(getpam_mod_dir) + # avoid bash-completion dep + --with-bashcompletiondir="$(get_bashcompdir)" + # make sure we get /bin:/sbin in $PATH + --enable-split-usr + # For testing. + --with-rootprefix="${ROOTPREFIX-/usr}" + --with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)" + # disable sysv compatibility + --with-sysvinit-path= + --with-sysvrcnd-path= + # no deps + --enable-efi + --enable-ima + + # Optional components/dependencies + $(multilib_native_use_enable acl) + $(multilib_native_use_enable apparmor) + $(multilib_native_use_enable audit) + $(multilib_native_use_enable cryptsetup libcryptsetup) + $(multilib_native_use_enable curl libcurl) + $(multilib_native_use_enable doc gtk-doc) + $(multilib_native_use_enable elfutils) + $(use_enable gcrypt) + $(use_enable gudev) + $(multilib_native_use_enable http microhttpd) + $(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls) + $(multilib_native_use_enable idn libidn) + $(multilib_native_use_enable introspection) + $(use_enable kdbus) + $(multilib_native_use_enable kmod) + $(use_enable lz4) + $(use_enable lzma xz) + $(multilib_native_use_enable pam) + $(multilib_native_use_enable policykit polkit) + $(multilib_native_use_with python) + $(multilib_native_use_enable python python-devel) + $(multilib_native_use_enable qrcode qrencode) + $(multilib_native_use_enable seccomp) + $(multilib_native_use_enable selinux) + $(multilib_native_use_enable terminal) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable test dbus) + + # Disable optional binaries for non-native abis + $(multilib_native_enable backlight) + $(multilib_native_enable binfmt) + $(multilib_native_enable bootchart) + $(multilib_native_enable coredump) + $(multilib_native_enable firstboot) + $(multilib_native_enable hibernate) + $(multilib_native_enable hostnamed) + $(multilib_native_enable localed) + $(multilib_native_enable logind) + $(multilib_native_enable machined) + $(multilib_native_enable networkd) + $(multilib_native_enable quotacheck) + $(multilib_native_enable randomseed) + $(multilib_native_enable resolved) + $(multilib_native_enable rfkill) + $(multilib_native_enable sysusers) + $(multilib_native_enable timedated) + $(multilib_native_enable timesyncd) + $(multilib_native_enable tmpfiles) + $(multilib_native_enable vconsole) + + # not supported (avoid automagic deps in the future) + --disable-chkconfig + + # hardcode a few paths to spare some deps + QUOTAON=/usr/sbin/quotaon + QUOTACHECK=/usr/sbin/quotacheck + + # dbus paths + --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" + --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" + --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" + --with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces" + + --with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" + ) + + if ! multilib_is_native_abi; then + myeconfargs+=( + ac_cv_search_cap_init= + ac_cv_header_sys_capability_h=yes + ) + fi + + # Work around bug 463846. + tc-export CC + + autotools-utils_src_configure +} + +multilib_src_compile() { + local mymakeopts=( + udevlibexecdir="${MY_UDEVDIR}" + ) + + if multilib_is_native_abi; then + emake "${mymakeopts[@]}" + else + # prerequisites for gudev + use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h} + + echo 'gentoo: $(BUILT_SOURCES)' | \ + emake "${mymakeopts[@]}" -f Makefile -f - gentoo + echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \ + emake "${mymakeopts[@]}" -f Makefile -f - gentoo + fi +} + +multilib_src_test() { + multilib_is_native_abi || continue + + default +} + +multilib_src_install() { + local mymakeopts=( + # automake fails with parallel libtool relinking + # https://bugs.gentoo.org/show_bug.cgi?id=491398 + -j1 + + udevlibexecdir="${MY_UDEVDIR}" + dist_udevhwdb_DATA= + DESTDIR="${D}" + ) + + if multilib_is_native_abi; then + emake "${mymakeopts[@]}" install + else + mymakeopts+=( + install-libLTLIBRARIES + install-pkgconfiglibDATA + install-includeHEADERS + # safe to call unconditionally, 'installs' empty list + install-libgudev_includeHEADERS + install-pkgincludeHEADERS + ) + + emake "${mymakeopts[@]}" + fi + + # install compat pkg-config files + # Change dbus to >=sys-apps/dbus-1.8.8 if/when this is dropped. + local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc ) + emake "${mymakeopts[@]}" install-pkgconfiglibDATA \ + pkgconfiglib_DATA="${pcfiles[*]}" +} + +multilib_src_install_all() { + prune_libtool_files --modules + einstalldocs + + # we just keep sysvinit tools, so no need for the mans + rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ + || die + rm "${D}"/usr/share/man/man1/init.1 || die + + # Disable storing coredumps in journald, bug #433457 + mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die + + # Preserve empty dirs in /etc & /var, bug #437008 + keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ + /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \ + /var/log/journal/remote + + # Symlink /etc/sysctl.conf for easy migration. + dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf + + # If we install these symlinks, there is no way for the sysadmin to remove them + # permanently. + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service + rm -rf "${D}"/etc/systemd/system/network-online.target.wants +} + +migrate_locale() { + local envd_locale_def="${EROOT%/}/etc/env.d/02locale" + local envd_locale=( "${EROOT%/}"/etc/env.d/??locale ) + local locale_conf="${EROOT%/}/etc/locale.conf" + + if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then + # If locale.conf does not exist... + if [[ -e ${envd_locale} ]]; then + # ...either copy env.d/??locale if there's one + ebegin "Moving ${envd_locale} to ${locale_conf}" + mv "${envd_locale}" "${locale_conf}" + eend ${?} || FAIL=1 + else + # ...or create a dummy default + ebegin "Creating ${locale_conf}" + cat > "${locale_conf}" <<-EOF + # This file has been created by the sys-apps/systemd ebuild. + # See locale.conf(5) and localectl(1). + + # LANG=${LANG} + EOF + eend ${?} || FAIL=1 + fi + fi + + if [[ ! -L ${envd_locale} ]]; then + # now, if env.d/??locale is not a symlink (to locale.conf)... + if [[ -e ${envd_locale} ]]; then + # ...warn the user that he has duplicate locale settings + ewarn + ewarn "To ensure consistent behavior, you should replace ${envd_locale}" + ewarn "with a symlink to ${locale_conf}. Please migrate your settings" + ewarn "and create the symlink with the following command:" + ewarn "ln -s -n -f ../locale.conf ${envd_locale}" + ewarn + else + # ...or just create the symlink if there's nothing here + ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" + ln -n -s ../locale.conf "${envd_locale_def}" + eend ${?} || FAIL=1 + fi + fi +} + +migrate_net_name_slot() { + # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, + # do the same for 80-net-setup-link.rules to keep the old behavior + local net_move=no + local net_name_slot_sym=no + local net_rules_path="${EROOT%/}"/etc/udev/rules.d + local net_name_slot="${net_rules_path}"/80-net-name-slot.rules + local net_setup_link="${net_rules_path}"/80-net-setup-link.rules + if [[ -e ${net_setup_link} ]]; then + net_move=no + elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then + net_move=yes + elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then + net_move=yes + net_name_slot_sym=yes + fi + if [[ ${net_move} == yes ]]; then + ebegin "Copying ${net_name_slot} to ${net_setup_link}" + + if [[ ${net_name_slot_sym} == yes ]]; then + ln -nfs /dev/null "${net_setup_link}" + else + cp "${net_name_slot}" "${net_setup_link}" + fi + eend $? || FAIL=1 + fi +} + +pkg_postinst() { + newusergroup() { + enewgroup "$1" + enewuser "$1" -1 -1 -1 "$1" + } + + enewgroup input + enewgroup systemd-journal + newusergroup systemd-bus-proxy + newusergroup systemd-journal-gateway + newusergroup systemd-journal-remote + newusergroup systemd-journal-upload + newusergroup systemd-network + newusergroup systemd-resolve + newusergroup systemd-timesync + use http && newusergroup systemd-journal-gateway + + systemd_update_catalog + + # Keep this here in case the database format changes so it gets updated + # when required. Despite that this file is owned by sys-apps/hwids. + if has_version "sys-apps/hwids[udev]"; then + udevadm hwdb --update --root="${ROOT%/}" + fi + + udev_reload || FAIL=1 + + # Bug 465468, make sure locales are respect, and ensure consistency + # between OpenRC & systemd + migrate_locale + + # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules + migrate_net_name_slot + + if [[ ${FAIL} ]]; then + eerror "One of the postinst commands failed. Please check the postinst output" + eerror "for errors. You may need to clean up your system and/or try installing" + eerror "systemd again." + eerror + fi + + if [[ ! -L "${ROOT}"/etc/mtab ]]; then + ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts." + ewarn "Not having it is not supported by upstream and will cause tools like 'df'" + ewarn "and 'mount' to not work properly. Please run:" + ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" + ewarn + fi + + if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then + ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable" + ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf" + ewarn "to /run/systemd/resolve/resolv.conf" + ewarn + fi + + if ! has_version sys-apps/systemd-ui; then + elog "To get additional features, a number of optional runtime dependencies may" + elog "be installed:" + elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent" + fi + + if has_version sys-apps/openrc && + ! has_version sys-fs/udev-init-scripts; then + elog "If you plan to boot using OpenRC and udev or eudev, you" + elog "need to install the udev-init-scripts package." + fi +} + +pkg_prerm() { + # If removing systemd completely, remove the catalog database. + if [[ ! ${REPLACED_BY_VERSION} ]]; then + rm -f -v "${EROOT}"/var/lib/systemd/catalog/database + fi +} diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index a7439ec3a58c..c13360ed63ef 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.147 2014/11/18 19:15:03 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.148 2014/12/14 05:27:58 floppym Exp $ EAPI=5 @@ -104,21 +104,6 @@ SRC_URI= KEYWORDS= #endif -src_prepare() { -#if LIVE - if use doc; then - gtkdocize --docdir docs/ || die - else - echo 'EXTRA_DIST =' > docs/gtk-doc.make - fi - -#endif - # Bug 463376 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - - autotools-utils_src_prepare -} - pkg_pretend() { local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS @@ -160,6 +145,21 @@ pkg_setup() { use python && python-single-r1_pkg_setup } +src_prepare() { +#if LIVE + if use doc; then + gtkdocize --docdir docs/ || die + else + echo 'EXTRA_DIST =' > docs/gtk-doc.make + fi + +#endif + # Bug 463376 + sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die + + autotools-utils_src_prepare +} + src_configure() { # Keep using the one where the rules were installed. MY_UDEVDIR=$(get_udevdir) |