diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-03-02 23:35:16 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-03-02 23:35:16 +0000 |
| commit | 287182d10521ce6d040bdd8332c7903749a4c7ce (patch) | |
| tree | 00aa1b9340cbe751979d315f2fd52bd73cf2796b | |
| parent | 2 compile fixes (mempolicy/NFS). Another USB EHCI boot fix. (diff) | |
| download | gentoo-2-287182d10521ce6d040bdd8332c7903749a4c7ce.tar.gz gentoo-2-287182d10521ce6d040bdd8332c7903749a4c7ce.tar.bz2 gentoo-2-287182d10521ce6d040bdd8332c7903749a4c7ce.zip | |
cvs headers - the bane of patches
(Portage version: 2.1_pre5-r2)
| -rw-r--r-- | sys-apps/baselayout/Manifest | 6 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch | 55 |
2 files changed, 20 insertions, 41 deletions
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 4ae0afeb0fb9..dbbeb697549d 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -16,9 +16,9 @@ SHA256 397221c066cbbb65d572df431b4babde766dc92d9177005e522e0df8faa25030 files/ba MD5 ec29ba4690f7c58a8d562195bc9eed42 files/baselayout-1.11.14-adsl.patch 501 RMD160 81db918f622eba2eef3f76e0441023998b367d3f files/baselayout-1.11.14-adsl.patch 501 SHA256 5634f36c4f27ddae7a4a22c6dc7b6adad5f83cdb5d9f4291ce061d62361a71c8 files/baselayout-1.11.14-adsl.patch 501 -MD5 08bc03119bcc983bc0d3ed981e014132 files/baselayout-1.11.14-depscan.patch 4105 -RMD160 ce5d8e4002a80008de3890cc0ab377dee9ba0835 files/baselayout-1.11.14-depscan.patch 4105 -SHA256 897d20710f0ff5c62b2116ac8b077b239db674284bfee3c95de891753412198d files/baselayout-1.11.14-depscan.patch 4105 +MD5 5651d7e5c42c69c9343cb156fc816f9d files/baselayout-1.11.14-depscan.patch 3198 +RMD160 75cf15798fe495f7928d0dac4a620f6b4308b4e5 files/baselayout-1.11.14-depscan.patch 3198 +SHA256 8baf535a28e952a251d729de9c88941849dcf1e0fc1de4fa6fa143a0cc5de12c files/baselayout-1.11.14-depscan.patch 3198 MD5 ab0d5a169769126f5c9d679a86244ee2 files/baselayout-1.11.14-essidnet.patch 619 RMD160 9cd29b7be10ef4c665be44a84c84df64fca8c64e files/baselayout-1.11.14-essidnet.patch 619 SHA256 2fdce59727910e4ae4f30aedc0d1ae32b852bfc9f740e049676104052900407b files/baselayout-1.11.14-essidnet.patch 619 diff --git a/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch b/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch index 8c532fd7a738..ea1573439aa8 100644 --- a/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch +++ b/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch @@ -1,15 +1,10 @@ --- sbin/depscan.sh 2005-07-22 01:24:27.000000000 +0100 -+++ sbin/depscan.sh 2006-03-02 20:28:03.000000000 +0000 -@@ -1,58 +1,64 @@ - #!/bin/bash - # Copyright 1999-2004 Gentoo Foundation - # Distributed under the terms of the GNU General Public License v2 --# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch,v 1.3 2006/03/02 22:27:16 uberlord Exp $ - --source /etc/init.d/functions.sh -- ++++ sbin/depscan.sh 2006-03-02 23:31:55.000000000 +0000 +@@ -5,54 +5,62 @@ + + source /etc/init.d/functions.sh + -if [[ $1 == "--debug" ]] ; then -+. /sbin/functions.sh +mysvcdir="${svcdir}" +update=false + @@ -96,7 +91,7 @@ DEPTYPES="${deptypes}" ORDTYPES="${ordtypes}" -@@ -65,17 +71,17 @@ +@@ -65,17 +73,17 @@ -f /lib/rcscripts/awk/cachedepends.awk || \ retval=1 @@ -117,33 +112,6 @@ - # vim:ts=4 ---- sbin/rc 2006-03-02 22:10:56.000000000 +0000 -+++ sbin/rc 2006-03-02 20:28:03.000000000 +0000 -@@ -1,5 +1,5 @@ - #!/bin/bash --# Copyright 1999-2005 Gentoo Foundation -+# Copyright 1999-2006 Gentoo Foundation - # Distributed under the terms of the GNU General Public License v2 - # $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch,v 1.3 2006/03/02 22:27:16 uberlord Exp $ - -@@ -111,7 +111,7 @@ - - echo - echo -e "${GOOD}Gentoo Linux${GENTOO_VERS}; ${BRACKET}http://www.gentoo.org/${NORMAL}" -- echo -e " Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2" -+ echo -e " Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2" - echo - - check_statedir /proc -@@ -407,7 +407,7 @@ - grep -ve '\(depcache\|deptree\|envcache\)') - - # Update the dependency cache -- /sbin/depscan.sh -u -+ /sbin/depscan.sh - - # Now that the dependency cache are up to date, make sure these - # are marked as started ... --- sbin/rc-services.sh 2005-03-08 16:07:30.000000000 +0000 +++ sbin/rc-services.sh 2006-03-02 20:28:03.000000000 +0000 @@ -10,7 +10,7 @@ @@ -155,3 +123,14 @@ then echo eerror "Error running '/sbin/depscan.sh'!" +--- sbin/rc 2006-03-02 23:22:31.000000000 +0000 ++++ sbin/rc 2006-03-02 20:28:03.000000000 +0000 +@@ -407,7 +407,7 @@ + grep -ve '\(depcache\|deptree\|envcache\)') + + # Update the dependency cache +- /sbin/depscan.sh -u ++ /sbin/depscan.sh + + # Now that the dependency cache are up to date, make sure these + # are marked as started ... |