diff options
| -rw-r--r-- | app-misc/bins/ChangeLog | 9 | ||||
| -rw-r--r-- | app-misc/bins/files/bins-1.1.23-install.patch | 74 | ||||
| -rw-r--r-- | app-misc/bins/files/bins-1.1.26-install.patch | 74 | ||||
| -rw-r--r-- | app-misc/bins/files/bins-1.1.27-install.patch | 74 |
4 files changed, 7 insertions, 224 deletions
diff --git a/app-misc/bins/ChangeLog b/app-misc/bins/ChangeLog index b6a1e29c1b0b..8f3ddb54267d 100644 --- a/app-misc/bins/ChangeLog +++ b/app-misc/bins/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/bins -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/bins/ChangeLog,v 1.50 2007/08/19 10:35:37 ian Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/bins/ChangeLog,v 1.51 2009/08/16 10:15:23 tove Exp $ + + 16 Aug 2009; Torsten Veller <tove@gentoo.org> + -files/bins-1.1.23-install.patch, -files/bins-1.1.26-install.patch, + -files/bins-1.1.27-install.patch: + Remove unused patches 19 Aug 2007; Christian Hartmann <ian@gentoo.org> bins-1.1.29.ebuild: Fixed bug #185346 diff --git a/app-misc/bins/files/bins-1.1.23-install.patch b/app-misc/bins/files/bins-1.1.23-install.patch deleted file mode 100644 index 8d9cc6eb06ee..000000000000 --- a/app-misc/bins/files/bins-1.1.23-install.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- install.sh.orig 2003-12-21 23:44:07.361074109 -0800 -+++ install.sh 2003-12-21 23:48:53.443159629 -0800 -@@ -20,11 +20,12 @@ - PREFIX="${PREFIX:-/usr/local}" - RC="${RC:-/etc/bins}" - -+SHARE="${PREFIX}/share" - DESTDIR=`echo "$DESTDIR"|sed 's%/$%%'` - PREFIX=$DESTDIR/`echo "$PREFIX"|sed 's%^/%%'` - PREFIX=`echo "$PREFIX"|sed 's%/$%%'` --RC=$DESTDIR/`echo "$RC"|sed 's%^/%%'` --RC=`echo "$RC"|sed 's%/$%%'` -+DESTRC=$DESTDIR/`echo "$RC"|sed 's%^/%%'` -+DESTRC=`echo "$DESTRC"|sed 's%/$%%'` - - BIN="$PREFIX/bin" - SHARE="$PREFIX/share" -@@ -54,7 +55,7 @@ - Press Enter to go on or Crtl-C to stop now... - !EoF - --read dummy -+#read dummy - - install_binaries() - { -@@ -79,31 +80,31 @@ - - install_config() - { -- mkdir -p $RC 2>/dev/null || true -- if [ -w $RC ]; then -+ mkdir -p $DESTRC 2>/dev/null || true -+ if [ -w $DESTRC ]; then - echo "Installing configuration file in $RC" -- cp binsrc $RC -+ cp binsrc $DESTRC - echo "Installing default HTML templates in $RC/templates.default" -- if [ ! -d $RC/templates.default ] ; then -- mkdir $RC/templates.default -+ if [ ! -d $DESTRC/templates.default ] ; then -+ mkdir $DESTRC/templates.default - fi -- cp templates/*.html $RC/templates.default -+ cp templates/*.html $DESTRC/templates.default - echo "Installing joi HTML templates in $RC/templates.joi" -- if [ ! -d $RC/templates.joi ] ; then -- mkdir $RC/templates.joi -+ if [ ! -d $DESTRC/templates.joi ] ; then -+ mkdir $DESTRC/templates.joi - fi -- cp templates.joi/*.html $RC/templates.joi -- cp -R templates.joi/static $RC/templates.joi -+ cp templates.joi/*.html $DESTRC/templates.joi -+ cp -R templates.joi/static $DESTRC/templates.joi - echo "Installing satyap HTML templates in $RC/templates.satyap" -- if [ ! -d $RC/templates.satyap ] ; then -- mkdir $RC/templates.satyap -+ if [ ! -d $DESTRC/templates.satyap ] ; then -+ mkdir $DESTRC/templates.satyap - fi -- cp templates.satyap/*.html $RC/templates.satyap -- cp -R templates.satyap/static $RC/templates.satyap -- chmod -R a+r $RC/* -+ cp templates.satyap/*.html $DESTRC/templates.satyap -+ cp -R templates.satyap/static $DESTRC/templates.satyap -+ chmod -R a+r $DESTRC/* - return 0 - else -- echo "Cannot write to $RC." -+ echo "Cannot write to $DESTRC." - return 1 - fi - } diff --git a/app-misc/bins/files/bins-1.1.26-install.patch b/app-misc/bins/files/bins-1.1.26-install.patch deleted file mode 100644 index d062e1f5dc59..000000000000 --- a/app-misc/bins/files/bins-1.1.26-install.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- install.sh.old 2004-05-24 08:31:08.000000000 -0500 -+++ install.sh 2004-09-29 13:59:04.911944000 -0500 -@@ -23,11 +23,12 @@ - RC="${RC:-/etc/bins}" - GLOBAL_RC="$RC" - -+SHARE="${PREFIX}/share" - DESTDIR=`echo "$DESTDIR"|sed 's%/$%%'` - PREFIX=$DESTDIR/`echo "$PREFIX"|sed 's%^/%%'` - PREFIX=`echo "$PREFIX"|sed 's%/$%%'` --RC=$DESTDIR/`echo "$RC"|sed 's%^/%%'` --RC=`echo "$RC"|sed 's%/$%%'` -+DESTRC=$DESTDIR/`echo "$RC"|sed 's%^/%%'` -+DESTRC=`echo "$DESTRC"|sed 's%/$%%'` - - BIN="$PREFIX/bin" - SHARE="$PREFIX/share" -@@ -58,7 +59,7 @@ - Press Enter to go on or Crtl-C to stop now... - !EoF - --read dummy -+#read dummy - - install_binaries() - { -@@ -84,20 +85,20 @@ - - install_config() - { -- mkdir -p $RC 2>/dev/null || true -- if [ -w $RC ]; then -+ mkdir -p $DESTRC 2>/dev/null || true -+ if [ -w $DESTRC ]; then - echo "Installing configuration file in $RC" -- cp binsrc $RC -+ cp binsrc $DESTRC - for T in $templates - do -- if [ -d "$RC/templates.$T" ]; then -+ if [ -d "$DESTRC/templates.$T" ]; then - echo "Removing old template.$T in $RC" -- rm -Rf "$RC/templates.$T" -+ rm -Rf "$DESTRC/templates.$T" - fi - done -- chmod -R a+r $RC/* -+ chmod -R a+r $DESTRC/* - else -- echo "Cannot write to $RC." -+ echo "Cannot write to $DESTRC." - return 1 - fi - } -@@ -179,16 +180,9 @@ - fi - - # bash completion --if [ -w /etc/bash_completion.d ] ; then -- echo "Installing bash completion system wide." -- cp -f bash_completion /etc/bash_completion.d/bins --else -- mkdir ~/.bash_completion 2>/dev/null || true -- if [ -w ~/.bash_completion ] ; then -- echo "Installing bash completion for user `whoami`." -- cp -f bash_completion ~/.bash_completion/bins -- fi --fi -+echo "Installing bash completion system wide." -+mkdir -p $SHARE/bash-completion -+cp -f bash_completion $SHARE/bash-completion/bins - - # I18N files - mkdir -p $LOCALE 2>/dev/null || true diff --git a/app-misc/bins/files/bins-1.1.27-install.patch b/app-misc/bins/files/bins-1.1.27-install.patch deleted file mode 100644 index d062e1f5dc59..000000000000 --- a/app-misc/bins/files/bins-1.1.27-install.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- install.sh.old 2004-05-24 08:31:08.000000000 -0500 -+++ install.sh 2004-09-29 13:59:04.911944000 -0500 -@@ -23,11 +23,12 @@ - RC="${RC:-/etc/bins}" - GLOBAL_RC="$RC" - -+SHARE="${PREFIX}/share" - DESTDIR=`echo "$DESTDIR"|sed 's%/$%%'` - PREFIX=$DESTDIR/`echo "$PREFIX"|sed 's%^/%%'` - PREFIX=`echo "$PREFIX"|sed 's%/$%%'` --RC=$DESTDIR/`echo "$RC"|sed 's%^/%%'` --RC=`echo "$RC"|sed 's%/$%%'` -+DESTRC=$DESTDIR/`echo "$RC"|sed 's%^/%%'` -+DESTRC=`echo "$DESTRC"|sed 's%/$%%'` - - BIN="$PREFIX/bin" - SHARE="$PREFIX/share" -@@ -58,7 +59,7 @@ - Press Enter to go on or Crtl-C to stop now... - !EoF - --read dummy -+#read dummy - - install_binaries() - { -@@ -84,20 +85,20 @@ - - install_config() - { -- mkdir -p $RC 2>/dev/null || true -- if [ -w $RC ]; then -+ mkdir -p $DESTRC 2>/dev/null || true -+ if [ -w $DESTRC ]; then - echo "Installing configuration file in $RC" -- cp binsrc $RC -+ cp binsrc $DESTRC - for T in $templates - do -- if [ -d "$RC/templates.$T" ]; then -+ if [ -d "$DESTRC/templates.$T" ]; then - echo "Removing old template.$T in $RC" -- rm -Rf "$RC/templates.$T" -+ rm -Rf "$DESTRC/templates.$T" - fi - done -- chmod -R a+r $RC/* -+ chmod -R a+r $DESTRC/* - else -- echo "Cannot write to $RC." -+ echo "Cannot write to $DESTRC." - return 1 - fi - } -@@ -179,16 +180,9 @@ - fi - - # bash completion --if [ -w /etc/bash_completion.d ] ; then -- echo "Installing bash completion system wide." -- cp -f bash_completion /etc/bash_completion.d/bins --else -- mkdir ~/.bash_completion 2>/dev/null || true -- if [ -w ~/.bash_completion ] ; then -- echo "Installing bash completion for user `whoami`." -- cp -f bash_completion ~/.bash_completion/bins -- fi --fi -+echo "Installing bash completion system wide." -+mkdir -p $SHARE/bash-completion -+cp -f bash_completion $SHARE/bash-completion/bins - - # I18N files - mkdir -p $LOCALE 2>/dev/null || true |