Delete older, vulnerable ebuilds.

Package-Manager: portage-14242-svn/cvs/Linux x86_64

9 files changed, 8 insertions, 632 deletions

diff --git a/dev-util/buildbot/ChangeLog b/dev-util/buildbot/ChangeLog
index e5a28780aa02..ca2e85a37395 100644
--- a/dev-util/buildbot/ChangeLog
+++ b/dev-util/buildbot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/buildbot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.50 2009/09/11 19:31:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.51 2009/09/13 14:30:56 arfrever Exp $
+
+  13 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -buildbot-0.7.5.ebuild, -buildbot-0.7.6.ebuild, -buildbot-0.7.7-r1.ebuild,
+  -buildbot-0.7.9-r1.ebuild, -buildbot-0.7.9-r2.ebuild,
+  -buildbot-0.7.10_p1.ebuild, -files/buildbot.initd:
+  Delete older, vulnerable ebuilds.
 
   11 Sep 2009; Markus Meier <maekke@gentoo.org> buildbot-0.7.11_p3.ebuild:
   amd64 stable, bug #282855
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index f62d35d66ed0..43507bf535d6 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,30 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX buildbot-0.7.5-root-skip-tests.patch 430 RMD160 696badc78f800a535996550977fa9a433a0ad7ae SHA1 f774027e049544bb241548914b7ff393aa0a4ee4 SHA256 ca953c4edeaac73fd8de49d9e936621efb2e9c6dead31f276db9b1cdb8488ebd
-AUX buildbot.initd 1207 RMD160 3bc054c15b8c530f8f4012026319d3f5c6264079 SHA1 1eefb47a1872b578a6b47b01c79662cb8890fa6e SHA256 0774ae5c3cfd67e537251a6e3c4bdd4bc6c948fadf7e15bd137ad977e21475fb
 AUX buildbot.initd-r1 1230 RMD160 16a9fc902f09d5c73d68df8970e7491af9002594 SHA1 341384a6bb5e817914d26da4d854dcacfb8c9b25 SHA256 2caac58f72af711c54adaa7dcdfb1417255d26d07cf9f3388fd5267ee7fc7c47
 AUX buildmaster.confd 218 RMD160 a8f6893aa83c0c169f493104e1c6f023ec45f787 SHA1 8dc5e868092a8ea90c0cec5650ba85e412295968 SHA256 bb7f93e3867b32a25e2445a66d40573fa5073a80e73e35ae2a904db715f870c6
 AUX buildslave.confd 215 RMD160 ffe7545a43c10a9f3e9798f23ba6a32ab47c137b SHA1 8c57893b6ef370a98f4af552d91e1b702b89abd6 SHA256 5d0ab58d0808ccfa2d594b22047dfca9167c855ff749d34523177cefb307f76a
-DIST buildbot-0.7.10p1.tar.gz 1113464 RMD160 bdd9a8d6daf9e947e52784ee6d5fb30285f8d8b6 SHA1 799bf66cf4d6f8b9f94c0b167ac14b1198afdb7d SHA256 c3443194b341d44f3cca1a092690eaeb559b4b9b17769fcf1cce1df8d3a2ac71
 DIST buildbot-0.7.11p3.tar.gz 1019706 RMD160 5fc1d9e1c32127109f58ea727cae2e6266b16fb9 SHA1 3c0fc8bbdb2db92450d7294da11fc40979e94e63 SHA256 5bc20a29e761c3eb191c8d7b36ef10929f7c371c50dfeeec426ce3589c8ce740
-DIST buildbot-0.7.5.tar.gz 937490 RMD160 3aa6c243536771ed579c050d574fd57c56a96c8c SHA1 ef5c884141b016472b5eaf3a2ff0657f9ef6b221 SHA256 48366fc4032487702dea95b12ddf246ca43942450924c76a60235edf9cd0b004
-DIST buildbot-0.7.6.tar.gz 1070806 RMD160 445049911a96e358732a90cf34d13e44139574a4 SHA1 f1c9693fefa6cc882387126e45cb0bdec8bce88c SHA256 e73afc607885133ed4a68f174fe6b43a77c4436bd0923109c5a76f415a2e1b25
-DIST buildbot-0.7.7.tar.gz 1109613 RMD160 4ff3fa7e9b3fef26c85f716de231e5241768a7a6 SHA1 47201c3e0d98f7b4a2bc5a4d959ebdc1be0634d7 SHA256 71f31925b9108a460345ab5cee975c28a28b4ce894a8877004f956617555f42c
-DIST buildbot-0.7.9.tar.gz 1032433 RMD160 586a8aecec6c30bde2ee277279f281fcd7be97e5 SHA1 9a1410007aff6ae965c746efa9d48fe5d344e9b9 SHA256 196e25f0f4320636cdf7165bc5affb4e2a0444b19cafd64d486b47fdec470265
-EBUILD buildbot-0.7.10_p1.ebuild 3095 RMD160 e2453e37c4dc0f91d14fbbdc9b6c2cb59462408a SHA1 8fee568a3559ca69cf2bf80c84609d04364b7be2 SHA256 d2ed87111e81284c1a9c977cace6273dca3237de1b5e8792b4f6bcfd3d234c1e
 EBUILD buildbot-0.7.11_p3.ebuild 3104 RMD160 0860515cc50d4a047a2e3df52cb4275ae45a2e5e SHA1 7e0cb5df80fa3ea6cf9aef6524344fcaabb7c4ae SHA256 31419578360ee325bb6d118eb61f449dddb68d2669207e08fef3f5ab093bcf6d
-EBUILD buildbot-0.7.5.ebuild 2637 RMD160 f9ee0eb764e14ca34240c0e1085e1191e1649872 SHA1 ff58372798c6bfb9027f760ccb79ceaf81a5f6d2 SHA256 d468c59078dae6ffce2f884d17150df20a9416ef2f88039f4b831c8518acf274
-EBUILD buildbot-0.7.6.ebuild 3007 RMD160 6d76790abab7a9ba22775f70ed3293647ced3548 SHA1 554614e6c2cd91106c68219301f4a686adb1fb13 SHA256 fc272e62288989434d034d405bd89536e32b3b8a40a947e4ac279630d04b63e4
-EBUILD buildbot-0.7.7-r1.ebuild 2955 RMD160 f0b9ae03e34ee7fb12d41094d812b867cccff959 SHA1 e86fb2f65f7f483d80f811200a9feab8fa388397 SHA256 e1a873f834a2f93bb9c995c45c419c81631e6a50a110077eaa932340b4ef5767
-EBUILD buildbot-0.7.9-r1.ebuild 3019 RMD160 644edfd71e5a51d2f2e421bb013f2d9cd234b2df SHA1 53ce490657e49a2b57f5720dbc2068a02ad1ddcb SHA256 6e3a4b82090979a132fd2fea12243074b41d0ecf2e31212c5e96a6b2f5057763
-EBUILD buildbot-0.7.9-r2.ebuild 3037 RMD160 fc57dea372714f2cfefd682051ea5610b1f409e9 SHA1 d6fb8ece70ad6ff02aa0aa11f307d315111553ff SHA256 9c62c218d6fc8214e0513b31641deb4545e111b75adc944ca19bd3298d37f483
-MISC ChangeLog 6905 RMD160 31fec6fc584b234abfb798409c57c378dccf8bb1 SHA1 8fb009e2005e5cc2c5d0435c26730dae6c74f465 SHA256 d10642432d23d725a696921152ca583edf0aaceb36c643d354fc5f842b5f29d7
+MISC ChangeLog 7203 RMD160 dbf519a49a82f87d4a91a89742c84bb34a6a739a SHA1 fd8295a2de36d81541a67cc068cde105779a7168 SHA256 e88041fda2e868cdba5bc1436102b556e1d83e9baab217d253d78eda52fa2759
 MISC metadata.xml 1256 RMD160 d74c4604444efafc29c32588ad6ba8f206aa412c SHA1 1b8e8628bdb88f94b975193b149533e0fee810f2 SHA256 51805591f3d3b53c0352700a6a1758d2a2a27c7f8df753095968771efcaf8ace
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqqpcMACgkQkKaRLQcq0GJnVgCfVnDRQpuHV/bL8aJ6DoLaNI4a
-B7QAn2Eh5ZpEagVOw6Ml7w9hG3qfk/lE
-=0NQo
------END PGP SIGNATURE-----
diff --git a/dev-util/buildbot/buildbot-0.7.10_p1.ebuild b/dev-util/buildbot/buildbot-0.7.10_p1.ebuild
deleted file mode 100644
index 59135783e2d1..000000000000
--- a/dev-util/buildbot/buildbot-0.7.10_p1.ebuild
+++ /dev/null
@@ -1,100 +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/buildbot/buildbot-0.7.10_p1.ebuild,v 1.9 2009/06/17 20:10:33 jer Exp $
-
-EAPI=1
-NEED_PYTHON="2.4"
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-inherit distutils
-
-DESCRIPTION="A Python system to automate the compile/test cycle to validate code changes"
-HOMEPAGE="http://buildbot.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="doc irc mail manhole test"
-
-CDEPEND=">=dev-python/twisted-2.0.1"
-RDEPEND="${CDEPEND}
-	mail? ( dev-python/twisted-mail )
-	manhole? ( dev-python/twisted-conch )
-	irc? ( dev-python/twisted-words )
-	dev-python/twisted-web
-	dev-python/twisted-mail"
-DEPEND="${CDEPEND}
-	test? ( dev-python/twisted-web
-		    dev-python/twisted-mail )
-	doc? ( =dev-python/epydoc-2* )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewuser buildbot
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.7.5-root-skip-tests.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		PYTHONPATH=. "${python}" docs/epyrun -o docs/reference || \
-			die "epyrun failed"
-	fi
-}
-
-src_test() {
-	local trialopts
-	if ! has_version ">=dev-python/twisted-2.2"; then
-		trialopts=-R
-	fi
-	PYTHONPATH=. trial ${trialopts} buildbot || die "tests failed!"
-}
-
-src_install() {
-	distutils_src_install
-	doinfo docs/buildbot.info
-	dohtml -r docs/buildbot.html docs/images
-
-	insinto /usr/share/doc/${PF}
-	doins -r contrib
-	doins -r docs/examples
-
-	use doc && doins -r docs/reference
-
-	newconfd "${FILESDIR}/buildslave.confd" buildslave
-	newinitd "${FILESDIR}/buildbot.initd-r1" buildslave
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildbot.initd-r1" buildmaster
-
-	# Make it print the right names when you start/stop the script.
-	sed -i -e 's/@buildbot@/buildslave/' \
-		"${D}/etc/init.d/buildslave" || die "buildslave sed failed"
-	sed -i -e 's/@buildbot@/buildmaster/' \
-		"${D}/etc/init.d/buildmaster" || die "buildmaster sed failed"
-}
-
-pkg_postinst() {
-	elog 'The "buildbot" user and the "buildmaster" and "buildslave" init'
-	elog "scripts were added to support starting buildbot through gentoo's"
-	elog "init system.  To use this set up your build master or build slave"
-	elog "following the buildbot documentation, make sure the resulting"
-	elog 'directories are owned by the "buildbot" user and point'
-	elog "${ROOT}etc/conf.d/buildmaster or ${ROOT}etc/conf.d/buildslave"
-	elog "at the right location.  The scripts can run as a different user"
-	elog "if desired.  If you need to run more than one master or slave"
-	elog "just copy the scripts."
-	elog ""
-	elog "Upstream recommends the following when upgrading:"
-	elog "Each time you install a new version of Buildbot, you should run the new"
-	elog "'buildbot upgrade-master' command on each of your pre-existing buildmasters."
-	elog "This will add files and fix (or at least detect) incompatibilities between"
-	elog "your old config and the new code."
-}
diff --git a/dev-util/buildbot/buildbot-0.7.5.ebuild b/dev-util/buildbot/buildbot-0.7.5.ebuild
deleted file mode 100644
index 72b70e0b38ec..000000000000
--- a/dev-util/buildbot/buildbot-0.7.5.ebuild
+++ /dev/null
@@ -1,87 +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/buildbot/buildbot-0.7.5.ebuild,v 1.13 2008/04/05 17:24:13 hawking Exp $
-
-inherit distutils eutils
-
-DESCRIPTION="A Python system to automate the compile/test cycle to validate code changes"
-HOMEPAGE="http://buildbot.net/"
-SRC_URI="mirror://sourceforge/buildbot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc irc mail test web"
-
-commondepend=">=dev-lang/python-2.3
-	>=dev-python/twisted-2.0.1"
-RDEPEND="${commondepend}
-	mail? ( dev-python/twisted-mail )
-	irc? ( dev-python/twisted-words )
-	web? ( dev-python/twisted-web )"
-DEPEND="${commondepend}
-	test? ( dev-python/twisted-web )
-	doc? ( dev-python/epydoc )"
-
-pkg_setup() {
-	enewuser buildbot
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-root-skip-tests.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		PYTHONPATH=. "${python}" docs/epyrun -o docs/reference || \
-			die "epyrun failed"
-	fi
-}
-
-src_test() {
-	local trialopts
-	if ! has_version ">=dev-python/twisted-2.2"; then
-		trialopts=-R
-	fi
-	PYTHONPATH=. trial ${trialopts} buildbot || die "tests failed!"
-}
-
-src_install() {
-	distutils_src_install
-	doinfo docs/buildbot.info
-	dohtml -r docs/buildbot.html docs/images
-
-	insinto /usr/share/doc/${PF}
-	doins -r docs/examples
-
-	if use doc; then
-		doins -r docs/reference
-	fi
-
-	newconfd "${FILESDIR}/buildslave.confd" buildslave
-	newinitd "${FILESDIR}/buildbot.initd" buildslave
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildbot.initd" buildmaster
-
-	# Make it print the right names when you start/stop the script.
-	sed -i -e '/ebegin/s/Starting buildbot/Starting buildslave/' \
-		"${D}/etc/init.d/buildslave" || die "buildslave sed failed"
-	sed -i -e '/ebegin/s/Starting buildbot/Starting buildmaster/' \
-		"${D}/etc/init.d/buildmaster" || die "buildmaster sed failed"
-}
-
-pkg_postinst() {
-	elog 'The "buildbot" user and the "buildmaster" and "buildslave" init'
-	elog "scripts were added to support starting buildbot through gentoo's"
-	elog "init system.  To use this set up your build master or build slave"
-	elog "following the buildbot documentation, make sure the resulting"
-	elog 'directories are owned by the "buildbot" user and point'
-	elog "${ROOT}etc/conf.d/buildmaster or ${ROOT}etc/conf.d/buildslave"
-	elog "at the right location.  The scripts can run as a different user"
-	elog "if desired.  If you need to run more than one master or slave"
-	elog "just copy the scripts."
-}
diff --git a/dev-util/buildbot/buildbot-0.7.6.ebuild b/dev-util/buildbot/buildbot-0.7.6.ebuild
deleted file mode 100644
index e77ff4cbf5ce..000000000000
--- a/dev-util/buildbot/buildbot-0.7.6.ebuild
+++ /dev/null
@@ -1,92 +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/buildbot/buildbot-0.7.6.ebuild,v 1.5 2008/05/27 16:45:29 corsair Exp $
-
-NEED_PYTHON="2.3"
-
-inherit distutils eutils
-
-DESCRIPTION="A Python system to automate the compile/test cycle to validate code changes"
-HOMEPAGE="http://buildbot.net/"
-SRC_URI="mirror://sourceforge/buildbot/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc irc mail test web"
-
-CDEPEND=">=dev-python/twisted-2.0.1"
-RDEPEND="${CDEPEND}
-	mail? ( dev-python/twisted-mail )
-	irc? ( dev-python/twisted-words )
-	web? ( dev-python/twisted-web )"
-DEPEND="${CDEPEND}
-	test? ( dev-python/twisted-web
-		dev-python/twisted-mail )
-	doc? ( =dev-python/epydoc-2* )"
-
-pkg_setup() {
-	enewuser buildbot
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.7.5-root-skip-tests.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		PYTHONPATH=. "${python}" docs/epyrun -o docs/reference || \
-			die "epyrun failed"
-	fi
-}
-
-src_test() {
-	local trialopts
-	if ! has_version ">=dev-python/twisted-2.2"; then
-		trialopts=-R
-	fi
-	PYTHONPATH=. trial ${trialopts} buildbot || die "tests failed!"
-}
-
-src_install() {
-	distutils_src_install
-	doinfo docs/buildbot.info
-	dohtml -r docs/buildbot.html docs/images
-
-	insinto /usr/share/doc/${PF}
-	doins -r docs/examples
-
-	use doc && doins -r docs/reference
-
-	newconfd "${FILESDIR}/buildslave.confd" buildslave
-	newinitd "${FILESDIR}/buildbot.initd" buildslave
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildbot.initd" buildmaster
-
-	# Make it print the right names when you start/stop the script.
-	sed -i -e '/ebegin/s/Starting buildbot/Starting buildslave/' \
-		"${D}/etc/init.d/buildslave" || die "buildslave sed failed"
-	sed -i -e '/ebegin/s/Starting buildbot/Starting buildmaster/' \
-		"${D}/etc/init.d/buildmaster" || die "buildmaster sed failed"
-}
-
-pkg_postinst() {
-	elog 'The "buildbot" user and the "buildmaster" and "buildslave" init'
-	elog "scripts were added to support starting buildbot through gentoo's"
-	elog "init system.  To use this set up your build master or build slave"
-	elog "following the buildbot documentation, make sure the resulting"
-	elog 'directories are owned by the "buildbot" user and point'
-	elog "${ROOT}etc/conf.d/buildmaster or ${ROOT}etc/conf.d/buildslave"
-	elog "at the right location.  The scripts can run as a different user"
-	elog "if desired.  If you need to run more than one master or slave"
-	elog "just copy the scripts."
-	elog ""
-	elog "Upstream recommends the following when upgrading:"
-	elog "Each time you install a new version of Buildbot, you should run the new"
-	elog "'buildbot upgrade-master' command on each of your pre-existing buildmasters."
-	elog "This will add files and fix (or at least detect) incompatibilities between"
-	elog "your old config and the new code."
-}
diff --git a/dev-util/buildbot/buildbot-0.7.7-r1.ebuild b/dev-util/buildbot/buildbot-0.7.7-r1.ebuild
deleted file mode 100644
index 570a664aafe0..000000000000
--- a/dev-util/buildbot/buildbot-0.7.7-r1.ebuild
+++ /dev/null
@@ -1,92 +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/buildbot/buildbot-0.7.7-r1.ebuild,v 1.7 2008/11/04 23:15:34 vapier Exp $
-
-NEED_PYTHON="2.3"
-
-inherit distutils eutils
-
-DESCRIPTION="A Python system to automate the compile/test cycle to validate code changes"
-HOMEPAGE="http://buildbot.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc irc mail test web"
-
-CDEPEND=">=dev-python/twisted-2.0.1"
-RDEPEND="${CDEPEND}
-	mail? ( dev-python/twisted-mail )
-	irc? ( dev-python/twisted-words )
-	web? ( dev-python/twisted-web )"
-DEPEND="${CDEPEND}
-	test? ( dev-python/twisted-web
-		dev-python/twisted-mail )
-	doc? ( =dev-python/epydoc-2* )"
-
-pkg_setup() {
-	enewuser buildbot
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.7.5-root-skip-tests.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		PYTHONPATH=. "${python}" docs/epyrun -o docs/reference || \
-			die "epyrun failed"
-	fi
-}
-
-src_test() {
-	local trialopts
-	if ! has_version ">=dev-python/twisted-2.2"; then
-		trialopts=-R
-	fi
-	PYTHONPATH=. trial ${trialopts} buildbot || die "tests failed!"
-}
-
-src_install() {
-	distutils_src_install
-	doinfo docs/buildbot.info
-	dohtml -r docs/buildbot.html docs/images
-
-	insinto /usr/share/doc/${PF}
-	doins -r docs/examples
-
-	use doc && doins -r docs/reference
-
-	newconfd "${FILESDIR}/buildslave.confd" buildslave
-	newinitd "${FILESDIR}/buildbot.initd-r1" buildslave
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildbot.initd-r1" buildmaster
-
-	# Make it print the right names when you start/stop the script.
-	sed -i -e 's/@buildbot@/buildslave/' \
-		"${D}/etc/init.d/buildslave" || die "buildslave sed failed"
-	sed -i -e 's/@buildbot@/buildmaster/' \
-		"${D}/etc/init.d/buildmaster" || die "buildmaster sed failed"
-}
-
-pkg_postinst() {
-	elog 'The "buildbot" user and the "buildmaster" and "buildslave" init'
-	elog "scripts were added to support starting buildbot through gentoo's"
-	elog "init system.  To use this set up your build master or build slave"
-	elog "following the buildbot documentation, make sure the resulting"
-	elog 'directories are owned by the "buildbot" user and point'
-	elog "${ROOT}etc/conf.d/buildmaster or ${ROOT}etc/conf.d/buildslave"
-	elog "at the right location.  The scripts can run as a different user"
-	elog "if desired.  If you need to run more than one master or slave"
-	elog "just copy the scripts."
-	elog ""
-	elog "Upstream recommends the following when upgrading:"
-	elog "Each time you install a new version of Buildbot, you should run the new"
-	elog "'buildbot upgrade-master' command on each of your pre-existing buildmasters."
-	elog "This will add files and fix (or at least detect) incompatibilities between"
-	elog "your old config and the new code."
-}
diff --git a/dev-util/buildbot/buildbot-0.7.9-r1.ebuild b/dev-util/buildbot/buildbot-0.7.9-r1.ebuild
deleted file mode 100644
index 8cc941d1f368..000000000000
--- a/dev-util/buildbot/buildbot-0.7.9-r1.ebuild
+++ /dev/null
@@ -1,94 +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/buildbot/buildbot-0.7.9-r1.ebuild,v 1.1 2009/02/15 11:53:12 patrick Exp $
-
-NEED_PYTHON="2.3"
-
-inherit distutils eutils
-
-DESCRIPTION="A Python system to automate the compile/test cycle to validate code changes"
-HOMEPAGE="http://buildbot.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc irc mail manhole test"
-
-CDEPEND=">=dev-python/twisted-2.0.1"
-RDEPEND="${CDEPEND}
-	mail? ( dev-python/twisted-mail )
-	manhole? ( dev-python/twisted-conch )
-	irc? ( dev-python/twisted-words )
-	dev-python/twisted-web
-	dev-python/twisted-mail"
-DEPEND="${CDEPEND}
-	test? ( dev-python/twisted-web
-		dev-python/twisted-mail )
-	doc? ( =dev-python/epydoc-2* )"
-
-pkg_setup() {
-	enewuser buildbot
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.7.5-root-skip-tests.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		PYTHONPATH=. "${python}" docs/epyrun -o docs/reference || \
-			die "epyrun failed"
-	fi
-}
-
-src_test() {
-	local trialopts
-	if ! has_version ">=dev-python/twisted-2.2"; then
-		trialopts=-R
-	fi
-	PYTHONPATH=. trial ${trialopts} buildbot || die "tests failed!"
-}
-
-src_install() {
-	distutils_src_install
-	doinfo docs/buildbot.info
-	dohtml -r docs/buildbot.html docs/images
-
-	insinto /usr/share/doc/${PF}
-	doins -r docs/examples
-
-	use doc && doins -r docs/reference
-
-	newconfd "${FILESDIR}/buildslave.confd" buildslave
-	newinitd "${FILESDIR}/buildbot.initd-r1" buildslave
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildbot.initd-r1" buildmaster
-
-	# Make it print the right names when you start/stop the script.
-	sed -i -e 's/@buildbot@/buildslave/' \
-		"${D}/etc/init.d/buildslave" || die "buildslave sed failed"
-	sed -i -e 's/@buildbot@/buildmaster/' \
-		"${D}/etc/init.d/buildmaster" || die "buildmaster sed failed"
-}
-
-pkg_postinst() {
-	elog 'The "buildbot" user and the "buildmaster" and "buildslave" init'
-	elog "scripts were added to support starting buildbot through gentoo's"
-	elog "init system.  To use this set up your build master or build slave"
-	elog "following the buildbot documentation, make sure the resulting"
-	elog 'directories are owned by the "buildbot" user and point'
-	elog "${ROOT}etc/conf.d/buildmaster or ${ROOT}etc/conf.d/buildslave"
-	elog "at the right location.  The scripts can run as a different user"
-	elog "if desired.  If you need to run more than one master or slave"
-	elog "just copy the scripts."
-	elog ""
-	elog "Upstream recommends the following when upgrading:"
-	elog "Each time you install a new version of Buildbot, you should run the new"
-	elog "'buildbot upgrade-master' command on each of your pre-existing buildmasters."
-	elog "This will add files and fix (or at least detect) incompatibilities between"
-	elog "your old config and the new code."
-}
diff --git a/dev-util/buildbot/buildbot-0.7.9-r2.ebuild b/dev-util/buildbot/buildbot-0.7.9-r2.ebuild
deleted file mode 100644
index 391ffda9c293..000000000000
--- a/dev-util/buildbot/buildbot-0.7.9-r2.ebuild
+++ /dev/null
@@ -1,95 +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/buildbot/buildbot-0.7.9-r2.ebuild,v 1.1 2009/02/24 21:09:56 hawking Exp $
-
-NEED_PYTHON="2.3"
-
-inherit distutils eutils
-
-DESCRIPTION="A Python system to automate the compile/test cycle to validate code changes"
-HOMEPAGE="http://buildbot.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc irc mail manhole test"
-
-CDEPEND=">=dev-python/twisted-2.0.1"
-RDEPEND="${CDEPEND}
-	mail? ( dev-python/twisted-mail )
-	manhole? ( dev-python/twisted-conch )
-	irc? ( dev-python/twisted-words )
-	dev-python/twisted-web
-	dev-python/twisted-mail"
-DEPEND="${CDEPEND}
-	test? ( dev-python/twisted-web
-		dev-python/twisted-mail )
-	doc? ( =dev-python/epydoc-2* )"
-
-pkg_setup() {
-	enewuser buildbot
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.7.5-root-skip-tests.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		PYTHONPATH=. "${python}" docs/epyrun -o docs/reference || \
-			die "epyrun failed"
-	fi
-}
-
-src_test() {
-	local trialopts
-	if ! has_version ">=dev-python/twisted-2.2"; then
-		trialopts=-R
-	fi
-	PYTHONPATH=. trial ${trialopts} buildbot || die "tests failed!"
-}
-
-src_install() {
-	distutils_src_install
-	doinfo docs/buildbot.info
-	dohtml -r docs/buildbot.html docs/images
-
-	insinto /usr/share/doc/${PF}
-	doins -r contrib
-	doins -r docs/examples
-
-	use doc && doins -r docs/reference
-
-	newconfd "${FILESDIR}/buildslave.confd" buildslave
-	newinitd "${FILESDIR}/buildbot.initd-r1" buildslave
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildbot.initd-r1" buildmaster
-
-	# Make it print the right names when you start/stop the script.
-	sed -i -e 's/@buildbot@/buildslave/' \
-		"${D}/etc/init.d/buildslave" || die "buildslave sed failed"
-	sed -i -e 's/@buildbot@/buildmaster/' \
-		"${D}/etc/init.d/buildmaster" || die "buildmaster sed failed"
-}
-
-pkg_postinst() {
-	elog 'The "buildbot" user and the "buildmaster" and "buildslave" init'
-	elog "scripts were added to support starting buildbot through gentoo's"
-	elog "init system.  To use this set up your build master or build slave"
-	elog "following the buildbot documentation, make sure the resulting"
-	elog 'directories are owned by the "buildbot" user and point'
-	elog "${ROOT}etc/conf.d/buildmaster or ${ROOT}etc/conf.d/buildslave"
-	elog "at the right location.  The scripts can run as a different user"
-	elog "if desired.  If you need to run more than one master or slave"
-	elog "just copy the scripts."
-	elog ""
-	elog "Upstream recommends the following when upgrading:"
-	elog "Each time you install a new version of Buildbot, you should run the new"
-	elog "'buildbot upgrade-master' command on each of your pre-existing buildmasters."
-	elog "This will add files and fix (or at least detect) incompatibilities between"
-	elog "your old config and the new code."
-}
diff --git a/dev-util/buildbot/files/buildbot.initd b/dev-util/buildbot/files/buildbot.initd
deleted file mode 100644
index bf11190b128f..000000000000
--- a/dev-util/buildbot/files/buildbot.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/files/buildbot.initd,v 1.2 2006/11/02 20:03:49 marienz Exp $
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [[ -z "${BASEDIR}" ]]; then
-		eerror "BASEDIR not set"
-		return 1
-	fi
-	if [[ -z "${USERNAME}" ]]; then
-		eerror "USERNAME not set"
-		return 1
-	fi
-	if [[ ! -d "${BASEDIR}" ]]; then
-		eerror "${BASEDIR} is not a directory"
-		return 1
-	fi
-	if [[ ! -e "${BASEDIR}/buildbot.tac" ]]; then
-		eerror "${BASEDIR} does not contain buildbot.tac"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting buildbot in ${BASEDIR}"
-	# We set HOME here to make something valid show up in the env of child
-	# processes spawned by the buildslave.
-	start-stop-daemon --start -c "${USERNAME}" --quiet \
-		--env HOME="${BASEDIR}" \
-		--exec /usr/bin/twistd -- \
-		--no_save \
-		--logfile="${BASEDIR}/twistd.log" \
-		--pidfile="${BASEDIR}/twistd.pid" \
-		--python="${BASEDIR}/buildbot.tac"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping buildbot in ${BASEDIR}"
-	start-stop-daemon --stop --quiet --pidfile "${BASEDIR}/twistd.pid"
-	eend $?
-}