8 files changed, 18 insertions, 100 deletions
diff --git a/dev-util/systemtap/ChangeLog b/dev-util/systemtap/ChangeLog
index 43f56cef6610..2524bcfdd799 100644
--- a/dev-util/systemtap/ChangeLog
+++ b/dev-util/systemtap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/systemtap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.31 2007/10/27 15:43:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.32 2007/11/10 20:27:34 swegener Exp $
+
+*systemtap-0.6_p20071110 (10 Nov 2007)
+
+  10 Nov 2007; Sven Wegener <swegener@gentoo.org>
+  +systemtap-0.6_p20071110.ebuild, -systemtap-20071006.ebuild,
+  -systemtap-20071020.ebuild, -systemtap-20071027.ebuild:
+  Version bump. Change versioning scheme to match internal release versions.
 
 *systemtap-20071027 (27 Oct 2007)
 
diff --git a/dev-util/systemtap/files/digest-systemtap-0.6_p20071110 b/dev-util/systemtap/files/digest-systemtap-0.6_p20071110
new file mode 100644
index 000000000000..2513859b500e
--- /dev/null
+++ b/dev-util/systemtap/files/digest-systemtap-0.6_p20071110
@@ -0,0 +1,3 @@
+MD5 08e027196df75a25676cc83dae1aaba3 systemtap-20071110.tar.bz2 779046
+RMD160 458b28527d9308d4170667788dd3c86c6837db0a systemtap-20071110.tar.bz2 779046
+SHA256 b837f8c72db9270de5122e9501b61abbd8aac709485c9433b049b058bb664f69 systemtap-20071110.tar.bz2 779046
diff --git a/dev-util/systemtap/files/digest-systemtap-20071006 b/dev-util/systemtap/files/digest-systemtap-20071006
deleted file mode 100644
index c2395649aa51..000000000000
--- a/dev-util/systemtap/files/digest-systemtap-20071006
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2cc844fb088afbc60bfd1fbaff996a47 systemtap-20071006.tar.bz2 764588
-RMD160 6f7876873f15a162a9917c3d80740785ce8f61c7 systemtap-20071006.tar.bz2 764588
-SHA256 84fc09dfcd772ec42d0f4781b418cc5a4fd705d623cb1ad8bfd00510aae468be systemtap-20071006.tar.bz2 764588
diff --git a/dev-util/systemtap/files/digest-systemtap-20071020 b/dev-util/systemtap/files/digest-systemtap-20071020
deleted file mode 100644
index 525131375c45..000000000000
--- a/dev-util/systemtap/files/digest-systemtap-20071020
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 306c2c4e2b1978210a8b4ebc541e8376 systemtap-20071020.tar.bz2 773425
-RMD160 107ac693f7e03e4839898b2cb2bd1492f7e84e50 systemtap-20071020.tar.bz2 773425
-SHA256 c20ff3eeb97e2cab870f231ab745ec6da45b516660667f4d18d9f3103277e265 systemtap-20071020.tar.bz2 773425
diff --git a/dev-util/systemtap/files/digest-systemtap-20071027 b/dev-util/systemtap/files/digest-systemtap-20071027
deleted file mode 100644
index 56172ae32903..000000000000
--- a/dev-util/systemtap/files/digest-systemtap-20071027
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d52fa2d8547e48e723ed687278990b1b systemtap-20071027.tar.bz2 778055
-RMD160 dbad491144e00edef92ea288aba26d56500145df systemtap-20071027.tar.bz2 778055
-SHA256 4798ecb105c629094eb712c83afd16136140a25efaed33ba9281d1e0d6d400b2 systemtap-20071027.tar.bz2 778055
diff --git a/dev-util/systemtap/systemtap-20071020.ebuild b/dev-util/systemtap/systemtap-0.6_p20071110.ebuild
index d7a15037f240..f00ccec74241 100644
--- a/dev-util/systemtap/systemtap-20071020.ebuild
+++ b/dev-util/systemtap/systemtap-0.6_p20071110.ebuild
@@ -1,12 +1,17 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-20071020.ebuild,v 1.1 2007/10/21 12:27:18 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.6_p20071110.ebuild,v 1.1 2007/11/10 20:27:34 swegener Exp $
 
 inherit linux-info eutils
 
 DESCRIPTION="A linux trace/probe tool"
 HOMEPAGE="http://sourceware.org/systemtap/"
-SRC_URI="ftp://sources.redhat.com/pub/${PN}/snapshots/${P}.tar.bz2"
+if [[ ${PV} = *_p* ]] # is this a snaphot?
+then
+	SRC_URI="ftp://sources.redhat.com/pub/${PN}/snapshots/${PN}-${PV/*_p/}.tar.bz2"
+else
+	: # currently there are only snapshots available, but they have an internal version (see configure.ac)
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/systemtap/systemtap-20071006.ebuild b/dev-util/systemtap/systemtap-20071006.ebuild
deleted file mode 100644
index b5e31c04ea75..000000000000
--- a/dev-util/systemtap/systemtap-20071006.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-20071006.ebuild,v 1.1 2007/10/07 15:33:10 swegener Exp $
-
-inherit linux-info eutils
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="http://sourceware.org/systemtap/"
-SRC_URI="ftp://sources.redhat.com/pub/${PN}/snapshots/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/elfutils-0.122
-	sys-libs/libcap
-	=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-20070414-grsecurity.patch
-}
-
-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-20071027.ebuild b/dev-util/systemtap/systemtap-20071027.ebuild
deleted file mode 100644
index dd745ff9343f..000000000000
--- a/dev-util/systemtap/systemtap-20071027.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-20071027.ebuild,v 1.1 2007/10/27 15:43:16 swegener Exp $
-
-inherit linux-info eutils
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="http://sourceware.org/systemtap/"
-SRC_URI="ftp://sources.redhat.com/pub/${PN}/snapshots/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/elfutils-0.122
-	sys-libs/libcap
-	=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-20070414-grsecurity.patch
-}
-
-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."
-}