Magellan Linux

Diff of /smage/trunk/core/coreutils/coreutils-7.6-r3.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 55 by niro, Sun Jan 3 22:35:20 2010 UTC revision 56 by niro, Mon Jan 4 15:02:04 2010 UTC
# Line 26  SDEPEND=">= sys-dev/automake-3 Line 26  SDEPEND=">= sys-dev/automake-3
26  SRCFILE="${PNAME}-${PVER}.tar.gz"  SRCFILE="${PNAME}-${PVER}.tar.gz"
27  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"  SRCDIR="${BUILDDIR}/${PNAME}-${PVER}"
28    
29    MCORE_ONLY_KEEP="bin/dircolors bin/install bin/ls usr/bin/mktemp bin/touch"
30  sminclude mtools mcore-split  sminclude mtools mcore-split
31    
32  SRC_URI=(  SRC_URI=(
# Line 76  src_compile() Line 77  src_compile()
77   mmake || die   mmake || die
78  }  }
79    
80  generic_src_install()  mcore_generic_src_install()
81  {  {
82   cd ${SRCDIR}   cd ${SRCDIR}
83    
# Line 107  generic_src_install() Line 108  generic_src_install()
108   minstalldocs ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS TODO || die   minstalldocs ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS TODO || die
109  }  }
110    
111  src_install_coreutils()  # preinstall()
112  {  # {
113   generic_src_install  # if [[ ! -z $(magequery -n mktemp) ]]
114    # then
115   # cleanup  # echo -e ${COLRED}
116   zapmost ${BINDIR} bin/dircolors bin/install bin/ls usr/bin/mktemp bin/touch || die  # echo -e "Error: sys-apps/mktemp is installed!!"
117  }  # echo -e "mktemp is now provided by coreutils and doesn't need an extra package anymore."
118    # echo -e "Please uninstall sys-apps/mktemp first!"
119  src_install_coreutils_dev()  # echo -e ${COLDEFAULT}
120  {  # die "sys-apps/mktemp found!"
121   generic_src_install  # fi
122    # }
  # cleanup  
  rm ${BINDIR}/bin/dircolors || die  
  rm ${BINDIR}/bin/install || die  
  rm ${BINDIR}/bin/ls || die  
  rm ${BINDIR}/usr/bin/mktemp || die  
  rm ${BINDIR}/bin/touch || die  
 }  
   
 preinstall()  
 {  
  if [[ ! -z $(magequery -n mktemp) ]]  
  then  
  echo -e ${COLRED}  
  echo -e "Error: sys-apps/mktemp is installed!!"  
  echo -e "mktemp is now provided by coreutils and doesn't need an extra package anymore."  
  echo -e "Please uninstall sys-apps/mktemp first!"  
  echo -e ${COLDEFAULT}  
  die "sys-apps/mktemp found!"  
  fi  
 }  

Legend:
Removed from v.55  
changed lines
  Added in v.56