Make sure we build all the nss libs on non-native abis. Bug 538966 by Hristo Venev.
authorMike Gilbert <floppym@gentoo.org>
Sun, 8 Feb 2015 17:21:22 +0000 (17:21 +0000)
committerMike Gilbert <floppym@gentoo.org>
Sun, 8 Feb 2015 17:21:22 +0000 (17:21 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

sys-apps/systemd/ChangeLog
sys-apps/systemd/Manifest
sys-apps/systemd/systemd-216-r4.ebuild [new file with mode: 0644]
sys-apps/systemd/systemd-218-r3.ebuild [new file with mode: 0644]
sys-apps/systemd/systemd-9999.ebuild

index 630bfc3d3492358885455d4adecacf7959858d15..dd2bdc99a5ca33b27b71bae1fff7b6c64576d8fd 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/systemd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.345 2015/02/02 21:23:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.346 2015/02/08 17:21:18 floppym Exp $
+
+*systemd-216-r4 (08 Feb 2015)
+*systemd-218-r3 (08 Feb 2015)
+
+  08 Feb 2015; Mike Gilbert <floppym@gentoo.org> +systemd-216-r4.ebuild,
+  +systemd-218-r3.ebuild, systemd-9999.ebuild:
+  Make sure we build all the nss libs on non-native abis. Bug 538966 by Hristo
+  Venev.
 
   02 Feb 2015; Mike Gilbert <floppym@gentoo.org> systemd-218-r2.ebuild,
   systemd-9999.ebuild:
index 4b01758594a4e6a0d433bffa7d3c3a805b8e0666..328ebd5f784694d347750fcc99a926bcc54d30cd 100644 (file)
@@ -16,16 +16,18 @@ DIST systemd-gentoo-patches-217-r1.tar.xz 8388 SHA256 09a75238e12f520560de2a0714
 EBUILD systemd-215-r3.ebuild 16088 SHA256 29066774eada0721a1c48aa49273ce79052f76679fc1ac398519d77a0d012400 SHA512 1535b50eadca16d59fed82c2df29be8ed3fdfaa09daa73daf754a22a03858033a3f522292e23adede305ade08057471c9b368f7bf5403c2133524ca3612ef678 WHIRLPOOL 900f36eb522e48bffbe1a9dc121834f63b0030a3ee87ed467b1f7e9b34cc1d0373408c217da0dea40aed116bae627b175ba65d1fcf16a0d4836da947bc934fda
 EBUILD systemd-216-r2.ebuild 16052 SHA256 99f24b3d604762727852c9367e157ccb5bfc0005acdf923c645599ae0fbebc27 SHA512 65c3d9a1f9e2d8886182a4cc219cc485825e72f6453c6a9903b3e8fc0f9fcd21c2798783df24fd692263f1ee7e57984d043122849501a5736f25d9c2666d51aa WHIRLPOOL 9f5ef2cadd44621cf5866e529e5abee3f69b2d21ba9ffeff8b33f893ba274c1eca2ff15336dae0ca8a187c42f843ef7c3a328bf4f5b00b8747719ab714ffbb75
 EBUILD systemd-216-r3.ebuild 16098 SHA256 55145bcee79b532010ca729b24d113e1db52382ce5dd6ce9dfb78d081e244f3b SHA512 e8b4bdade44306672a7312e7c4f88e914f7686b41e9d81066a4285bc4600114cd8d340bbe3d5295e1856a3caa831c6c66f54cf5b3296a4bf5837bc696910bc21 WHIRLPOOL 979355b007ab513b60952f6e0bc0786c819f14f7d4b0eb077ab6715ba518df5f9b579ad672d8b311c7955ee4a6842f8932e93c6d50e9524c438ae8258c056efb
+EBUILD systemd-216-r4.ebuild 16027 SHA256 c95f0d46695377e552be65a5037bf101de264246ffb82b1ca322b6b3015f4bdd SHA512 eee0e7dd2b913991137673a87d185a440a7b3ac0da66b844a77dc1845740a215409ac7c798d825fa160d1a116d9171cdee96d7d7ccc69fa00fc004a0d0f5b63e WHIRLPOOL 22aa0778741fa5a14f60ac0d91c9d80c4b94d9c880bac92fb531fbb5b9f1fb61061ca6b3253c2b500989e6eae1c1a72adbd7d3a1d228dd18880e0cdd4428eb48
 EBUILD systemd-217-r4.ebuild 15912 SHA256 561c2ce6d447d5815490ecdd06cd1fc370cee040a667b3d02c39e38364845014 SHA512 fc18b1e2b86ca161aa36874d3cebe6c5f410195785db7b40bba953d71d784e06f3041a8b8055aaf44b0039526a66d5f9b5b201cafac622eae2ab1949d9902470 WHIRLPOOL d51381ae93216140567ba6b114a89b087e77f6db9c6882256b90a914709f7c61b5c4420e58289e51529751da9251302b689c272da3a74b906b01548109785399
 EBUILD systemd-218-r1.ebuild 15926 SHA256 b1423ef151904973217a0ad1913eb2b6c046874a11785d66711ef17d77154e95 SHA512 9312fe83c60754c8214b4f6ed7ebfffa2045c7566ab09532266b9f5d1284299360109df441065cee10ffc8b04060d7e1e33c12ab5d8ba3b28091f7bfaa41e6fc WHIRLPOOL f03ee2c5c6e89d86b93a9f1cd62b6a656212196e3c90c203131898367594be535b277b597db12f70c64a93fa6fb9f96d945872779a0985267e6cb492c923c8e5
 EBUILD systemd-218-r2.ebuild 15984 SHA256 dde3630af79d8f2b9e574919e97a1cbd68455ab76da4735871fbe1f795741e50 SHA512 af69273c4519ad44bcd57dfae3da99bf389f7f94443ebd55a14297e7fd171ebe14712d3336ce0680c67607a99b4a57910f14b18cf4df555bc2f3a51de2cbc15d WHIRLPOOL 10f9246bb8ed52aca9a018204d9420b30daae79a916a32388a724acad57055bc3abfc62379535e4db042753cfd667cecf5068002433e0b2c28ae120f8ec645eb
-EBUILD systemd-9999.ebuild 16306 SHA256 3636d28801e17f062e678234d5058ba96274617208f2c1a115359dab936830d2 SHA512 ccd2d836137b113f407101f3b2e5e55a30c27a0f93a0a15e2404b98649caf329446f59211a230d81e09ece04b91cd145c900484ac4d72fa08c47354cdc367472 WHIRLPOOL 39472f99a0ae1a40c3390330b58738dd15b70bcae3236e12a18822464415badc46d43e1fcb2dc5d996d0eaef9ebe2e602bf00eb94d07766b97d582a9bef2c79f
-MISC ChangeLog 61484 SHA256 c4cc1ba8d81efd3e6fdae1c7f08f6e3dcc46ac4cf21991cbb67e37449124e27a SHA512 ec616b57a971f1069bef9e3d9ca61f72ed9f78a2a34ab90a656a963f58c609e981fda0edd85bab20cb8fed4e08edb744f221be7da350760d163aaa41be53628e WHIRLPOOL 33c3869ca736c46b60f56ca226d6936de24a0857debd8289c7d157f243e0fbba2abc9dbedf1fa56aeec3b8308410c1e4a63ed626744b0398240bbfa3a9c038c3
+EBUILD systemd-218-r3.ebuild 15069 SHA256 e0c58d21370c58301b3d7a217541c10f1c2f390d5f45c8a95a3acc4fa50bde74 SHA512 26fca5baab35c263332540ca5b05e52312d18fa93315a92425352e31b949522eb4302f86bcd5b49a0e42e09bebdfe4a333b72bf0c7a1b1156ef0c0e1171b864d WHIRLPOOL a34e16e806bb494fa74d56351272288685d306caa3afbe6a17a5762d72a118f9930dd4224810351e87909c799a6f1ab89403d6be93e38bab8d65f5635b40483b
+EBUILD systemd-9999.ebuild 15391 SHA256 d2ec380e4dc161784486c377acfb61657a5ded6b35b0150fc130bf8c6652eeaa SHA512 d14a403ded9840b78cd0d685defa63b9ee57d003f379e39e3041966e72f79a8bc84f9a9dbce5ecfd371c4463d24fb23f50c6b2d7b5f71e8a7b79c30594d8fb13 WHIRLPOOL 7a312a1d6d81cdc33e7b1ae75563ebbc312620c0b8280496641f3e660370e968b8d81edc9f9eafa0c6c4a618e1d247aee6fa169cca2c64b405c89b1d8ccc163b
+MISC ChangeLog 61754 SHA256 27360a6fa7728a80a3a121c0f606fda147eac233ac69da2e9bd6e3348570e615 SHA512 bcaf39f3198589afad319765b286b19729f266dc610c12f2c970b57be9d77f4f2498c13f7e867d921bf6a5f1c87ae9ec1077bbc5f331021af1e563a942a6f34c WHIRLPOOL 17c58d12c114acd398e277349e40253c46c8a097ed88bab7b8701ea16840716f2ad1955293ff5a9628d447d79bf8491313f1f81ca406778c7ce968188201ea3f
 MISC metadata.xml 2102 SHA256 29dc8c540869321c152890aee0909c259d313e8ebf0bcf827d3f032ed68e7b80 SHA512 a365a2a925c8c97a6b3fe67dea455bf9735d060b698624c2b1ae94f4c03aa86a1c78ed13f9310795584b55ecc338b9e1a3dd3634c1975fdcd0905d3cb4f5dc7d WHIRLPOOL 2eb5cb636ee2439bbe8d715c7b742f87f44ae23dfdb6c4c7d21654dc6d16092b83e9ccd1922551ef28237d51c5812efc8a96941f6549595afe9bfbe7c809b7af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTP6r8ACgkQC77qH+pIQ6Rc2AD9F9VncuNmqWzgxBqvEgXTNkJ/
-VTZ3sWcWV30rOYeEmmYA/3xc7FgezpHn4tj43ul5zIAWq10I/127RMNpogGJv4fv
-=JY4s
+iF4EAREIAAYFAlTXmxEACgkQC77qH+pIQ6Rx3gD/TX3yW9sq9PXAoVu86zy8XEeD
+hwlpX7aIe14FVOLsREUA/2npKQGVkUNFa5zdRVrtOdVSyA4B+KmQvlAxfLhpGiPG
+=TICf
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-216-r4.ebuild b/sys-apps/systemd/systemd-216-r4.ebuild
new file mode 100644 (file)
index 0000000..dd5837c
--- /dev/null
@@ -0,0 +1,513 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r4.ebuild,v 1.1 2015/02/08 17:21:18 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 +firmware-loader gcrypt gudev http
+       idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
+       selinux ssl sysv-utils test vanilla"
+
+MINKV="3.8"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.20: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= )
+       sysv-utils? (
+               !sys-apps/systemd-sysv-utils
+               !sys-apps/sysvinit
+               >=sys-apps/util-linux-2.24.1-r2 )
+       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-apps/util-linux-2.22
+               <sys-apps/sysvinit-2.88-r4
+       )
+       !sys-auth/nss-myhostname
+       !<sys-libs/glibc-2.14
+       !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 )"
+
+PATCHES=(
+       "${FILESDIR}/216-lz4-build.patch"
+       "${FILESDIR}/216-tmpfiles-setup-dev.patch"
+)
+
+src_prepare() {
+       # 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
+               ~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR ~DEVPTS_MULTIPLE_INSTANCES
+               ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
+               ~!GRKERNSEC_PROC"
+
+       use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+       kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+       use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER"
+
+       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
+
+               if ! use firmware-loader && kernel_is -lt 3 8; then
+                       ewarn "You seem to be using kernel older than 3.8. Those kernel versions"
+                       ewarn "require systemd with USE=firmware-loader to support loading"
+                       ewarn "firmware. Missing this flag may cause some hardware not to work."
+               fi
+
+               check_extra_config
+       fi
+}
+
+pkg_setup() {
+       use python && python-single-r1_pkg_setup
+}
+
+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 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 hostnamed)
+               $(multilib_native_enable localed)
+               $(multilib_native_enable logind)
+               $(multilib_native_enable networkd)
+               $(multilib_native_enable quotacheck)
+               $(multilib_native_enable randomseed)
+               $(multilib_native_enable readahead)
+               $(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 use firmware-loader; then
+               myeconfargs+=(
+                       --with-firmware-path="/lib/firmware/updates:/lib/firmware"
+               )
+       fi
+
+       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
+       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
+
+       if use sysv-utils; then
+               for app in halt poweroff reboot runlevel shutdown telinit; do
+                       dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
+               done
+               dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
+       else
+               # 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
+       fi
+
+       # 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-218-r3.ebuild b/sys-apps/systemd/systemd-218-r3.ebuild
new file mode 100644 (file)
index 0000000..24831c1
--- /dev/null
@@ -0,0 +1,479 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218-r3.ebuild,v 1.1 2015/02/08 17:21:18 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 sysv-utils terminal test vanilla xkb"
+
+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= )
+       sysv-utils? (
+               !sys-apps/systemd-sysv-utils
+               !sys-apps/sysvinit )
+       terminal? ( >=dev-libs/libevdev-1.2:0=
+               >=x11-libs/libxkbcommon-0.5:0=
+               >=x11-libs/libdrm-2.4:0= )
+       xkb? ( >=x11-libs/libxkbcommon-0.4.1: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 )"
+
+PATCHES=( "${FILESDIR}/218-Dont-enable-audit-by-default.patch" )
+
+pkg_pretend() {
+       local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+               ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
+               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
+               ~TIMERFD ~TMPFS_XATTR
+               ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+               ~!SYSFS_DEPRECATED_V2"
+
+       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
+
+       # missing in tarball
+       cp "${FILESDIR}"/217-systemd-consoled.service.in \
+               units/user/systemd-consoled.service.in || 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_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)
+               $(multilib_native_use_enable xkb xkbcommon)
+
+               # 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+=(
+                       MOUNT_{CFLAGS,LIBS}=' '
+
+                       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
+
+       if use sysv-utils; then
+               for app in halt poweroff reboot runlevel shutdown telinit; do
+                       dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
+               done
+               dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
+       else
+               # 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
+       fi
+
+       # 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 "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+       rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+       rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
+       rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
+}
+
+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
+}
index e7197f0cfeeec927571610d34a29aa3c084cb49e..0ba2c1e694d9ea6ce717c5bb4a72157a367ba393 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.156 2015/02/02 21:23:09 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.157 2015/02/08 17:21:18 floppym Exp $
 
 EAPI=5
 
@@ -174,14 +174,6 @@ src_configure() {
        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
@@ -238,28 +230,6 @@ multilib_src_configure() {
                $(multilib_native_use_enable test dbus)
                $(multilib_native_use_enable xkb xkbcommon)
 
-               # 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