maint(sys-apps/systemd): Refresh live ebuild, remove old.

Apply changes made upstream to our live ebuild. Adds a ssl use flag and
removes tcp wrappers support. Remove old 210 live ebuild.
This commit is contained in:
Michael Marineau 2014-04-07 14:55:59 -07:00
parent d1616f863d
commit 3bc78b7e94
3 changed files with 10 additions and 8 deletions

View File

@ -78,3 +78,6 @@ net-analyzer/nmap ncat -lua
# removes mta dependencies
app-admin/sudo -sendmail
# avoid pulling in gnutls
sys-apps/systemd -ssl

View File

@ -1 +0,0 @@
systemd-9999.ebuild

View File

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.100 2014/03/03 22:19:31 floppym Exp $
# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.103 2014/03/31 19:01:25 floppym Exp $
EAPI=5
@ -34,7 +34,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
kdbus +kmod lzma pam policykit python qrcode +seccomp selinux tcpd
kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl
test vanilla xattr openrc"
MINKV="3.0"
@ -46,7 +46,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= )
gudev? ( dev-libs/glib:2=[${MULTILIB_USEDEP}] )
http? ( net-libs/libmicrohttpd:0= )
http? ( >=net-libs/libmicrohttpd-0.9.33:0= )
introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
kmod? ( >=sys-apps/kmod-15:0= )
lzma? ( app-arch/xz-utils:0=[${MULTILIB_USEDEP}] )
@ -55,7 +55,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
qrcode? ( media-gfx/qrencode:0= )
seccomp? ( >=sys-libs/libseccomp-2.1:0= )
selinux? ( sys-libs/libselinux:0= )
tcpd? ( sys-apps/tcp-wrappers:0= )
ssl? ( >=net-libs/gnutls-3.1.4:0= )
xattr? ( sys-apps/attr:0= )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
@ -122,7 +122,7 @@ fi
pkg_pretend() {
local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID
~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS
~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS
~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD
~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
~!GRKERNSEC_PROC"
@ -210,7 +210,7 @@ multilib_src_configure() {
$(use_enable qrcode qrencode)
$(use_enable seccomp)
$(use_enable selinux)
$(use_enable tcpd tcpwrap)
$(use_enable ssl gnutls)
$(use_enable test tests)
$(use_enable xattr)
@ -249,6 +249,7 @@ multilib_src_configure() {
--disable-acl
--disable-audit
--disable-gcrypt
--disable-gnutls
--disable-gtk-doc
--disable-introspection
--disable-kmod
@ -260,7 +261,6 @@ multilib_src_configure() {
--disable-qrencode
--disable-seccomp
--disable-selinux
--disable-tcpwrap
--disable-tests
--disable-xattr
--disable-xz