commit:     345a7f2eac7f4b0898acc3c6121aa106a7358d02
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 15:09:55 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 15:10:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=345a7f2e

sys-apps/systemd: remove old

Package-Manager: Portage-2.3.6_p39, Repoman-2.3.3_p17

 sys-apps/systemd/Manifest              |   5 -
 sys-apps/systemd/metadata.xml          |   1 -
 sys-apps/systemd/systemd-226-r2.ebuild | 484 ---------------------------------
 sys-apps/systemd/systemd-231.ebuild    | 454 -------------------------------
 sys-apps/systemd/systemd-232.ebuild    | 456 -------------------------------
 sys-apps/systemd/systemd-233-r1.ebuild | 459 -------------------------------
 6 files changed, 1859 deletions(-)

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index ae810c2c99d..e4684c7c942 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,8 +1,3 @@
-DIST systemd-226.tar.gz 3914162 SHA256 
baff6a938c5579769330d0224280bf1a1ff5920151d7201545fc9880b6326c67 SHA512 
565331661e7d144dcdf1505f9a1a70b20a9b904567478593a8fa47ed18f9eb68a9339cf32f117ede994676a84d0cfe3fcedbc9b8d8c964445b741a32271e5584
 WHIRLPOOL 
9f0d7b761ad84f0bb557a22738d7fcc1b6515340db776790d9199401017747a62c24de214300c1f00fb33f86284f3498cadbece713d6e66a30903475f6bce273
-DIST systemd-231-man.tar.gz 29466 SHA256 
aecf91c13333e1791d026b82360d55b4783f8d281c6e80bfe9d6bbf0bac633e4 SHA512 
6c359f88da3e5dc01745f7255c021aafe495d9ca16c74277cbcfa05a6903093ec2c4746a34504d04f2aff464eeaa5518519577c831a08f4336552c6b6e05fdfd
 WHIRLPOOL 
55371b404bfc945abc38d4cef5c555223abbee0993d56b506c896a851ba9ce283f0a020fe24ea273d3674f8a9dbe79b843d32eed93a59b2597b7bad113fbc3e1
-DIST systemd-231.tar.gz 4381464 SHA256 
899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 SHA512 
199fa33a0494d1d15f7fe3c796fe14913ad386766571d4d3fbb1cb1c446e04f6d06a965213be4c594a7183e810fc2fd4804fe14f64f21b0a1278b717889811c6
 WHIRLPOOL 
7779291e9fb9873cb1773b8583cf6d4b7dec837363ea89c4a73c1e397a76752b66f8b57d8fc4d9cef768cc1855b5e325ad88a8a69eb5380aa924e0a6dead41b1
-DIST systemd-232-man.tar.gz 30579 SHA256 
23fee775eece788322841e61d6b3bd8c0c13f54a94a40124af816b27cd9f7b69 SHA512 
533ab1a41533b080aad2de7f8579b9b97081668e60cb94fc305316a43e9b0ebb85a959199e0d07278010e437e254b7eebc35f76aabb4bf3cb39a70dcb834a06f
 WHIRLPOOL 
0c13be0a8546f720e72977549fc49ab000377e630856eb5541b948c8105cf4994bba6e694297f3c5cff596293e2a0f857f1346964c6878b32c14fb83a3ce9335
-DIST systemd-232.tar.gz 4529048 SHA256 
1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 SHA512 
5dbe52f655ec2901b1bfbb1256f83ba26bc82c13097ac9a82e4fbb97886551530f9888c369592f1b410cfff40d6d127b985533a3e29cfab5b30d18739ee5dcb1
 WHIRLPOOL 
f2a1499584c5b5c4d9e945e45ef5e0eef2e8be77acdbd7b3b29a8c8b62dc7a10c162a856df7107c19e2eb19e63bc43a33433686472ca30909237981683cbe980
 DIST systemd-233-man.tar.gz 31386 SHA256 
825e62eb82c4e23997061fc8f56f7ec9bb1e6ac1111d279c76c926cc2bfbf1dc SHA512 
cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40
 WHIRLPOOL 
ff1f36beff377f675047271df38503e8b71d615ea73c5fdfebf465edaf1fe29b4f89e3194d65cdf84eec9b7c3156de597627fdaffa4b86018520aaa127a7a159
 DIST systemd-233.tar.gz 4660737 SHA256 
8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 
5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 WHIRLPOOL 
ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176
 DIST systemd-234.tar.gz 4800186 SHA256 
da3e69d10aa1c983d33833372ad4929037b411ac421fb085c8cee79ae1d80b6a SHA512 
762336a7d96c6583cf71cad62efce95a0ed93cd0a0d7251f128d10dba8200c0c8df0e5a7d168179ababa5b221295a231e73b7e7ea2697cb3fb5c1b33538efa68
 WHIRLPOOL 
9ff9f25ce82514db969a427eee51c0483b2bcaaa611f93c1fc17c356ea25eee712217708c54101ecaafd835cd8ac988b16e8ad411b48541a32442b9a0d148f07

diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 0ff06358a67..357ed6005f9 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -21,7 +21,6 @@
                <flag name="gcrypt">Enable sealing of journal files using 
gcrypt; required to build systemd-import/systemd-pull</flag>
                <flag name="http">Enable embedded HTTP server in journald</flag>
                <flag name="importd">Enable import daemon</flag>
-               <flag name="kdbus">Connect to kernel dbus (KDBUS) instead of 
userspace dbus if available</flag>
                <flag name="kmod">Enable kernel module loading via 
<pkg>sys-apps/kmod</pkg></flag>
                <flag name="libidn2">If IDN support is enabled, use 
<pkg>net-dns/libidn2</pkg> instead of <pkg>net-dns/libidn</pkg></flag>
                <flag name="lz4">Enable lz4 compression for the journal</flag>

diff --git a/sys-apps/systemd/systemd-226-r2.ebuild 
b/sys-apps/systemd/systemd-226-r2.ebuild
deleted file mode 100644
index f6b48149c7b..00000000000
--- a/sys-apps/systemd/systemd-226-r2.ebuild
+++ /dev/null
@@ -1,484 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-fi
-
-inherit autotools bash-completion-r1 linux-info multilib \
-       multilib-minimal pam systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd";
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build 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.11"
-
-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
-       !build? ( || (
-               sys-apps/util-linux[kill(-)]
-               sys-process/procps[kill(+)]
-               sys-apps/coreutils[kill(-)]
-       ) )
-       !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-3.1
-       >=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}
-       virtual/pkgconfig
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-       test? ( >=sys-apps/dbus-1.6.8-r1:0 )
-       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"
-
-pkg_pretend() {
-       local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-               ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
-               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-               ~TIMERFD ~TMPFS_XATTR ~UNIX
-               ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE 
~!SYSFS_DEPRECATED
-               ~!SYSFS_DEPRECATED_V2"
-
-       use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-       use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-       kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-       kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-
-       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
-       epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-       epatch "${FILESDIR}/226-noclean-tmp.patch"
-       epatch "${FILESDIR}/CVE-2015-7510.patch"
-       epatch "${FILESDIR}/226-kcmp.patch"
-       epatch_user
-       eautoreconf
-}
-
-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
-
-       # Prevent conflicts with i686 cross toolchain, bug 559726
-       tc-export AR CC NM OBJCOPY RANLIB
-
-       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
-               KILL=/bin/kill
-               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
-
-       ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-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
-
-       # Needed for bus-related tests
-       local -x SANDBOX_WRITE=${SANDBOX_WRITE}
-       addwrite /sys/fs/kdbus
-
-       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
-}

diff --git a/sys-apps/systemd/systemd-231.ebuild 
b/sys-apps/systemd/systemd-231.ebuild
deleted file mode 100644
index 6345a4573b1..00000000000
--- a/sys-apps/systemd/systemd-231.ebuild
+++ /dev/null
@@ -1,454 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-               !doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools bash-completion-r1 linux-info multilib-minimal pam 
python-any-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd";
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http
-       idn importd +kmod +lz4 lzma nat pam policykit
-       qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.27.1: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_p131: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
-       selinux? ( sec-policy/selinux-base-policy[systemd] )
-       !build? ( || (
-               sys-apps/util-linux[kill(-)]
-               sys-process/procps[kill(+)]
-               sys-apps/coreutils[kill(-)]
-       ) )
-       !sys-auth/nss-myhostname
-       !<sys-kernel/dracut-044
-       !sys-fs/eudev
-       !sys-fs/udev"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.8.8: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}
-       virtual/pkgconfig
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-       test? ( >=sys-apps/dbus-1.6.8-r1:0 )
-       app-text/docbook-xml-dtd:4.2
-       app-text/docbook-xml-dtd:4.5
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt:0
-       doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-       has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-       local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-               ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
-               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-               ~TIMERFD ~TMPFS_XATTR ~UNIX
-               ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE 
~!SYSFS_DEPRECATED
-               ~!SYSFS_DEPRECATED_V2"
-
-       use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-       use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-       kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-       kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-
-       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
-
-       local PATCHES=(
-               
"${FILESDIR}"/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
-               
"${FILESDIR}"/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
-               "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-               "${FILESDIR}/228-noclean-tmp.patch"
-       )
-       [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-       default
-
-       eautoreconf
-}
-
-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
-
-       # Prevent conflicts with i686 cross toolchain, bug 559726
-       tc-export AR CC NM OBJCOPY RANLIB
-
-       use doc && python_setup
-
-       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
-               # disable -fuse-ld=gold since Gentoo supports explicit linker
-               # choice and forcing gold is undesired, #539998
-               # ld.gold may collide with user's LDFLAGS, #545168
-               # ld.gold breaks sparc, #573874
-               cc_cv_LDFLAGS__Wl__fuse_ld_gold=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
-
-               # 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)
-               $(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)
-               $(multilib_native_use_with doc python)
-
-               # hardcode a few paths to spare some deps
-               KILL=/bin/kill
-               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"
-
-               # Breaks screen, tmux, etc.
-               --without-kill-user-processes
-       )
-
-       # Work around bug 463846.
-       tc-export CC
-
-       ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-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 || return 0
-       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
-}
-
-multilib_src_install_all() {
-       prune_libtool_files --modules
-       einstalldocs
-
-       if [[ ${PV} != 9999 ]]; then
-               use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7
-       fi
-
-       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
-
-       # 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 -f 
"${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
-}
-
-pkg_postinst() {
-       newusergroup() {
-               enewgroup "$1"
-               enewuser "$1" -1 -1 -1 "$1"
-       }
-
-       enewgroup input
-       enewgroup systemd-journal
-       newusergroup systemd-bus-proxy
-       newusergroup systemd-coredump
-       newusergroup systemd-journal-gateway
-       newusergroup systemd-journal-remote
-       newusergroup systemd-journal-upload
-       newusergroup systemd-network
-       newusergroup systemd-resolve
-       newusergroup systemd-timesync
-
-       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
-
-       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/* ]]; then
-       #       ewarn "You should replace the resolv.conf symlink:"
-       #       ewarn "ln -snf ${ROOTPREFIX-/usr}/lib/systemd/resolv.conf 
${ROOT}etc/resolv.conf"
-       #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-232.ebuild 
b/sys-apps/systemd/systemd-232.ebuild
deleted file mode 100644
index b952bbbec5b..00000000000
--- a/sys-apps/systemd/systemd-232.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-               !doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools bash-completion-r1 linux-info multilib-minimal pam 
python-any-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd";
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http
-       idn importd +kmod +lz4 lzma nat pam policykit
-       qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.27.1: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_p131:0=[${MULTILIB_USEDEP}] )
-       lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-       nat? ( net-firewall/iptables:0= )
-       pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
-       qrcode? ( media-gfx/qrencode:0= )
-       seccomp? ( >=sys-libs/libseccomp-2.3.1: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
-       selinux? ( sec-policy/selinux-base-policy[systemd] )
-       !build? ( || (
-               sys-apps/util-linux[kill(-)]
-               sys-process/procps[kill(+)]
-               sys-apps/coreutils[kill(-)]
-       ) )
-       !sys-auth/nss-myhostname
-       !<sys-kernel/dracut-044
-       !sys-fs/eudev
-       !sys-fs/udev"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.8.8: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-kernel/linux-headers-${MINKV}
-       virtual/pkgconfig
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-       test? ( >=sys-apps/dbus-1.6.8-r1:0 )
-       app-text/docbook-xml-dtd:4.2
-       app-text/docbook-xml-dtd:4.5
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt:0
-       doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-       has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-       local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-               ~CHECKPOINT_RESTORE ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
-               ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-               ~TIMERFD ~TMPFS_XATTR ~UNIX
-               ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE 
~!SYSFS_DEPRECATED
-               ~!SYSFS_DEPRECATED_V2"
-
-       use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-       use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-       kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-       kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-
-       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} != 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
-
-       local PATCHES=(
-               
"${FILESDIR}"/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
-               
"${FILESDIR}"/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-                       "${FILESDIR}/228-noclean-tmp.patch"
-                       "${FILESDIR}/232-systemd-user-pam.patch"
-               )
-       fi
-
-       [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-       default
-
-       eautoreconf
-}
-
-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
-
-       # Prevent conflicts with i686 cross toolchain, bug 559726
-       tc-export AR CC NM OBJCOPY RANLIB
-
-       use doc && python_setup
-
-       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
-               # disable -fuse-ld=gold since Gentoo supports explicit linker
-               # choice and forcing gold is undesired, #539998
-               # ld.gold may collide with user's LDFLAGS, #545168
-               # ld.gold breaks sparc, #573874
-               cc_cv_LDFLAGS__Wl__fuse_ld_gold=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
-
-               # 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)
-               --with-efi-libdir="/usr/$(get_libdir)"
-               $(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 kmod)
-               $(use_enable lz4)
-               $(use_enable lzma xz)
-               $(multilib_native_use_enable nat libiptc)
-               $(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)
-               $(multilib_native_use_with doc python)
-
-               # hardcode a few paths to spare some deps
-               KILL=/bin/kill
-               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"
-
-               # Breaks screen, tmux, etc.
-               --without-kill-user-processes
-       )
-
-       # Work around bug 463846.
-       tc-export CC
-
-       ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-       local mymakeopts=(
-               udevlibexecdir="${MY_UDEVDIR}"
-       )
-
-       if multilib_is_native_abi; then
-               emake "${mymakeopts[@]}"
-       else
-               emake built-sources
-               local targets=(
-                       '$(rootlib_LTLIBRARIES)'
-                       '$(lib_LTLIBRARIES)'
-                       '$(pamlib_LTLIBRARIES)'
-                       '$(pkgconfiglib_DATA)'
-               )
-               echo "gentoo: ${targets[*]}" | emake "${mymakeopts[@]}" -f 
Makefile -f - gentoo
-       fi
-}
-
-multilib_src_test() {
-       multilib_is_native_abi || return 0
-       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-rootlibLTLIBRARIES
-                       install-libLTLIBRARIES
-                       install-pamlibLTLIBRARIES
-                       install-pkgconfiglibDATA
-                       install-includeHEADERS
-                       install-pkgincludeHEADERS
-               )
-
-               emake "${mymakeopts[@]}"
-       fi
-}
-
-multilib_src_install_all() {
-       prune_libtool_files --modules
-       einstalldocs
-       dodoc "${FILESDIR}"/nsswitch.conf
-
-       if [[ ${PV} != 9999 ]]; then
-               use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7
-       fi
-
-       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
-
-       # 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 -f 
"${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
-}
-
-pkg_postinst() {
-       newusergroup() {
-               enewgroup "$1"
-               enewuser "$1" -1 -1 -1 "$1"
-       }
-
-       enewgroup input
-       enewgroup systemd-journal
-       newusergroup systemd-bus-proxy
-       newusergroup systemd-coredump
-       newusergroup systemd-journal-gateway
-       newusergroup systemd-journal-remote
-       newusergroup systemd-journal-upload
-       newusergroup systemd-network
-       newusergroup systemd-resolve
-       newusergroup systemd-timesync
-
-       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
-
-       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/* ]]; then
-               ewarn "You should replace the resolv.conf symlink:"
-               ewarn "ln -snf ${ROOTPREFIX-/usr}/lib/systemd/resolv.conf 
${ROOT}etc/resolv.conf"
-       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-233-r1.ebuild 
b/sys-apps/systemd/systemd-233-r1.ebuild
deleted file mode 100644
index c0a2a3751ca..00000000000
--- a/sys-apps/systemd/systemd-233-r1.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-               !doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
-       KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
-fi
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit autotools bash-completion-r1 linux-info multilib-minimal pam 
python-any-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd";
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http
-       idn importd +kmod +lz4 lzma nat pam policykit
-       qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.27.1: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_p131:0=[${MULTILIB_USEDEP}] )
-       lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-       nat? ( net-firewall/iptables:0= )
-       pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
-       qrcode? ( media-gfx/qrencode:0= )
-       seccomp? ( >=sys-libs/libseccomp-2.3.1: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
-       selinux? ( sec-policy/selinux-base-policy[systemd] )
-       !build? ( || (
-               sys-apps/util-linux[kill(-)]
-               sys-process/procps[kill(+)]
-               sys-apps/coreutils[kill(-)]
-       ) )
-       !sys-auth/nss-myhostname
-       !<sys-kernel/dracut-044
-       !sys-fs/eudev
-       !sys-fs/udev"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[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-kernel/linux-headers-${MINKV}
-       virtual/pkgconfig
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-       test? ( sys-apps/dbus )
-       app-text/docbook-xml-dtd:4.2
-       app-text/docbook-xml-dtd:4.5
-       app-text/docbook-xsl-stylesheets
-       dev-libs/libxslt:0
-       doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-       has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != buildonly ]]; then
-               local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-                       ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-                       ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD 
~SYSFS
-                       ~TIMERFD ~TMPFS_XATTR ~UNIX
-                       ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-                       ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE 
~!SYSFS_DEPRECATED
-                       ~!SYSFS_DEPRECATED_V2"
-
-               use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-               use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-               kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-               kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-
-               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
-                       if linux_chkconfig_present X86; then
-                               CONFIG_CHECK+=" ~DMIID"
-                       fi
-               fi
-
-               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
-
-       local PATCHES=(
-               
"${FILESDIR}/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch"
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-                       "${FILESDIR}/228-noclean-tmp.patch"
-                       "${FILESDIR}/233-systemd-user-pam.patch"
-               )
-       fi
-
-       [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-       default
-
-       eautoreconf
-}
-
-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
-
-       # Prevent conflicts with i686 cross toolchain, bug 559726
-       tc-export AR CC NM OBJCOPY RANLIB
-
-       use doc && python_setup
-
-       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
-               # disable -fuse-ld=gold since Gentoo supports explicit linker
-               # choice and forcing gold is undesired, #539998
-               # ld.gold may collide with user's LDFLAGS, #545168
-               # ld.gold breaks sparc, #573874
-               cc_cv_LDFLAGS__Wl__fuse_ld_gold=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
-
-               # 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)
-               --with-efi-libdir="/usr/$(get_libdir)"
-               $(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 kmod)
-               $(use_enable lz4)
-               $(use_enable lzma xz)
-               $(multilib_native_use_enable nat libiptc)
-               $(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)
-               $(multilib_native_use_with doc python)
-
-               # hardcode a few paths to spare some deps
-               KILL=/bin/kill
-               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"
-
-               # Breaks screen, tmux, etc.
-               --without-kill-user-processes
-       )
-
-       # Work around bug 463846.
-       tc-export CC
-
-       ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-       local mymakeopts=(
-               udevlibexecdir="${MY_UDEVDIR}"
-       )
-
-       if multilib_is_native_abi; then
-               emake "${mymakeopts[@]}"
-       else
-               emake built-sources
-               local targets=(
-                       '$(rootlib_LTLIBRARIES)'
-                       '$(lib_LTLIBRARIES)'
-                       '$(pamlib_LTLIBRARIES)'
-                       '$(pkgconfiglib_DATA)'
-               )
-               echo "gentoo: ${targets[*]}" | emake "${mymakeopts[@]}" -f 
Makefile -f - gentoo
-       fi
-}
-
-multilib_src_test() {
-       multilib_is_native_abi || return 0
-       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-rootlibLTLIBRARIES
-                       install-libLTLIBRARIES
-                       install-pamlibLTLIBRARIES
-                       install-pkgconfiglibDATA
-                       install-includeHEADERS
-                       install-pkgincludeHEADERS
-               )
-
-               emake "${mymakeopts[@]}"
-       fi
-}
-
-multilib_src_install_all() {
-       prune_libtool_files --modules
-       einstalldocs
-       dodoc "${FILESDIR}"/nsswitch.conf
-
-       if [[ ${PV} != 9999 ]]; then
-               use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7
-       fi
-
-       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
-
-       # 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 -f 
"${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
-}
-
-pkg_postinst() {
-       newusergroup() {
-               enewgroup "$1"
-               enewuser "$1" -1 -1 -1 "$1"
-       }
-
-       enewgroup input
-       enewgroup systemd-journal
-       newusergroup systemd-bus-proxy
-       newusergroup systemd-coredump
-       newusergroup systemd-journal-gateway
-       newusergroup systemd-journal-remote
-       newusergroup systemd-journal-upload
-       newusergroup systemd-network
-       newusergroup systemd-resolve
-       newusergroup systemd-timesync
-
-       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
-
-       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/* ]]; then
-               ewarn "You should replace the resolv.conf symlink:"
-               ewarn "ln -snf ${ROOTPREFIX-/usr}/lib/systemd/resolv.conf 
${ROOT}etc/resolv.conf"
-       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
-}

Reply via email to