diff options
| -rw-r--r-- | sys-apps/baselayout/Manifest | 20 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.8.5.9.ebuild | 56 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.8.6.10.ebuild | 62 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.8.6.7.ebuild | 62 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild | 62 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.8.6.9.ebuild | 62 | ||||
| -rw-r--r-- | sys-apps/thinkpad/Manifest | 12 | ||||
| -rw-r--r-- | sys-apps/thinkpad/thinkpad-3.2.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/thinkpad/thinkpad-4.1.ebuild | 4 |
9 files changed, 172 insertions, 172 deletions
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 239e55796d0e..8764c5c5c5af 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,18 +1,18 @@ MD5 b6bbdace64d7da5d897ffbc25cbd4830 ChangeLog 16748 -MD5 530e50a1287b13a52e09c55923240bec baselayout-1.8.5.9.ebuild 15850 -MD5 bf3d6f0b7b7e5932b2763ea57d5f2d4c baselayout-1.8.6.8-r1.ebuild 19337 -MD5 83fb1b27df184a7cac623962108c100a baselayout-1.8.6.9.ebuild 19490 -MD5 bcc081b6b849250517765ea65575bfcb baselayout-1.8.6.10.ebuild 19699 -MD5 a5b994bf404b03ce30025b88f4950e9f baselayout-1.8.6.7.ebuild 19407 +MD5 2f1a9af14be831867f613fa87a3e7619 baselayout-1.8.6.8-r1.ebuild 19291 +MD5 9ca41f1296313d231fd8741d1eb2a64a baselayout-1.8.6.9.ebuild 19444 +MD5 2e75b23c792c33416ac9a6bed7941342 baselayout-1.8.5.9.ebuild 15726 +MD5 7b2055a0e4c53449ce2a09abc2e7042f baselayout-1.8.6.7.ebuild 19361 +MD5 b05ce315576f426a1d221d12e73fce52 baselayout-1.8.6.10.ebuild 19653 MD5 520c7779777130658aa2c770de34ab4b files/MAKEDEV.8 9397 -MD5 e052f896b2ab38e3b7804083c2e182c7 files/rc-scripts-1.4.3.7.tar.bz2 94779 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099 +MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.5.9 64 +MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.8-r1 64 MD5 a0bbfe8eed08e0f2faced365b96e3bad files/rc-scripts-1.4.3.8p1.tar.bz2 95476 -MD5 de825b9fbc2c09563bb2313a70937c4a files/rc-scripts-1.4.3.9.tar.bz2 95334 MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.9 64 MD5 963a1c8eb93fbf75d215a832b039c65a files/rc-scripts-1.4.2.9.tar.bz2 78886 -MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.8-r1 64 -MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.10 64 +MD5 de825b9fbc2c09563bb2313a70937c4a files/rc-scripts-1.4.3.9.tar.bz2 95334 MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.7 64 -MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.5.9 64 +MD5 e052f896b2ab38e3b7804083c2e182c7 files/rc-scripts-1.4.3.7.tar.bz2 94779 +MD5 76a07c8f9b30bd607a50b2b3eba0ebd8 files/digest-baselayout-1.8.6.10 64 MD5 e7fd4d0be4e6479a39c879f92549e9da files/rc-scripts-1.4.3.10.tar.bz2 97872 diff --git a/sys-apps/baselayout/baselayout-1.8.5.9.ebuild b/sys-apps/baselayout/baselayout-1.8.5.9.ebuild index 77cdf0fa3653..d46f1886b5d4 100644 --- a/sys-apps/baselayout/baselayout-1.8.5.9.ebuild +++ b/sys-apps/baselayout/baselayout-1.8.5.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.5.9.ebuild,v 1.5 2003/07/23 21:39:13 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.5.9.ebuild,v 1.6 2003/09/07 00:50:54 msterret Exp $ IUSE="bootstrap build" @@ -33,7 +33,7 @@ RDEPEND="${DEPEND} # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" # or "build" are in USE. - + # This ebuild needs to be merged "live". You can't simply make a package # of it and merge it later. @@ -77,7 +77,7 @@ src_unpack() { sed -e 's:PROGS\t= init halt shutdown killall5 runlevel sulogin:PROGS\t= init halt shutdown killall5 runlevel:g' \ Makefile.orig > Makefile || die fi - + # Fix Sparc specific stuff if [ "${ARCH}" = "sparc" ] then @@ -93,14 +93,14 @@ src_unpack() { fi # Fix mips specific stuff - if [ "${ARCH}" = "mips" ] - then - cd ${S}/etc - cp inittab inittab.orig - sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \ - inittab.orig > inittab || die - rm -f inittab.orig - fi + if [ "${ARCH}" = "mips" ] + then + cd ${S}/etc + cp inittab inittab.orig + sed -e 's"# TERMINALS"# SERIAL CONSOLE\nc0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100\n\n# TERMINALS"' \ + inittab.orig > inittab || die + rm -f inittab.orig + fi } src_compile() { @@ -190,11 +190,11 @@ src_install() { keepdir /home keepdir /usr/include /usr/src /usr/portage keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib - + dosym ../X11R6/include/X11 /usr/include/X11 dosym ../X11R6/include/GL /usr/include/GL dosym ../X11R6/lib/X11 /usr/lib/X11 - + #dosym ../src/linux/include/linux /usr/include/linux #dosym ../src/linux/include/asm-i386 /usr/include/asm # Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes. @@ -210,8 +210,8 @@ src_install() { keepdir /usr/local/${foo} done # Local FHS compat symlinks - dosym share/man /usr/local/man - dosym share/doc /usr/local/doc + dosym share/man /usr/local/man + dosym share/doc /usr/local/doc # FHS compatibility symlinks stuff dosym share/man /usr/man @@ -220,7 +220,7 @@ src_install() { keepdir /usr/X11R6/share dosym ../../share/info /usr/X11R6/share/info # End FHS compatibility symlinks stuff - + for foo in doman ${FILESDIR}/MAKEDEV.8 ${S}/man/* do [ -f ${foo} ] && doman ${foo} @@ -235,18 +235,18 @@ src_install() { #install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/control #install -d -m0750 -o root -g wheel ${D}/var/lib/supervise/services # End supervise stuff - + keepdir /opt # The .keep file messes up Portage when looking in /var/db/pkg - dodir /var/db/pkg + dodir /var/db/pkg keepdir /var/spool /var/tmp /var/lib/misc chmod 1777 ${D}/var/tmp keepdir /root - + # /proc is very likely mounted right now so a keepdir will fail on merge - dodir /proc - + dodir /proc + chmod go-rx ${D}/root keepdir /tmp /var/lock chmod 1777 ${D}/tmp @@ -285,7 +285,7 @@ src_install() { keepdir /dev keepdir /dev/pts /dev/shm dosym /usr/sbin/MAKEDEV /dev/MAKEDEV - fi + fi cd ${S}/sbin into / @@ -316,7 +316,7 @@ src_install() { doins ${S}/etc/env.d/00basic keepdir /etc/devfs.d - + keepdir /etc/modules.d insinto /etc/modules.d doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386 @@ -387,7 +387,7 @@ src_install() { # Skip this if we are merging to ROOT [ "${ROOT}" = "/" ] && return 0 - + # Set up default runlevel symlinks local bar="" for foo in default boot nonetwork single @@ -443,7 +443,7 @@ pkg_postinst() { cd ${ROOT}/dev # These devices are also needed by many people and should be included einfo "Making device nodes (this could take a minute or so...)" - + case ${ARCH} in x86) einfo "Using generic-i386 to make device nodes..." @@ -466,10 +466,10 @@ pkg_postinst() { ${ROOT}/usr/sbin/MAKEDEV generic-i386 ;; esac - + ${ROOT}/usr/sbin/MAKEDEV sg ${ROOT}/usr/sbin/MAKEDEV scd - ${ROOT}/usr/sbin/MAKEDEV rtc + ${ROOT}/usr/sbin/MAKEDEV rtc ${ROOT}/usr/sbin/MAKEDEV audio ${ROOT}/usr/sbin/MAKEDEV hde ${ROOT}/usr/sbin/MAKEDEV hdf @@ -511,7 +511,7 @@ EOF chgrp utmp ${ROOT}/var/${x} chmod 0664 ${ROOT}/var/${x} done - + # Handle the ${svcdir} that changed in location if [ ! -d ${ROOT}/${svcdir}/started/ ] && \ diff --git a/sys-apps/baselayout/baselayout-1.8.6.10.ebuild b/sys-apps/baselayout/baselayout-1.8.6.10.ebuild index c0d0b3f68541..975ba71fe0cf 100644 --- a/sys-apps/baselayout/baselayout-1.8.6.10.ebuild +++ b/sys-apps/baselayout/baselayout-1.8.6.10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. +# Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.10.ebuild,v 1.1 2003/08/04 21:46:43 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.10.ebuild,v 1.2 2003/09/07 00:50:55 msterret Exp $ # This ebuild needs to be merged "live". You can't simply make a package # of it and merge it later. @@ -40,7 +40,7 @@ RDEPEND="${DEPEND} # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" # or "build" are in USE. - + src_unpack() { unpack sysvinit-${SVIV}.tar.gz @@ -62,7 +62,7 @@ src_unpack() { fi cd ${S}/etc - + # Fix Sparc specific stuff if [ "${ARCH}" = "sparc" ] then @@ -115,7 +115,7 @@ src_compile() { if [ -z "`use bootstrap`" ] then - # We let gawk now install filefuncs.so, and that is as a symlink to a + # We let gawk now install filefuncs.so, and that is as a symlink to a # versioned .so ... if [ -f /usr/include/awk/awk.h -a ! -L ${ROOT}/lib/rcscripts/filefuncs.so ] then @@ -127,7 +127,7 @@ src_compile() { # eerror "sys-apps/gawk-3.1.1-r1 or later installed" # die "problem compiling gawk module" # } - + eerror "Please install sys-apps/gawk-3.1.1-r2 or later!" die "gawk too old" fi @@ -164,7 +164,7 @@ keepdir_mount() { for y in $* do doit=0 - + for x in $(gawk '{print $2}' /proc/mounts) do [ "${x}" = "${y}" ] && doit=1 @@ -208,11 +208,11 @@ src_install() { keepdir /usr/include /usr/src keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share - + # If it already exist, do not recreate, else we get # problems when /usr/portage mounted as ro NFS, etc. keepdir_mount /usr/portage - + #dosym ../src/linux/include/linux /usr/include/linux #dosym ../src/linux/include/asm-i386 /usr/include/asm # Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes. @@ -228,27 +228,27 @@ src_install() { keepdir /usr/local/${foo} done # Local FHS compat symlinks - dosym share/man /usr/local/man - dosym share/doc /usr/local/doc + dosym share/man /usr/local/man + dosym share/doc /usr/local/doc # FHS compatibility symlinks stuff dosym share/man /usr/man dosym share/doc /usr/doc dosym share/info /usr/info dosym ../../share/info /usr/X11R6/share/info - dosym ../X11R6/include/X11 /usr/include/X11 - dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/lib/X11 /usr/lib/X11 + dosym ../X11R6/include/X11 /usr/include/X11 + dosym ../X11R6/include/GL /usr/include/GL + dosym ../X11R6/lib/X11 /usr/lib/X11 # End FHS compatibility symlinks stuff # The .keep file messes up Portage when looking in /var/db/pkg - dodir /var/db/pkg + dodir /var/db/pkg chmod 1777 ${D}/var/tmp keepdir /root - + # /proc is very likely mounted right now so a keepdir will fail on merge - dodir /proc - + dodir /proc + chmod go-rx ${D}/root keepdir /tmp /var/lock chmod 1777 ${D}/tmp @@ -289,7 +289,7 @@ src_install() { keepdir /dev keepdir /dev/pts /dev/shm dosym ../sbin/MAKEDEV /dev/MAKEDEV - fi + fi cd ${S}/sbin into / @@ -372,11 +372,11 @@ src_install() { docinto sysvinit-${SVIV} dodoc COPYRIGHT README doc/* fi - + for foo in ${S}/man/* do [ -f ${foo} ] && doman ${foo} - done + done docinto / dodoc ${FILESDIR}/copyright dodoc ${S}/ChangeLog @@ -394,7 +394,7 @@ src_install() { do [ -f ${foo} ] && doins ${foo} done - + keepdir /etc/modules.d insinto /etc/modules.d doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386 @@ -407,7 +407,7 @@ src_install() { done # Now ships with net-dialup/ppp ... - rm -f ${D}/etc/{conf,init}.d/net.ppp* + rm -f ${D}/etc/{conf,init}.d/net.ppp* dodir /etc/skel insinto /etc/skel @@ -420,7 +420,7 @@ src_install() { # Skip this if we are merging to ROOT [ "${ROOT}" = "/" ] && return 0 - + # Set up default runlevel symlinks for foo in default boot nonetwork single do @@ -469,7 +469,7 @@ pkg_preinst() { ${ROOT}/etc/modules.autoload.d/kernel-2.4 ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload fi - + # Make sure user get things updated first time he merge 1.8.6 ... if [ -f "${WORKDIR}/update_init_d" ] then @@ -504,7 +504,7 @@ pkg_postinst() { cd ${ROOT}/dev # These devices are also needed by many people and should be included einfo "Making device nodes (this could take a minute or so...)" - + case ${ARCH} in x86) einfo "Using generic-i386 to make device nodes..." @@ -535,10 +535,10 @@ pkg_postinst() { ${ROOT}/sbin/MAKEDEV generic ;; esac - + ${ROOT}/sbin/MAKEDEV sg ${ROOT}/sbin/MAKEDEV scd - ${ROOT}/sbin/MAKEDEV rtc + ${ROOT}/sbin/MAKEDEV rtc ${ROOT}/sbin/MAKEDEV audio ${ROOT}/sbin/MAKEDEV hde ${ROOT}/sbin/MAKEDEV hdf @@ -616,7 +616,7 @@ EOF cp -f "${S}/${rcconfd}" "${ROOT}/${rcconfd}" fi - # Replace and backup /etc/inittab (unless already in new format) + # Replace and backup /etc/inittab (unless already in new format) if [ -f "${ROOT}/${inittab}" ] && \ [ -z "$(grep '^si::sysinit:/sbin/rc sysinit' "${ROOT}/${inittab}")" ] then @@ -639,7 +639,7 @@ EOF if [ -d "${ROOT}/${oldsvcdir}/started" ] then cp -ax "${ROOT}/${oldsvcdir}"/* "${ROOT}/${svcdir}" - + elif [ -d "${ROOT}/mnt/.init.d/started" ] then cp -ax "${ROOT}/mnt/.init.d"/* "${ROOT}/${svcdir}" @@ -686,7 +686,7 @@ EOF echo ewarn " # etc-update" echo - + if [ -f "${ROOT}/etc/env.d/99foo" ] then echo diff --git a/sys-apps/baselayout/baselayout-1.8.6.7.ebuild b/sys-apps/baselayout/baselayout-1.8.6.7.ebuild index 4fd8b4ff0baa..53663f3469b9 100644 --- a/sys-apps/baselayout/baselayout-1.8.6.7.ebuild +++ b/sys-apps/baselayout/baselayout-1.8.6.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. +# Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.7.ebuild,v 1.5 2003/07/23 21:39:13 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.7.ebuild,v 1.6 2003/09/07 00:50:55 msterret Exp $ # This ebuild needs to be merged "live". You can't simply make a package # of it and merge it later. @@ -36,7 +36,7 @@ RDEPEND="${DEPEND} # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" # or "build" are in USE. - + src_unpack() { unpack sysvinit-${SVIV}.tar.gz @@ -58,7 +58,7 @@ src_unpack() { fi cd ${S}/etc - + # Fix Sparc specific stuff if [ "${ARCH}" = "sparc" ] then @@ -111,7 +111,7 @@ src_compile() { if [ -z "`use bootstrap`" ] then - # We let gawk now install filefuncs.so, and that is as a symlink to a + # We let gawk now install filefuncs.so, and that is as a symlink to a # versioned .so ... if [ -f /usr/include/awk/awk.h -a ! -L ${ROOT}/lib/rcscripts/filefuncs.so ] then @@ -123,7 +123,7 @@ src_compile() { # eerror "sys-apps/gawk-3.1.1-r1 or later installed" # die "problem compiling gawk module" # } - + eerror "Please install sys-apps/gawk-3.1.1-r2 or later!" die "gawk too old" fi @@ -160,7 +160,7 @@ keepdir_mount() { for y in $* do doit=0 - + for x in $(gawk '{print $2}' /proc/mounts) do [ "${x}" = "${y}" ] && doit=1 @@ -204,11 +204,11 @@ src_install() { keepdir /usr/include /usr/src keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share - + # If it already exist, do not recreate, else we get # problems when /usr/portage mounted as ro NFS, etc. keepdir_mount /usr/portage - + #dosym ../src/linux/include/linux /usr/include/linux #dosym ../src/linux/include/asm-i386 /usr/include/asm # Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes. @@ -224,27 +224,27 @@ src_install() { keepdir /usr/local/${foo} done # Local FHS compat symlinks - dosym share/man /usr/local/man - dosym share/doc /usr/local/doc + dosym share/man /usr/local/man + dosym share/doc /usr/local/doc # FHS compatibility symlinks stuff dosym share/man /usr/man dosym share/doc /usr/doc dosym share/info /usr/info dosym ../../share/info /usr/X11R6/share/info - dosym ../X11R6/include/X11 /usr/include/X11 - dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/lib/X11 /usr/lib/X11 + dosym ../X11R6/include/X11 /usr/include/X11 + dosym ../X11R6/include/GL /usr/include/GL + dosym ../X11R6/lib/X11 /usr/lib/X11 # End FHS compatibility symlinks stuff # The .keep file messes up Portage when looking in /var/db/pkg - dodir /var/db/pkg + dodir /var/db/pkg chmod 1777 ${D}/var/tmp keepdir /root - + # /proc is very likely mounted right now so a keepdir will fail on merge - dodir /proc - + dodir /proc + chmod go-rx ${D}/root keepdir /tmp /var/lock chmod 1777 ${D}/tmp @@ -285,7 +285,7 @@ src_install() { keepdir /dev keepdir /dev/pts /dev/shm dosym ../sbin/MAKEDEV /dev/MAKEDEV - fi + fi cd ${S}/sbin into / @@ -368,11 +368,11 @@ src_install() { docinto sysvinit-${SVIV} dodoc COPYRIGHT README doc/* fi - + for foo in ${S}/man/* do [ -f ${foo} ] && doman ${foo} - done + done docinto / dodoc ${FILESDIR}/copyright dodoc ${S}/ChangeLog @@ -390,7 +390,7 @@ src_install() { do [ -f ${foo} ] && doins ${foo} done - + keepdir /etc/modules.d insinto /etc/modules.d doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386 @@ -403,7 +403,7 @@ src_install() { done # Now ships with net-dialup/ppp ... - rm -f ${D}/etc/{conf,init}.d/net.ppp* + rm -f ${D}/etc/{conf,init}.d/net.ppp* dodir /etc/skel insinto /etc/skel @@ -416,7 +416,7 @@ src_install() { # Skip this if we are merging to ROOT [ "${ROOT}" = "/" ] && return 0 - + # Set up default runlevel symlinks for foo in default boot nonetwork single do @@ -465,7 +465,7 @@ pkg_preinst() { ${ROOT}/etc/modules.autoload.d/kernel-2.4 ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload fi - + # Make sure user get things updated first time he merge 1.8.6 ... if [ -f "${WORKDIR}/update_init_d" ] then @@ -500,7 +500,7 @@ pkg_postinst() { cd ${ROOT}/dev # These devices are also needed by many people and should be included einfo "Making device nodes (this could take a minute or so...)" - + case ${ARCH} in x86) einfo "Using generic-i386 to make device nodes..." @@ -531,10 +531,10 @@ pkg_postinst() { ${ROOT}/sbin/MAKEDEV generic ;; esac - + ${ROOT}/sbin/MAKEDEV sg ${ROOT}/sbin/MAKEDEV scd - ${ROOT}/sbin/MAKEDEV rtc + ${ROOT}/sbin/MAKEDEV rtc ${ROOT}/sbin/MAKEDEV audio ${ROOT}/sbin/MAKEDEV hde ${ROOT}/sbin/MAKEDEV hdf @@ -605,7 +605,7 @@ EOF cp -f "${S}/${rcconfd}" "${ROOT}/${rcconfd}" fi - # Replace and backup /etc/inittab (unless already in new format) + # Replace and backup /etc/inittab (unless already in new format) if [ -f "${ROOT}/${inittab}" ] && \ [ -z "$(grep '^si::sysinit:/sbin/rc sysinit' "${ROOT}/${inittab}")" ] then @@ -628,7 +628,7 @@ EOF if [ -d "${ROOT}/${oldsvcdir}/started" ] then cp -ax "${ROOT}/${oldsvcdir}"/* "${ROOT}/${svcdir}" - + elif [ -d "${ROOT}/mnt/.init.d/started" ] then cp -ax "${ROOT}/mnt/.init.d"/* "${ROOT}/${svcdir}" @@ -675,7 +675,7 @@ EOF echo ewarn " # etc-update" echo - + if [ -f "${ROOT}/etc/env.d/99foo" ] then echo diff --git a/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild index b0031908d498..cc18fa8ff775 100644 --- a/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild +++ b/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. +# Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild,v 1.10 2003/08/03 19:04:25 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.8-r1.ebuild,v 1.11 2003/09/07 00:50:55 msterret Exp $ # This ebuild needs to be merged "live". You can't simply make a package # of it and merge it later. @@ -36,7 +36,7 @@ RDEPEND="${DEPEND} # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" # or "build" are in USE. - + src_unpack() { unpack sysvinit-${SVIV}.tar.gz @@ -58,7 +58,7 @@ src_unpack() { fi cd ${S}/etc - + # Fix Sparc specific stuff if [ "${ARCH}" = "sparc" ] then @@ -111,7 +111,7 @@ src_compile() { if [ -z "`use bootstrap`" ] then - # We let gawk now install filefuncs.so, and that is as a symlink to a + # We let gawk now install filefuncs.so, and that is as a symlink to a # versioned .so ... if [ -f /usr/include/awk/awk.h -a ! -L ${ROOT}/lib/rcscripts/filefuncs.so ] then @@ -123,7 +123,7 @@ src_compile() { # eerror "sys-apps/gawk-3.1.1-r1 or later installed" # die "problem compiling gawk module" # } - + eerror "Please install sys-apps/gawk-3.1.1-r2 or later!" die "gawk too old" fi @@ -160,7 +160,7 @@ keepdir_mount() { for y in $* do doit=0 - + for x in $(gawk '{print $2}' /proc/mounts) do [ "${x}" = "${y}" ] && doit=1 @@ -204,11 +204,11 @@ src_install() { keepdir /usr/include /usr/src keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share - + # If it already exist, do not recreate, else we get # problems when /usr/portage mounted as ro NFS, etc. keepdir_mount /usr/portage - + #dosym ../src/linux/include/linux /usr/include/linux #dosym ../src/linux/include/asm-i386 /usr/include/asm # Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes. @@ -224,27 +224,27 @@ src_install() { keepdir /usr/local/${foo} done # Local FHS compat symlinks - dosym share/man /usr/local/man - dosym share/doc /usr/local/doc + dosym share/man /usr/local/man + dosym share/doc /usr/local/doc # FHS compatibility symlinks stuff dosym share/man /usr/man dosym share/doc /usr/doc dosym share/info /usr/info dosym ../../share/info /usr/X11R6/share/info - dosym ../X11R6/include/X11 /usr/include/X11 - dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/lib/X11 /usr/lib/X11 + dosym ../X11R6/include/X11 /usr/include/X11 + dosym ../X11R6/include/GL /usr/include/GL + dosym ../X11R6/lib/X11 /usr/lib/X11 # End FHS compatibility symlinks stuff # The .keep file messes up Portage when looking in /var/db/pkg - dodir /var/db/pkg + dodir /var/db/pkg chmod 1777 ${D}/var/tmp keepdir /root - + # /proc is very likely mounted right now so a keepdir will fail on merge - dodir /proc - + dodir /proc + chmod go-rx ${D}/root keepdir /tmp /var/lock chmod 1777 ${D}/tmp @@ -285,7 +285,7 @@ src_install() { keepdir /dev keepdir /dev/pts /dev/shm dosym ../sbin/MAKEDEV /dev/MAKEDEV - fi + fi cd ${S}/sbin into / @@ -366,11 +366,11 @@ src_install() { docinto sysvinit-${SVIV} dodoc COPYRIGHT README doc/* fi - + for foo in ${S}/man/* do [ -f ${foo} ] && doman ${foo} - done + done docinto / dodoc ${FILESDIR}/copyright dodoc ${S}/ChangeLog @@ -388,7 +388,7 @@ src_install() { do [ -f ${foo} ] && doins ${foo} done - + keepdir /etc/modules.d insinto /etc/modules.d doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386 @@ -401,7 +401,7 @@ src_install() { done # Now ships with net-dialup/ppp ... - rm -f ${D}/etc/{conf,init}.d/net.ppp* + rm -f ${D}/etc/{conf,init}.d/net.ppp* dodir /etc/skel insinto /etc/skel @@ -414,7 +414,7 @@ src_install() { # Skip this if we are merging to ROOT [ "${ROOT}" = "/" ] && return 0 - + # Set up default runlevel symlinks for foo in default boot nonetwork single do @@ -463,7 +463,7 @@ pkg_preinst() { ${ROOT}/etc/modules.autoload.d/kernel-2.4 ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload fi - + # Make sure user get things updated first time he merge 1.8.6 ... if [ -f "${WORKDIR}/update_init_d" ] then @@ -498,7 +498,7 @@ pkg_postinst() { cd ${ROOT}/dev # These devices are also needed by many people and should be included einfo "Making device nodes (this could take a minute or so...)" - + case ${ARCH} in x86) einfo "Using generic-i386 to make device nodes..." @@ -529,10 +529,10 @@ pkg_postinst() { ${ROOT}/sbin/MAKEDEV generic ;; esac - + ${ROOT}/sbin/MAKEDEV sg ${ROOT}/sbin/MAKEDEV scd - ${ROOT}/sbin/MAKEDEV rtc + ${ROOT}/sbin/MAKEDEV rtc ${ROOT}/sbin/MAKEDEV audio ${ROOT}/sbin/MAKEDEV hde ${ROOT}/sbin/MAKEDEV hdf @@ -603,7 +603,7 @@ EOF cp -f "${S}/${rcconfd}" "${ROOT}/${rcconfd}" fi - # Replace and backup /etc/inittab (unless already in new format) + # Replace and backup /etc/inittab (unless already in new format) if [ -f "${ROOT}/${inittab}" ] && \ [ -z "$(grep '^si::sysinit:/sbin/rc sysinit' "${ROOT}/${inittab}")" ] then @@ -626,7 +626,7 @@ EOF if [ -d "${ROOT}/${oldsvcdir}/started" ] then cp -ax "${ROOT}/${oldsvcdir}"/* "${ROOT}/${svcdir}" - + elif [ -d "${ROOT}/mnt/.init.d/started" ] then cp -ax "${ROOT}/mnt/.init.d"/* "${ROOT}/${svcdir}" @@ -673,7 +673,7 @@ EOF echo ewarn " # etc-update" echo - + if [ -f "${ROOT}/etc/env.d/99foo" ] then echo diff --git a/sys-apps/baselayout/baselayout-1.8.6.9.ebuild b/sys-apps/baselayout/baselayout-1.8.6.9.ebuild index ef0e5dc9c3d2..4d59a973f2bd 100644 --- a/sys-apps/baselayout/baselayout-1.8.6.9.ebuild +++ b/sys-apps/baselayout/baselayout-1.8.6.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. +# Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.9.ebuild,v 1.2 2003/07/23 21:39:13 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.9.ebuild,v 1.3 2003/09/07 00:50:55 msterret Exp $ # This ebuild needs to be merged "live". You can't simply make a package # of it and merge it later. @@ -40,7 +40,7 @@ RDEPEND="${DEPEND} # This version of baselayout needs gawk in /bin, but as we do not have # a c++ compiler during bootstrap, we cannot depend on it if "bootstrap" # or "build" are in USE. - + src_unpack() { unpack sysvinit-${SVIV}.tar.gz @@ -62,7 +62,7 @@ src_unpack() { fi cd ${S}/etc - + # Fix Sparc specific stuff if [ "${ARCH}" = "sparc" ] then @@ -115,7 +115,7 @@ src_compile() { if [ -z "`use bootstrap`" ] then - # We let gawk now install filefuncs.so, and that is as a symlink to a + # We let gawk now install filefuncs.so, and that is as a symlink to a # versioned .so ... if [ -f /usr/include/awk/awk.h -a ! -L ${ROOT}/lib/rcscripts/filefuncs.so ] then @@ -127,7 +127,7 @@ src_compile() { # eerror "sys-apps/gawk-3.1.1-r1 or later installed" # die "problem compiling gawk module" # } - + eerror "Please install sys-apps/gawk-3.1.1-r2 or later!" die "gawk too old" fi @@ -164,7 +164,7 @@ keepdir_mount() { for y in $* do doit=0 - + for x in $(gawk '{print $2}' /proc/mounts) do [ "${x}" = "${y}" ] && doit=1 @@ -208,11 +208,11 @@ src_install() { keepdir /usr/include /usr/src keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib keepdir /usr/X11R6/lib /usr/X11R6/man /usr/X11R6/share - + # If it already exist, do not recreate, else we get # problems when /usr/portage mounted as ro NFS, etc. keepdir_mount /usr/portage - + #dosym ../src/linux/include/linux /usr/include/linux #dosym ../src/linux/include/asm-i386 /usr/include/asm # Important note: Gentoo Linux 1.0_rc6 no longer uses symlinks to /usr/src for includes. @@ -228,27 +228,27 @@ src_install() { keepdir /usr/local/${foo} done # Local FHS compat symlinks - dosym share/man /usr/local/man - dosym share/doc /usr/local/doc + dosym share/man /usr/local/man + dosym share/doc /usr/local/doc # FHS compatibility symlinks stuff dosym share/man /usr/man dosym share/doc /usr/doc dosym share/info /usr/info dosym ../../share/info /usr/X11R6/share/info - dosym ../X11R6/include/X11 /usr/include/X11 - dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/lib/X11 /usr/lib/X11 + dosym ../X11R6/include/X11 /usr/include/X11 + dosym ../X11R6/include/GL /usr/include/GL + dosym ../X11R6/lib/X11 /usr/lib/X11 # End FHS compatibility symlinks stuff # The .keep file messes up Portage when looking in /var/db/pkg - dodir /var/db/pkg + dodir /var/db/pkg chmod 1777 ${D}/var/tmp keepdir /root - + # /proc is very likely mounted right now so a keepdir will fail on merge - dodir /proc - + dodir /proc + chmod go-rx ${D}/root keepdir /tmp /var/lock chmod 1777 ${D}/tmp @@ -289,7 +289,7 @@ src_install() { keepdir /dev keepdir /dev/pts /dev/shm dosym ../sbin/MAKEDEV /dev/MAKEDEV - fi + fi cd ${S}/sbin into / @@ -370,11 +370,11 @@ src_install() { docinto sysvinit-${SVIV} dodoc COPYRIGHT README doc/* fi - + for foo in ${S}/man/* do [ -f ${foo} ] && doman ${foo} - done + done docinto / dodoc ${FILESDIR}/copyright dodoc ${S}/ChangeLog @@ -392,7 +392,7 @@ src_install() { do [ -f ${foo} ] && doins ${foo} done - + keepdir /etc/modules.d insinto /etc/modules.d doins ${S}/etc/modules.d/aliases ${S}/etc/modules.d/i386 @@ -405,7 +405,7 @@ src_install() { done # Now ships with net-dialup/ppp ... - rm -f ${D}/etc/{conf,init}.d/net.ppp* + rm -f ${D}/etc/{conf,init}.d/net.ppp* dodir /etc/skel insinto /etc/skel @@ -418,7 +418,7 @@ src_install() { # Skip this if we are merging to ROOT [ "${ROOT}" = "/" ] && return 0 - + # Set up default runlevel symlinks for foo in default boot nonetwork single do @@ -467,7 +467,7 @@ pkg_preinst() { ${ROOT}/etc/modules.autoload.d/kernel-2.4 ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload fi - + # Make sure user get things updated first time he merge 1.8.6 ... if [ -f "${WORKDIR}/update_init_d" ] then @@ -502,7 +502,7 @@ pkg_postinst() { cd ${ROOT}/dev # These devices are also needed by many people and should be included einfo "Making device nodes (this could take a minute or so...)" - + case ${ARCH} in x86) einfo "Using generic-i386 to make device nodes..." @@ -533,10 +533,10 @@ pkg_postinst() { ${ROOT}/sbin/MAKEDEV generic ;; esac - + ${ROOT}/sbin/MAKEDEV sg ${ROOT}/sbin/MAKEDEV scd - ${ROOT}/sbin/MAKEDEV rtc + ${ROOT}/sbin/MAKEDEV rtc ${ROOT}/sbin/MAKEDEV audio ${ROOT}/sbin/MAKEDEV hde ${ROOT}/sbin/MAKEDEV hdf @@ -607,7 +607,7 @@ EOF cp -f "${S}/${rcconfd}" "${ROOT}/${rcconfd}" fi - # Replace and backup /etc/inittab (unless already in new format) + # Replace and backup /etc/inittab (unless already in new format) if [ -f "${ROOT}/${inittab}" ] && \ [ -z "$(grep '^si::sysinit:/sbin/rc sysinit' "${ROOT}/${inittab}")" ] then @@ -630,7 +630,7 @@ EOF if [ -d "${ROOT}/${oldsvcdir}/started" ] then cp -ax "${ROOT}/${oldsvcdir}"/* "${ROOT}/${svcdir}" - + elif [ -d "${ROOT}/mnt/.init.d/started" ] then cp -ax "${ROOT}/mnt/.init.d"/* "${ROOT}/${svcdir}" @@ -677,7 +677,7 @@ EOF echo ewarn " # etc-update" echo - + if [ -f "${ROOT}/etc/env.d/99foo" ] then echo diff --git a/sys-apps/thinkpad/Manifest b/sys-apps/thinkpad/Manifest index c95ec09cd3c2..b7780bbaadd9 100644 --- a/sys-apps/thinkpad/Manifest +++ b/sys-apps/thinkpad/Manifest @@ -1,10 +1,10 @@ +MD5 ffcd0f9cadf445e3d62a15ccbb552979 ChangeLog 1576 +MD5 1d66e97fd75b729d6c73f675b5cdfaec thinkpad-3.2.ebuild 1488 +MD5 44cefbdc48d41e1ad7e6d83218d343df thinkpad-4.1.ebuild 1523 +MD5 785b2dae70a5c8bfed5f439b6e6cd7af thinkpad-4.3.ebuild 2060 +MD5 17f1394169c2235e87af080f488a7955 thinkpad-4.3-r1.ebuild 2063 MD5 67a420196c59076408625a82b1b0f3eb files/digest-thinkpad-3.2 63 -MD5 26886c3a2e8b9c3b807371e643dd5c75 files/thinkpad 545 MD5 f6711c6d29ed136c770235acf6bebf4a files/digest-thinkpad-4.1 63 +MD5 26886c3a2e8b9c3b807371e643dd5c75 files/thinkpad 545 MD5 c4bd4b11c836429cb452ababe9575efd files/digest-thinkpad-4.3 63 MD5 c4bd4b11c836429cb452ababe9575efd files/digest-thinkpad-4.3-r1 63 -MD5 b97b1b5bf7c0a11def3874a85dc48322 thinkpad-3.2.ebuild 1489 -MD5 ffcd0f9cadf445e3d62a15ccbb552979 ChangeLog 1576 -MD5 41c19411707f28c2870b1f62d60d511a thinkpad-4.1.ebuild 1523 -MD5 785b2dae70a5c8bfed5f439b6e6cd7af thinkpad-4.3.ebuild 2060 -MD5 17f1394169c2235e87af080f488a7955 thinkpad-4.3-r1.ebuild 2063 diff --git a/sys-apps/thinkpad/thinkpad-3.2.ebuild b/sys-apps/thinkpad/thinkpad-3.2.ebuild index a304405f79f4..1d517c73ba2a 100644 --- a/sys-apps/thinkpad/thinkpad-3.2.ebuild +++ b/sys-apps/thinkpad/thinkpad-3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/thinkpad/thinkpad-3.2.ebuild,v 1.12 2003/06/21 21:19:41 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/thinkpad/thinkpad-3.2.ebuild,v 1.13 2003/09/07 00:52:20 msterret Exp $ #transform P to match tarball versioning MYPV=${PV/_beta/beta} @@ -20,7 +20,7 @@ pkg_setup() { #thinkpad will compile modules for the kernel pointed to by /usr/src/linux KV=`readlink /usr/src/linux` if [ $? -ne 0 ] ; then - echo + echo echo "/usr/src/linux symlink does not exist; cannot continue." echo die diff --git a/sys-apps/thinkpad/thinkpad-4.1.ebuild b/sys-apps/thinkpad/thinkpad-4.1.ebuild index 5b2b469ce683..7e9acab57839 100644 --- a/sys-apps/thinkpad/thinkpad-4.1.ebuild +++ b/sys-apps/thinkpad/thinkpad-4.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. +# Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/thinkpad/thinkpad-4.1.ebuild,v 1.3 2003/06/21 21:19:41 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/thinkpad/thinkpad-4.1.ebuild,v 1.4 2003/09/07 00:52:20 msterret Exp $ #transform P to match tarball versioning MYPV=${PV/_beta/beta} |