From: Aron Griffis Date: Sat, 23 Oct 2004 20:01:36 +0000 (+0000) Subject: Use rc-scripts-1.4.16-livecd.patch for baselayout-1.11.x until patch is applied to... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0cc8c91e07b72655144f66d0e7f2085c371c1279;p=gentoo.git Use rc-scripts-1.4.16-livecd.patch for baselayout-1.11.x until patch is applied to rc-scripts in cvs --- diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 0545d405ae27..f32735ab218d 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,14 @@ # ChangeLog for sys-apps/baselayout # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.183 2004/10/23 19:52:53 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.184 2004/10/23 20:01:36 agriffis Exp $ # See the gentoo-src rc-scripts ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup + 23 Oct 2004; Aron Griffis baselayout-1.11.3.ebuild: + Use rc-scripts-1.4.16-livecd.patch for baselayout-1.11.x until patch is + applied to rc-scripts in cvs + *baselayout-1.11.3 (23 Oct 2004) 23 Oct 2004; Aron Griffis diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 05cfb66606c2..ec79a6643b04 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -5,8 +5,8 @@ MD5 e732366f1c9633439cfa0ebc303897e0 baselayout-1.10.4.ebuild 15539 MD5 e8247bd1882a2f981e3c355deb8a57e8 baselayout-1.9.4-r4.ebuild 16536 MD5 bba5d1a312678f93f33f27da9eeee00c baselayout-1.9.4-r5.ebuild 16761 MD5 f518f7fdff8ec883cf0362a03be02165 baselayout-1.9.4-r6.ebuild 16812 -MD5 3855fee2fd03677ef519ab908170b9de baselayout-1.11.3.ebuild 16228 -MD5 3c0629d0c7a955cc3363b149860001d6 ChangeLog 41498 +MD5 3e2d1812aa48ac5cad31adc671994ce6 ChangeLog 41680 +MD5 f6b6111bdbe47fb32173e789c70a35f9 baselayout-1.11.3.ebuild 16335 MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443 MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206 MD5 ab3b5bbd5ce8a8b1386c834ff4a118b4 files/digest-baselayout-1.10.3 69 diff --git a/sys-apps/baselayout/baselayout-1.11.3.ebuild b/sys-apps/baselayout/baselayout-1.11.3.ebuild index f8d452163b29..5556dbe0f3e2 100644 --- a/sys-apps/baselayout/baselayout-1.11.3.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.3.ebuild,v 1.1 2004/10/23 19:52:53 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.3.ebuild,v 1.2 2004/10/23 20:01:36 agriffis Exp $ inherit flag-o-matic eutils @@ -31,6 +31,10 @@ DEPEND="virtual/os-headers" src_unpack() { unpack ${A} + # Patch that should go into rc-scripts-1.6.4 + cd ${S} + epatch ${FILESDIR}/rc-scripts-1.4.16-livecd.patch + # Fix Sparc specific stuff if [[ ${ARCH} == sparc ]]; then sed -i -e 's:KEYMAP="us":KEYMAP="sunkeymap":' ${S}/etc/rc.conf || die