Remove old version, really fix bug 395235

(Portage version: 2.1.10.49/cvs/Linux x86_64)

5 files changed, 9 insertions, 158 deletions

diff --git a/app-admin/bcfg2/ChangeLog b/app-admin/bcfg2/ChangeLog
index 983089170ee5..1b58c7c5b99b 100644
--- a/app-admin/bcfg2/ChangeLog
+++ b/app-admin/bcfg2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/bcfg2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.19 2011/12/28 07:56:20 xmw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.20 2012/04/14 09:48:37 xmw Exp $
+
+  14 Apr 2012; Michael Weber <xmw@gentoo.org> -files/bcfg2-server.rc,
+  -bcfg2-1.1.3.ebuild, -bcfg2-1.2.0_rc2.ebuild, bcfg2-1.2.0.ebuild:
+  Remove old version, really fix bug 395235
 
 *bcfg2-1.2.0 (28 Dec 2011)
 
diff --git a/app-admin/bcfg2/bcfg2-1.1.3.ebuild b/app-admin/bcfg2/bcfg2-1.1.3.ebuild
deleted file mode 100644
index d8f04eca47c8..000000000000
--- a/app-admin/bcfg2/bcfg2-1.1.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.1.3.ebuild,v 1.1 2011/11/11 00:21:13 xmw Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-# ssl module required.
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-
-inherit distutils
-
-DESCRIPTION="Bcfg2 is a configuration management tool."
-HOMEPAGE="http://bcfg2.org"
-
-# handle the "pre" case
-MY_P="${P/_/}"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="server"
-
-DEPEND="app-portage/gentoolkit
-	server? (
-		dev-python/lxml
-		app-admin/gam-server )"
-RDEPEND="${DEPEND}"
-
-PYTHON_MODNAME="Bcfg2"
-
-distutils_src_install_post_hook() {
-	if ! use server; then
-		rm -f "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/sbin/bcfg2-"*
-	fi
-}
-
-src_install() {
-	distutils_src_install --record=PY_SERVER_LIBS --install-scripts "${EPREFIX}/usr/sbin"
-
-	# Remove files only necessary for a server installation
-	if ! use server; then
-		rm -rf "${ED}usr/share/bcfg2"
-		rm -rf "${ED}usr/share/man/man8"
-	fi
-
-	# Install a server init.d script
-	if use server; then
-		newinitd "${FILESDIR}/bcfg2-server.rc" bcfg2-server
-	fi
-
-	insinto /etc
-	doins examples/bcfg2.conf || die "doins failed"
-}
-
-pkg_postinst () {
-	distutils_pkg_postinst
-
-	if use server; then
-		einfo "If this is a new installation, you probably need to run:"
-		einfo "    bcfg2-admin init"
-	fi
-}
diff --git a/app-admin/bcfg2/bcfg2-1.2.0.ebuild b/app-admin/bcfg2/bcfg2-1.2.0.ebuild
index c93ced670f4d..d797e72d42e0 100644
--- a/app-admin/bcfg2/bcfg2-1.2.0.ebuild
+++ b/app-admin/bcfg2/bcfg2-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.0.ebuild,v 1.1 2011/12/28 07:56:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.0.ebuild,v 1.2 2012/04/14 09:48:37 xmw Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -40,7 +40,7 @@ src_install() {
 		rm -rf "${ED}usr/share/bcfg2"
 		rm -rf "${ED}usr/share/man/man8"
 	else
-		newinitd "${FILESDIR}/bcfg2-server.rc" bcfg2-server
+		newinitd "${FILESDIR}/${PN}-server-${PV}.rc" bcfg2-server
 	fi
 
 	insinto /etc
diff --git a/app-admin/bcfg2/bcfg2-1.2.0_rc2.ebuild b/app-admin/bcfg2/bcfg2-1.2.0_rc2.ebuild
deleted file mode 100644
index 6008d71a9bd0..000000000000
--- a/app-admin/bcfg2/bcfg2-1.2.0_rc2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.0_rc2.ebuild,v 1.1 2011/11/11 00:21:13 xmw Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-# ssl module required.
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-
-inherit distutils
-
-DESCRIPTION="Bcfg2 is a configuration management tool."
-HOMEPAGE="http://bcfg2.org"
-
-# handle the "pre" case
-MY_P="${P/_/}"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="server"
-
-DEPEND="app-portage/gentoolkit
-	server? (
-		dev-python/lxml
-		app-admin/gam-server )"
-RDEPEND="${DEPEND}"
-
-PYTHON_MODNAME="Bcfg2"
-
-distutils_src_install_post_hook() {
-	if ! use server; then
-		rm -f "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/sbin/bcfg2-"*
-	fi
-}
-
-src_install() {
-	distutils_src_install --record=PY_SERVER_LIBS --install-scripts "${EPREFIX}/usr/sbin"
-
-	# Remove files only necessary for a server installation
-	if ! use server; then
-		rm -rf "${ED}usr/share/bcfg2"
-		rm -rf "${ED}usr/share/man/man8"
-	fi
-
-	# Install a server init.d script
-	if use server; then
-		newinitd "${FILESDIR}/bcfg2-server.rc" bcfg2-server
-	fi
-
-	insinto /etc
-	doins examples/bcfg2.conf || die "doins failed"
-}
-
-pkg_postinst () {
-	distutils_pkg_postinst
-
-	if use server; then
-		einfo "If this is a new installation, you probably need to run:"
-		einfo "    bcfg2-admin init"
-	fi
-}
diff --git a/app-admin/bcfg2/files/bcfg2-server.rc b/app-admin/bcfg2/files/bcfg2-server.rc
deleted file mode 100644
index 92e4c5c10d5d..000000000000
--- a/app-admin/bcfg2/files/bcfg2-server.rc
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-#
-# bcfgd - bcfg configuration daemon
-#
-# 
-
-depend () {
-	need net
-}
-
-start () {
-	ebegin "Starting bcfg2-server"
-	start-stop-daemon --start --quiet --pidfile /var/run/bcfg2-server.pid \
-		--startas /usr/sbin/bcfg2-server -- -D /var/run/bcfg2-server.pid
-	eend $? "Failed to start bcfg2-server"
-}
-
-stop () {
-	ebegin "Stopping bcfg2-server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/bcfg2-server.pid \
-		--signal INT
-	eend $? "Failed to stop bcfg2-server"
-}