Fix slotting wrt #312423.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 6 insertions, 111 deletions

diff --git a/app-admin/bcfg2/ChangeLog b/app-admin/bcfg2/ChangeLog
index b67812aa76c2..994285ecd04f 100644
--- a/app-admin/bcfg2/ChangeLog
+++ b/app-admin/bcfg2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/bcfg2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.11 2010/03/28 03:55:51 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.12 2010/03/31 15:45:52 ssuominen Exp $
+
+  31 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> bcfg2-1.0.1.ebuild:
+  Fix slotting wrt #312423.
 
   28 Mar 2010; Jeremy Olexa <darkside@gentoo.org> metadata.xml:
   Drop myself from metadata, add maintainer-needed
diff --git a/app-admin/bcfg2/bcfg2-0.9.6.ebuild b/app-admin/bcfg2/bcfg2-0.9.6.ebuild
deleted file mode 100644
index 169ffaa1c5bd..000000000000
--- a/app-admin/bcfg2/bcfg2-0.9.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-0.9.6.ebuild,v 1.3 2009/01/08 18:01:41 darkside Exp $
-
-inherit distutils
-
-DESCRIPTION="Bcfg2 is a configuration management tool."
-HOMEPAGE="http://trac.mcs.anl.gov/projects/bcfg2"
-
-# 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"
-IUSE="server"
-
-DEPEND=">=dev-lang/python-2.5"
-
-RDEPEND="app-portage/gentoolkit
-	dev-python/lxml
-	server? (
-		dev-python/pyopenssl
-		app-admin/gam-server )"
-
-src_install() {
-	distutils_src_install --record=PY_SERVER_LIBS --install-scripts /usr/sbin
-
-	# Remove files only necessary for a server installation
-	if ! use server; then
-		rm -rf "${D}"/usr/sbin/bcfg2-*
-		rm -rf "${D}"/usr/share/bcfg2
-		rm -rf "${D}"/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 "${S}"/examples/bcfg2.conf
-}
-
-pkg_postinst () {
-	depscan.sh
-	use server && einfo "If this is a new installation, you probably need to run: "
-	use server && einfo "    bcfg2-admin init"
-}
-
-pkg_postrm () {
-	depscan.sh
-}
diff --git a/app-admin/bcfg2/bcfg2-1.0.0.ebuild b/app-admin/bcfg2/bcfg2-1.0.0.ebuild
deleted file mode 100644
index 7c2008288db9..000000000000
--- a/app-admin/bcfg2/bcfg2-1.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.0.0.ebuild,v 1.1 2010/01/17 22:10:45 darkside Exp $
-
-inherit distutils
-
-DESCRIPTION="Bcfg2 is a configuration management tool."
-HOMEPAGE="http://trac.mcs.anl.gov/projects/bcfg2"
-
-# 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="1"
-KEYWORDS="~amd64 ~x86"
-IUSE="server"
-
-DEPEND="app-portage/gentoolkit
-	>=dev-lang/python-2.6
-	server? (
-		dev-python/lxml
-		app-admin/gam-server )"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	distutils_src_install --record=PY_SERVER_LIBS --install-scripts /usr/sbin
-
-	# Remove files only necessary for a server installation
-	if ! use server; then
-		rm -rf "${D}"/usr/sbin/bcfg2-*
-		rm -rf "${D}"/usr/share/bcfg2
-		rm -rf "${D}"/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 "${S}"/examples/bcfg2.conf
-}
-
-pkg_postinst () {
-	use server && einfo "If this is a new installation, you probably need to run: "
-	use server && einfo "    bcfg2-admin init"
-}
-
-pkg_postrm () {
-	python_mod_cleanup
-}
diff --git a/app-admin/bcfg2/bcfg2-1.0.1.ebuild b/app-admin/bcfg2/bcfg2-1.0.1.ebuild
index 0b37c228fc1c..c14a5ee8522b 100644
--- a/app-admin/bcfg2/bcfg2-1.0.1.ebuild
+++ b/app-admin/bcfg2/bcfg2-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.0.1.ebuild,v 1.2 2010/02/20 07:38:40 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.0.1.ebuild,v 1.3 2010/03/31 15:45:52 ssuominen Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
-SLOT="1"
+SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="server"