sys-apps/systemd: remove old
authorMike Gilbert <floppym@gentoo.org>
Thu, 24 Jan 2019 14:48:54 +0000 (09:48 -0500)
committerMike Gilbert <floppym@gentoo.org>
Thu, 24 Jan 2019 14:48:54 +0000 (09:48 -0500)
Package-Manager: Portage-2.3.56_p3, Repoman-2.3.12_p50
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
sys-apps/systemd/Manifest
sys-apps/systemd/systemd-240-r2.ebuild [deleted file]

index 690f6b032b00484f9e4ecced12296a45314d4425..56b3ef36d149fc07d72fc13ea948dc7c1833f132 100644 (file)
@@ -1,7 +1,6 @@
 DIST systemd-239-patches-1.tar.gz 20639 BLAKE2B 9b03367becdef20d16056cdbbeaaefd9f10bf6c56528ad1a738684ab08d99a464411c23aea32d47307b0399f092107069d09ad42fb07217f8eca520cc4010b84 SHA512 757c7fc8f60ccf99d2803128a8c4d8b924093b150384569c5ffb3bc39f06728e99b18e2f77ff0f1c16bbd45bc75cbb0f385dac0135443d70c7dcd9cc1e84a490
 DIST systemd-239-patches-2.tar.gz 33416 BLAKE2B 9602d101cbac65d3b2490f28308e843c28fcaea848dd09005abef0da0bc79ba0766a1cbe7c3cac63f796accddf0295b4eb946e601a201f7e81a48bd1720051ca SHA512 5f5a764d317c43c6b1854171a753eafaca006e12e4f91c81e6ba1d50e80bbbaca23c900fba417264bf9f0d827a73aca71a6da8f2a2043aaaefefed62f5a92b23
 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
-DIST systemd-240-patches-1.tar.gz 15364 BLAKE2B e5cf4c2b8666a5c03e658f46674422d2566a748d3dc088f3cda0f5c5e7b51aec00a531ef7e9d047fd59504299d2e8a44faa353da1183260ae72156bb486d51f7 SHA512 1541810dbcfcc75c4323015c056c963ef69d633761293dea7f27aa6106e3ccc59a84263c703fc5542cf2fb3410c846e97ffb11ecc7d56a98ca658b43b73b6313
 DIST systemd-240-patches-2.tar.gz 28099 BLAKE2B 2e497ed729e2482ef3cc0d010504314f2982a9af19341d6f4efa06b24b3c01f9f69996d43e5b484c641777d00a8a0ba4508bcf6a0296a63d4fc57440f2d3708c SHA512 1be0432d918a4866056ffc65de6e8b412784e5018490c0349a98bba801536d2689c5b2ce41ddd5adbb945aac71bfd0168f94c1daf0788661cd83b159a8c975b8
 DIST systemd-240-patches-3.tar.gz 31952 BLAKE2B 0677d24c4f4e1575dbd4953eb75734f0773671e4ffc2a8d848353a379f5ea2caf4f96620ed6303d98ec00a15367d5e2124b493aaef80b1a0fe118866a1c04ada SHA512 e604e1de17bcd4c941036f12d2e3ae96dd6e86647db2b07576e8468405900b6e8af6a0e55a50c7e9b19704601930b8152c8ac506b2624e261ee0cd35dfc91a21
 DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5
diff --git a/sys-apps/systemd/systemd-240-r2.ebuild b/sys-apps/systemd/systemd-240-r2.ebuild
deleted file mode 100644 (file)
index 6fa2f40..0000000
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}/${P}.tar.gz
-               https://dev.gentoo.org/~floppym/dist/${P}-patches-1.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils 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 elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30: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? (
-               libidn2? ( net-dns/libidn2:= )
-               !libidn2? ( net-dns/libidn:= )
-       )
-       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}] )
-       pcre? ( dev-libs/libpcre2 )
-       qrcode? ( media-gfx/qrencode:0= )
-       seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-       selinux? ( sys-libs/libselinux:0= )
-       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-       >=sys-apps/baselayout-2.2
-       selinux? ( sec-policy/selinux-base-policy[systemd] )
-       sysv-utils? ( !sys-apps/sysvinit )
-       !sysv-utils? ( sys-apps/sysvinit )
-       resolvconf? ( !net-dns/openresolv )
-       !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="
-       >=sys-kernel/linux-headers-${MINKV}
-       gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-BDEPEND="
-       app-arch/xz-utils:0
-       dev-util/gperf
-       >=dev-util/meson-0.46
-       >=dev-util/intltool-0.50
-       >=sys-apps/coreutils-8.16
-       virtual/pkgconfig[${MULTILIB_USEDEP}]
-       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
-       $(python_gen_any_dep '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_FALLBACK ~!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"
-               kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-               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() {
-       # Do NOT add patches here
-       local PATCHES=()
-
-       [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-       # Add local patches here
-       PATCHES+=(
-       )
-
-       if ! use vanilla; then
-               PATCHES+=(
-                       "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-                       "${FILESDIR}/gentoo-systemd-user-pam.patch"
-                       "${FILESDIR}/gentoo-uucp-group-r1.patch"
-                       "${FILESDIR}/gentoo-generator-path-r1.patch"
-               )
-       fi
-
-       default
-}
-
-src_configure() {
-       # Prevent conflicts with i686 cross toolchain, bug 559726
-       tc-export AR CC NM OBJCOPY RANLIB
-
-       python_setup
-
-       multilib-minimal_src_configure
-}
-
-meson_use() {
-       usex "$1" true false
-}
-
-meson_multilib() {
-       if multilib_is_native_abi; then
-               echo true
-       else
-               echo false
-       fi
-}
-
-meson_multilib_native_use() {
-       if multilib_is_native_abi && use "$1"; then
-               echo true
-       else
-               echo false
-       fi
-}
-
-multilib_src_configure() {
-       local myconf=(
-               --localstatedir="${EPREFIX}/var"
-               -Dpamlibdir="$(getpam_mod_dir)"
-               # avoid bash-completion dep
-               -Dbashcompletiondir="$(get_bashcompdir)"
-               # make sure we get /bin:/sbin in PATH
-               -Dsplit-usr=$(usex split-usr true false)
-               -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-               -Dsysvinit-path=
-               -Dsysvrcnd-path=
-               # Avoid infinite exec recursion, bug 642724
-               -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-               # no deps
-               -Defi=$(meson_multilib)
-               -Dima=true
-               # Optional components/dependencies
-               -Dacl=$(meson_multilib_native_use acl)
-               -Dapparmor=$(meson_multilib_native_use apparmor)
-               -Daudit=$(meson_multilib_native_use audit)
-               -Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-               -Dlibcurl=$(meson_multilib_native_use curl)
-               -Delfutils=$(meson_multilib_native_use elfutils)
-               -Dgcrypt=$(meson_use gcrypt)
-               -Dgnu-efi=$(meson_multilib_native_use gnuefi)
-               -Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
-               -Dmicrohttpd=$(meson_multilib_native_use http)
-               $(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
-               -Dimportd=$(meson_multilib_native_use importd)
-               -Dbzip2=$(meson_multilib_native_use importd)
-               -Dzlib=$(meson_multilib_native_use importd)
-               -Dkmod=$(meson_multilib_native_use kmod)
-               -Dlz4=$(meson_use lz4)
-               -Dxz=$(meson_use lzma)
-               -Dlibiptc=$(meson_multilib_native_use nat)
-               -Dpam=$(meson_use pam)
-               -Dpcre2=$(meson_multilib_native_use pcre)
-               -Dpolkit=$(meson_multilib_native_use policykit)
-               -Dqrencode=$(meson_multilib_native_use qrcode)
-               -Dseccomp=$(meson_multilib_native_use seccomp)
-               -Dselinux=$(meson_multilib_native_use selinux)
-               #-Dtests=$(meson_multilib_native_use test)
-               -Ddbus=$(meson_multilib_native_use test)
-               -Dxkbcommon=$(meson_multilib_native_use xkb)
-               # hardcode a few paths to spare some deps
-               -Dkill-path=/bin/kill
-               -Dntp-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.
-               -Ddefault-kill-user-processes=false
-
-               # multilib options
-               -Dbacklight=$(meson_multilib)
-               -Dbinfmt=$(meson_multilib)
-               -Dcoredump=$(meson_multilib)
-               -Denvironment-d=$(meson_multilib)
-               -Dfirstboot=$(meson_multilib)
-               -Dhibernate=$(meson_multilib)
-               -Dhostnamed=$(meson_multilib)
-               -Dhwdb=$(meson_multilib)
-               -Dldconfig=$(meson_multilib)
-               -Dlocaled=$(meson_multilib)
-               -Dman=$(meson_multilib)
-               -Dnetworkd=$(meson_multilib)
-               -Dquotacheck=$(meson_multilib)
-               -Drandomseed=$(meson_multilib)
-               -Drfkill=$(meson_multilib)
-               -Dsysusers=$(meson_multilib)
-               -Dtimedated=$(meson_multilib)
-               -Dtimesyncd=$(meson_multilib)
-               -Dtmpfiles=$(meson_multilib)
-               -Dvconsole=$(meson_multilib)
-       )
-
-       if multilib_is_native_abi && use idn; then
-               myconf+=(
-                       -Dlibidn2=$(usex libidn2 true false)
-                       -Dlibidn=$(usex libidn2 false true)
-               )
-       else
-               myconf+=(
-                       -Dlibidn2=false
-                       -Dlibidn=false
-               )
-       fi
-
-       meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       eninja
-}
-
-multilib_src_test() {
-       unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-       eninja test
-}
-
-multilib_src_install() {
-       DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-       local rootprefix=$(usex split-usr '' /usr)
-
-       # meson doesn't know about docdir
-       mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-       einstalldocs
-       dodoc "${FILESDIR}"/nsswitch.conf
-
-       if ! use resolvconf; then
-               rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-       fi
-
-       if ! use sysv-utils; then
-               rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-               rm "${ED}"/usr/share/man/man1/init.1 || die
-               rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-       fi
-
-       if ! use resolvconf && ! use sysv-utils; then
-               rmdir "${ED}${rootprefix}"/sbin || die
-       fi
-
-       # Preserve empty dirs in /etc & /var, bug #437008
-       keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-       keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
-       keepdir /etc/udev/{hwdb.d,rules.d}
-       keepdir /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 "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-       rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
-       rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-       rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
-       rm -fr "${ED}"/etc/systemd/system/network-online.target.wants || die
-       rm -fr "${ED}"/etc/systemd/system/sockets.target.wants || die
-       rm -fr "${ED}"/etc/systemd/system/sysinit.target.wants || die
-
-       local udevdir=/lib/udev
-       use split-usr || udevdir=/usr/lib/udev
-
-       rm -r "${ED}${udevdir}/hwdb.d" || die
-
-       if use split-usr; then
-               # Avoid breaking boot/reboot
-               dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-               dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-       fi
-}
-
-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 kvm 78
-       enewgroup render
-       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="${EROOT}"
-       fi
-
-       udev_reload || FAIL=1
-
-       # Bug 465468, make sure locales are respect, and ensure consistency
-       # between OpenRC & systemd
-       migrate_locale
-
-       systemd_reenable systemd-networkd.service systemd-resolved.service
-
-       if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-               ebegin "Reexecuting system manager"
-               systemctl daemon-reexec
-               eend $?
-       fi
-
-       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
-}
-
-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
-}