Added patch to fix siegerc and urls.txt access violations instead of einstall for bug 71558; removed 2.59 ebuild.

7 files changed, 94 insertions, 61 deletions

diff --git a/app-benchmarks/siege/ChangeLog b/app-benchmarks/siege/ChangeLog
index 8b04914215f6..8d75fc8d062b 100644
--- a/app-benchmarks/siege/ChangeLog
+++ b/app-benchmarks/siege/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/siege
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.17 2004/10/08 14:39:44 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.18 2004/11/18 10:54:38 ka0ttic Exp $
+
+  18 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/siege-2.60-gentoo.diff, -siege-2.59.ebuild, siege-2.60.ebuild,
+  siege-2.61_beta1.ebuild:
+  Added patch to fix siegerc and urls.txt access violations instead of
+  einstall for bug 71558; removed 2.59 ebuild.
 
   08 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> siege-2.60.ebuild:
   Fix access violation (bug #66758)
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 6011f72fb8ec..0fdf6c2d25d8 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ab86d6e5d262941a375b149ca4b3f93a siege-2.61_beta1.ebuild 840
-MD5 904a71f83c784ae52d61439531dbbd0b siege-2.59.ebuild 1043
-MD5 acd1c831b486283a28139b0a4472b59b siege-2.60.ebuild 756
-MD5 d7849e3f982b00f9ee0a1cfcfd7f05c0 ChangeLog 1542
+MD5 914d853b4d0fa280315a216684f24341 siege-2.61_beta1.ebuild 1049
+MD5 5b2937fd1aa455b700059c10885fce53 siege-2.60.ebuild 987
+MD5 eda5cc7c78ccddca2365471fa1fbe597 ChangeLog 1809
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 163ff997dbf4a1327327c037ae2d1a76 files/digest-siege-2.59 62
+MD5 9e437904b960c0cab42d691c8678774b files/siege-2.60-gentoo.diff 1740
 MD5 1185a0d2d8ac987001f575f8eb302327 files/digest-siege-2.60 62
 MD5 f518e2804c3deb28aa5f44c0299f0477 files/digest-siege-2.61_beta1 64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBZqa5EZCkKN40op4RAmngAJ4yY76cr7LEgiFmKw9y3hrR41AHSgCdGUE6
-U2cMNC2EsQCIupa+ffevZzA=
-=Fp8W
+iD8DBQFBnH+CEZCkKN40op4RAhBZAJ9m2yy8La5D91GPdcQDZpd1qfOz/gCfQDgR
+K8OnXN5IuTxPDn6ojflfJ6o=
+=6ozY
 -----END PGP SIGNATURE-----
diff --git a/app-benchmarks/siege/files/digest-siege-2.59 b/app-benchmarks/siege/files/digest-siege-2.59
deleted file mode 100644
index b50f14fe50c5..000000000000
--- a/app-benchmarks/siege/files/digest-siege-2.59
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52bf3ae4d8e7bdec158a5ad16a6c66f0 siege-2.59.tar.gz 374921
diff --git a/app-benchmarks/siege/files/siege-2.60-gentoo.diff b/app-benchmarks/siege/files/siege-2.60-gentoo.diff
new file mode 100644
index 000000000000..0f9c3d1243b1
--- /dev/null
+++ b/app-benchmarks/siege/files/siege-2.60-gentoo.diff
@@ -0,0 +1,47 @@
+diff -urN siege-2.60.orig/doc/Makefile.am siege-2.60/doc/Makefile.am
+--- siege-2.60.orig/doc/Makefile.am	2002-12-09 11:16:41.000000000 -0500
++++ siege-2.60/doc/Makefile.am	2004-11-17 23:26:02.752206536 -0500
+@@ -42,38 +42,13 @@
+ 
+ DISTCLEANFILES    =      siegerc $(man_MANS)
+ 
+-SIEGERC           =      $(HOME)/.siegerc
++SIEGERC           =      ../siegerc-example
+ 
+-URLSTXT           =      $(sysconfdir)/urls.txt
+-
+-install-exec-hook: 
+-	@if test -f $(SIEGERC); then \
+-	  if cmp -s $(srcdir)/siegerc $(SIEGERC); then echo ""; \
+-	    else \
+-	    echo ' $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new'; \
+-	    $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC).new; \
+-	    echo "#####################################################"; \
+-	    echo "WARNING: File $(SIEGERC) already exists."; \
+-	    echo "         A new resource file has been installed as"; \
+-	    echo "         $(SIEGERC).new. You may want to"; \
+-	    echo "         consider using the newer version in order to"; \
+-	    echo "         take advantage of any new features."; \
+-	    echo "#####################################################"; \
+-	  fi; \
+-	else \
+-	  $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC); \
+-	fi 
+-	@if test -f $(URLSTXT); then \
+-	  if cmp -s $(srcdir)/siegerc $(URLSTXT); then echo ""; \
+-	    else \
+-	    echo "WARNING: File $(URLSTXT) already exists."; \
+-	    echo "         It was NOT replaced with this installation."; \
+-	  fi; \
+-	else \
+-	  $(mkinstalldirs) $(sysconfdir); \
+-	  $(INSTALL_DATA) $(srcdir)/urls.txt $(URLSTXT); \
+-	fi 
++URLSTXT           =      ../urls.txt
+ 
++install-data-hook: 
++	  $(INSTALL_DATA) $(srcdir)/siegerc $(SIEGERC)
++	  $(INSTALL_DATA) $(srcdir)/urls.txt $(URLSTXT)
+ 
+ uninstall:
+ 	rm -f $(SIEGERC)
diff --git a/app-benchmarks/siege/siege-2.59.ebuild b/app-benchmarks/siege/siege-2.59.ebuild
deleted file mode 100644
index 05b171bab174..000000000000
--- a/app-benchmarks/siege/siege-2.59.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.59.ebuild,v 1.4 2004/06/24 21:29:04 agriffis Exp $
-
-DESCRIPTION="An http regression testing and benchmarking utility"
-HOMEPAGE="http://www.joedog.org/siege/"
-SRC_URI="ftp://sid.joedog.org/pub/siege/${P}.tar.gz"
-
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="ssl"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
-
-src_compile() {
-	has_version '=dev-libs/openssl-0.9.7*' \
-		&& sed -i -e "s:^# include <openssl/e_os.h>::" src/ssl.h
-	local myconf
-	use ssl && myconf="--with-ssl" || myconf="--with-ssl=off"
-	econf ${myconf} || die "econf failed"
-	emake || die
-
-}
-
-src_install() {
-	# makefile tries to install into $HOME by default... bad monkey!
-	dodir /usr/share/doc/${P}
-
-	einstall SIEGERC="${D}/usr/share/doc/${P}/siegerc-example"
-
-	# all non-html docs must be gzip'd
-	gzip ${D}/usr/share/doc/${P}/siegerc-example
-
-	dodoc AUTHORS INSTALL KNOWNBUGS NEWS MACHINES README
-}
diff --git a/app-benchmarks/siege/siege-2.60.ebuild b/app-benchmarks/siege/siege-2.60.ebuild
index 8eb6f628fd1d..bc578d22b893 100644
--- a/app-benchmarks/siege/siege-2.60.ebuild
+++ b/app-benchmarks/siege/siege-2.60.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.60.ebuild,v 1.5 2004/10/08 14:39:44 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.60.ebuild,v 1.6 2004/11/18 10:54:38 ka0ttic Exp $
+
+inherit eutils
 
 DESCRIPTION="A HTTP regression testing and benchmarking utility"
 HOMEPAGE="http://www.joedog.org/siege/"
@@ -15,14 +17,22 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
 RDEPEND="${DEPEND}
 	dev-lang/perl"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
 src_compile() {
-	econf $(use_with ssl) || die
-	emake || die
+	einfo "Running autoreconf"
+	autoreconf || die "autoreconf failed"
+	econf $(use_with ssl) || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	einstall SIEGERC="${S}/siegerc-example" || die
-	dodoc AUTHORS ChangeLog INSTALL MACHINES README \
-		KNOWNBUGS siegerc-example
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog INSTALL MACHINES README KNOWNBUGS \
+		siegerc-example urls.txt || die "dodoc failed"
 	use ssl && dodoc README.https
 }
diff --git a/app-benchmarks/siege/siege-2.61_beta1.ebuild b/app-benchmarks/siege/siege-2.61_beta1.ebuild
index e2a270d93901..05ad85713a98 100644
--- a/app-benchmarks/siege/siege-2.61_beta1.ebuild
+++ b/app-benchmarks/siege/siege-2.61_beta1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.61_beta1.ebuild,v 1.1 2004/09/24 16:48:23 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.61_beta1.ebuild,v 1.2 2004/11/18 10:54:38 ka0ttic Exp $
+
+inherit eutils
 
 MY_P=${P/_beta/b}
 S=${WORKDIR}/${MY_P}
@@ -18,16 +20,22 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
 RDEPEND="${DEPEND}
 	dev-lang/perl"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.60-gentoo.diff
+}
+
 src_compile() {
-	econf $(use_with ssl) || die
-	emake || die
+	einfo "Running autoreconf"
+	autoreconf || die "autoreconf failed"
+	econf $(use_with ssl) || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		SIEGERC="${S}/siegerc-example" \
-		install || die
-	dodoc AUTHORS ChangeLog INSTALL MACHINES README \
-		KNOWNBUGS siegerc-example
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog INSTALL MACHINES README KNOWNBUGS \
+		siegerc-example urls.txt || die "dodoc failed"
 	use ssl && dodoc README.https
 }