diff options
| author |   William Hubbs <williamh@gentoo.org> | 2013-08-16 18:19:05 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2013-08-16 18:19:05 +0000 |
| commit | 2a1ae17f4b3a0a1dbff6afaed9226859e33e8740 (patch) | |
| tree | 7083a029e139a2e35b3ac46ee397f4215174c598 /sys-apps/openrc | |
| parent | move the net comment into a here document. (diff) | |
| download | historical-2a1ae17f4b3a0a1dbff6afaed9226859e33e8740.tar.gz historical-2a1ae17f4b3a0a1dbff6afaed9226859e33e8740.tar.bz2 historical-2a1ae17f4b3a0a1dbff6afaed9226859e33e8740.zip | |
sync live ebuild
Package-Manager: portage-2.2.0/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538
Diffstat (limited to 'sys-apps/openrc')
| -rw-r--r-- | sys-apps/openrc/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/openrc/Manifest | 10 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-9999.ebuild | 17 |
3 files changed, 25 insertions, 7 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index e86a206bc292..d08322007b24 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.277 2013/08/16 18:12:50 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.278 2013/08/16 18:19:03 williamh Exp $ + + 16 Aug 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild: + sync live ebuild 16 Aug 2013; William Hubbs <williamh@gentoo.org> -files/net.confd.comment, openrc-0.12.ebuild: diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index ae359240281c..acf4f4b30c7f 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -11,13 +11,13 @@ DIST openrc-0.11.8.tar.bz2 174860 SHA256 e1f7c5ed98a63178c20f3d023a7d35fe416e8e7 DIST openrc-0.12.tar.bz2 131787 SHA256 e07f46682b2623cdd47655cf6a2e54ab13f1b46bd83159bb9e36bfa1ee27142c SHA512 4c385155abc593c415d6862dbd9f616ae39f8a73568602135f7e89f6a98e3f0f6be13c090fe768b41dd0da85996b61a6453054a94597d88d4e4d1161427e3381 WHIRLPOOL 61a73b4f94fc6fcb96795b319685c2402d33a69878dd452dd8bb573ec45fb2c7890cefee63745f0db77258bd9b23cca0c8c61c5c07160fb2449829bf077e1bed EBUILD openrc-0.11.8.ebuild 16313 SHA256 d4b00e3e986de2b8d9f47d81a3ba735485243af2ae8425f7d29b52e3d1071e24 SHA512 e8dd911b0b2336486275a13238e2a1cbe2d4a84e6d96e405da9581ec67cb0aed50735ae61e79ce5d742a38756061386a0319835e4aa416543f3aed7ea7143fc5 WHIRLPOOL 55bf4ef9c4d95731f827dd23decd8cea10ce333693965e004f7f14c9309228f51936b9f61377966aae2cae04faeb4cf85ddb02d18e18bc90afdb757d8f069d45 EBUILD openrc-0.12.ebuild 10530 SHA256 0bf6ff4db45aa44f99071a17b4fe127e331d141b58c5346fe0e1a4401e1d6cb1 SHA512 f2714126bdf83976f482e1336de2d45c1f990810362691de0fd53852ace2095cdf5f99fb433f0c234583aacb6e09cce6011cd2a3eec3d09f00588c12f348fdab WHIRLPOOL b5efec3a2a9d0b8b38036b24ad880a58fd9e9afeb4170f5220ffa61543a6f08b7bc8943efcbb40af57063f4daa4eb7b6e9b2d140a0cfe2e1014eb756dbe27a79 -EBUILD openrc-9999.ebuild 9920 SHA256 de67b4893a65a509d6e2a873ad331f254874a5ab529bca0354fdc70f9446e836 SHA512 fcb43cd4cbc5643e39692b2dbf2b347ff3743eae2602d00b7ee20bf2d0f180dfeec836166e52bb499ada86d169a4056bb0265886881bd3e1355976f07bcf7282 WHIRLPOOL b5d1c5a14d922d46f7c8199e85027c41ca51851de201a7275cc08e8a66dd79c4981d8cb8b421485058bea6ff4ea9ea268c391b382dd373b1d92580ccf5d64918 -MISC ChangeLog 46854 SHA256 191a9a608867ebe3832450a1a998dfb48401de02979fb477c84d848d36ae1ff2 SHA512 7ecfd39eb0e32a727e9f9b8035a948b3f2585e8dc9d58a585b94f9fb9737e8536df10e527e60e2ddaf0c0ba9a367ced44692034e2a29c5de39b510a1804f29ec WHIRLPOOL ba3f2759ce4e6d72a0e541c2ed313fe40a588de193be38e1006e933f5b1bf118cfe3b002940202d2e9d01f8b747e009313487df78017473af5a8cb5014e028e5 +EBUILD openrc-9999.ebuild 10532 SHA256 96a6cb8952e9b4d670756a080982a016b21dfb07b396b8f1f219332811d2d44f SHA512 f76573bd4d582b069e16a2b61382ed105c8e13019d8e99903411a8e548e5418e2f63d65b079409312f1a529479e49a87a778e53f2e0d3f910ac1425bdb76526b WHIRLPOOL 051b851fbb5b4525937cba9a53e472afedb2ac55906ae8422fb19e5aa8acd65a81d6943c02c590fd284fce180c22a069218f6e4e6ca34ca1f3214c613a5b3264 +MISC ChangeLog 46945 SHA256 3016e84a48ae6ef86085a2b4750940eb656509bb5b8358556d6bee527564e308 SHA512 fcd4639c04ad82953efdf0ab2417d24a3e38cdae817de0cd94a71e2a9ec0c3e128327b053922c49af8971d0dcef3223002c2f3b40bafc798aa6feb24bbec0fdc WHIRLPOOL b7eb69446774218bda588e96fad05b9c6adcad80956d4b6983c21586727e49cb7c2347af6aefbbfff68c6d65f5e75d02edd7932f584aa477ae2e1da8ba88c97d MISC metadata.xml 373 SHA256 02f4a9ad32e00c6c046a55dd14949c4b5a3b9a8f5d4725aa07c698c107bbc1cf SHA512 80d1f2a14cddd37e7d8866ff556c753e631eca6239c0474f8a067bf387778e702a8d15152b1324744110b2f5972c2e2858eb195f8448001f322e19acc589e033 WHIRLPOOL 8a8176f52fd07682ee407923e956962ded7ce45f1b9b535e80b84195f6407954f504c44dc1b0f2cb2af8ed8a84a1e8b4cd5dc956163431c59bbc1f7785fb9151 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlIOa7cACgkQblQW9DDEZTi/qgCfc4UowVqubxT3Bg9qUdfF6OwP -kvMAn15eJBWp5IMMKFEv6w9Kf4UjobKZ -=n66j +iEYEAREIAAYFAlIObRgACgkQblQW9DDEZTiJRwCdHJ/tf9B+gf83XyfeBn5VZmUJ +wIgAnjUzsk9WAUNGlrEYUuzPWBgTvROT +=JDDm -----END PGP SIGNATURE----- diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index 8381ff9be88a..5498e13ea154 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.127 2013/08/16 17:39:21 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.128 2013/08/16 18:19:03 williamh Exp $ EAPI=5 @@ -208,6 +208,21 @@ pkg_preinst() { if ! has_version ">=sys-apps/openrc-0.12"; then add_boot_init loopback add_boot_init tmpfiles.dev sysinit + + # ensure existing /etc/conf.d/net is not removed + # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier + # this needs to stay in openrc ebuilds for a long time. :( + # Added in 0.12. + if [[ -f "${EROOT}"etc/conf.d/net ]]; then + einfo "Modifying conf.d/net to keep it from being removed" + cat <<-EOF >>"${EROOT}"etc/conf.d/net + +# The network scripts are now part of net-misc/netifrc +# In order to avoid sys-apps/${P} from removing this file, this comment was +# added; you can safely remove this comment. Please see +# /usr/share/doc/netifrc*/README* for more information. +EOF + fi fi } |