Fix slotting wrt #312423.

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

5 files changed, 8 insertions, 117 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/Manifest b/app-admin/bcfg2/Manifest
index 023ed8373ea6..018948b7b623 100644
--- a/app-admin/bcfg2/Manifest
+++ b/app-admin/bcfg2/Manifest
@@ -1,9 +1,5 @@
 AUX bcfg2-server.rc 483 RMD160 bb62e38431cec8cddf275b0c7c05555b7ef90727 SHA1 b883878c6bb8c1787629d8b3288037356e8f239a SHA256 0c73b6c09fbb8cc7f3387e1565f2327d728d41d7875c73df3708f2c94c8d96f0
-DIST bcfg2-0.9.6.tar.gz 651177 RMD160 08164cdb969cc50027b48aee02289359f50fb6ab SHA1 97c946ec643b5cb98386c51dcc597553a3c4ebea SHA256 574aeb3741f370af8e8787165eb93de1687cdf85a331c2554cb2f256352043b4
-DIST bcfg2-1.0.0.tar.gz 946875 RMD160 974b9973e9a4297fcc9c94ee93cd16d4957a0418 SHA1 592d94b5626200aa513f06b8ecc38a7ea021aa72 SHA256 640ec77f6c679230ff577f6d4cc73dcf3707d08faa9ca24f0300ed3c80136d6e
 DIST bcfg2-1.0.1.tar.gz 936209 RMD160 fae98b10b721d059a9a483e046b83bd61458179d SHA1 36cac49009c906d4cb61e36a7a8c7b6859518862 SHA256 d5985c6b20cbda74dc22bd60efda3f063b7071ddb5cf39e06fdca779bb6b779d
-EBUILD bcfg2-0.9.6.ebuild 1297 RMD160 7e7855161b6b0f72ff6ca24edb21d7a74657530f SHA1 fc479186f9d40b70d1a136e3fb3c333d1a0b56d7 SHA256 6db62996f8a0bc7c5806e614ad979e7d1ac2f8956ade7756b39ea7cc12232db9
-EBUILD bcfg2-1.0.0.ebuild 1281 RMD160 f94e744b92071b90aa0fecbc6a94ed72fa95204a SHA1 657ee782c40cdfcf7ac2bf077db1f1eb986aec81 SHA256 1459c205a83ac3ecb07c63cad2ff0f85a7485a22bea609275523dafa6485202b
-EBUILD bcfg2-1.0.1.ebuild 1337 RMD160 c572baa2769c38b366b6d034e6492a1ef4cbbc8d SHA1 7331453800f5ed5a9d52def576befb9997e2669d SHA256 fb1a673a7e214aa37dd9b644e5d1b773d43e3eab61e28431dfa7914af3ccac99
-MISC ChangeLog 1862 RMD160 a473670ce153383830f3e8eae292732ba74a7378 SHA1 5f59128a92fb0aed622929642f4f8b7d54ee7d9f SHA256 195acb2c3fa9698420fca518cdfacf90aafbf6a61097770d782dc049d94578da
+EBUILD bcfg2-1.0.1.ebuild 1342 RMD160 b656f6ea55b651d6a00a842c946254ca4157c0a4 SHA1 ffea250c6224a9a13946d38f078aabdc2e35c356 SHA256 1aea8bd9cc79c852fde86759e007616f234d45c6c65ce4bd9df4630c6233d2b7
+MISC ChangeLog 1966 RMD160 6c6ad6ebe54e8762d704156efa263272612a8326 SHA1 3c66f6cd991908b041ad6bfce8c76c9c2323575f SHA256 a84d755844547b6cd878daec7d8ae33890674fcd1db75549fd960059b5aa3f52
 MISC metadata.xml 471 RMD160 3b8715be899bf89711065625af569575f39c4ed0 SHA1 743e7aa8befaa5f1f494e9350a9edcd2c068c1af SHA256 e4f4274a8d3b1048a0144dcfa3e48d27c020f2bf6d3087327a20da6a5c74cee0
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"