floppym 14/04/19 01:04:09 Modified: systemd-9999.ebuild systemd-212-r2.ebuild ChangeLog Removed: systemd-212-r1.ebuild systemd-212.ebuild Log: Nest gnutls within http use flag, bug 508022 by Alexander Tsoy. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path 1.104 sys-apps/systemd/systemd-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.104&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.104&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.103&r2=1.104 Index: systemd-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- systemd-9999.ebuild 31 Mar 2014 19:01:25 -0000 1.103 +++ systemd-9999.ebuild 19 Apr 2014 01:04:09 -0000 1.104 @@ -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.103 2014/03/31 19:01:25 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.104 2014/04/19 01:04:09 floppym Exp $ EAPI=5 @@ -38,7 +38,10 @@ 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.9.33:0= ) + http? ( + >=net-libs/libmicrohttpd-0.9.33:0= + ssl? ( >=net-libs/gnutls-3.1.4: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 +50,6 @@ qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux: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(-)] )" @@ -189,6 +191,7 @@ $(use_enable gcrypt) $(use_enable gudev) $(use_enable http microhttpd) + $(usex http $(use_enable ssl gnutls) --disable-gnutls) $(use_enable introspection) $(use_enable kdbus) $(use_enable kmod) @@ -200,7 +203,6 @@ $(use_enable qrcode qrencode) $(use_enable seccomp) $(use_enable selinux) - $(use_enable ssl gnutls) $(use_enable test tests) $(use_enable xattr) 1.2 sys-apps/systemd/systemd-212-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-212-r2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-212-r2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-212-r2.ebuild?r1=1.1&r2=1.2 Index: systemd-212-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-212-r2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- systemd-212-r2.ebuild 12 Apr 2014 22:03:59 -0000 1.1 +++ systemd-212-r2.ebuild 19 Apr 2014 01:04:09 -0000 1.2 @@ -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-212-r2.ebuild,v 1.1 2014/04/12 22:03:59 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-212-r2.ebuild,v 1.2 2014/04/19 01:04:09 floppym Exp $ EAPI=5 @@ -32,7 +32,10 @@ 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.9.33:0= ) + http? ( + >=net-libs/libmicrohttpd-0.9.33:0= + ssl? ( >=net-libs/gnutls-3.1.4:0= ) + ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lzma? ( app-arch/xz-utils:0=[${MULTILIB_USEDEP}] ) @@ -41,7 +44,6 @@ qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux: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(-)] )" @@ -167,6 +169,7 @@ $(use_enable gcrypt) $(use_enable gudev) $(use_enable http microhttpd) + $(usex http $(use_enable ssl gnutls) --disable-gnutls) $(use_enable introspection) $(use_enable kdbus) $(use_enable kmod) @@ -178,7 +181,6 @@ $(use_enable qrcode qrencode) $(use_enable seccomp) $(use_enable selinux) - $(use_enable ssl gnutls) $(use_enable test tests) $(use_enable xattr) 1.248 sys-apps/systemd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.248&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.248&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.247&r2=1.248 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- ChangeLog 12 Apr 2014 22:03:59 -0000 1.247 +++ ChangeLog 19 Apr 2014 01:04:09 -0000 1.248 @@ -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.247 2014/04/12 22:03:59 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.248 2014/04/19 01:04:09 floppym Exp $ + + 19 Apr 2014; Mike Gilbert <[email protected]> -systemd-212-r1.ebuild, + -systemd-212.ebuild, systemd-212-r2.ebuild, systemd-9999.ebuild: + Nest gnutls within http use flag, bug 508022 by Alexander Tsoy. *systemd-212-r2 (12 Apr 2014)
