Cleanup.

Package-Manager: portage-2.2_rc47/cvs/Linux x86_64

12 files changed, 13 insertions, 528 deletions

diff --git a/dev-util/systemtap/ChangeLog b/dev-util/systemtap/ChangeLog
index 48f4c80ef842..7f7d33a37c99 100644
--- a/dev-util/systemtap/ChangeLog
+++ b/dev-util/systemtap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/systemtap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.84 2009/10/31 15:40:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/ChangeLog,v 1.85 2009/10/31 15:42:28 swegener Exp $
+
+  31 Oct 2009; Sven Wegener <swegener@gentoo.org> -systemtap-0.7.ebuild,
+  -systemtap-0.8.ebuild, -files/systemtap-0.8-gcc-4.3.3-warnings.patch,
+  -systemtap-0.9.5.ebuild, -systemtap-0.9.7.ebuild, -systemtap-0.9.8.ebuild,
+  -systemtap-0.9.9.ebuild, -systemtap-1.0.ebuild,
+  -files/systemtap-20080119-grsecurity.patch,
+  -files/systemtap-20080621-as-needed.patch:
+  Cleanup.
 
 *systemtap-1.0-r1 (31 Oct 2009)
 
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index ce317a006f64..865422329f65 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,33 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX systemtap-0.8-gcc-4.3.3-warnings.patch 1148 RMD160 bcb92f553b0acdfb478bc0a709a808f1df54cdc7 SHA1 14cc853e1a10bb8b83dd920fa868fd03c6d6d880 SHA256 8451c659554424ef5f51a9f63b69726ef8c0f23af5ef88fdc98aa2b006536b40
 AUX systemtap-1.0-CVE-2009-2911-dwarf.patch 4252 RMD160 cea3c287b775d3a00dadfb609b635673309cf8b2 SHA1 5ff00486e9c3a0d1f3203fd10a74891939e97301 SHA256 1e665a3ea2ef0c05b0ab6321ed34377d9150ce7e1fd4845eb291fdb41d4e28c2
 AUX systemtap-1.0-CVE-2009-2911-unwind.patch 6985 RMD160 fe4a0b73a2a5c415d52a5a42d8729cd4cde9ffbd SHA1 495e91b7ab63e826b7d3654b8a1aa4b5a4a15fcb SHA256 558396bdfc98e08f52a82eb7b24ebaf4550f0a36adc527dfc7321337a9641c05
 AUX systemtap-1.0-CVE-2009-2911-varargs.patch 1972 RMD160 25780779174ca05e62b759b12a50c05650fdaa18 SHA1 d6b9d4a5c3e3a850d35828d929fe00afb87091fc SHA256 57d1cfe521cb291954c9c0f045f4fd3c22e9af343d400178b9708a5bc653bda5
-AUX systemtap-20080119-grsecurity.patch 1315 RMD160 0f94b5602d0026abec5c4ede2cefeb43a76f5ad7 SHA1 32a3cb2a69bae46a98df58fff4d9e3989f498e5c SHA256 b27e23eea34271f4ce7c1d6c3dd9d5757d6a870706fd3f39058636ed58238781
-AUX systemtap-20080621-as-needed.patch 548 RMD160 e5e674e46ce5bf0d9161d15e3ee0689d29987855 SHA1 b3c050eff9c4c8deaef76922b36463761de7d0de SHA256 2fa520e4c53ee1d8de792384fab96dc9d3bddd96c79c94cad4620b64ab475125
-DIST systemtap-0.7.tar.gz 1081985 RMD160 7e6495ef3a910f2aeb805487200da50eab819c50 SHA1 26d3ea6483fa8592538a6ae16c5d30c0c4eda1f0 SHA256 3ca2ffa581bed3d36ee68ae9fecbc2ca9dbee82ff543a17fea1874dcb393ae56
-DIST systemtap-0.8.tar.gz 1254892 RMD160 e08882656a189e965686e206ed61a843bf2cc036 SHA1 417808164a6482ac98eb0197961d15a10b0093cf SHA256 959b5c52560bdf48710cb13dc665000cb806453f0bd14405f3e5be1818d8a3a7
-DIST systemtap-0.9.5.tar.gz 1267885 RMD160 53976c51d4d7aeb3c84c3b46dcd8563aedbce83c SHA1 217d9fa5ec98f4994c51b2aec170e8b06d95d1ec SHA256 57bfafc4502d2fea05b748379c2b7298e32e72825c6d23e612bab4c093039a72
-DIST systemtap-0.9.7.tar.gz 1315229 RMD160 6321b925365f7f0999b04e5e399d52af1f73f7c5 SHA1 732c78217e098b6f62e582ea69b9b25d4fa27cdf SHA256 dd013d9576de80d97bb7d7e617baecb9210c32bd05098b91ff7858ca11a5c058
-DIST systemtap-0.9.8.tar.gz 1381316 RMD160 733181a2d8bddcc9ef039871cc0448519ecc52f1 SHA1 c029138116e8bff2fb27db30d66c0122d32fbe07 SHA256 6f2bd9829ec6fb04440f7fcf653fb60b81b8b994268a3059cbec5fefff9b3351
-DIST systemtap-0.9.9.tar.gz 1436504 RMD160 6a843d4984ce823d24e81effdf9e309abf75547f SHA1 15cb4cbe07132f40b90580d3e67bd8badf6b0d4d SHA256 4416f8a3cc00fa2bf296c9fe3c765c3073617ab83d594a08f8f75160525c359b
 DIST systemtap-1.0.tar.gz 1472694 RMD160 f8315c01fe630d323ec453edb20628091c72f3e1 SHA1 6778a6c13c4ce1ffacb054a5b53b53553c50e80e SHA256 e0f30c80a9098f449d83a28b028111473349c02bb913ca286657cdb82a9a2e2c
-EBUILD systemtap-0.7.ebuild 1965 RMD160 b1853d20a1bfd63c251aabda3414897eb0a6c601 SHA1 9abe3cda1fb11c6fe5f97026e4df4fe34eb261a0 SHA256 977475481ce700413866785bb619b7917b003304863985d89b12f331ce2820e1
-EBUILD systemtap-0.8.ebuild 2051 RMD160 f1f0f51c92fe312584f6734080656bb1f3d7342d SHA1 66c6381581b27a6b77733b40efb69405ff32e4bf SHA256 dabf55e1096847ec492f9e0bbd536a50d0abe1ffbeb279afc627d24351c49e0c
-EBUILD systemtap-0.9.5.ebuild 2034 RMD160 e943818de0c020043333f14ed83c3bc777e9504e SHA1 e159e5d1ddd00c1d01ce6ec08aa1954ea340d451 SHA256 ed32893211bfe1b69579e02e661b926cffd566dd9e2eeaaca88d24c046a565ff
-EBUILD systemtap-0.9.7.ebuild 2056 RMD160 c9d720d0904abc3be8f0310443ab9036750470f8 SHA1 c2a98d595f8bac8d1dbba3dee167e64119b94fca SHA256 d4d50c5c852910e75a99cbbb3a2cce42a4647e00793c316c3329d5f7f76cc69e
-EBUILD systemtap-0.9.8.ebuild 2074 RMD160 5ef7d4fcc50d6c55e7fc828e2c09e028eb75b5f9 SHA1 53824891a2bfc024804005ee7b28801376a7a22e SHA256 2fdf58dcfd75a2260e1c1cb5e6cb87671ab1df79cee116c4d8adbfcbc533d9d5
-EBUILD systemtap-0.9.9.ebuild 2074 RMD160 7d4eb477a770de56178f80ad3649b751f0462774 SHA1 aaa221d5ad11c4f5c09c0c47e9e8258266b31d66 SHA256 6957995aa58834c0a5c647b7337eac388b02afcd16673ad4d24a03d58f2c8ae9
 EBUILD systemtap-1.0-r1.ebuild 1858 RMD160 a2f9305300c09f46f386d0c54dd1d47f641199aa SHA1 8f7bf39627cc24e89a248bfa6fce1fa761804f11 SHA256 22a2c704b07ce503cd4cb0d96e6758f2cadc10dc3c7ea1c965e908e74a5cdf10
-EBUILD systemtap-1.0.ebuild 1776 RMD160 505a8899295cd9b0b8f39bcc813f4930a5788ffa SHA1 2083041fb1c38e394c6c1cd7d1b8c16e8b8b6f78 SHA256 1a0c560ea2ee19e37ffc89bf0b30239c425e38e628b26a41598b9ae962af38f3
-MISC ChangeLog 14836 RMD160 34778811fd451a915de429c740d20cc2c42c6e1b SHA1 c3b642037eb72bea7dbb2c201d632c168737c75c SHA256 762ca16f5984ba8bdafedbf03f7ace2348ca07cba04c4f8708761d72574f6d5a
+MISC ChangeLog 15211 RMD160 4b0baef8dab282034fe1ec4df39571e58711a116 SHA1 88f142d579bb05c3f21e8e52e244cc5350bf3a6e SHA256 87f889140097e65e946f4a4cc41b502bb1a5bdfe077e6a5f9ee668e6373ab272
 MISC metadata.xml 224 RMD160 7f4383dcad66333b9ce8db59aa0d45bac5e95ef9 SHA1 6d56e5c988fe0c85370db92875086218349cea45 SHA256 707842fe6bed516e5865253fa613bb036ddfa66026dd163981627d4b90373a4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrsWmMACgkQI1lqEGTUzyQbuwCcDuOK1eB14oWQb88dWS2L/yod
-c+UAoJleKeSgN2llTPEFNtkDKtmCzyej
-=i6sM
+iEYEARECAAYFAkrsWuoACgkQI1lqEGTUzySaXwCg12iUwlKbz17rmeV/1gkINNl9
+cdgAmgKnPmJDBvMCTLW0y5tRTWxi/RPB
+=ddZ5
 -----END PGP SIGNATURE-----
diff --git a/dev-util/systemtap/files/systemtap-0.8-gcc-4.3.3-warnings.patch b/dev-util/systemtap/files/systemtap-0.8-gcc-4.3.3-warnings.patch
deleted file mode 100644
index bcf294689608..000000000000
--- a/dev-util/systemtap/files/systemtap-0.8-gcc-4.3.3-warnings.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/tapsets.cxx b/tapsets.cxx
-index c8742fb..1e44986 100644
---- a/tapsets.cxx
-+++ b/tapsets.cxx
-@@ -2273,21 +2273,21 @@ struct dwflpp
-     FILE *memstream = open_memstream (&buf, &bufsz);
-     assert(memstream);
- 
--    fprintf(memstream, "{\n");
--    fprintf(memstream, prelude.c_str());
-+    fputs("{\n", memstream);
-+    fputs(prelude.c_str(), memstream);
-     bool deref = c_emit_location (memstream, head, 1);
--    fprintf(memstream, postlude.c_str());
--    fprintf(memstream, "  goto out;\n");
-+    fputs(postlude.c_str(), memstream);
-+    fputs("  goto out;\n", memstream);
- 
-     // dummy use of deref_fault label, to disable warning if deref() not used
--    fprintf(memstream, "if (0) goto deref_fault;\n");
-+    fputs("if (0) goto deref_fault;\n", memstream);
- 
-     // XXX: deref flag not reliable; emit fault label unconditionally
-     (void) deref;
--    fprintf(memstream,
--            "deref_fault:\n"
--            "  goto out;\n");
--    fprintf(memstream, "}\n");
-+    fputs("deref_fault:\n"
-+          "  goto out;\n",
-+          memstream);
-+    fputs("}\n", memstream);
- 
-     fclose (memstream);
-     string result(buf);
diff --git a/dev-util/systemtap/files/systemtap-20080119-grsecurity.patch b/dev-util/systemtap/files/systemtap-20080119-grsecurity.patch
deleted file mode 100644
index a558647951db..000000000000
--- a/dev-util/systemtap/files/systemtap-20080119-grsecurity.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/runtime/print.c
-+++ src/runtime/print.c
-@@ -281,9 +281,15 @@
- 	printk(KERN_DEBUG "%s: systemtap: %s, base: %p, memory: %lu+%lu+%u+%u+%u data+text+ctx+net+alloc, probes: %d\n",
- 	       THIS_MODULE->name,
- 	       vstr, 
-+#ifdef HAVE_GRSECURITY
-+	       THIS_MODULE->module_core_rx,
-+	       (unsigned long) THIS_MODULE->core_size_rw,
-+               (unsigned long) THIS_MODULE->core_size_rx,
-+#else
- 	       THIS_MODULE->module_core,  
- 	       (unsigned long) (THIS_MODULE->core_size - THIS_MODULE->core_text_size),
-                (unsigned long) THIS_MODULE->core_text_size,
-+#endif
- 	       ctx,
- 	       _stp_allocated_net_memory,
- 	       _stp_allocated_memory - _stp_allocated_net_memory,
-@@ -292,9 +298,15 @@
- 	printk(KERN_DEBUG "%s: systemtap: %s, base: %p, memory: %lu+%lu+%u+%u data+text+ctx+net, probes: %d\n",
- 	       THIS_MODULE->name,
- 	       vstr, 
-+#ifdef HAVE_GRSECURITY
-+	       THIS_MODULE->module_core_rx,
-+	       (unsigned long) THIS_MODULE->core_size_rw,
-+               (unsigned long) THIS_MODULE->core_size_rx,
-+#else
- 	       THIS_MODULE->module_core,  
- 	       (unsigned long) (THIS_MODULE->core_size - THIS_MODULE->core_text_size),
-                (unsigned long) THIS_MODULE->core_text_size,
-+#endif
- 	       ctx,
- 	       _stp_allocated_net_memory,
- 	       num_probes);
diff --git a/dev-util/systemtap/files/systemtap-20080621-as-needed.patch b/dev-util/systemtap/files/systemtap-20080621-as-needed.patch
deleted file mode 100644
index aae5fbee65ff..000000000000
--- a/dev-util/systemtap/files/systemtap-20080621-as-needed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/configure.ac
-+++ src/configure.ac
-@@ -187,6 +187,10 @@
-   # Need libdwfl-capable recent elfutils from Fedora
-   save_LIBS="$LIBS"
-   AS_IF([test "x$enable_staticdw" != xyes],[
-+    AC_CHECK_LIB(dl, dlopen,,[
-+      AC_MSG_ERROR([missing libdl])])
-+    AC_CHECK_LIB(elf, gelf_getehdr,,[
-+      AC_MSG_ERROR([missing elfutils development headers/libraries (dw 0.123+)])])
-     AC_CHECK_LIB(dw, dwfl_module_getsym,,[
-       AC_MSG_ERROR([missing elfutils development headers/libraries (dw 0.123+)])])
-     AC_CHECK_LIB(ebl, ebl_openbackend,,[
diff --git a/dev-util/systemtap/systemtap-0.7.ebuild b/dev-util/systemtap/systemtap-0.7.ebuild
deleted file mode 100644
index d31012df0ce2..000000000000
--- a/dev-util/systemtap/systemtap-0.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.7.ebuild,v 1.5 2009/06/05 19:56:10 swegener Exp $
-
-inherit linux-info eutils
-
-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
-
-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"
-
-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 \
-		--disable-docs \
-		$(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.8.ebuild b/dev-util/systemtap/systemtap-0.8.ebuild
deleted file mode 100644
index 0b70e1e3a93a..000000000000
--- a/dev-util/systemtap/systemtap-0.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.8.ebuild,v 1.4 2009/06/05 19:56:10 swegener Exp $
-
-inherit linux-info eutils
-
-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
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sqlite"
-
-DEPEND=">=dev-libs/elfutils-0.131
-	sys-libs/libcap
-	sqlite? ( =dev-db/sqlite-3* )"
-RDEPEND="${DEPEND}
-	virtual/linux-sources"
-
-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}"/${P}-gcc-4.3.3-warnings.patch
-}
-
-src_compile() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-docs \
-		$(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.9.5.ebuild b/dev-util/systemtap/systemtap-0.9.5.ebuild
deleted file mode 100644
index 7dc5888b092a..000000000000
--- a/dev-util/systemtap/systemtap-0.9.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.9.5.ebuild,v 1.5 2009/06/05 19:56:10 swegener Exp $
-
-inherit linux-info eutils
-
-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
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sqlite"
-
-DEPEND=">=dev-libs/elfutils-0.131
-	sys-libs/libcap
-	sqlite? ( =dev-db/sqlite-3* )"
-RDEPEND="${DEPEND}
-	virtual/linux-sources"
-
-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 \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		$(use_enable sqlite) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS 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.9.7.ebuild b/dev-util/systemtap/systemtap-0.9.7.ebuild
deleted file mode 100644
index c4ca88dd339e..000000000000
--- a/dev-util/systemtap/systemtap-0.9.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.9.7.ebuild,v 1.2 2009/06/05 19:56:10 swegener Exp $
-
-inherit linux-info eutils
-
-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
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sqlite"
-
-DEPEND=">=dev-libs/elfutils-0.131
-	sys-libs/libcap
-	sqlite? ( =dev-db/sqlite-3* )"
-RDEPEND="${DEPEND}
-	virtual/linux-sources"
-
-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 \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable sqlite) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS 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.9.8.ebuild b/dev-util/systemtap/systemtap-0.9.8.ebuild
deleted file mode 100644
index 4c72083020e5..000000000000
--- a/dev-util/systemtap/systemtap-0.9.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.9.8.ebuild,v 1.2 2009/07/06 21:38:47 swegener Exp $
-
-inherit linux-info eutils
-
-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
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sqlite"
-
-DEPEND=">=dev-libs/elfutils-0.131
-	sys-libs/libcap
-	sqlite? ( =dev-db/sqlite-3* )"
-RDEPEND="${DEPEND}
-	virtual/linux-sources"
-
-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 \
-		--docdir=/usr/share/doc/${PF} \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable sqlite) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS 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.9.9.ebuild b/dev-util/systemtap/systemtap-0.9.9.ebuild
deleted file mode 100644
index 52481cbd6a07..000000000000
--- a/dev-util/systemtap/systemtap-0.9.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-0.9.9.ebuild,v 1.1 2009/08/10 20:30:37 swegener Exp $
-
-inherit linux-info eutils
-
-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
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sqlite"
-
-DEPEND=">=dev-libs/elfutils-0.131
-	sys-libs/libcap
-	sqlite? ( =dev-db/sqlite-3* )"
-RDEPEND="${DEPEND}
-	virtual/linux-sources"
-
-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 \
-		--docdir=/usr/share/doc/${PF} \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable sqlite) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS 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-1.0.ebuild b/dev-util/systemtap/systemtap-1.0.ebuild
deleted file mode 100644
index 42bdb9033047..000000000000
--- a/dev-util/systemtap/systemtap-1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/systemtap/systemtap-1.0.ebuild,v 1.1 2009/09/28 19:29:36 swegener Exp $
-
-inherit linux-info
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="http://sourceware.org/systemtap/"
-if [[ ${PV} = *_p* ]] # 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/*_p/}.tar.bz2
-		mirror://gentoo/${PN}-${PV/*_p/}.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
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sqlite"
-
-DEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
-	sqlite? ( =dev-db/sqlite-3* )"
-RDEPEND="${DEPEND}
-	virtual/linux-sources"
-
-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_compile() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable sqlite) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS HACKING NEWS README
-}