From d66677384001f87aed5377f59e039e06fd2c4ecb Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Fri, 19 Dec 2014 17:36:43 +0000 Subject: [PATCH] Fix the sys-apps/systemd-sysv-utils block, thanks to floppym for noticing Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- sys-apps/systemd/ChangeLog | 6 +++++- sys-apps/systemd/Manifest | 16 ++++++++-------- sys-apps/systemd/systemd-216-r2.ebuild | 7 ++++--- sys-apps/systemd/systemd-217-r4.ebuild | 7 ++++--- sys-apps/systemd/systemd-218-r1.ebuild | 7 ++++--- sys-apps/systemd/systemd-9999.ebuild | 7 ++++--- 6 files changed, 29 insertions(+), 21 deletions(-) diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 4d74823006b5..994f4991b82b 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.327 2014/12/19 17:07:50 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.328 2014/12/19 17:36:41 pacho Exp $ + + 19 Dec 2014; Pacho Ramos systemd-216-r2.ebuild, + systemd-217-r4.ebuild, systemd-218-r1.ebuild, systemd-9999.ebuild: + Fix the sys-apps/systemd-sysv-utils block, thanks to floppym for noticing *systemd-218-r1 (19 Dec 2014) *systemd-217-r4 (19 Dec 2014) diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index e9c2c801e0c6..da5208bdd2f9 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -12,18 +12,18 @@ DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b090 DIST systemd-gentoo-patches-217-r1.tar.xz 8388 SHA256 09a75238e12f520560de2a0714a0c37f206e25ae2c348cbfbf6ea526307e7a1b SHA512 bf310fa0dbcc82c49d7d537fb0cddd79ab83c836888706b946f110424a35cd71da9c509cc968a2dc3ccbb5ef6947b2d8b45b9d58a64da3c3dea269d8e8cf5fa7 WHIRLPOOL aad35822a2bed9f60a04245bd79434833e6f08331768b3bac2cea59c37e405064c29b5dca2f767eeace723a6daaf456862667aebc1c4b4a47548c817b5721755 EBUILD systemd-215-r3.ebuild 16057 SHA256 2da4addf870b75d67ef6bf8676beba3df6bec14d9cf7f207b12ab13744d4d9ea SHA512 32991ac75dcf24471330483cd66212c4e7cc32be257636b0c55be2beed91f24fbdd89455b9c1bff6ad8b67fc064add0417c00b5ed590bb3ec9b0c95ab2dcd080 WHIRLPOOL 923749465bc8c90a610f9abcbea66dd79fdce0fde29e0766468d925cc17764db829d150b281d7c08b0125b3d643f3aafd77e26f8271c883cdbafb277089a3342 EBUILD systemd-216-r1.ebuild 15637 SHA256 8fbf530eb7d9b02701571c0a3771ff15e4ad3630fd0616eb508664337e3644a5 SHA512 a1c30c8cfef7f20c52738c84ca5cc149cc080ef46bf778584e7afdd32153f633140ea5211e4a87c96f955fbea6c62d31a1dc9702613c3d905ffcab6bb24c6340 WHIRLPOOL aa9b9e921cd6b59ee82857c1e16fa9bde9087f0aad85813661f41dd6663968c1d68e8ce2277da03a5858457109684e80eb87a76a4c2912f1a0d124bb2e70a884 -EBUILD systemd-216-r2.ebuild 15967 SHA256 a1fecb5766e085e896e00cea1975f63e50ae269a46c6902f473cd3707382ee73 SHA512 9f04203a344f8799328c4b5ac5ecd743ed4edc4c2f3d9e30c2141afcf1e007b1b5cb0f1681656e3e122e7d7c5aaffce815d04ecafd08392cc954fdb59749eca6 WHIRLPOOL a47661edd7383358080433523d96fc6ec4bcfa41e4d50c45c7952b6522bfa63fe208e9d875879b6aca3c21c3779a73e483c96f88b7a9be7b41212e6979a32219 +EBUILD systemd-216-r2.ebuild 15970 SHA256 48989a9d6a40d19e34b2f1b40176513afbed862ea2ace7542afe220f2d350dfe SHA512 16b5178416bcf0770fd3b6578ad7c18eea24d9d3da8499c5b75c3b3f621b35430df92e426b998fa58c5bf2d9bab429c08e2f0a86c09f31f22162ed2f979fd07b WHIRLPOOL 7820dbdb9c6dce96e55dd7f609192e5889e6e21515ba6d8f45e05d48754ea031fc4f6b17e867c5c9c80c328578db23f516d236065398b87564ba71fb7694202e EBUILD systemd-217-r3.ebuild 15572 SHA256 1e04c7dd56c989efda7546f86f3165be5a68e215ea4f8795fe2237f10b328e09 SHA512 979e61dce72446fb73b325021d662dbdc99f6c63c2d9ce4614cb8c6d3daa1d31c155d53daec2ce3b2c5d4e84916cb631beead049cf0d9c0d73106ca89b8e0ef1 WHIRLPOOL 58f17767fb81f0a459353fbb747f6dd4df2f1cc30d3510aeea8d34ec2182e94c46b6bd3ef916bccba8039471f1f243d9da1b06ae1f7c6b837d384e4665110ed4 -EBUILD systemd-217-r4.ebuild 15811 SHA256 0157be2da212c331ad0a7e26a525932b0c5294ef2f41260ca435c04726209cd1 SHA512 70f81d7cff54bea0c1492097d957dfccc4ee473a11d0cd12407e25a902c3fe8ad0e812822141f76403a4979c94f2fd326c2c6223cfec6c674db3b7da6de0fb13 WHIRLPOOL 7d14403db539aec949c1274a6361d05940ce718c0128f62f8426f8322b7cf4634085ecdacf5ab57756a48149058ba815b4878c520460456e245b5c3bafc02e1a -EBUILD systemd-218-r1.ebuild 15797 SHA256 193b95dbc064da2946a845e5ef9ddaa6ce53691630eedd179935a564aa94c979 SHA512 4443b005b65994f3c0b735a2ce146e0f6aff72732c0bf91b904ed3980c419344598a2fb8d56e7c54bf1bea5d8dab3f3a6d6541ad9b709ab8975b7c5511e79e12 WHIRLPOOL a567b80a05d3a2fe270c574f420283c82047747f9a5a1840d5329648fdcba5c6f27b89789c40d63637acda68d7199d6f3b65954ab5f475a54a9f90f0c91e585a +EBUILD systemd-217-r4.ebuild 15814 SHA256 ecf87a37a3587445e3bdc45d460156fe48d7297560b79ae791788265903d374e SHA512 b2bf7e702f7a44901fa42530facf9c7a5f5da55b1716c55467cfac1598444d0f2d1833f1197a5030ba11b5bf6baae37ac9b1aeaa68cb340aed335d11790ba0ac WHIRLPOOL 20c68385af548a1cd3715d8b7d5c422aa69e1a11e1f2c97957dabc5dd68a3429a7ec6866c02e9936e094e378ac3deba849076b5bcb746e7bf0600b684039e394 +EBUILD systemd-218-r1.ebuild 15800 SHA256 cef3dbe716106aaf81890c161d9a79f6184b150ada86991234fc44609505313f SHA512 9f2db038663ab058e5e1dda3318deae5caa0fc44c842d924330ae59f8b13dcb10d91abca31aba83aaf5105b340dcdfcf1b4fe6b87617ae9c521e79ff37b0f063 WHIRLPOOL e65ac913c6c7311bd9fb00e317e12ebbf33ee799d50bc7f995a8ddc404e942e68369404253043dd52cb240beed6912becc5fadc3aa404d5bd36ea6907de9de82 EBUILD systemd-218.ebuild 15555 SHA256 a517ce8478c19b1e3e34e3462b625341f2fe78173a626e64bda8b4b49964532a SHA512 29d740558476e507eb1a0dc022025318ec313a5b8f4d274edf1bccaf9e9e6316abd2abf9a9c6452f86f222d9f190a27ab40e09705486893b97cfa17a198418be WHIRLPOOL ade3bd663c3e112587b8214fe90d7f53f0cbab71461cc464fcf1b82b1bb0538eb29eaa81e78e3952943753aae2da51eb50bd36bff4a8215fcf2cd0e56dbbb75c -EBUILD systemd-9999.ebuild 16185 SHA256 efd4d95b5980a0a5b171bdaa21313ea413ed23f7d0add11229ff47645ae7e1cd SHA512 41d0066e86c703a77136419362170b3a5c4beb16710121d3b98f27c0bb91f1d0dbf825ee132dbe7d598eea6a29635cc53ebcb9f1d7c4693291efe555350f613b WHIRLPOOL cc2e97480818d8be15db1b0c00676b951886536e5fc9c6dda32858096080d02497455a64081a1cf0cf42907e96d410786cf574cce9ff8704caf4df9faa46500a -MISC ChangeLog 58772 SHA256 fd0c4b0b7bae40f11fe34a3981a0425f1a48027df3a4e4f789946ec16b3334ce SHA512 ae5e3198b0678d899d8d7fea30f628cdc841f3a42563ee98d0042850824437e264a89176e5cf00f7eefb27d54278e5f41e6c88b55ec08c821ff17d5fb280eef9 WHIRLPOOL 5edcccb84d393c3f05c2a770cec29c2c8cfcc5aa7cb7f96da9d630bfc717228c42e2a613e83934ad414cfc0085c9a9b947fa86e8e27e63df1b881e6e3da0910a +EBUILD systemd-9999.ebuild 16188 SHA256 c18b5da890403eb7cd405ad39db98ea0bf11315518fb6e84060e5da265efa96e SHA512 e80654b86cd5a47b382f3ea8aa31d45f53496b1606ca26ea843ada75b89483831c82a9d689f841b9788778599ef117f4b0826286820b8cbebd0a1b66e4b453a6 WHIRLPOOL f439853f8607dcbb7d0bbf40b69f1fcd3f594d130ac89e65d9b84056aaa98f5e88c075ab4408ceb383676409e378a11969963a5ad94ddd642608b362f188b0b5 +MISC ChangeLog 58987 SHA256 98ded00cef196221d6454d1caced75f9220155a1fccb5cb34961ea732d944abe SHA512 212351846ef1d354eaeb6154559906017e80d9bed6ba0072ae28da1a3a1f48f04430e70cbc9acdbb4586986cfc9a2b6adbd7b46f1127576ba1a58b56a15c70ce WHIRLPOOL 8258722212b352924e36bdaef6b5200172b42e69184e54a61d2e1924db1a8fb4190399aebb950a89c0d5cde22835385e4677d37abe88f46febaba462091f95d1 MISC metadata.xml 1560 SHA256 324b6648be6be5d66bd83621c4f60ff8fa7ca1bb7a5951f06a303869546bba5f SHA512 1af44b819ae101735ed53f3560fb72245db816d55f8309b4ed9e0e7ed98a6c8012c478acf141f66a14a4b3c5092abdfd314468de2cd62f3f1b05cf2081f7c0b3 WHIRLPOOL 06e876f88111c5a23ed08d92d67076620e0bc1d88a10d733a17cbd66f8ce0d21b3a56ed10f976fd0450e66d3e1d728696c081376e35a6f6834af4c365db26e98 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSUW2gACgkQCaWpQKGI+9QVYQCeO6MQj67SixEhbsmxCcOYJGvz -JGkAn2b9iRpsxifStWVLVqSvfKCK6ynP -=Hujs +iEYEAREIAAYFAlSUYisACgkQCaWpQKGI+9TBWACffz4OaGZaPSSfGdfXHtU6WMjC +8HMAn1ZW7QHgfynELpTTAL+RnEF9eKnv +=TBbl -----END PGP SIGNATURE----- diff --git a/sys-apps/systemd/systemd-216-r2.ebuild b/sys-apps/systemd/systemd-216-r2.ebuild index 234287b9a9c2..98848218fe31 100644 --- a/sys-apps/systemd/systemd-216-r2.ebuild +++ b/sys-apps/systemd/systemd-216-r2.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-216-r2.ebuild,v 1.1 2014/12/19 17:07:50 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild,v 1.2 2014/12/19 17:36:41 pacho Exp $ EAPI=5 @@ -47,7 +47,9 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20:0= qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) - sysv-utils? ( !sys-apps/sysvinit + sysv-utils? ( + !sys-apps/systemd-sysv-utils + !sys-apps/sysvinit >=sys-apps/util-linux-2.24.1-r2 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" @@ -59,7 +61,6 @@ RDEPEND="${COMMON_DEPEND} >=sys-apps/util-linux-2.22 =sys-apps/util-linux-2.25:0= # baselayout-2.2 has /run RDEPEND="${COMMON_DEPEND} >=sys-apps/baselayout-2.2 - !sys-apps/systemd-sysv-utils !sys-auth/nss-myhostname !=sys-apps/util-linux-2.25:0= # baselayout-2.2 has /run RDEPEND="${COMMON_DEPEND} >=sys-apps/baselayout-2.2 - !sys-apps/systemd-sysv-utils !sys-auth/nss-myhostname !=sys-apps/util-linux-2.25:0= # baselayout-2.2 has /run RDEPEND="${COMMON_DEPEND} >=sys-apps/baselayout-2.2 - !sys-apps/systemd-sysv-utils !sys-auth/nss-myhostname !