sys-apps/systemd: Remove old
authorMike Gilbert <floppym@gentoo.org>
Sat, 22 Aug 2015 17:16:06 +0000 (13:16 -0400)
committerMike Gilbert <floppym@gentoo.org>
Sat, 22 Aug 2015 17:16:26 +0000 (13:16 -0400)
Package-Manager: portage-2.2.20_p134

sys-apps/systemd/Manifest
sys-apps/systemd/metadata.xml
sys-apps/systemd/systemd-216-r3.ebuild [deleted file]
sys-apps/systemd/systemd-220-r2.ebuild [deleted file]
sys-apps/systemd/systemd-221.ebuild [deleted file]
sys-apps/systemd/systemd-222-r1.ebuild [deleted file]
sys-apps/systemd/systemd-222.ebuild [deleted file]
sys-apps/systemd/systemd-224.ebuild [deleted file]

index aa6147444e580079f252a3e9bc245289a5c904c9..d0ae4b4230ccb6eb4789b506a3ad439475f40f11 100644 (file)
@@ -1,11 +1,4 @@
-DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494
 DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b09075010a97c7aa08eee3fd59b SHA512 c183cce8532ccb4716b84587c96a626eea390202a5469b9d89c8cee7f703e40d7c584e05f29501d375b8cd2a1409d011de564df16f54e27f66b3c3007a6e5bd4 WHIRLPOOL 4d0bcf3ddfecd3354d9f4ab13851f8da6baf31e89e64d3b1ac671159f16f23597d88cc2525aece2f867c140fc97e80bce086a5af91f84b8095e2503c13995e6d
 DIST systemd-219_p112.tar.xz 3944604 SHA256 8394ca0d55b05cb07c2187da8b614f3cb4eacc297c501dd09a31dad18acf28ea SHA512 480526ff45a8588b3a572ccc455d6357208093f5dae858947182f6e9e4595c1f612d1b661eff41f39f5df6ad0dcb6b0a08b08c15125baf1cf07402ac18a5130b WHIRLPOOL cf1ea60dc59a2a3f54cb66d24a529b742bd403f996a9e8f132fd9f9dc551308ee233fec4fec3e8feb7a657ccdd25e56a6e0756633a1c76a9c427588b262558d9
-DIST systemd-220-gentoo-r2.tar.xz 7008 SHA256 9d40328056437d0ad799ef6c659e1017cba482888b8f03b8b4628990d79b2a20 SHA512 b0c45d73ee0d0be114f48f4e071a596d6d069c04c8012761aae33658fe569f6ab89e6df370101432484c288b79eb1aef6f0e6c586ce0237c455c7ba6e23d3ab7 WHIRLPOOL 2b017f5d453bd485203a613f6cad424067cb4f561c070e3b2574fdfa1877da3ab45e98d647eec463df8c625c2ce13d7289f439f5ac7a76c2d4f44b256a834d24
-DIST systemd-220-src-boot-efi.tar.xz 19024 SHA256 63aa064938e6d295a2ac4b308876c161aff9eddd1d2012cec0ce00d9b8423469 SHA512 33f8b7d2d09c7dc2f9c55791ab855e3b1763a17db8dd534f67bc4b116def905c2782039e38bb93cd071b198ef582b1d923a5eb15b97a0d6983cb0afffdccdef9 WHIRLPOOL 675654d1fe5c021d7f9ec10d439ccd959812e69b0b816cbdb12508516e41be416a0e7adcb556f49aa7abfaceba4f682ccd353628ddf87cc8d507e5e75ea750b8
-DIST systemd-220.tar.xz 4036028 SHA256 3659588c40221ee7257502c0735491f72796dbe17be560013f6d310deb446332 SHA512 c309b4309f8b8d2d97450fb281053feec7b89227626b69e37f3a0d2154c2810c217e58e218f17da11c04f703c6196cec21c4afdcf63879bc736bbdca058a5da5 WHIRLPOOL 2f8974eacb706987e85c7907a517f6b2d47b009f9259a36375537c8bd09bc4774c81e8dc853aa83e644d7c1b579f5113d0bb8a504c7caa5a9240750f9936d561
-DIST systemd-221.tar.xz 4010048 SHA256 085e088650afbfc688ccb13459aedb1fbc7c8810358605b076301f472d51cc4f SHA512 db2552674f1d656e0398b461b42738fcad40dd64700700a7041650581981e7ac563652ef45b859f73a74058bf0a428c26402b5356cfe50b59c20c2678441ab0f WHIRLPOOL 00939e03a780972ef9ce3a8833ed150c067d86094ea11b92baba42469969653ed8f156744fcde1809df6b127f48e82d73391aec9340146829d83312a40cfb138
-DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
 DIST systemd-224.tar.gz 3868075 SHA256 0d7ac1532a57639fbc828f8a5051a090883c6ad2908618a7a13ab386db831bfc SHA512 7717d340c6de11afd589234b7ec8952fe2ffcd05829622bd7ea8e008870c0e3b83eb1eaf20e85ffffa7adafc9c0c0b94fd93784510792109240e22e6b963f198 WHIRLPOOL 645b08ff0c20994b17b8ed585fb0eef682336961d7fedf25031fa4dc89a4d9a2b58c254e0f9baeedcb228435316fdfb562f9fefd21e5a63f94499d2f1040e093
 DIST systemd.conf.m4-v219 1493 SHA256 90ee489b6e34945e5cda27a269e1247644382084f5a145a2df691282007c6768 SHA512 a117c40229af3ba2a0cec4c3db01728c3cab49bb6403fc84cb34f8a09979d98f7a200cd28bf2bbc7a71cbad856edf31190fba30a9d5810c55911746457bbf31a WHIRLPOOL a1604a4fdf5e2d4a4505252859c64d0a3c131b4bb371cff8c75331438f291f138d2732d939947988ab95b040e377412db84fbf6c45866fee028a2aac70e8eb9f
-DIST unifont-8.0.01.hex.gz 938016 SHA256 f67cffeb5e8a0ce5ad2c19a6f289a4e7c8caa0b8c624368adaf8571994c3ec1c SHA512 23aa0228da186b2f6575c1f06101f58713dfb98193ad3772405668d4e3e18d4c1e0fea40639b237dd3a5f4dee6dea90aed85fea3c28165fdfeeace79a2059e6f WHIRLPOOL 23069b019ca1aa9e33df4ce7a728d399090670b85e37029d45f9a0125d13f965039c7e5b9cd6bc633ef259780286f0e6a596b410c1fc144f1f1205e69e36c5cb
index 1e6a5da4a4f42b65d3c643bbfd7da7ac183cd1ba..a37388f01737744ce2e05bd0cd9c146ade89ebe8 100644 (file)
@@ -11,7 +11,6 @@
                <!-- TODO: drop reference to systemd-import once the oldest release in tree is >218 -->
                <flag name="curl">Enable support for uploading journals; required to build systemd-import/systemd-pull</flag>
                <flag name="cryptsetup">Enable cryptsetup tools (includes unit generator for crypttab)</flag>
-               <flag name="firmware-loader">Enable user-space firmware loader (for kernels prior to 3.8)</flag>
                <flag name="gnuefi">Enable EFI boot manager and stub loader (built using <pkg>sys-boot/gnu-efi</pkg>)</flag>
                <flag name="elfutils">Enable coredump stacktraces in the journal</flag>
                <!-- TODO: drop reference to systemd-import once the oldest release in tree is >218 -->
diff --git a/sys-apps/systemd/systemd-216-r3.ebuild b/sys-apps/systemd/systemd-216-r3.ebuild
deleted file mode 100644 (file)
index 99aae12..0000000
+++ /dev/null
@@ -1,496 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,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=
-       !<sys-libs/glibc-2.16
-       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-fs/udev
-       gudev? ( !dev-libs/libgudev )"
-
-# 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 machined)
-               $(multilib_native_enable networkd)
-               $(multilib_native_enable quotacheck)
-               $(multilib_native_enable randomseed)
-               $(multilib_native_enable readahead)
-               $(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 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 [[ $(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
-}
-
-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-220-r2.ebuild b/sys-apps/systemd/systemd-220-r2.ebuild
deleted file mode 100644 (file)
index 2687fef..0000000
+++ /dev/null
@@ -1,494 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,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
-       http://dev.gentoo.org/~floppym/dist/systemd-220-src-boot-efi.tar.xz
-       http://dev.gentoo.org/~floppym/dist/systemd-220-gentoo-r2.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
-IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gnuefi gudev http
-       idn importd introspection kdbus +kmod +lz4 lzma nat pam policykit python
-       qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-
-MINKV="3.8"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.25:0=
-       sys-libs/libcap:0=
-       !<sys-libs/glibc-2.16
-       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= )
-       importd? (
-               app-arch/bzip2:0=
-               sys-libs/zlib: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}] )
-       nat? ( net-firewall/iptables:0= )
-       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-fs/eudev
-       !sys-fs/udev
-       gudev? ( !dev-libs/libgudev )"
-
-# 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 )
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-       python? ( dev-python/lxml[${PYTHON_USEDEP}] )
-       terminal? ( media-fonts/unifont[utils(+)] )
-       test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
-
-if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
-       DEPEND+="
-               app-text/docbook-xml-dtd:4.2
-               app-text/docbook-xml-dtd:4.5
-               app-text/docbook-xsl-stylesheets
-               dev-libs/libxslt:0
-               >=dev-libs/libgcrypt-1.4.5:0"
-fi
-
-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
-
-       # http://lists.freedesktop.org/archives/systemd-devel/2015-May/032149.html
-       rm src/journal/audit_type-to-name.h src/udev/keyboard-keys-from-name.gperf || die
-
-       cp "${FILESDIR}"/compile-unifont.py tools/compile-unifont.py || die
-       chmod +x tools/compile-unifont.py || die
-
-       EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch
-
-       [[ -e src/libsystemd-terminal/unifont-glyph-array.bin ]] || die
-       touch src/libsystemd-terminal/unifont-glyph-array.bin || 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)
-               $(multilib_native_use_enable gnuefi)
-               $(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 importd)
-               $(multilib_native_use_enable importd bzip2)
-               $(multilib_native_use_enable importd zlib)
-               $(multilib_native_use_enable introspection)
-               $(use_enable kdbus)
-               $(multilib_native_use_enable kmod)
-               $(use_enable lz4)
-               $(use_enable lzma xz)
-               $(multilib_native_use_enable nat libiptc)
-               $(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
-
-               # TODO: we may need to restrict this to gcc
-               EFI_CC="$(tc-getCC)"
-
-               # 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-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 [[ $(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
-}
-
-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-221.ebuild b/sys-apps/systemd/systemd-221.ebuild
deleted file mode 100644 (file)
index a80e5e3..0000000
+++ /dev/null
@@ -1,489 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-if [[ ${PV} == 9999 ]]; then
-       AUTOTOOLS_AUTORECONF=yes
-       EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-       inherit git-r3
-else
-       SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
-       KEYWORDS="~amd64 ~arm ~ia64 ~x86"
-fi
-
-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"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http
-       idn importd +kdbus +kmod +lz4 lzma nat pam policykit python
-       qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )
-       python? ( ${PYTHON_REQUIRED_USE} )"
-
-MINKV="3.8"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=
-       sys-libs/libcap:0=
-       !<sys-libs/glibc-2.16
-       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}] )
-       http? (
-               >=net-libs/libmicrohttpd-0.9.33:0=
-               ssl? ( >=net-libs/gnutls-3.1.4:0= )
-       )
-       idn? ( net-dns/libidn:0= )
-       importd? (
-               app-arch/bzip2:0=
-               sys-libs/zlib: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}] )
-       nat? ( net-firewall/iptables:0= )
-       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-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
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-       python? ( dev-python/lxml[${PYTHON_USEDEP}] )
-       terminal? ( media-fonts/unifont[utils(+)] )
-       test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
-
-if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
-       DEPEND+="
-               app-text/docbook-xml-dtd:4.2
-               app-text/docbook-xml-dtd:4.5
-               app-text/docbook-xsl-stylesheets
-               dev-libs/libxslt:0
-               >=dev-libs/libgcrypt-1.4.5:0"
-fi
-
-if [[ ${PV} == 9999 ]]; then
-       DEPEND+=" ${PYTHON_DEPS}"
-       REQUIRED_USE+=" ${PYTHON_REQUIRED_USE}"
-fi
-
-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() {
-       :
-}
-
-src_prepare() {
-       # Bug 463376
-       sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
-
-       if [[ ${PV} != 9999 ]]; then
-               # Update the timestamp on this to avoid rebuilding it.
-               [[ -e src/libsystemd-terminal/unifont-glyph-array.bin ]] || die "File missing from tarball"
-               touch src/libsystemd-terminal/unifont-glyph-array.bin || die
-       fi
-
-       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
-
-       if [[ ${PV} == 9999 ]] || use python; then
-               python_setup
-       fi
-
-       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 elfutils)
-               $(use_enable gcrypt)
-               $(multilib_native_use_enable gnuefi)
-               $(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 importd)
-               $(multilib_native_use_enable importd bzip2)
-               $(multilib_native_use_enable importd zlib)
-               $(use_enable kdbus)
-               $(multilib_native_use_enable kmod)
-               $(use_enable lz4)
-               $(use_enable lzma xz)
-               $(multilib_native_use_enable nat libiptc)
-               $(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)
-
-               # hardcode a few paths to spare some deps
-               QUOTAON=/usr/sbin/quotaon
-               QUOTACHECK=/usr/sbin/quotacheck
-
-               # TODO: we may need to restrict this to gcc
-               EFI_CC="$(tc-getCC)"
-
-               # 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-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
-               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-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 [[ $(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
-}
-
-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-222-r1.ebuild b/sys-apps/systemd/systemd-222-r1.ebuild
deleted file mode 100644 (file)
index 6ae7210..0000000
+++ /dev/null
@@ -1,480 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-if [[ ${PV} == 9999 ]]; then
-       EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~amd64 ~arm ~ia64 ~x86"
-fi
-UNIFONT=unifont-8.0.01
-SRC_URI+=" terminal? ( http://unifoundry.com/pub/${UNIFONT}/font-builds/${UNIFONT}.hex.gz )"
-
-inherit autotools-utils bash-completion-r1 linux-info multilib \
-       multilib-minimal pam python-any-r1 systemd toolchain-funcs udev \
-       user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http
-       idn importd +kdbus +kmod +lz4 lzma nat pam policykit
-       qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-
-MINKV="3.8"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=[${MULTILIB_USEDEP}]
-       sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-       !<sys-libs/glibc-2.16
-       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}] )
-       http? (
-               >=net-libs/libmicrohttpd-0.9.33:0=
-               ssl? ( >=net-libs/gnutls-3.1.4:0= )
-       )
-       idn? ( net-dns/libidn:0= )
-       importd? (
-               app-arch/bzip2:0=
-               sys-libs/zlib: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}] )
-       nat? ( net-firewall/iptables:0= )
-       pam? ( virtual/pam:= )
-       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-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-20150417[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
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-       terminal? ( ${PYTHON_DEPS} )
-       test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
-
-if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
-       DEPEND+="
-               app-text/docbook-xml-dtd:4.2
-               app-text/docbook-xml-dtd:4.5
-               app-text/docbook-xsl-stylesheets
-               dev-libs/libxslt:0
-               >=dev-libs/libgcrypt-1.4.5:0"
-fi
-
-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() {
-       :
-}
-
-src_unpack() {
-       default
-       [[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-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
-
-       if use terminal; then
-               python_setup
-       fi
-
-       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 gcc-4.7, bug 554454.
-               cc_cv_CFLAGS__Werror_shadow=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
-               # Moved to dev-python/python-systemd
-               --disable-python-devel
-               --without-python
-
-               # 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 elfutils)
-               $(use_enable gcrypt)
-               $(multilib_native_use_enable gnuefi)
-               $(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 importd)
-               $(multilib_native_use_enable importd bzip2)
-               $(multilib_native_use_enable importd zlib)
-               $(use_enable kdbus)
-               $(multilib_native_use_enable kmod)
-               $(use_enable lz4)
-               $(use_enable lzma xz)
-               $(multilib_native_use_enable nat libiptc)
-               $(multilib_native_use_enable pam)
-               $(multilib_native_use_enable policykit polkit)
-               $(multilib_native_use_enable qrcode qrencode)
-               $(multilib_native_use_enable seccomp)
-               $(multilib_native_use_enable selinux)
-               $(multilib_native_use_enable terminal)
-               $(multilib_native_use_with terminal unifont "${WORKDIR}/${UNIFONT}.hex")
-               $(multilib_native_use_enable test tests)
-               $(multilib_native_use_enable test dbus)
-               $(multilib_native_use_enable xkb xkbcommon)
-
-               # hardcode a few paths to spare some deps
-               QUOTAON=/usr/sbin/quotaon
-               QUOTACHECK=/usr/sbin/quotacheck
-
-               # TODO: we may need to restrict this to gcc
-               EFI_CC="$(tc-getCC)"
-
-               # 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-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-       )
-
-       # 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
-               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-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 [[ $(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
-}
-
-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-222.ebuild b/sys-apps/systemd/systemd-222.ebuild
deleted file mode 100644 (file)
index da54f38..0000000
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-if [[ ${PV} == 9999 ]]; then
-       EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~amd64 ~arm ~ia64 ~x86"
-fi
-UNIFONT=unifont-8.0.01
-SRC_URI+=" terminal? ( http://unifoundry.com/pub/${UNIFONT}/font-builds/${UNIFONT}.hex.gz )"
-
-inherit autotools-utils bash-completion-r1 linux-info multilib \
-       multilib-minimal pam python-any-r1 systemd toolchain-funcs udev \
-       user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http
-       idn importd +kdbus +kmod +lz4 lzma nat pam policykit
-       qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-
-MINKV="3.8"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=
-       sys-libs/libcap:0=
-       !<sys-libs/glibc-2.16
-       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}] )
-       http? (
-               >=net-libs/libmicrohttpd-0.9.33:0=
-               ssl? ( >=net-libs/gnutls-3.1.4:0= )
-       )
-       idn? ( net-dns/libidn:0= )
-       importd? (
-               app-arch/bzip2:0=
-               sys-libs/zlib: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}] )
-       nat? ( net-firewall/iptables:0= )
-       pam? ( virtual/pam:= )
-       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-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
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-       terminal? ( ${PYTHON_DEPS} )
-       test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
-
-if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
-       DEPEND+="
-               app-text/docbook-xml-dtd:4.2
-               app-text/docbook-xml-dtd:4.5
-               app-text/docbook-xsl-stylesheets
-               dev-libs/libxslt:0
-               >=dev-libs/libgcrypt-1.4.5:0"
-fi
-
-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() {
-       :
-}
-
-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
-
-       if use terminal; then
-               python_setup
-       fi
-
-       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 gcc-4.7, bug 554454.
-               cc_cv_CFLAGS__Werror_shadow=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
-               # Moved to dev-python/python-systemd
-               --disable-python-devel
-               --without-python
-
-               # 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 elfutils)
-               $(use_enable gcrypt)
-               $(multilib_native_use_enable gnuefi)
-               $(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 importd)
-               $(multilib_native_use_enable importd bzip2)
-               $(multilib_native_use_enable importd zlib)
-               $(use_enable kdbus)
-               $(multilib_native_use_enable kmod)
-               $(use_enable lz4)
-               $(use_enable lzma xz)
-               $(multilib_native_use_enable nat libiptc)
-               $(multilib_native_use_enable pam)
-               $(multilib_native_use_enable policykit polkit)
-               $(multilib_native_use_enable qrcode qrencode)
-               $(multilib_native_use_enable seccomp)
-               $(multilib_native_use_enable selinux)
-               $(multilib_native_use_enable terminal)
-               $(multilib_native_use_with terminal unifont "${WORKDIR}/${UNIFONT}.hex")
-               $(multilib_native_use_enable test tests)
-               $(multilib_native_use_enable test dbus)
-               $(multilib_native_use_enable xkb xkbcommon)
-
-               # hardcode a few paths to spare some deps
-               QUOTAON=/usr/sbin/quotaon
-               QUOTACHECK=/usr/sbin/quotacheck
-
-               # TODO: we may need to restrict this to gcc
-               EFI_CC="$(tc-getCC)"
-
-               # 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-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
-               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-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 [[ $(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
-}
-
-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-224.ebuild b/sys-apps/systemd/systemd-224.ebuild
deleted file mode 100644 (file)
index a7df264..0000000
+++ /dev/null
@@ -1,476 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-if [[ ${PV} == 9999 ]]; then
-       EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-       inherit git-r3
-else
-       SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-       KEYWORDS="~amd64 ~arm ~ia64 ~x86"
-fi
-
-inherit autotools-utils bash-completion-r1 linux-info multilib \
-       multilib-minimal pam systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http
-       idn importd +kdbus +kmod +lz4 lzma nat pam policykit
-       qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-
-MINKV="3.8"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=[${MULTILIB_USEDEP}]
-       sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-       !<sys-libs/glibc-2.16
-       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}] )
-       http? (
-               >=net-libs/libmicrohttpd-0.9.33:0=
-               ssl? ( >=net-libs/gnutls-3.1.4:0= )
-       )
-       idn? ( net-dns/libidn:0= )
-       importd? (
-               app-arch/bzip2:0=
-               sys-libs/zlib: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}] )
-       nat? ( net-firewall/iptables:0= )
-       pam? ( virtual/pam:= )
-       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 )
-       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-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-20150417[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
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-       test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
-
-if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
-       DEPEND+="
-               app-text/docbook-xml-dtd:4.2
-               app-text/docbook-xml-dtd:4.5
-               app-text/docbook-xsl-stylesheets
-               dev-libs/libxslt:0
-               >=dev-libs/libgcrypt-1.4.5:0"
-fi
-
-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() {
-       :
-}
-
-src_unpack() {
-       default
-       [[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-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_src_configure() {
-       local myeconfargs=(
-               # disable -flto since it is an optimization flag
-               # and makes distcc less effective
-               cc_cv_CFLAGS__flto=no
-
-               # Workaround for gcc-4.7, bug 554454.
-               cc_cv_CFLAGS__Werror_shadow=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
-               --without-python
-
-               # 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 elfutils)
-               $(use_enable gcrypt)
-               $(multilib_native_use_enable gnuefi)
-               $(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 importd)
-               $(multilib_native_use_enable importd bzip2)
-               $(multilib_native_use_enable importd zlib)
-               $(use_enable kdbus)
-               $(multilib_native_use_enable kmod)
-               $(use_enable lz4)
-               $(use_enable lzma xz)
-               $(multilib_native_use_enable nat libiptc)
-               $(multilib_native_use_enable pam)
-               $(multilib_native_use_enable policykit polkit)
-               $(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)
-               $(multilib_native_use_enable xkb xkbcommon)
-
-               # hardcode a few paths to spare some deps
-               QUOTAON=/usr/sbin/quotaon
-               QUOTACHECK=/usr/sbin/quotacheck
-
-               # TODO: we may need to restrict this to gcc
-               EFI_CC="$(tc-getCC)"
-
-               # 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-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-       )
-
-       # 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
-               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-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/sockets.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
-}
-
-reenable_unit() {
-       if systemctl is-enabled --root="${ROOT}" "$1" &> /dev/null; then
-               ebegin "Re-enabling $1"
-               systemctl reenable --root="${ROOT}" "$1"
-               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
-
-       # Re-enable systemd-networkd for socket activation
-       reenable_unit systemd-networkd.service
-
-       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 [[ $(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
-}
-
-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
-}