Version bump.

(Portage version: 2.2_rc3/cvs/Linux 2.6.26-07257-g024e8ac x86_64)

5 files changed, 25 insertions, 128 deletions

diff --git a/dev-util/systemtap/ChangeLog b/dev-util/systemtap/ChangeLog
index 2a9a79f34b41..b2127929a8c8 100644
--- a/dev-util/systemtap/ChangeLog
+++ b/dev-util/systemtap/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/systemtap
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.68 2008/07/12 15:19:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.69 2008/07/26 15:20:59 swegener Exp $
+
+*systemtap-0.7.1_pre20080726 (26 Jul 2008)
+*systemtap-0.7 (26 Jul 2008)
+
+  26 Jul 2008; Sven Wegener <swegener@gentoo.org> +systemtap-0.7.ebuild,
+  -systemtap-0.7_p20080621.ebuild, -systemtap-0.7_p20080628.ebuild,
+  -systemtap-0.7_p20080705.ebuild, -systemtap-0.7_p20080712.ebuild,
+  +systemtap-0.7.1_pre20080726.ebuild:
+  Version bump.
 
 *systemtap-0.7_p20080712 (12 Jul 2008)
 
diff --git a/dev-util/systemtap/systemtap-0.7_p20080705.ebuild b/dev-util/systemtap/systemtap-0.7.1_pre20080726.ebuild
index 63b0c61d339b..d6701ad1fa80 100644
--- a/dev-util/systemtap/systemtap-0.7_p20080705.ebuild
+++ b/dev-util/systemtap/systemtap-0.7.1_pre20080726.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.7_p20080705.ebuild,v 1.1 2008/07/06 18:11:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.7.1_pre20080726.ebuild,v 1.1 2008/07/26 15:20:59 swegener Exp $
 
 inherit linux-info eutils
 
 DESCRIPTION="A linux trace/probe tool"
 HOMEPAGE="http://sourceware.org/systemtap/"
-if [[ ${PV} = *_p* ]] # is this a snaphot?
+if [[ ${PV} = *_pre* ]] # is this a snaphot?
 then
-	SRC_URI="ftp://sources.redhat.com/pub/${PN}/snapshots/${PN}-${PV/*_p/}.tar.bz2"
+	# see configure.ac to see the version of the snapshot
+	SRC_URI="ftp://sources.redhat.com/pub/${PN}/snapshots/${PN}-${PV/*_pre/}.tar.bz2"
+	S="${WORKDIR}"/src
 else
-	die "Sorry, currently there are only snapshots available." # but they have an internal version (see configure.ac)
+	SRC_URI="ftp://sources.redhat.com/pub/${PN}/releases/${P}.tar.gz"
+	# use default S for releases
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="sqlite"
 
 DEPEND=">=dev-libs/elfutils-0.122
@@ -24,8 +27,6 @@ DEPEND=">=dev-libs/elfutils-0.122
 RDEPEND="${DEPEND}
 	virtual/linux-sources"
 
-S="${WORKDIR}"/src
-
 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)'."
diff --git a/dev-util/systemtap/systemtap-0.7_p20080628.ebuild b/dev-util/systemtap/systemtap-0.7.ebuild
index 9d9adf137b53..b019ed9cb619 100644
--- a/dev-util/systemtap/systemtap-0.7_p20080628.ebuild
+++ b/dev-util/systemtap/systemtap-0.7.ebuild
@@ -1,16 +1,19 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.7_p20080628.ebuild,v 1.1 2008/06/29 00:03:43 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.7.ebuild,v 1.1 2008/07/26 15:20:59 swegener Exp $
 
 inherit linux-info eutils
 
 DESCRIPTION="A linux trace/probe tool"
 HOMEPAGE="http://sourceware.org/systemtap/"
-if [[ ${PV} = *_p* ]] # is this a snaphot?
+if [[ ${PV} = *_pre* ]] # is this a snaphot?
 then
-	SRC_URI="ftp://sources.redhat.com/pub/${PN}/snapshots/${PN}-${PV/*_p/}.tar.bz2"
+	# see configure.ac to see the version of the snapshot
+	SRC_URI="ftp://sources.redhat.com/pub/${PN}/snapshots/${PN}-${PV/*_pre/}.tar.bz2"
+	S="${WORKDIR}"/src
 else
-	die "Sorry, currently there are only snapshots available." # but they have an internal version (see configure.ac)
+	SRC_URI="ftp://sources.redhat.com/pub/${PN}/releases/${P}.tar.gz"
+	# use default S for releases
 fi
 
 LICENSE="GPL-2"
@@ -24,8 +27,6 @@ DEPEND=">=dev-libs/elfutils-0.122
 RDEPEND="${DEPEND}
 	virtual/linux-sources"
 
-S="${WORKDIR}"/src
-
 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)'."
diff --git a/dev-util/systemtap/systemtap-0.7_p20080621.ebuild b/dev-util/systemtap/systemtap-0.7_p20080621.ebuild
deleted file mode 100644
index d188d4bfd46c..000000000000
--- a/dev-util/systemtap/systemtap-0.7_p20080621.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.7_p20080621.ebuild,v 1.3 2008/06/21 19:29:12 swegener Exp $
-
-WANT_AUTOCONF="2.5"
-WANT_AUTOMAKE="1.10"
-
-inherit linux-info eutils autotools
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="http://sourceware.org/systemtap/"
-if [[ ${PV} = *_p* ]] # is this a snaphot?
-then
-	SRC_URI="ftp://sources.redhat.com/pub/${PN}/snapshots/${PN}-${PV/*_p/}.tar.bz2"
-else
-	die "Sorry, currently there are only snapshots available." # but they have an internal version (see configure.ac)
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sqlite"
-
-DEPEND=">=dev-libs/elfutils-0.122
-	sys-libs/libcap
-	sqlite? ( =dev-db/sqlite-3* )"
-RDEPEND="${DEPEND}
-	virtual/linux-sources"
-
-S="${WORKDIR}"/src
-
-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'."
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/systemtap-20080119-grsecurity.patch
-	epatch "${FILESDIR}"/systemtap-20080621-as-needed.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable sqlite) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog HACKING NEWS README
-}
-
-pkg_postinst() {
-	elog "If you use a kernel patched with grsecurity (e.g. sys-kernel/hardened-sources)"
-	elog "then please append '-D HAVE_GRSECURITY' to your stap command line."
-}
diff --git a/dev-util/systemtap/systemtap-0.7_p20080712.ebuild b/dev-util/systemtap/systemtap-0.7_p20080712.ebuild
deleted file mode 100644
index 1508a0923e2b..000000000000
--- a/dev-util/systemtap/systemtap-0.7_p20080712.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.7_p20080712.ebuild,v 1.1 2008/07/12 15:19:42 swegener Exp $
-
-inherit linux-info eutils
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="http://sourceware.org/systemtap/"
-if [[ ${PV} = *_p* ]] # is this a snaphot?
-then
-	SRC_URI="ftp://sources.redhat.com/pub/${PN}/snapshots/${PN}-${PV/*_p/}.tar.bz2"
-else
-	die "Sorry, currently there are only snapshots available." # but they have an internal version (see configure.ac)
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sqlite"
-
-DEPEND=">=dev-libs/elfutils-0.122
-	sys-libs/libcap
-	sqlite? ( =dev-db/sqlite-3* )"
-RDEPEND="${DEPEND}
-	virtual/linux-sources"
-
-S="${WORKDIR}"/src
-
-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'."
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/systemtap-20080119-grsecurity.patch
-}
-
-src_compile() {
-	econf $(use_enable sqlite) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog HACKING NEWS README
-}
-
-pkg_postinst() {
-	elog "If you use a kernel patched with grsecurity (e.g. sys-kernel/hardened-sources)"
-	elog "then please append '-D HAVE_GRSECURITY' to your stap command line."
-}