diff options
author | 2011-11-16 19:50:05 +0000 | |
---|---|---|
committer | 2011-11-16 19:50:05 +0000 | |
commit | e767779395cf34f9ba0c14dcfe5c7967a0117eb7 (patch) | |
tree | 2a6de1f1b019eab7180b5289dee9cb7999901629 /sys-apps/openrc | |
parent | Adjust dependency to avoid pulling in freerdp-1.0. (diff) | |
download | historical-e767779395cf34f9ba0c14dcfe5c7967a0117eb7.tar.gz historical-e767779395cf34f9ba0c14dcfe5c7967a0117eb7.tar.bz2 historical-e767779395cf34f9ba0c14dcfe5c7967a0117eb7.zip |
since oldnet is now the default upstream, we do not need to force this in the ebuild.
Package-Manager: portage-2.2.0_alpha74/cvs/Linux i686
Diffstat (limited to 'sys-apps/openrc')
-rw-r--r-- | sys-apps/openrc/ChangeLog | 6 | ||||
-rw-r--r-- | sys-apps/openrc/Manifest | 12 | ||||
-rw-r--r-- | sys-apps/openrc/openrc-9999.ebuild | 14 |
3 files changed, 14 insertions, 18 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index 379d52fab7ff..d9594b869057 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.172 2011/11/07 12:57:19 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.173 2011/11/16 19:50:05 williamh Exp $ + + 16 Nov 2011; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild: + Since oldnet is now the default upstream, we do not need to force this + in the ebuild. 07 Nov 2011; Alexis Ballier <aballier@gentoo.org> openrc-0.8.3-r1.ebuild, openrc-0.9.2.ebuild, openrc-0.9.3.ebuild, openrc-0.9.3-r1.ebuild, diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index fd80413d3438..50e1b0362f9c 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -16,13 +16,13 @@ EBUILD openrc-0.9.2.ebuild 14179 RMD160 3775f445228811986554186d2865effd79345344 EBUILD openrc-0.9.3-r1.ebuild 14192 RMD160 c897085d00542b34e416bd3e38f46c993edd24e8 SHA1 2c3189ecc608bab0f1c2818f29871970123edcaf SHA256 5d5f2a33188743d2739463693f56f47f0f2782652b61b78b3000afe4738f98b6 EBUILD openrc-0.9.3.ebuild 14179 RMD160 636683e3572c56c0e69020bbad2a704561596928 SHA1 38167d4fa5efebc8ee98cf475771c4efb4c48be5 SHA256 5104c6daa2bff6b474045d28841635ac8055dd78674c246ab6d594a7bcdb5876 EBUILD openrc-0.9.4.ebuild 14189 RMD160 9dbe1cd364ba859356de54bb42ec808c229431c8 SHA1 0eb3af0a3fd5ef94a257af85629e5f46cb4a4f52 SHA256 37d4e43fa55ecfd7ab6e330bfd52e0a90c38fc11f487c6204ef9ed86faa099ca -EBUILD openrc-9999.ebuild 14189 RMD160 3ba3890089e7fc6b2ede18e39e408526d40a979f SHA1 16757eeb91b5b7879613ebbf1b81acd3c9ac44a4 SHA256 4e23b3974ffb2af60e0891be31fd4e25b23ae5d1f7d1be4580d754d18b4d2b9d -MISC ChangeLog 31512 RMD160 1b9a4d92aa3cffbfd171f105bd4e6e0bd9608d5c SHA1 e92b21385172be81aeb5cea7b1cddef8e5e541a4 SHA256 ee5aad960300d4ea8f73d9b1be440a9ef2cbd7a3a8ba8a482a22a37a495121f0 +EBUILD openrc-9999.ebuild 13930 RMD160 a9a8ffb511a44bc6b0746d388ff976b5ffa46097 SHA1 d76496bdadb42dacdda3531cb014323065376a69 SHA256 5ab39c37543e56507a3ca134a1062f349e633abfd8164a659bf9604cf9f410b0 +MISC ChangeLog 31674 RMD160 3e1b5aa77db70a1fbc972ca68641d283c9154dac SHA1 f4abb6b2a61b7920f54f7ca9b88e60b0626aa5b6 SHA256 21efa102145295751ae77fa4e95ae05fd2126a5d9a1c51f08fae6ff4c93ec8d4 MISC metadata.xml 159 RMD160 b92bb52b0f2ee2c0ee08ac8b32f98c3521f9d480 SHA1 aac3cb897981c4918f5f2244d192b5bcc6727d36 SHA256 ca2e1a5ac106397eca5111140a1b07830e4d5dfacbeadba359fe17896c33a6c8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk631bUACgkQvFcC4BYPU0qJIgCfSTfe4fKX1aGxm6cbNHbv4jiL -P14AnR3XR5wjtn5n08e9TP2Hevi4Tlu4 -=qzRh +iEYEARECAAYFAk7EEugACgkQblQW9DDEZThowQCgp2G4F6u6SZJhpQyskAl4B6ju +lfQAnjZRwMCwGz32VqNAEE/eLFTbZHd2 +=bd1i -----END PGP SIGNATURE----- diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index a40fb8013cee..ab7fe7a61014 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.88 2011/11/07 12:57:19 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.89 2011/11/16 19:50:05 williamh Exp $ EAPI=4 @@ -36,7 +36,6 @@ make_args() { unset LIBDIR #266688 MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc" - MAKE_ARGS="${MAKE_ARGS} MKOLDNET=yes" local brand="Unknown" if use kernel_linux ; then @@ -95,9 +94,6 @@ src_install() { make_args emake ${MAKE_ARGS} DESTDIR="${D}" install - # install the readme for the new network scripts - dodoc README.newnet - # move the shared libs back to /usr so ldscript can install # more of a minimal set of files # disabled for now due to #270646 @@ -113,12 +109,8 @@ src_install() { cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die rm -rf "${D}"/etc/runlevels - # Stick with "old" net as the default for now - doconfd conf.d/net || die - pushd "${D}"/usr/share/${PN}/runlevels/boot > /dev/null - rm -f network staticroute - ln -s /etc/init.d/net.lo net.lo - popd > /dev/null + # Install the default net configuration + doconfd conf.d/net # Setup unicode defaults for silly unicode users set_config_yes_no /etc/rc.conf unicode use unicode |