bug 52088, 53870

7 files changed, 129 insertions, 10 deletions

diff --git a/app-misc/bins/ChangeLog b/app-misc/bins/ChangeLog
index cc0c88f2250f..ace49e9032a0 100644
--- a/app-misc/bins/ChangeLog
+++ b/app-misc/bins/ChangeLog
@@ -2,6 +2,18 @@
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # $Header:
 
+*bins-1.1.26-r1 (15 Jun 2004)
+
+  15 Jun 2004; Michael Cummings <mcummings@gentoo.org> bins-1.1.23-r2.ebuild,
+  bins-1.1.26-r1.ebuild, bins-1.1.26.ebuild, files/bins-1.1.26-install.patch:
+  re-enabled the patch, version bumping to catch it for our ~arch users
+
+*bins-1.1.23-r2 (15 Jun 2004)
+
+  15 Jun 2004; Michael Cummings <mcummings@gentoo.org> bins-1.1.23-r2.ebuild,
+  bins-1.1.26-r1.ebuild:
+  Made gtk optional - that was a mistake on my part
+
 *bins-1.1.26 (13 Jun 2004)
 
   13 Jun 2004; Michael Cummings <mcummings@gentoo.org> bins-1.1.26.ebuild:
diff --git a/app-misc/bins/Manifest b/app-misc/bins/Manifest
index 2d5e5afba9b9..2ea0e7141c2b 100644
--- a/app-misc/bins/Manifest
+++ b/app-misc/bins/Manifest
@@ -1,9 +1,10 @@
-MD5 6ef08004aed690f968550a6419180b08 bins-1.1.23-r2.ebuild 1271
-MD5 540f53c8aa55f18eb94e4334a419ccf0 bins-1.1.26.ebuild 1208
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 34319d5f4f3a0700ec6df3a4e961bc58 ChangeLog 2132
 MD5 b8e86d4dcd2d2146245d58a48cef13d4 bins-1.1.23-r1.ebuild 1137
-MD5 4b441f015c5d65cea204a17955188625 ChangeLog 1948
-MD5 e691d4766973f8fa705055f6d6664ce8 files/digest-bins-1.1.23-r1 63
+MD5 8196ad10985f9b21421942495dd1d34d bins-1.1.23-r2.ebuild 1280
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 32ebab6dc12e01fb571f7cf3b5bb0f9e bins-1.1.26-r1.ebuild 1347
 MD5 904b594ebfa89adf9b522cf9cfb56bd5 files/bins-1.1.23-install.patch 2321
-MD5 9bf07881d8a8267c11b383bb0ed22d31 files/digest-bins-1.1.26 63
+MD5 e691d4766973f8fa705055f6d6664ce8 files/digest-bins-1.1.23-r1 63
 MD5 e691d4766973f8fa705055f6d6664ce8 files/digest-bins-1.1.23-r2 63
+MD5 08fee6831de60c678e175dff4bbbacdb files/bins-1.1.26-install.patch 1292
+MD5 9bf07881d8a8267c11b383bb0ed22d31 files/digest-bins-1.1.26-r1 63
diff --git a/app-misc/bins/bins-1.1.23-r2.ebuild b/app-misc/bins/bins-1.1.23-r2.ebuild
index 25e7ce0f19e9..d1918d1dcec0 100644
--- a/app-misc/bins/bins-1.1.23-r2.ebuild
+++ b/app-misc/bins/bins-1.1.23-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r2.ebuild,v 1.2 2004/06/14 09:06:40 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/bins/bins-1.1.23-r2.ebuild,v 1.3 2004/06/15 10:26:21 mcummings Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ DEPEND=">=dev-lang/perl-5.6.1-r6
 	>=dev-perl/XML-DOM-1.39-r1
 	>=dev-perl/XML-Grove-0.46_alpha
 	>=dev-perl/XML-Handler-YAWriter-0.23
-	dev-perl/gtk-perl-glade
+	gtk? ( dev-perl/gtk-perl-glade )
 	>=dev-perl/XML-XQL-0.67"
 
 src_unpack() {
diff --git a/app-misc/bins/bins-1.1.26-r1.ebuild b/app-misc/bins/bins-1.1.26-r1.ebuild
new file mode 100644
index 000000000000..2ecfb5414ed8
--- /dev/null
+++ b/app-misc/bins/bins-1.1.26-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2004 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.26-r1.ebuild,v 1.1 2004/06/15 10:26:21 mcummings Exp $
+
+inherit eutils
+
+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"
+IUSE=""
+
+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
+	gtk? ( dev-perl/gtk-perl-glade )
+	>=dev-perl/XML-XQL-0.67"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-install.patch
+}
+
+src_install() {
+	echo "" |env DESTDIR=${D} PREFIX="/usr" ./install.sh || die
+	# Fix for pathing
+	for i in `grep -l portage ${D}/usr/bin/*`; do
+		sed -i -e  "s:${D}:/:" ${i}
+	done
+
+	mkdir ${D}/usr/local
+	mv ${D}/usr/share ${D}/usr/local/
+}
diff --git a/app-misc/bins/bins-1.1.26.ebuild b/app-misc/bins/bins-1.1.26.ebuild
index e8ed91110298..66ea18541703 100644
--- a/app-misc/bins/bins-1.1.26.ebuild
+++ b/app-misc/bins/bins-1.1.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.26.ebuild,v 1.2 2004/06/14 09:06:40 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/bins/bins-1.1.26.ebuild,v 1.3 2004/06/15 10:26:21 mcummings Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ DEPEND=">=dev-lang/perl-5.6.1-r6
 	>=dev-perl/XML-DOM-1.39-r1
 	>=dev-perl/XML-Grove-0.46_alpha
 	>=dev-perl/XML-Handler-YAWriter-0.23
-	dev-perl/gtk-perl-glade
+	gtk? ( dev-perl/gtk-perl-glade )
 	>=dev-perl/XML-XQL-0.67"
 
 src_unpack() {
diff --git a/app-misc/bins/files/bins-1.1.26-install.patch b/app-misc/bins/files/bins-1.1.26-install.patch
new file mode 100644
index 000000000000..fbaef17fd70c
--- /dev/null
+++ b/app-misc/bins/files/bins-1.1.26-install.patch
@@ -0,0 +1,54 @@
+--- install.sh.old	2004-06-15 06:34:53.000000000 +0000
++++ install.sh	2004-06-15 06:38:01.000000000 +0000
+@@ -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
+ }
diff --git a/app-misc/bins/files/digest-bins-1.1.26-r1 b/app-misc/bins/files/digest-bins-1.1.26-r1
new file mode 100644
index 000000000000..2b061d637e1c
--- /dev/null
+++ b/app-misc/bins/files/digest-bins-1.1.26-r1
@@ -0,0 +1 @@
+MD5 d7282ca6f7c487aa10d5f2832ea85162 bins-1.1.26.tar.gz 259102