Bump to eapi4 and prune old mess. Do not build with werror. Fixes bug#260893.

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

3 files changed, 49 insertions, 40 deletions

diff --git a/dev-util/systemtap/ChangeLog b/dev-util/systemtap/ChangeLog
index 2029b19a5d80..c4450b4d4c01 100644
--- a/dev-util/systemtap/ChangeLog
+++ b/dev-util/systemtap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/systemtap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.99 2012/02/13 20:32:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.100 2012/03/27 11:40:43 scarabeus Exp $
+
+  27 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> systemtap-1.7.ebuild:
+  Bump to eapi4 and prune old mess. Do not build with werror. Fixes bug#260893.
 
   13 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> systemtap-1.7.ebuild:
   Marked ~ppc/~ppc64 wrt #351931
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 1bfe72dfbb95..b95dd6c19112 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST systemtap-1.6.tar.gz 2133835 RMD160 5d1ee1bdbe6bdade092e62a23814918a54d4eb86 SHA1 e9bc2d2aec9a607b92ea5dd2556c9406076c7e37 SHA256 c82352f9245ffb105590bf1142346db81e2be33976e32c4884a5220619e10ec1
 DIST systemtap-1.7.tar.gz 2391055 RMD160 01eb91200e5d527a254526a9ba9adaf67481f824 SHA1 26fcab4a05d79ef94a84b47c55aaac81a4ece271 SHA256 13298b889a3a00ec0279eae737adae33139047aa88cf396d9846fa4da75228ae
 EBUILD systemtap-1.6.ebuild 1776 RMD160 a386f02d1b19c4c324fa80f99aba751ce22c503b SHA1 3a11a0e3ddbc68f981e28a4f97223d83e831bc3a SHA256 6a9839b5aeff41805507b1022e080538f504c9d78988b4e2b7c6c1e24e7aace6
-EBUILD systemtap-1.7.ebuild 1792 RMD160 f3b9ae8b67f7d2fcc89f3fb2bd67df01333abd2c SHA1 7de0f5486ada98e3b406158e60bed698c17eec14 SHA256 6d30aad3df1a0ffa522a351847cb7990dbe8bada8fdbea1c67779e9e7bcca111
-MISC ChangeLog 17002 RMD160 08e51a08fd676ef24f1f86115f8c18b6cb701f9f SHA1 7d774078d787a7f0f334485fd05d102824d8b4d5 SHA256 09a35e81ab92c51b5400552dcc7b8c23d5aa3fceae369dc141771cd436f9b8aa
+EBUILD systemtap-1.7.ebuild 1910 RMD160 c630c89c5a0a093b8c9db9256f0d1ccacaebd24e SHA1 4a67c75b2de5393558d571cc4decd7341ba00f73 SHA256 d2d1f9acb4ea8d590638eddb6fa0179ac2062d253d4dc4d75ffba4ac5b2168fd
+MISC ChangeLog 17160 RMD160 81556cb9035226432903998e6d35003f15e482ae SHA1 1040118bd8fa1f9629a577b5034c78fe7e959fd6 SHA256 de852b6e37d293d95a04164ed2bb8a3d6dfecaea719545008d7bd559982730a1
 MISC metadata.xml 203 RMD160 d3eac892b9598342d6acad2567e6fc9c5e0d74c0 SHA1 c4ae450546049fa5bbb53d9611b59bba56177263 SHA256 2c3148e7687e70b2a6b31de8ac0f93eeab5ee357df8573ff7c039f7363b1edfe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPOXODAAoJEF0huFKJUZL5LkgP/0iXOIQALJcCtj5Go98kulbT
-xvMg6qeGjuRIX92sCV/oQctB4wErU4gKoAhsj/oZZzMybIsZ+DJignZI/TOsX9QP
-FRZjGKk4nQR7vb0ZGF1io8RdZdTydetep1M+nDjkhE9lwKS0xqqNQCm/rFjkwx9p
-MNhTqlM99VyE4LTCtyqAND6zW4RYmvfIopTs6fcQy07F6vsiRhD9yclZvp1QNzQA
-cD8ddiqsSXXavSQ2KrTZh1+vsmLMgfJmG6Z1J636Qi6yoTP6Y38mny997UfvRaUB
-ylRXv3a3Lxgn2PAoT+rBrvfSuvNiGK49I/hhncbO8ZbJulbBhX/FKI7A64nmUpD7
-dKog/V0S0HOVvw26QMVCN/wJxeHY0AVscBQSxRKdQBC2ko83f1OQ9TdUPRp1iHJM
-g8MF8hPOyvB0kkqVxjMM7evP0vLgVYY/Ef1ZMMIxOjS/F+k3EYtioYUf+659ZRvD
-Ie4cL+jeVdbomsDiNpESm+ELQS8G2emKZGBhB/fQI/0TgqbNmnaLizGtZ9oBS/v3
-c6O4Y7JCUYfVgRBTXXEyIM0Bx4JCwFMH/DvHczPud38MESJIBxSJUEfhNVGSBT8L
-6uzwH3rBTBcFoUwzYXgzzNsC6Z51xBz3vaUenrgCYW3xVFVT6lKejxMmC17v140m
-VVZ1GYzKgMuKiBzSdvtG
-=7wZo
+iQIcBAEBAgAGBQJPcadBAAoJEOSiRoyO7jvoVIAP/Rc/5RVH0psfC9GTbTs/ourf
+3gU0XUsQkleaQEtc2hGRJMPWys48QCVRr3rjutv+JcSgjpAA0OM/U1YWG6oWphTi
+g65eDuWkJ8Rx4Cx3qiQ/IW+BFvWIj1ZSh4VAJOPVaEtWE2gMLipL1C+mS9na6kNM
+FHVgZYUMmNZVUuT4FA3MHFD6WlV19zCijp6zPj67RIA+QSNVB+2AfvTj/5Wtbir5
+T+zHgjGFgMVP+snpZ0HaPz9bOV5HBhGCoYfTlo/zAivr6pV0TFLjrMvZ5Xo2Yr59
+0YCNTeUM7dSwkxxgcgtDoWGvqP2RV8kHnUpFZHdto1zP47JseLWb6BkLlno96oA2
+g/4WTYJfN023DCrwEN9f5N8MHaU7Xjk1VVIsH810Egh3QukPCBqPHbnC6+llsfNU
+GAHw66h633TPftK9RdVCNqyVmHP33YBXoq2Y2rouuY8uye5U6c6Wl8gejLzDC/xj
+GcJOllYMSMoKv+u3V4dIdJL55fwF3wszPV2hEMHr5+j5rgzxhf/zoj3g4pHzvQw4
+K6+TUt91p2r+Ou9VBT840xWs0w3LdGgkyVx3z54q9YH5DoSb+dxqzG/B7Uv+XvK2
+biQjpE2Bu6CL3TJfPd1rns49fLM/5oipH2TS0O9uCkju2A+VEXMMu1DHE62BJ7Vw
+lg4EiiX9dqrzHX3MXicy
+=0vXu
 -----END PGP SIGNATURE-----
diff --git a/dev-util/systemtap/systemtap-1.7.ebuild b/dev-util/systemtap/systemtap-1.7.ebuild
index 9886f4956d13..312ab5ed3f26 100644
--- a/dev-util/systemtap/systemtap-1.7.ebuild
+++ b/dev-util/systemtap/systemtap-1.7.ebuild
@@ -1,23 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-1.7.ebuild,v 1.2 2012/02/13 20:32:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-1.7.ebuild,v 1.3 2012/03/27 11:40:43 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
-inherit linux-info
+inherit linux-info autotools
 
 DESCRIPTION="A linux trace/probe tool"
 HOMEPAGE="http://sourceware.org/systemtap/"
-if [[ ${PV} = *_pre* ]] # is this a snaphot?
-then
-	# see configure.ac to get the version of the snapshot
-	SRC_URI="http://sources.redhat.com/${PN}/ftp/snapshots/${PN}-${PV/*_pre/}.tar.bz2
-		mirror://gentoo/${PN}-${PV/*_pre/}.tar.bz2" # upstream only keeps four snapshot distfiles around
-	S="${WORKDIR}"/src
-else
-	SRC_URI="http://sources.redhat.com/${PN}/ftp/releases/${P}.tar.gz"
-	# use default S for releases
-fi
+SRC_URI="http://sources.redhat.com/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,7 +17,7 @@ IUSE="sqlite"
 
 DEPEND=">=dev-libs/elfutils-0.142
 	sys-libs/libcap
-	sqlite? ( =dev-db/sqlite-3* )"
+	sqlite? ( dev-db/sqlite:3 )"
 RDEPEND="${DEPEND}
 	virtual/linux-sources"
 
@@ -35,19 +26,34 @@ ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - th
 ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
 ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
 
+DOCS="AUTHORS HACKING NEWS README"
+
+src_prepare() {
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac Makefile.am \
+		grapher/Makefile.am \
+		runtime/staprun/Makefile.am \
+		buildrun.cxx \
+		runtime/bench2/bench.rb \
+		runtime/bench2/Makefile \
+		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
+		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
+		testsuite/systemtap.base/stmt_rel_user.exp \
+		testsuite/systemtap.base/sdt_va_args.exp \
+		testsuite/systemtap.base/sdt_misc.exp \
+		testsuite/systemtap.base/sdt.exp \
+		scripts/kprobes_test/gen_code.py
+	eautoreconf
+}
+
 src_configure() {
 	econf \
-		--docdir=/usr/share/doc/${PF} \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--without-rpm \
 		--disable-server \
 		--disable-docs \
 		--disable-refdocs \
 		--disable-grapher \
-		$(use_enable sqlite) \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS HACKING NEWS README
+		$(use_enable sqlite)
 }