Version bump, bug #425570.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x64D4CF24)

3 files changed, 84 insertions, 1 deletions

diff --git a/dev-util/systemtap/ChangeLog b/dev-util/systemtap/ChangeLog
index c4450b4d4c01..3b3711927864 100644
--- a/dev-util/systemtap/ChangeLog
+++ b/dev-util/systemtap/ChangeLog
@@ -1,6 +1,12 @@
 # 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.100 2012/03/27 11:40:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.101 2012/11/04 22:15:44 swegener Exp $
+
+*systemtap-2.0 (04 Nov 2012)
+
+  04 Nov 2012; Sven Wegener <swegener@gentoo.org> +systemtap-2.0.ebuild,
+  +files/systemtap-2.0-gettext.patch:
+  Version bump, bug #425570.
 
   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.
diff --git a/dev-util/systemtap/files/systemtap-2.0-gettext.patch b/dev-util/systemtap/files/systemtap-2.0-gettext.patch
new file mode 100644
index 000000000000..1fc780c5c68d
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-2.0-gettext.patch
@@ -0,0 +1,12 @@
+diff -Nur systemtap-2.0.orig/configure.ac systemtap-2.0/configure.ac
+--- systemtap-2.0.orig/configure.ac	2012-11-04 22:04:07.726950494 +0000
++++ systemtap-2.0/configure.ac	2012-11-04 22:11:08.747068941 +0000
+@@ -30,7 +30,7 @@
+ AC_SUBST(CXXFLAGS)
+ AC_SYS_LARGEFILE
+ AM_GNU_GETTEXT(external)
+-AM_GNU_GETTEXT_VERSION(0.17)
++AM_GNU_GETTEXT_VERSION(0.18)
+ AC_CHECK_FUNCS(ppoll)
+ 
+ dnl Handle the prologues option.
diff --git a/dev-util/systemtap/systemtap-2.0.ebuild b/dev-util/systemtap/systemtap-2.0.ebuild
new file mode 100644
index 000000000000..84f31f7b9e4f
--- /dev/null
+++ b/dev-util/systemtap/systemtap-2.0.ebuild
@@ -0,0 +1,65 @@
+# 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-2.0.ebuild,v 1.1 2012/11/04 22:15:44 swegener Exp $
+
+EAPI=4
+
+inherit linux-info autotools eutils
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="http://sourceware.org/systemtap/"
+SRC_URI="http://sources.redhat.com/${PN}/ftp/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="sqlite"
+
+DEPEND=">=dev-libs/elfutils-0.142
+	sys-libs/libcap
+	sqlite? ( dev-db/sqlite:3 )"
+RDEPEND="${DEPEND}
+	virtual/linux-sources"
+DEPEND="${DEPEND}
+	>=sys-devel/gettext-0.18"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+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() {
+	epatch "${FILESDIR}"/${P}-gettext.patch
+
+	sed -i \
+		-e 's:-Werror::g' \
+		configure.ac \
+		Makefile.am \
+		staprun/Makefile.am \
+		stapdyn/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 \
+		|| die "Failed to clean up sources"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--without-rpm \
+		--disable-server \
+		--disable-docs \
+		--disable-refdocs \
+		--disable-grapher \
+		$(use_enable sqlite)
+}