Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-12-20 08:25:27 +0000
committerMichał Górny <mgorny@gentoo.org>2014-12-20 08:25:27 +0000
commit57315c10843cd55c34652dd4f56a228573071e0c (patch)
tree7eb39fa50000d9ce7ef3665ea700b3f38e564f6c /sys-apps
parentclean old impls, rm old (diff)
downloadhistorical-57315c10843cd55c34652dd4f56a228573071e0c.tar.gz
historical-57315c10843cd55c34652dd4f56a228573071e0c.tar.bz2
historical-57315c10843cd55c34652dd4f56a228573071e0c.zip
Fix sysv-utils symlink install, bug #533090.
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/ChangeLog6
-rw-r--r--sys-apps/systemd/Manifest28
-rw-r--r--sys-apps/systemd/systemd-216-r2.ebuild6
-rw-r--r--sys-apps/systemd/systemd-217-r4.ebuild5
-rw-r--r--sys-apps/systemd/systemd-218-r1.ebuild5
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild5
6 files changed, 37 insertions, 18 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 994f4991b82b..719d675262aa 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.328 2014/12/19 17:36:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.329 2014/12/20 08:25:20 mgorny Exp $
+
+ 20 Dec 2014; Michał Górny <mgorny@gentoo.org> systemd-216-r2.ebuild,
+ systemd-217-r4.ebuild, systemd-218-r1.ebuild, systemd-9999.ebuild:
+ Fix sysv-utils symlink install, bug #533090.
19 Dec 2014; Pacho Ramos <pacho@gentoo.org> systemd-216-r2.ebuild,
systemd-217-r4.ebuild, systemd-218-r1.ebuild, systemd-9999.ebuild:
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index da5208bdd2f9..efdefd098cd4 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -12,18 +12,30 @@ 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 15970 SHA256 48989a9d6a40d19e34b2f1b40176513afbed862ea2ace7542afe220f2d350dfe SHA512 16b5178416bcf0770fd3b6578ad7c18eea24d9d3da8499c5b75c3b3f621b35430df92e426b998fa58c5bf2d9bab429c08e2f0a86c09f31f22162ed2f979fd07b WHIRLPOOL 7820dbdb9c6dce96e55dd7f609192e5889e6e21515ba6d8f45e05d48754ea031fc4f6b17e867c5c9c80c328578db23f516d236065398b87564ba71fb7694202e
+EBUILD systemd-216-r2.ebuild 15981 SHA256 a1423b4f042ade4fd27b339e64dbf3470ac5029b5d64285c50a8adbcca79e56b SHA512 e1b5cef5a8531eb79df9524070bd9a0f6130c7b606d07aaec101e763558389c8a20ad1d8e7129863389648de3df73c0acd2f6a65fe8ae685b9c354bce1439ca4 WHIRLPOOL bc7c36d18c844b8b8f6b7c9496a79882da546a1631df4b165aed1b60d76bda6b88cf115f34704fe712185f501e34820ebc86b12c57a5ff21fdb5bd69da25c6ef
EBUILD systemd-217-r3.ebuild 15572 SHA256 1e04c7dd56c989efda7546f86f3165be5a68e215ea4f8795fe2237f10b328e09 SHA512 979e61dce72446fb73b325021d662dbdc99f6c63c2d9ce4614cb8c6d3daa1d31c155d53daec2ce3b2c5d4e84916cb631beead049cf0d9c0d73106ca89b8e0ef1 WHIRLPOOL 58f17767fb81f0a459353fbb747f6dd4df2f1cc30d3510aeea8d34ec2182e94c46b6bd3ef916bccba8039471f1f243d9da1b06ae1f7c6b837d384e4665110ed4
-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-217-r4.ebuild 15882 SHA256 801298f2d7299aa24335f9dc71a961fcdb41a9406c8ff453191680ec99e19918 SHA512 212ad18b8a4c990e20ca13483d331750b87794896419e2cb59a1cd97b8f03f3b0779095447283387c54e02396a5628bbd09b79f80b3d5e8498e493b734044934 WHIRLPOOL 4af74ab7200b80df093a3244d251a858afe80d4ce70a40928123c20d08bad2371e7f832f82fd3d610e52d8cdbd534805926a5a74ff08ad73b27e0b9d376fc787
+EBUILD systemd-218-r1.ebuild 15868 SHA256 9c4dc3028f361e99c9221ee1b5331e2699da818a598b05e0e90081f4ed8243d4 SHA512 f05fc1673ff34dbd4f19a134e1d704afb99851cd110f4457dfcf0ddf0766fcecb4b73dfa2a7576d51ebed61652dbb5b77c6bbcd5a213f27311e54771ab699005 WHIRLPOOL d5b31121eebcfa6075dbdc38a502a7d2c3df01dcf2ab0ce5909602df0cb38afbcbc4b089d837a0e257ed4f28874282356d5d5209422221d506385e17858e1d37
EBUILD systemd-218.ebuild 15555 SHA256 a517ce8478c19b1e3e34e3462b625341f2fe78173a626e64bda8b4b49964532a SHA512 29d740558476e507eb1a0dc022025318ec313a5b8f4d274edf1bccaf9e9e6316abd2abf9a9c6452f86f222d9f190a27ab40e09705486893b97cfa17a198418be WHIRLPOOL ade3bd663c3e112587b8214fe90d7f53f0cbab71461cc464fcf1b82b1bb0538eb29eaa81e78e3952943753aae2da51eb50bd36bff4a8215fcf2cd0e56dbbb75c
-EBUILD systemd-9999.ebuild 16188 SHA256 c18b5da890403eb7cd405ad39db98ea0bf11315518fb6e84060e5da265efa96e SHA512 e80654b86cd5a47b382f3ea8aa31d45f53496b1606ca26ea843ada75b89483831c82a9d689f841b9788778599ef117f4b0826286820b8cbebd0a1b66e4b453a6 WHIRLPOOL f439853f8607dcbb7d0bbf40b69f1fcd3f594d130ac89e65d9b84056aaa98f5e88c075ab4408ceb383676409e378a11969963a5ad94ddd642608b362f188b0b5
-MISC ChangeLog 58987 SHA256 98ded00cef196221d6454d1caced75f9220155a1fccb5cb34961ea732d944abe SHA512 212351846ef1d354eaeb6154559906017e80d9bed6ba0072ae28da1a3a1f48f04430e70cbc9acdbb4586986cfc9a2b6adbd7b46f1127576ba1a58b56a15c70ce WHIRLPOOL 8258722212b352924e36bdaef6b5200172b42e69184e54a61d2e1924db1a8fb4190399aebb950a89c0d5cde22835385e4677d37abe88f46febaba462091f95d1
+EBUILD systemd-9999.ebuild 16256 SHA256 b714de50427ac5759e2a4e55a759f8dca1adea8b1904cc19ba44e51935ab2b30 SHA512 01eda1b420d60ce93ed90103da36b2cdb7059d706c4afc9a832cb993d6663c16474d8ed1426f2886948a165aa998b89e5483cd9638997f5a24058d372284e2f8 WHIRLPOOL 736e5af5f315d4c55c063fb27853491a25ccdcde2ffc865545a155fff27f6e78a24b5cfdf6165ab47e9bc1dc7e123b8f269cd7cad785754aba0366ac79f89467
+MISC ChangeLog 59178 SHA256 6573312430f1f7e95be6cc5b290ceb86ec9779596f3632a9d71ea35458a22c32 SHA512 175d66155b7e76379c1dfa8ac8e3708ba8d479bdd9b4afee4562fb9b67bd456a1b7214d34ae58d83f66620343bbb76d1650d6d745cd261f3719f735b082bc4d0 WHIRLPOOL 9f1c43e7d04d8c6f465521b6180c02922b2468df2b0db83ff032df7abecbacc59f5c4c3e76e338622c2c2d8a04024c8cb946ce3ef0b3c32471ec9dfeff3ba57d
MISC metadata.xml 1560 SHA256 324b6648be6be5d66bd83621c4f60ff8fa7ca1bb7a5951f06a303869546bba5f SHA512 1af44b819ae101735ed53f3560fb72245db816d55f8309b4ed9e0e7ed98a6c8012c478acf141f66a14a4b3c5092abdfd314468de2cd62f3f1b05cf2081f7c0b3 WHIRLPOOL 06e876f88111c5a23ed08d92d67076620e0bc1d88a10d733a17cbd66f8ce0d21b3a56ed10f976fd0450e66d3e1d728696c081376e35a6f6834af4c365db26e98
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlSUYisACgkQCaWpQKGI+9TBWACffz4OaGZaPSSfGdfXHtU6WMjC
-8HMAn1ZW7QHgfynELpTTAL+RnEF9eKnv
-=TBbl
+iQJ8BAEBCABmBQJUlTJ2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7sgP/1415epWYtcZE009cyDKheKx
+LRQaw5RttF4XWAiSov95sp+tfWqJNdGqLlOfAqpVF+SpBeIMklh+RF+p94jl2g4a
+dN8+tYYTxrvHwL0WC8UjqX/VlpNVa6xWmkBH4h9jGK9TKhR51X7xNs+d6D/JODVJ
+4KLPVJMoZtFbza0nkdwBBnYZiNcK8KgKIBueb6vXdC5n++C9h38CZbltc+D7ps7B
+n6nt9FcOJs3e4UWT40CKjZGDY/8Lgj8T89/KK7BTek84nqncrkMkA7dnjx8iDfSp
+n7ndT4ftSoY6Jp42EU7Ye6yPynteKfhRUz4rP6nTqp7VgndAtbBg7Vh0vrVXkQtl
+rzbryG129l3NNf/DNC0tXt+udRduYXa8YMkOVXqBFmyRpZomXGBL11KUJXKSP30f
+OBtRt7abx6vWNeNiSyPgUbThT4fLcTBvm1WKilhtzLi+T3ROhXSo+tEEoVfoH9yb
+5v+kjG+3NA4OiQ16EAynRybTm0afrqHEyQnR/fcXyec577jqcbTAwS12X5wF+J/y
+eQOnFV4qSL0hb6S+96Y/fTu0uBbGsij6lACuVu3rTZs8gVzWdWY50/LcgeZ8TeLY
+OD1s+247tDLbodRQjVbtqQRBLEHjj4hggeoDr09bfyCte5yQnjEzo8hMy3gfHBpk
+ohFUOPAQrvV3qAqOkxP+
+=efaJ
-----END PGP SIGNATURE-----
diff --git a/sys-apps/systemd/systemd-216-r2.ebuild b/sys-apps/systemd/systemd-216-r2.ebuild
index 98848218fe31..3612fb8771e7 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.2 2014/12/19 17:36:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r2.ebuild,v 1.3 2014/12/20 08:25:20 mgorny Exp $
EAPI=5
@@ -332,9 +332,9 @@ multilib_src_install_all() {
if use sysv-utils; then
for app in halt poweroff reboot runlevel shutdown telinit; do
- dosym "..${ROOTPREFIX}/bin/systemctl" /sbin/${app}
+ dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
done
- dosym "..${ROOTPREFIX}/lib/systemd/systemd" /sbin/init
+ dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
else
# we just keep sysvinit tools, so no need for the mans
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
diff --git a/sys-apps/systemd/systemd-217-r4.ebuild b/sys-apps/systemd/systemd-217-r4.ebuild
index 3852cbdbbb41..4ad19a355077 100644
--- a/sys-apps/systemd/systemd-217-r4.ebuild
+++ b/sys-apps/systemd/systemd-217-r4.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-217-r4.ebuild,v 1.2 2014/12/19 17:36:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-217-r4.ebuild,v 1.3 2014/12/20 08:25:20 mgorny Exp $
EAPI=5
@@ -326,8 +326,9 @@ multilib_src_install_all() {
if use sysv-utils; then
for app in halt poweroff reboot runlevel shutdown telinit; do
- dosym "..${ROOTPREFIX}/bin/systemctl" /sbin/${app}
+ dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
done
+ dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
else
# we just keep sysvinit tools, so no need for the mans
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
diff --git a/sys-apps/systemd/systemd-218-r1.ebuild b/sys-apps/systemd/systemd-218-r1.ebuild
index 42e98c35187c..8cedc200b567 100644
--- a/sys-apps/systemd/systemd-218-r1.ebuild
+++ b/sys-apps/systemd/systemd-218-r1.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-218-r1.ebuild,v 1.2 2014/12/19 17:36:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218-r1.ebuild,v 1.3 2014/12/20 08:25:20 mgorny Exp $
EAPI=5
@@ -326,8 +326,9 @@ multilib_src_install_all() {
if use sysv-utils; then
for app in halt poweroff reboot runlevel shutdown telinit; do
- dosym "..${ROOTPREFIX}/bin/systemctl" /sbin/${app}
+ dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
done
+ dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
else
# we just keep sysvinit tools, so no need for the mans
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index b519e0974847..5085ea0cdc2d 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.151 2014/12/19 17:36:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.152 2014/12/20 08:25:20 mgorny Exp $
EAPI=5
@@ -351,8 +351,9 @@ multilib_src_install_all() {
if use sysv-utils; then
for app in halt poweroff reboot runlevel shutdown telinit; do
- dosym "..${ROOTPREFIX}/bin/systemctl" /sbin/${app}
+ dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
done
+ dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
else
# we just keep sysvinit tools, so no need for the mans
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \