diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-03-24 19:33:02 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-03-24 19:33:02 +0000 |
| commit | ca2874e1cbc24d8ee14b2f16b1dc8e4ae6741dac (patch) | |
| tree | 2f9d9b140f5160dd1deebad2926669ee03ba98f6 | |
| parent | Remove older unstable verions (diff) | |
| download | gentoo-2-ca2874e1cbc24d8ee14b2f16b1dc8e4ae6741dac.tar.gz gentoo-2-ca2874e1cbc24d8ee14b2f16b1dc8e4ae6741dac.tar.bz2 gentoo-2-ca2874e1cbc24d8ee14b2f16b1dc8e4ae6741dac.zip | |
Update following upstream changes. GnuTLS support has been added, and tcp-wrappers support has been removed.
(Portage version: 2.2.9-r1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
| -rw-r--r-- | sys-apps/systemd/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 9706a4b706d2..711d64345a2a 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.239 2014/03/12 18:40:56 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.240 2014/03/24 19:33:02 mgorny Exp $ + + 24 Mar 2014; Michał Górny <mgorny@gentoo.org> systemd-9999.ebuild: + Update following upstream changes. GnuTLS support has been added, and tcp- + wrappers support has been removed. 12 Mar 2014; Mike Gilbert <floppym@gentoo.org> systemd-211.ebuild: Copy ROOTPREFIX logic from the live ebuild. diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index b84df853aa66..efdc5dd9fb53 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -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.101 2014/03/24 19:33:02 mgorny Exp $ EAPI=5 @@ -26,7 +26,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" MINKV="3.0" @@ -38,7 +38,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}] ) @@ -47,7 +47,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20:0= qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) - tcpd? ( sys-apps/tcp-wrappers:0= ) + ssl? ( net-libs/gnutls: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(-)] )" @@ -200,7 +200,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) @@ -239,6 +239,7 @@ multilib_src_configure() { --disable-acl --disable-audit --disable-gcrypt + --disable-gnutls --disable-gtk-doc --disable-introspection --disable-kmod @@ -250,7 +251,6 @@ multilib_src_configure() { --disable-qrencode --disable-seccomp --disable-selinux - --disable-tcpwrap --disable-tests --disable-xattr --disable-xz |