summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2011-02-01 00:04:03 +0000
committerWilliam Hubbs <williamh@gentoo.org>2011-02-01 00:04:03 +0000
commitd1cd3de98d2162ee8962b87112d019f092245ff1 (patch)
treec3c33b7c1698d09216ac70b366a36aa495145cf1
parentscp-1.2.6 requires at least pygobject-2.21.5. Bug 352958, discovered by Kacpe... (diff)
downloadhistorical-d1cd3de98d2162ee8962b87112d019f092245ff1.tar.gz
historical-d1cd3de98d2162ee8962b87112d019f092245ff1.tar.bz2
historical-d1cd3de98d2162ee8962b87112d019f092245ff1.zip
remove a workaround for parallel build issues.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux i686
-rw-r--r--sys-apps/openrc/ChangeLog5
-rw-r--r--sys-apps/openrc/Manifest14
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild3
3 files changed, 7 insertions, 15 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 4d1e2b4b5a7c..0e4e313dba8e 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,9 @@
# 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.130 2011/01/23 15:09:51 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.131 2011/02/01 00:04:03 williamh Exp $
+
+ 31 Jan 2011; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Bug #289264 is fixed upstream, so remove the sed that worked around it.
23 Jan 2011; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
Fix the /etc/conf.d/local.{start,stop} migration from baselayout-1 to
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 64a4ef32ce39..75206b118269 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX openrc-9999-msg-style.patch 2775 RMD160 af958b2a8ed5ad29f25b53bad9a426cf7e173405 SHA1 251b8d0a52bb6e98d80a5213afc4d067583441fc SHA256 637fc2d13e0940b55b7d4613ebf8ebabdee87a802a2690191c01fd5ee7cb3581
AUX openrc-9999-pause.patch 825 RMD160 737615919d779894e990072a0ff026aeb4fc0a95 SHA1 c9c469d0bfb685a83d8a736467434b22eaf702cd SHA256 ffa34418921d30c589ad762a5d6d7640c37e7279ca19af469912cb9f118cc75d
AUX openrc.logrotate 71 RMD160 4e7370ca873bd917f16e2b8cfc4bc71accbf2353 SHA1 ef1f26020db432f96a1485f72a189b288ef6873b SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c
@@ -16,13 +13,6 @@ EBUILD openrc-0.6.6.ebuild 14186 RMD160 9f10f30212bc68891e4d27bfa03e6156e1012f64
EBUILD openrc-0.6.7.ebuild 14186 RMD160 3b418b00fc1f0367b1eac9a3cf25f8d8fba26d34 SHA1 72f3c7a35d7e294b5f0df41ad12217a05a960f92 SHA256 9a5facc1d685235e51a611b784c87fa6ad9a1aa2f2e8b5a8749e85e2c0d8908a
EBUILD openrc-0.6.8.ebuild 14186 RMD160 7eee5fa69add6020e41a1e21145d25eba307b94c SHA1 1768693f6a4413aa329f04002b9cddfcd453a095 SHA256 3b68e325cf9d1d79f453c822a9cc0ed7c726866b0a9f7714ef06a6d397f61475
EBUILD openrc-0.7.0.ebuild 14237 RMD160 542e5cd3ae6d064c04f82930fe1f39e34064f8fe SHA1 4212faba9a7741a69a96881d4eef40e4b782112a SHA256 28f69ab8df400048363b27e49c667ee12d6dea80164ea523eba889d28ad64540
-EBUILD openrc-9999.ebuild 13960 RMD160 c1cee11bfe66f99ada53b6048cc4b939a9f6208e SHA1 f6cfe1839cb0f31142a1f0bc2b699d440451c897 SHA256 f090585aa0f9e57e3ba5e2a036648825ca0eca796db008f804a8ca77e6938633
-MISC ChangeLog 25731 RMD160 d7f41db83ce8e806dee1e5e8cd18cb88e72979ed SHA1 62bc9290000e1c2838db931c098dcf498f35432f SHA256 fca9f1e0704aa04783106890f3990d62919d33e47ef6963f7d43b637efac9327
+EBUILD openrc-9999.ebuild 13906 RMD160 c806556609a8a201e8496e0661b3ed9c9aaa8421 SHA1 2a788176215033b396dc15f2a63ad51a539c0429 SHA256 8a037048ed51fe07ac8cc9d0528aa1856b6f0869eb22870d49ad59b47f78887b
+MISC ChangeLog 25881 RMD160 64b34b3bb6075f4551d309c49b3942d790edd2e9 SHA1 2fc01d728fa2cd6768c2d42e5832756d6a9eff5c SHA256 775ba01ef296431474973e7a47dc294524acfa9b3fa0ef4c08ade8493b6bf5ef
MISC metadata.xml 159 RMD160 b92bb52b0f2ee2c0ee08ac8b32f98c3521f9d480 SHA1 aac3cb897981c4918f5f2244d192b5bcc6727d36 SHA256 ca2e1a5ac106397eca5111140a1b07830e4d5dfacbeadba359fe17896c33a6c8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk08RMUACgkQV3J2n04EauwdBQCgnGqm5HSimAlqt0pQOJcXumA8
-RPEAnA2qc0jFvYrX8OCrwzmR4CyKr94T
-=Aunq
------END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 1f3a29866bfb..1322b2908b6b 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.75 2011/01/23 01:20:19 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.76 2011/02/01 00:04:03 williamh Exp $
EAPI="1"
@@ -66,7 +66,6 @@ src_unpack() {
cd "${S}"
sed -i 's:0444:0644:' mk/sys.mk
sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342
- sed -i '/^CFLAGS+=.*_CC_FLAGS_SH/d' mk/cc.mk #289264
# Allow user patches to be applied without modifying the ebuild
epatch_user