fix bug 30436

5 files changed, 122 insertions, 3 deletions

diff --git a/app-misc/bins/ChangeLog b/app-misc/bins/ChangeLog
index b23593821f76..410b422aec71 100644
--- a/app-misc/bins/ChangeLog
+++ b/app-misc/bins/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # $Header:
 
+*bins-1.1.23-r1 (21 Dec 2003)
+
+  21 Dec 2003; <rac@gentoo.org> bins-1.1.23-r1.ebuild:
+  Fix install.sh to address bug 30436
+
   06 Oct 2003; Michael Cummings <mcummings@gentoo.org> bins-1.1.17.ebuild,
   bins-1.1.19-r1.ebuild, bins-1.1.19.ebuild, bins-1.1.23.ebuild:
   Removed older, unused versions; marked stable 1.1.23 for x86 
diff --git a/app-misc/bins/Manifest b/app-misc/bins/Manifest
index 16030b0a59bd..a037a09c2dac 100644
--- a/app-misc/bins/Manifest
+++ b/app-misc/bins/Manifest
@@ -1,11 +1,11 @@
-MD5 03e7e16ace33aa1a90f74a3fa8f9501f bins-1.1.23-r1.ebuild~ 1403
 MD5 03e7e16ace33aa1a90f74a3fa8f9501f bins-1.1.23.ebuild 1403
-MD5 f576d244dd5bcfec88e82d0b83785318 bins-1.1.23-r1.ebuild 1419
+MD5 71745fe76583db4910b0a05838335d70 bins-1.1.23-r1.ebuild 1111
 MD5 68b13d8deb5daf65848729b60e230ace bins-1.1.20.ebuild 1372
 MD5 77fdffc90e182cca1e3b884cc27f4514 bins-1.1.20-r1.ebuild 1405
-MD5 0b876578bc046daed11ef85f86782572 ChangeLog 1239
+MD5 41dba8b196eebe42cee9f78e7688225d ChangeLog 1364
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 666b73d727b66978cdf613cb65db33c3 files/digest-bins-1.1.20-r1 63
 MD5 e691d4766973f8fa705055f6d6664ce8 files/digest-bins-1.1.23-r1 63
+MD5 904b594ebfa89adf9b522cf9cfb56bd5 files/bins-1.1.23-install.patch 2321
 MD5 666b73d727b66978cdf613cb65db33c3 files/digest-bins-1.1.20 63
 MD5 e691d4766973f8fa705055f6d6664ce8 files/digest-bins-1.1.23 63
diff --git a/app-misc/bins/bins-1.1.23-r1.ebuild b/app-misc/bins/bins-1.1.23-r1.ebuild
new file mode 100644
index 000000000000..0e4a9c686974
--- /dev/null
+++ b/app-misc/bins/bins-1.1.23-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/bins/bins-1.1.23-r1.ebuild,v 1.1 2003/12/22 07:54:07 rac Exp $
+
+DESCRIPTION="Static HTML photo album generator"
+HOMEPAGE="http://bins.sautret.org/"
+SRC_URI="http://jsautret.free.fr/BINS/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~alpha ~ppc amd64"
+
+DEPEND=">=dev-lang/perl-5.6.1-r6
+	>=media-gfx/imagemagick-5.5.5.3
+	>=dev-perl/perlmagick-5.5.5.3
+	>=dev-perl/ImageSize-2.99
+	>=dev-perl/ImageInfo-1.04-r1
+	>=dev-perl/IO-String-1.01-r1
+	>=dev-perl/HTML-Clean-0.8
+	>=dev-perl/HTML-Parser-3.26-r1
+	>=dev-perl/HTML-Template-2.6
+	>=dev-perl/Locale-gettext-1.01
+	>=dev-perl/Storable-2.04
+	>=dev-perl/Text-Iconv-1.2
+	>=dev-perl/URI-1.18
+	>=dev-perl/libxml-perl-0.07-r1
+	>=dev-perl/XML-DOM-1.39-r1
+	>=dev-perl/XML-Grove-0.46_alpha
+	>=dev-perl/XML-Handler-YAWriter-0.23
+	>=dev-perl/XML-XQL-0.67"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-install.patch
+}
+
+src_install() {
+	env DESTDIR=${D} PREFIX="/usr" ./install.sh || die
+}
diff --git a/app-misc/bins/files/bins-1.1.23-install.patch b/app-misc/bins/files/bins-1.1.23-install.patch
new file mode 100644
index 000000000000..8d9cc6eb06ee
--- /dev/null
+++ b/app-misc/bins/files/bins-1.1.23-install.patch
@@ -0,0 +1,74 @@
+--- 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/digest-bins-1.1.23-r1 b/app-misc/bins/files/digest-bins-1.1.23-r1
new file mode 100644
index 000000000000..f7be7cac9e15
--- /dev/null
+++ b/app-misc/bins/files/digest-bins-1.1.23-r1
@@ -0,0 +1 @@
+MD5 88f53fab3140140bc9953d0ad2ec3801 bins-1.1.23.tar.gz 213803