Bump for #386895, should fix #337619 too, thanks to Michael Kensington

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/app-benchmarks/siege/ChangeLog b/app-benchmarks/siege/ChangeLog
index f0b5450140b08107e8c22325e4d4377d68b2cef6..e731be34582a67a6f8e5ddbdc066c8b311158f81 100644 (file)
--- a/app-benchmarks/siege/ChangeLog
+++ b/app-benchmarks/siege/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-benchmarks/siege
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.49 2010/11/10 19:07:56 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.50 2011/12/23 03:27:32 patrick Exp $
+
+*siege-2.70 (23 Dec 2011)
+
+  23 Dec 2011; Patrick Lauer <patrick@gentoo.org> +files/siege-2.70-gentoo.diff,
+  +siege-2.70.ebuild:
+  Bump for #386895, should fix #337619 too, thanks to Michael Kensington
 
   10 Nov 2010; Patrick Lauer <patrick@gentoo.org> siege-2.66.ebuild,
   siege-2.67.ebuild:

diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 82cdffbfc28a6262d2b67e3689a571c791e31b97..7f2cd71e27db32021358c19d6fcf03392db16ab8 100644 (file)
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,8 +1,11 @@
 AUX siege-2.60-gentoo.diff 1740 RMD160 33d69561f9c790d7c3d6783743ae69768022f8ad SHA1 f02341c4de8d49d6febca495b48a15616d74d813 SHA256 26efc21c9ba60e8b92428eddd8113586e41e8dc71ade8f32a26415105df301ae
+AUX siege-2.70-gentoo.diff 3903 RMD160 ec9de4cae9edb772bf3e15a7d315c0c3d2c4cd9e SHA1 ae114cb7822985cd67bd7ebc137f1314e25e7a1c SHA256 b7fc41a26566b410473d01546db9bbf1ecf9fa52a6c21262a4df07e6fec8f8a9
 AUX siege.bash-completion 783 RMD160 79348616a55fa1e810cb5c8d1bfba21e9970dc80 SHA1 688b05dd4a5004f6775d507b3b0f21fa1424ab66 SHA256 a7e54183dc7a6e0032683c3801b5eaa494ebe4356ff1a3cb09391bce7c30ad25
 DIST siege-2.66.tar.gz 478161 RMD160 25cd395432477cda02d04da3b7c72e6c15008714 SHA1 06c5fa98a4522b37281c7fc0b66dd904cd2962fc SHA256 c4b4aefc94e42f6817445ea88725b8058fcb87d238c1b3a7f9f3d21cde057be5
 DIST siege-2.67.tar.gz 524276 RMD160 4a1e65a5d50bc3cf5243bd1912bfc9d3b787fda9 SHA1 8beb37a0a2dd5253ae2534903d26fe2b7f34f3fb SHA256 0a65b0c4bc449dd262490faeb05f674ed8359d9971faf4c5a905a1c85752dac6
+DIST siege-2.70.tar.gz 484608 RMD160 3c3e780ece92ee4b5b98d490347cdf612371536b SHA1 ee0a0c3a9e6559cf8cbaf717649f6684b0d9643a SHA256 3cb4bcb52a4bee9b35a6b487492c3a8eb20d911d76131e1283ca73ac5d75dd91
 EBUILD siege-2.66.ebuild 1775 RMD160 fead7079220f925395f5ec2e3c663989a0ddc2fb SHA1 fa5344b53d55c8af62ccae7963a5a272c1653597 SHA256 8c3871f0007e89ea0dbc5c3140752710352fb0de8d84020593604eee9af29082
 EBUILD siege-2.67.ebuild 2148 RMD160 06af904a06d8653d1baea50130674042a62a54c6 SHA1 a5b0e16ed2639289fddf8b3aa5faac758c6ad69a SHA256 330f32a94058e172adf4ef8a8369c94db20f40adf29c7624faa10b9d90bd0159
-MISC ChangeLog 6160 RMD160 af342307bad00de5d5dc7f3c59e431b519001bb2 SHA1 942869c748e2eea124ceea4b0dbfb65f7de57b5a SHA256 a522f3bc277b059ac9c982b667a1464e0da31ecb03954b31eea28a3d27ba18c3
+EBUILD siege-2.70.ebuild 1213 RMD160 a8add695e4119a6664118cb77d9a184d7e5076f4 SHA1 a9d7d4ad7ab4ae04632148b86e00cd05e105d074 SHA256 dc6ff2f7bfbabe81ceff7bd6bdaee06306e10dce1cc23f20ee15b524e59f522d
+MISC ChangeLog 6364 RMD160 3529cba60afc821ee466d2f20b5849a25dcdb44e SHA1 f7f1e7ec460174498766b6e68e6822414f7f7d3b SHA256 b84fa93184ff812ac6389dbe6150b9fcdda1cf62fa3986ebba81d09e27429697
 MISC metadata.xml 164 RMD160 80582ab33b0b579ef4d41eb9899dbc2a5904566c SHA1 ad15e5d3d68ce39107636b39a2bcc6a847ab45dd SHA256 d1c053798bce14287e6955dac28fa5fc6c7415449545b2922f4d30fe4d84894c

diff --git a/app-benchmarks/siege/files/siege-2.70-gentoo.diff b/app-benchmarks/siege/files/siege-2.70-gentoo.diff
new file mode 100644 (file)
index 0000000..ee4d006
--- /dev/null
+++ b/app-benchmarks/siege/files/siege-2.70-gentoo.diff
@@ -0,0 +1,117 @@
+The bundled acinclude.m4 includeso ld libtool macros that
+are breaking build, and AC_PROG_SHELL is the only thing
+from it that can't be autogenerated. Since all it does
+is check for a POSIX shell, just avoid using it.
+--- configure.in
++++ configure.in
+@@ -44,7 +44,6 @@
+ dnl Program support
+ dnl
+ AC_PATH_PROG( PERL, perl, false )
+-AC_PROG_SHELL
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ case "$host_os" in
+@@ -405,7 +404,7 @@
+ dnl
+ AC_OUTPUT_COMMANDS([
+   infile=utils/siege2csv.in 
+-  outfile=utils/siege2csv.pl
++  outfile=utils/siege2csv
+   rm -f $outfile
+   sed -e "s|%_PREFIX%|$bindir|" \
+       -e "s|%_PERL%|$LREP|" \
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -28,7 +28,7 @@
+ 
+ AM_CFLAGS          =   $(PTHREAD_CFLAGS) $(WARN_CFLAGS) $(SSL_CFLAGS)
+ 
+-LDFLAGS            =   $(SSL_LDFLAGS) $(PTHREAD_LDFLAGS)  
++LDFLAGS            +=   $(SSL_LDFLAGS) $(PTHREAD_LDFLAGS)  
+ 
+ LIBS               =   $(SSL_LIBS) 
+
+Use of \b causes the T in "Transactions" to be displayed
+on the last column of the previous line.
+--- src/main.c
++++ src/main.c
+@@ -529,7 +529,7 @@
+     fprintf(stderr, "%s aborted due to excessive socket failure; you\n", program_name);
+     fprintf(stderr, "can change the failure threshold in $HOME/.%src\n", program_name);
+   }
+-  fprintf(stderr, "\bTransactions:\t\t%12u hits\n",        data_get_count(D));
++  fprintf(stderr, "Transactions:\t\t%12u hits\n",        data_get_count(D));
+   fprintf(stderr, "Availability:\t\t%12.2f %%\n",          data_get_count(D)==0 ? 0 :
+                                                            (double)data_get_count(D) /
+                                                            (data_get_count(D)+my.failed)
+
+--- utils/Makefile.am
++++ utils/Makefile.am
+@@ -25,7 +25,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ AM_CFLAGS = $(WARN_CFLAGS)
+ 
+-SIEGE_UTILITIES   =    bombardment siege2csv.pl siege.config
++SIEGE_UTILITIES   =    bombardment siege2csv siege.config
+ 
+ DISTCLEANFILES    =    $(SIEGE_UTILITIES)
+
+--- doc/Makefile.am
++++ doc/Makefile.am
+@@ -46,35 +46,6 @@
+ 
+ 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 
+-
+-
+ uninstall:
+       rm -f $(SIEGERC)
+
+bug 111057 - siege.config utility uses ${} which gets
+interpreted by bash sending the contents to stderr
+instead of ${HOME}/.siegerc
+--- doc/siegerc.in
++++ doc/siegerc.in
+@@ -9,11 +9,11 @@
+ # Variable declarations. You can set variables here 
+ # for use in the directives below. Example:
+ # PROXY = proxy.joedog.org
+-# Reference variables inside ${} or $(), example: 
++# Reference variables inside \${} or $(), example: 
+ # proxy-host = ${PROXY} 
+ # You can also reference ENVIRONMENT variables without
+ # actually declaring them, example:
+-# logfile = $(HOME)/var/siege.log
++# logfile = \$(HOME)/var/siege.log
+ 
+ #
+ # Signify verbose mode, true turns on verbose output

diff --git a/app-benchmarks/siege/siege-2.70.ebuild b/app-benchmarks/siege/siege-2.70.ebuild
new file mode 100644 (file)
index 0000000..a5b3cc7
--- /dev/null
+++ b/app-benchmarks/siege/siege-2.70.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-2.70.ebuild,v 1.1 2011/12/23 03:27:32 patrick Exp $
+
+EAPI=4
+
+WANT_AUTOMAKE=1.9
+
+inherit eutils bash-completion-r1 libtool autotools
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+HOMEPAGE="http://www.joedog.org/JoeDog/Siege"
+SRC_URI="http://www.joedog.org/pub/siege/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )"
+DEPEND="${RDEPEND}
+       sys-devel/libtool"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-gentoo.diff
+
+       # bundled macros break recent libtool
+       rm *.m4 || die "failed to remove bundled macros"
+
+       eautoreconf
+}
+
+src_configure() {
+       local myconf
+       use ssl && myconf="--with-ssl=/usr" || myconf="--without-ssl"
+       econf ${myconf}
+}
+
+src_install() {
+       make DESTDIR="${D}" install
+
+       dodoc AUTHORS ChangeLog INSTALL MACHINES README* KNOWNBUGS \
+               doc/siegerc doc/urls.txt
+
+       newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+       echo
+       elog "An example ~/.siegerc file has been installed in"
+       elog "/usr/share/doc/${PF}/"
+}