7 files changed, 95 insertions, 79 deletions
diff --git a/net-misc/ebayagent/ChangeLog b/net-misc/ebayagent/ChangeLog
index 5bb00efed330..2b34058ba863 100644
--- a/net-misc/ebayagent/ChangeLog
+++ b/net-misc/ebayagent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/ebayagent
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ebayagent/ChangeLog,v 1.4 2005/06/05 23:01:49 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ebayagent/ChangeLog,v 1.5 2005/06/12 20:20:34 mcummings Exp $
+
+*ebayagent-0.9.11-r2 (12 Jun 2005)
+
+  12 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  files/ebayagent.patch, -ebayagent-0.9.11.ebuild,
+  -ebayagent-0.9.11-r1.ebuild, +ebayagent-0.9.11-r2.ebuild:
+  bug 95144
 
   05 Jun 2005; Michael Cummings <mcummings@gentoo.org>
   +files/ebayagent.patch, ebayagent-0.9.11-r1.ebuild:
diff --git a/net-misc/ebayagent/Manifest b/net-misc/ebayagent/Manifest
index 48e6595f3945..34094e97ad10 100644
--- a/net-misc/ebayagent/Manifest
+++ b/net-misc/ebayagent/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 202f7294cb07caa2ac3b7cd1d4d7eb01 ChangeLog 715
+MD5 73028f26ea8e8ab5c602fd50c3901724 ChangeLog 930
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 f3d708258febb8f86c8245c11af5ca65 ebayagent-0.9.11.ebuild 1942
-MD5 8f0e4b610fafe1ffce72a9564bfc3e33 ebayagent-0.9.11-r1.ebuild 1198
-MD5 d91da69fc3c98bcf2692e807f7a3f071 files/digest-ebayagent-0.9.11-r1 68
-MD5 d91da69fc3c98bcf2692e807f7a3f071 files/digest-ebayagent-0.9.11 68
-MD5 71fb94b74761b7cd64ab6e3b8979e80c files/ebayagent.patch 1864
+MD5 24bcff594d71a6963f9724f46649e547 ebayagent-0.9.11-r2.ebuild 1655
+MD5 000972706fe20a16eedd74ec08296c7a files/ebayagent.patch 3838
+MD5 d91da69fc3c98bcf2692e807f7a3f071 files/digest-ebayagent-0.9.11-r2 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCo4QltG5z4I8BtQoRApWNAJ9l4kjAEkWwTj3hw93RBmESqQRJRQCfUGDh
-GwpAgG8zawtXX+SVuqk2y0A=
-=gg9Z
+iD8DBQFCrJkMtG5z4I8BtQoRAifeAKCJkC6ciE6Epptqd30PztN3i6vRIgCggoPc
+hUQq2fxs/k0GFVyBqTC1vDY=
+=sD9b
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ebayagent/ebayagent-0.9.11-r1.ebuild b/net-misc/ebayagent/ebayagent-0.9.11-r2.ebuild
index 9ed9812290c5..3a264a4ba8b3 100644
--- a/net-misc/ebayagent/ebayagent-0.9.11-r1.ebuild
+++ b/net-misc/ebayagent/ebayagent-0.9.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ebayagent/ebayagent-0.9.11-r1.ebuild,v 1.3 2005/06/05 23:03:16 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ebayagent/ebayagent-0.9.11-r2.ebuild,v 1.1 2005/06/12 20:20:34 mcummings Exp $
 
 inherit eutils
 
@@ -24,19 +24,35 @@ DEPEND="dev-lang/perl
 S=${WORKDIR}/eBayAgent-${PV}
 
 src_compile() {
-	epatch ${FILESDIR}/ebayagent.patch
-
 	sed -i -e "s|PREFIX=/usr|PREFIX=${D}${DESTTREE}|" ${S}/Makefile
+
+	# BUG: 95144 fix path for perl-tk app XeBayAgent.pl to point to eBayAgent 
+	sed -i -e "s|X_eBayAgentLocation\ \=>\ \"\",|X_eBayAgentLocation\ \=>\ \"${ROOT}\/usr\/bin\/eBayAgent\",|"	${S}/XeBayAgent.pl
+
+	# patching repebay and runrepebay
+	epatch ${FILESDIR}/ebayagent.patch
 	emake || die "emake failed"
 }
 
 src_install() {
 	einstall || die "einstall failed"
-	dobin ${S}/Tools/repebay ${S}/Tools/runrepebay ${S}/Tools/eBayAgent_Skript
 	dosym /usr/bin/eBayAgent /usr/bin/eBayAgent.pl
+
+	dobin ${S}/Tools/repebay ${S}/Tools/runrepebay ${S}/Tools/eBayAgent_Skript
 	doman ${S}/Tools/repebay.1 ${S}/Tools/runrepebay.1 ${S}/eBayAgent.1
 	newdoc ${S}/Tools/README_First.txt README_First_Tools.txt
 	newdoc ${S}/Tools/README.Debian README_Tools.Debian
+
+	# perl-tk (disable XeBayAgent.pl)
+	if ! use tcltk ; then
+		rm -rf ${D}/usr/bin/XeBayAgent
+	fi
+
+	# prepare manpages (prepallman won´t do that)
+	for mpage in $(find ${D} -name '*.1'|grep man);do
+		gzip $mpage
+	done
+
 	dodoc COPYING INSTALL
 	prepalldocs
 }
diff --git a/net-misc/ebayagent/ebayagent-0.9.11.ebuild b/net-misc/ebayagent/ebayagent-0.9.11.ebuild
deleted file mode 100644
index 6b189747dfc9..000000000000
--- a/net-misc/ebayagent/ebayagent-0.9.11.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ebayagent/ebayagent-0.9.11.ebuild,v 1.2 2005/05/14 17:21:47 mcummings Exp $
-
-DESCRIPTION="ebay bidding Perl-Script"
-HOMEPAGE="http://ebayagent.sf.net"
-SRC_URI="mirror://sourceforge/ebayagent/eBayAgent-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86"
-
-DEPEND="dev-lang/perl
-	>=dev-perl/libnet-1.16
-	>=dev-perl/URI-1.35
-	>=dev-perl/Crypt-SSLeay-0.49
-	>=dev-perl/libwww-perl-5.79
-	>=dev-perl/TimeDate-1.16"
-
-S=${WORKDIR}/eBayAgent-${PV}
-
-src_compile() {
-	sed -i -e "s|PREFIX=/usr|PREFIX=${D}${DESTTREE}|" ${S}/Makefile
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-		# Patching eBayAgent_Skript
-		# this will replace eBayAgent.pl with eBayAgent.
-		# It also let the script read the settings for eBayAgent_Skript
-		# from $HOME/.eBayAgent_Skript.config
-		mv ${S}/Tools/eBayAgent_Skript ${S}/Tools/eBayAgent_Skript.old
-		sed "s|eBayAgent.pl|eBayAgent|" ${S}/Tools/eBayAgent_Skript.old|sed -e '/fetching\ the\ data/'i"# Patched to read the settings from \$HOME/.eBayAgent_Skript.config\n# This will check if a config file exists. If not -> create\nif [ ! -e \$HOME/.eBayAgent_Skript.config ];then\n\tsed -n '/^# This is a simple/,/^ITEMS=/p' ${DESTTREE}/bin/eBayAgent_Skript > \$HOME/.eBayAgent_Skript.config\necho \"Please adjust \$HOME/.eBayAgent_Skript.config to your needs first\!\"\nexit\nfi\nsource \$HOME/.eBayAgent_Skript.config\n" > ${S}/Tools/eBayAgent_Skript
-		dobin ${S}/Tools/repebay ${S}/Tools/runrepebay ${S}/Tools/eBayAgent_Skript
-		doman ${S}/Tools/repebay.1 ${S}/Tools/runrepebay.1
-		newdoc ${S}/Tools/README_First.txt README_First_Tools.txt
-		newdoc ${S}/Tools/README.Debian README_Tools.Debian
-
-	# prepare manpages
-	for mpage in $(find ${D} -name '*.1'|grep man);do
-		gzip $mpage
-	done
-
-	dodoc COPYING INSTALL
-	prepalldocs
-}
diff --git a/net-misc/ebayagent/files/digest-ebayagent-0.9.11-r1 b/net-misc/ebayagent/files/digest-ebayagent-0.9.11-r1
deleted file mode 100644
index ab21ccdee8b2..000000000000
--- a/net-misc/ebayagent/files/digest-ebayagent-0.9.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 353eb58f62d2ac926709c0d8a9e6b920 eBayAgent-0.9.11.tar.bz2 55174
diff --git a/net-misc/ebayagent/files/digest-ebayagent-0.9.11 b/net-misc/ebayagent/files/digest-ebayagent-0.9.11-r2
index ab21ccdee8b2..ab21ccdee8b2 100644
--- a/net-misc/ebayagent/files/digest-ebayagent-0.9.11
+++ b/net-misc/ebayagent/files/digest-ebayagent-0.9.11-r2
diff --git a/net-misc/ebayagent/files/ebayagent.patch b/net-misc/ebayagent/files/ebayagent.patch
index 38862b0c8e6a..c9f2bfe1852e 100644
--- a/net-misc/ebayagent/files/ebayagent.patch
+++ b/net-misc/ebayagent/files/ebayagent.patch
@@ -1,21 +1,18 @@
---- XeBayAgent.pl.old	2005-06-05 18:50:42.000000000 -0400
-+++ XeBayAgent.pl	2005-06-05 18:49:22.000000000 -0400
-@@ -240,7 +240,7 @@ my %user_conf = (
-                  X_terminal => "",
-                  X_inanotherterm => 0,
-                  X_indialogbox => 0,
--                 X_eBayAgentLocation => "",
-+                 X_eBayAgentLocation => "/usr/bin/eBayAgent",
-                 );
- 
- my %tconf = %user_conf;
---- Tools/eBayAgent_Skript.old	2005-04-28 01:55:48.000000000 -0400
-+++ Tools/eBayAgent_Skript	2005-06-05 18:07:09.000000000 -0400
-@@ -35,12 +35,13 @@ ITEMS="2534478656 2533973254 2534483715 
+--- Tools/eBayAgent_Skript.orig	2005-06-12 14:41:53.000000000 -0400
++++ Tools/eBayAgent_Skript	2005-06-12 14:47:57.000000000 -0400
+@@ -35,12 +35,21 @@ ITEMS="2534478656 2533973254 2534483715 
  # along with this program; if not, write to the Free Software Foundation,
  # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
-+# Patched to read the settings from $HOME/.eBayAgent_Skript.confign# This will check if a config file exists. If not -> createnif [ ! -e $HOME/.eBayAgent_Skript.config ];thenntsed -n '/^# This is a simple/,/^ITEMS=/p' /bin/eBayAgent_Skript > $HOME/.eBayAgent_Skript.confignecho "Please adjust $HOME/.eBayAgent_Skript.config to your needs first!"nexitnfinsource $HOME/.eBayAgent_Skript.confign
++# Patched to read the settings from $HOME/.eBayAgent_Skript.conf
++# This will check if a config file exists. If not -> create
++if [ ! -e $HOME/.eBayAgent_Skript.conf ];then
++	sed -n '/^# This is a simple/,/^ITEMS=/p' /bin/eBayAgent_Skript > $HOME/.eBayAgent_Skript.conf
++	echo "Please adjust $HOME/.eBayAgent_Skript.conf to your needs first!"
++	exit	
++fi
++source $HOME/.eBayAgent_Skript.conf
++
  # fetching the data and sorting takes about 2-3 secs per article
  (
  for ITEM in $ITEMS ; do 
@@ -27,7 +24,7 @@
  		sed -n 's/Bid End time.*: \(.*\) (GMT)$/\1/p')
  	# convert to seconds since 1.1.1970
  	SECS=$(date +%s --date "$DATE")
-@@ -53,7 +54,7 @@ sort -n -k1 |
+@@ -53,7 +62,7 @@ sort -n -k1 |
  # and then bid one after the other. 
  while read SECS ITEM ; do 
  	echo 
@@ -36,3 +33,50 @@
  	# if not successful, continue
  	test $? -ne 99 && continue
          # ok, it's 99, so we won. so exit. 
+--- Tools/repebay.old	2005-06-12 14:48:38.000000000 -0400
++++ Tools/repebay	2005-06-12 14:48:43.000000000 -0400
+@@ -19,13 +19,13 @@ elif [ ! "$1" ] && [ ! "$2" ]; then
+ fi
+ 
+ if [ "$RCFILE" = "" ]; then
+- until [ $(ebayagent -i $AUCTION | egrep -c "(Auction has ended|Canceling snipe)") -ge "1" ]
++ until [ $(eBayAgent -i $AUCTION | egrep -c "(Auction has ended|Canceling snipe)") -ge "1" ]
+   do
+-   ebayagent -i $AUCTION -b $MAXBID
++   eBayAgent -i $AUCTION -b $MAXBID
+   done && echo Auction $AUCTION has already ended
+ else
+- until [ $(ebayagent -i $AUCTION | egrep -c "(Auction has ended|Canceling snipe)") -ge "1" ]
++ until [ $(eBayAgent -i $AUCTION | egrep -c "(Auction has ended|Canceling snipe)") -ge "1" ]
+   do
+-   ebayagent -i $AUCTION -b $MAXBID -r $RCFILE
++   eBayAgent -i $AUCTION -b $MAXBID -r $RCFILE
+   done && echo Auction $AUCTION has already ended
+ fi
+--- Tools/runrepebay.old	2005-06-12 14:48:23.000000000 -0400
++++ Tools/runrepebay	2005-06-12 14:48:32.000000000 -0400
+@@ -57,21 +57,21 @@ if [ -d $HOME/.eBay ]; then
+      cd $HOME/.eBay
+      for AUCTIONNR in $(ls | grep -E [0-9]{10} | grep -v done)
+        do
+-        if [ $(ebayagent -i $AUCTIONNR | grep -c "Auction has ended") -gt "0" ]; then
++        if [ $(eBayAgent -i $AUCTIONNR | grep -c "Auction has ended") -gt "0" ]; then
+            mv $HOME/.eBay/$AUCTIONNR $HOME/.eBay/$AUCTIONNR-done
+            echo "Auction for article number $AUCTIONNR has already ended."
+            echo "$(grep ^\# $AUCTIONNR-done)"
+            echo ""
+         else
+           if [ "$(grep ^[0-9]*\.[0-9]*$ $HOME/.eBay/$AUCTIONNR)" ]; then
+-             if [ ! $(ps ux | grep -v grep | grep -c "ebayagent -i $AUCTIONNR") -gt "0" ]; then
++             if [ ! $(ps ux | grep -v grep | grep -c "eBayAgent -i $AUCTIONNR") -gt "0" ]; then
+                 screen -S "$SCREENID" -X screen "$RUNCLIENT" "$AUCTIONNR" $(grep -v ^\# $HOME/.eBay/"$AUCTIONNR")
+                 echo "Bidding for article number $AUCTIONNR:"
+                 echo "$(grep ^\# $AUCTIONNR)"
+                 echo ""
+              else
+                 echo "Already bidding for article number $AUCTIONNR:"
+-                echo "$(ps ux | grep -v grep | grep "ebayagent -i $AUCTIONNR")"
++                echo "$(ps ux | grep -v grep | grep "eBayAgent -i $AUCTIONNR")"
+                 echo "$(grep ^\# $AUCTIONNR)"
+                 echo ""
+              fi