[gentoo-commits] dev/blueness:master commit in: app-benchmarks/spew/files/, app-benchmarks/spew/

[Anthony G. Basile]

commit:     446d0fd39d1ae2a8148018ea8eeb7cc9accbfe8b
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 22:42:15 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 22:42:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=446d0fd3

app-benchmarks/spew: removed static option

(Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 app-benchmarks/spew/ChangeLog                      |    4 ++
 app-benchmarks/spew/Manifest                       |   15 +++++++-
 .../spew/files/remove-broken-static-link.patch     |   39 ++++++++++++++++++++
 app-benchmarks/spew/spew-1.0.8.ebuild              |    9 ++---
 4 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/app-benchmarks/spew/ChangeLog b/app-benchmarks/spew/ChangeLog
index e5b7f2d..18de177 100644
--- a/app-benchmarks/spew/ChangeLog
+++ b/app-benchmarks/spew/ChangeLog
@@ -1,5 +1,9 @@
 
 
+  05 Apr 2011; Anthony G. Basile <blueness@g.o> spew-1.0.8.ebuild,
+  +files/remove-broken-static-link.patch:
+  removed static option
+
   05 Apr 2011; Anthony G. Basile <blueness@g.o> ChangeLog:
   failed attempt to save static linking
 

diff --git a/app-benchmarks/spew/Manifest b/app-benchmarks/spew/Manifest
index f02dddb..7230faf 100644
--- a/app-benchmarks/spew/Manifest
+++ b/app-benchmarks/spew/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX remove-broken-static-link.patch 1358 RMD160 3f0ee08ba8f44754cceb016a31b1985527459616 SHA1 aa1ca727780724854206c7f28f9a57c203699a2c SHA256 e5710581ee13202d8deab9ea5911bd5a65a179581eecded60c761f27c3b9e58f
 AUX remove-symlinks-makefile.patch 1125 RMD160 ce243020147db07916bbece151bd5116a9a106bf SHA1 6a4a64afe8cb45ee01af7b0e0a4997510b54a029 SHA256 06e591faefec55e12d52576f7ac4972dc4e4d0ba550f20bac3c089c7df1253a1
 DIST spew-1.0.8.tgz 162091 RMD160 e67314f97a04440a6590133377ae1b76d2e81c7a SHA1 70258b13b0c5ec622024ff077a1ea86dd972819c SHA256 200da1b4390a5e4bf91cb7278b3ad813194f0e395abc0da6296ac415e11a76cb
-EBUILD spew-1.0.8.ebuild 913 RMD160 c9ee740c8c82f549c8e17f981a60138d1502d419 SHA1 3d18897e9edbadd9e8d4421abcf2797c8533dc43 SHA256 080675e54018114ac26e4a33fc3706553e764aaf95352612512a86fdca43d442
-MISC ChangeLog 286 RMD160 72c080256dbe5f156ff9f4972ef32970df512df4 SHA1 7a0c0b6effcc820aec199e197064ad0a3da4064c SHA256 3d25396b7876ceaf1e5a5f14cc6bdbfbbf68d76082780e978fbb6faf879706f7
+EBUILD spew-1.0.8.ebuild 826 RMD160 23e2da59c31a44dd0093a4fef4211cb5d42f0b58 SHA1 cd92ea1f6f672d0260aaa3b5d8f82610e18a99ac SHA256 fced8fd20ef43ace5fb412a1ee5480f1204d5ae5d97a206bd0d36daffae54fca
+MISC ChangeLog 427 RMD160 04b279149e614dbcbcae47a22468c7b617ff10cf SHA1 c640e00dc36684a55146849eb585a1e17359a20e SHA256 a56d988c54f32c2a0e3a9d9ec6719b6e8c900f3049c01286dde1dff34d5db448
 MISC metadata.xml 447 RMD160 b52268043bc52e4e7585a08afce87d44d8aed447 SHA1 4a125d08613a97c00528b9dd1509e267eefa8000 SHA256 364f375c7dadcede1d8384f71bf2ad059cbcfea4efc486e9e8e3f7a3ef78c037
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk2bmscACgkQl5yvQNBFVTWKhACbBxt9xUtfZX3RBnxKGdXFadme
+BrsAoJMhe5NCn0BQk5oGEGJGV0rnlC8l
+=aEu6
+-----END PGP SIGNATURE-----

diff --git a/app-benchmarks/spew/files/remove-broken-static-link.patch b/app-benchmarks/spew/files/remove-broken-static-link.patch
new file mode 100644
index 0000000..c8ced74
--- /dev/null
+++ b/app-benchmarks/spew/files/remove-broken-static-link.patch
@@ -0,0 +1,39 @@
+diff -Naur spew-1.0.8.org/configure.ac spew-1.0.8/configure.ac
+--- spew-1.0.8.org/configure.ac	2010-05-14 01:17:52.000000000 -0400
++++ spew-1.0.8/configure.ac	2011-04-05 17:51:50.000000000 -0400
+@@ -85,26 +85,6 @@
+ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS([getpagesize gettimeofday memset strerror strsignal strrchr localtime_r basename])
+ 
+-# Add --enable-static
+-AC_ARG_ENABLE(static-link,
+-	[  --enable-static-link         link spew statically],
+-	[ case "$enableval" in
+-          yes) static_spew=yes ;;
+-          no) static_spew=no;;
+-          esac
+-        ],
+-	static_spew=no)
+-
+-STATIC_LINK=""
+-if test "x$static_spew" = "xyes" ; then
+-  if test "x`uname`" = "xHP-UX" ; then
+-    STATIC_LINK="-Wl,-a,archive_shared"
+-  else
+-    STATIC_LINK="-static"
+-  fi
+-fi
+-AC_SUBST(STATIC_LINK)
+-
+ CXXFLAGS="$CXXFLAGS -DSYSCONFDIR=${sysconfdir}"
+ 
+ AC_CONFIG_FILES([src/Makefile man/Makefile etc/Makefile])
+diff -Naur spew-1.0.8.org/src/Makefile.am spew-1.0.8/src/Makefile.am
+--- spew-1.0.8.org/src/Makefile.am	2011-04-05 17:43:15.000000000 -0400
++++ spew-1.0.8/src/Makefile.am	2011-04-05 17:56:17.000000000 -0400
+@@ -36,5 +36,3 @@
+                SpewTuiProgressWindow.cpp SpewTuiProgressWindow.h \
+                SpewTuiStatisticsWindow.cpp SpewTuiStatisticsWindow.h \
+                SpewTuiStatusWindow.cpp SpewTuiStatusWindow.h
+-
+-spew_LDFLAGS = $(STATIC_LINK)

diff --git a/app-benchmarks/spew/spew-1.0.8.ebuild b/app-benchmarks/spew/spew-1.0.8.ebuild
index b3c55a0..71a102d 100644
--- a/app-benchmarks/spew/spew-1.0.8.ebuild
+++ b/app-benchmarks/spew/spew-1.0.8.ebuild
@@ -13,21 +13,18 @@ SRC_URI="ftp://ftp.berlios.de/pub/spew/1.0.8/spew-1.0.8.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="static"
+IUSE=""
 
 DEPEND="sys-libs/ncurses
-	static? ( dev-libs/popt[static-libs] ) !static? ( dev-libs/popt )"
+	dev-libs/popt"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/remove-symlinks-makefile.patch
+	epatch "${FILESDIR}"/remove-broken-static-link.patch
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static static-link) || die "econf failed"
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dosym ${PN} /usr/bin/gorge