summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/systemd/ChangeLog6
-rw-r--r--sys-apps/systemd/Manifest22
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild12
3 files changed, 28 insertions, 12 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/Manifest b/sys-apps/systemd/Manifest
index 75003f14576b..8348d66966a2 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -23,13 +23,25 @@ EBUILD systemd-208-r3.ebuild 11107 SHA256 68066f079cb400f4736370d912e070b1ad106a
EBUILD systemd-208.277.ebuild 10938 SHA256 d764774487f6b2fe4736c700b68d6dc2bb0646258810255126ec42fb9195be07 SHA512 4d6fe9a695022e0656ab696bc947936e2cb01b8005f098ae9bd4cb4900ce837558db1b95a538d80cd013a3e56fe2581711fa77cd1454d4436cc38f33c9363255 WHIRLPOOL 17942309b0b13ffa1a8a10a6162c00705212d0913cd2ba0699307a648b79f1cbb7d2a652f28083df311f0dd571fbc2fdd99bf8e43f0edb4d8d00456c965332ce
EBUILD systemd-208.9999.ebuild 11488 SHA256 dd87fb7382883c8fb380436d09a0b428ebe2c4b87ec0ecf92a637059297bfc35 SHA512 497d82f8238b3505b577d062a9df6758aca7584172d19e4b3f6fa097a6369233385c144bf8cd58ef651a1ca3551a85cfc770ffcc53483048e7b44fd31b7088a0 WHIRLPOOL 90c4f85dfb1153a42ba90daeee1076ad8ff86693b0dfdbf18b61865c678295a456915097d10a4930bfc5c31e29ef8978043dca21f7d69bbebe9654da1cc0e862
EBUILD systemd-211.ebuild 13043 SHA256 9382bd68f9765ff1cdc071209da69a5bb7a7df26305f21bf6c2179b3eb77e164 SHA512 2684ade6b804170e52c6a47e27e68a2928733fc2f409a647bc636ba9a42b213e9462e365ee27d65a7ab781f712cba4eacfbc1f0c892f1224a1f7417a31924882 WHIRLPOOL a87589e921b891e5d2545cfcc68a5398b80e35385aa376d1ecd7f2aaa82dcdb9989c402c974bbb062dd1868c39265bfbdfdbee66c7c863bb3b13e45839c34048
-EBUILD systemd-9999.ebuild 13557 SHA256 834c3c26cbdf9c78832124ca8ad447c234f153efffb26a112b64043d93da6ce9 SHA512 d204ffc2d5fe70c97bc061ee677203a3b6a243db095f6692aac9569618b29b2ea5870ba1b5e709d5ea92980d5ca299ff4cb296ee3c438e7159b7a72dcaeb6e23 WHIRLPOOL bbbc90dfe7f0c14121832d9933aa78159e7d92d6e1c39b8f3324a292e84a841e68d372e284be23deab2262d50b24d5fcb7db1cec96010726f19b212fa31fd12c
-MISC ChangeLog 44457 SHA256 2e5ceb167c660d62d767e07c3e26bb8ca74b165b1f94867f4842edff0d53be2c SHA512 618540ea73c4b305d546793a2324e81ec5c0f721d2b4489bf64923c82346302fba505ac18e054a7f6649ff64bc7fb05f0825ba1e058b2f000705aa58deec0486 WHIRLPOOL 6b47687749dcf641811d27deb1e4dc25550d0ec4c3ea897bfac1597cc35a7d6059affb2cb06c8b0c75de84529186777cb97d6f893c3ff1d68e70b12a1d67dc57
+EBUILD systemd-9999.ebuild 13554 SHA256 1f6e5beb724ae18f3211e6dba4a5b327bdbaa901d8b66bac9f7c4be3b93d7434 SHA512 f0e2cf2c6c014ed431a47be5785acbb5bc51e69055229f68b7ae02a4bfa8fca27c265f496950c17a9c47aab379081a7dfce5add379ccb98dd6ecc34829bf9fee WHIRLPOOL f071df473b280ba28268415c5c02ab1594263623c5eebeaa44e2f652f0c82b740182e6896170d8efa2b3733f710b6bcffa775e2c4c8419e7743d7eddbc17b885
+MISC ChangeLog 44642 SHA256 9ad0de59969a54080e28499071e5630cc0125e71ac75d27266ee9773d80bd3b9 SHA512 ef7155eee28206d1eeac62e460f9492e0de8377fe2561b4e1395b7264446e88f58860d5f24f34f0688c6364479b0fb5dc7d2ddb210566bac829520f5a02c9af5 WHIRLPOOL 7ffc529ed4abaec406e9b84a4bf9c603021d6ce24c15eb5dfc96e7121d05b9b16ba7cbb1d1ed1fdf18f8a6a46ca1f7fd314e07343ddf6a53f37d4acc2f3ad58f
MISC metadata.xml 1277 SHA256 9fd7887738589446a3c9c289d593d68e602beb06b34f7b98ff1bbb84aeb7b653 SHA512 70cf0143e3e88e2eccc5475730530e732639cee660fff5ba8572eb497c3da69433878b2ded50e0bb2f027e287d73d9dfca08dcc9a38df7da02e8427c08ed904a WHIRLPOOL 7e18b6437f6081fd1640e2977d1657ca5db0acecb0f9e606ad8cd8c3280ba467596cce13cf1cf24d4e34545424252cf6ee5f13030f111dd0334fd6b1f999a83e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iF4EAREIAAYFAlMgqjkACgkQC77qH+pIQ6RkTAD/R3RLP+NtHL5qI8StPHVicyoQ
-GdDNFttvdBF2oT/wHpcBAIzG9BB1q6EBhrMkslF/Xk9j9ApGRxVfhIUJYHamMtg6
-=xv5B
+iQJ8BAEBCABmBQJTMIhwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjb0P/RfQ0AYi9wrJMJNc1qiErd3u
+XYmBepqP6z6ej00BclydLag4/EeJSIrgcRgt1/yfmYFTp7bomJ6Mzq+La4rCVd+m
+ZweEo3rP/zYxcfeRrh83P0XLaJjy5JgzYtpeJoboy4EYgKfYs0voidIbSON4zEPE
++ubnGh2+7OTWobky6OXCuTn3hdQStBChUe++jXr38BJ/4rE8X3ZhP/spQ13mIrJ8
+btPamfDLXJkB43Px3lnaEQPWs2J5ueCdj8pGLHFOb1641M8yTihD2srM5seDUQuk
+cPRGVcy9UJ/miJMAivLck6LWU2OEYKsUm1TzQM8VRiFw2IvKyPHj1l85/VKtSk3w
+iWj5iCruPROIPkm1P/9IyheVjYx3p3XE14R0OT2oeKIVCZCnm8UrVnSO5JdtL5XZ
+hNkTklcTsUq7hNCkoGaggJFZtEhnnzvETDOnnLOKExSvUn7TuAzZIVX+++16/yUe
+G8hG7nLwerzKcf6dpA4WIYwQ65HJ4CFQLgb1vWGC+RgC+alSzDcGEtBm0m+H/xwx
+Ts5aB7DAmUP3dE17aITIMjyIEmSpntNQKz1D12wE49ej/u4FrGkMb3PP6L4zz7SC
+kqETiZejzxtb6K/0Ms9ljpV96l+kAepUh+INERP4S8QmqZUUUNlGVE8YkR7/2ot+
+d2IysA9JZ9rbbWfAE+e5
+=WR6I
-----END PGP SIGNATURE-----
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