Revbump to include dev-python/nose RDEPEND (thanks Alexandr Tiurin, bug 447396)

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

3 files changed, 92 insertions, 17 deletions

diff --git a/app-admin/bcfg2/ChangeLog b/app-admin/bcfg2/ChangeLog
index eddff43d9bcf..8ddcfa14d50e 100644
--- a/app-admin/bcfg2/ChangeLog
+++ b/app-admin/bcfg2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/bcfg2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.28 2013/03/17 15:30:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.29 2013/03/18 09:50:56 xmw Exp $
+
+*bcfg2-1.2.3-r1 (18 Mar 2013)
+
+  18 Mar 2013; Michael Weber <xmw@gentoo.org> +bcfg2-1.2.3-r1.ebuild:
+  Revbump to include dev-python/nose RDEPEND (thanks Alexandr Tiurin, bug
+  447396)
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/app-admin/bcfg2/Manifest b/app-admin/bcfg2/Manifest
index 753f10cb53c8..02e100907a89 100644
--- a/app-admin/bcfg2/Manifest
+++ b/app-admin/bcfg2/Manifest
@@ -7,25 +7,14 @@ DIST bcfg2-1.2.2.tar.gz 1957621 SHA256 78449bbb37cd446876fed9356a6ccd53b5eb2493c
 DIST bcfg2-1.2.3.tar.gz 1960494 SHA256 236b4ba7ff349243459c18a9cfdd52f69f477cc7a528902c21c01698af4ec45d SHA512 58b4053f0d32fb9f305b1c9ec9d64dcf8346c3232cf2b47ff567dcb73554e441e231a96deff4d903106c7e0583ea8a4d2936488cbe8b4e7a4e8a27b48a6410d8 WHIRLPOOL 841168db75d5650e8cb6c1955a1746286f3282c920af0a786775a5f42742b0bfd9f6b23b093dcbfcdf5f51d348c017ae398b19228e183a7ffe7935dceb267683
 EBUILD bcfg2-1.2.2-r1.ebuild 1970 SHA256 faa8c4dec1c40458c48a71f37735cf3347d75dc5bb31dc6df08a955f6adbdd7e SHA512 19c9175f5d80f8ea2beffd3f8038bace7c6bee7a2b11ddea25bd7a8a6466a293bb5309350d708b8ffe28a9b59eeaedcd1591eb41034b1525bf0ee4a90c9017b2 WHIRLPOOL a490c5d54b4e130f2fb34b204526d03c02b750743f72fdb4aed30f7261425f95fbdbe8f759c971fc29cf32e0d6f912d6d6ebe43324f981de92060b80beb4b987
 EBUILD bcfg2-1.2.2.ebuild 1856 SHA256 779c568decaa924918f7f505739a33a2d14f0726d865671b24669c8c5c4373e6 SHA512 799f324322f74f1ecbc2403704c2ef90f2596d22b3f1f4fb34d958b5c4712ec2334a58a77c1f748ad043597955cdcf41a0d03a1a1dd3eb613b99eeb89c145cc4 WHIRLPOOL 6b044b8a7da724bb3404cfc68cc20cc6a843552f99f54eba8d10f03e7b33fa9968558733a4d9b469636a88dc21d169b88a93a3b5e2c2077d5b2e32884252bb43
+EBUILD bcfg2-1.2.3-r1.ebuild 1877 SHA256 e2e02f5300be16eb1df7a3da3122aada85fff1966b816457b95846977c527232 SHA512 cf711417b8b26e4758af2afadcedd3359da8a38ba03ec21f86f12a1472360d911979ef48cb86516a39bf56c0b7f88e3287b12f6fd4360e59c9a21bd337d62cf4 WHIRLPOOL 147a7054cd8bd1f18e40bdd5596da420b3dd4c28c503cf40ff8cffb1f65d77befd772087c72e39e5c85da5aa04150c02de9e17e016049b1124b2b6f98a08a6b6
 EBUILD bcfg2-1.2.3.ebuild 1856 SHA256 17b967aad71b51bfbcc0e00652af84536a2eb12aabd0c7ea360af130c373d190 SHA512 ae6324aa44177fc98a663890ff92570f69304d188d8a2043d30a173b6be4b6f92df2e5fe38dd571ca78759853bc3f25ad54f38b18a7461a462235805bb67dd6e WHIRLPOOL 97b163fabd77518283bfe32331a1b53902c69c008651624231fff246935903290d7646e6d016e4a58d320a6f1c7e7be5df97cdbfe024bf8c7ee29dbf56c9ec01
-MISC ChangeLog 4492 SHA256 ffb94abd6840059cd63904b1d29d3c087c6c2d17da136d7fc0ed9693baf11df8 SHA512 7ab510881c91abf346f0b4dadb15eac1dd728e4f02a0360dd368d927be5c0bf7cf135d360f647a5e07d1d3a606bc317f72b8ea7e82a125b775660831e7365dd4 WHIRLPOOL 25bd792b0203207f40cb74a0d3a9c565c4fbfb28684c45dc9fc57427fd5cd309bbdb12f9dcd1bf0e9749b21805e64471d0cc07d560b2b0a48835a6551a53781d
+MISC ChangeLog 4673 SHA256 86047894babab3be5edca2c7d145d26a255e9285b561283c8278455fdb717143 SHA512 e26ab102399badb2c0f5a520a3e3947fc33d443cca434dfbf6f97860638466c1a2fe35502716ae4c1283530e063f5bef95200fd0fa516ebb383235a18d2c7f14 WHIRLPOOL bf7e0cb8d9f055225b4d9658d0b1e9242131363cc3abf4f7619f736a1b9973071de65538a3a97adba4b9afc6f8e66af68438af26a7d18bed8aa6bdd2a33bbc2c
 MISC metadata.xml 624 SHA256 3b42fb8a9de10f82c8e70103ea2bdbecc9f54570bdc34be1eeef4cab4cc74cac SHA512 ba6d58b4f1dcd1786a4077a1ea03f0c646709645f603d0d6e2c445e39f2e1e42e7db552979526e48356f66576d3051e26aa27e58917194231c37ec098db5dc7d WHIRLPOOL b17497bf8eb4484ba06a7767adf62ffbfafdff1416621eaa81182a78e29277f09f722f2528daa199bbcfe0d487b626f84f58c6edffe6ef06aeb33a52b9608244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRReGTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88kmYP/0L5mUY7+caUEMmZ75trugIs
-nzQ2okeyEcU7k0u2F3iF56Bz8dqdfRnH+5Lycz461PY3Pt4h6YA0PVSfYvOKndPr
-/p8wbrx61M+b2l0ABZbQ+S7K1WFEyXIj6Vewk2aU47qUj/u+6phcPtUbt4XTDP7O
-iAK+9G/VMHM9QGDAdYUf+KhJXBIKwL1YWiInN0/Ro2rse5M4Rxl6Jp8/hCFL6Lme
-Wa5dTSwpx4zgpCVxEuFFt66HsMGJ55GUD13sFU21q2bxQcaKmXmrfKszFHQF5GwC
-YKep39V5YiKkOvjfwSOGJ/1fbm7ZLHcfY3/6TA84RtH3DZmtLnj4LGz+I4aBVltw
-Luax+HnPvxv5FJxiCMvxGQiUKiYtI45H2cl+Ub0WSaNVXe9ECjzBMSTjH/B6/jhJ
-he2vHNeJ3SB3BCcZQ+iQESTkdY9Rm2BbMH333CI0cqf3oEXKNHu7mWogQAh/swgB
-aT6XLeL/BznCCzEDiIhTZfc1N3OR+y9GR4ncHTuGmeyJn9ch6qPJSFAW2S/RY0yf
-wWQ2f5F/utLSdSjHHxKOdlSqcKE6IHHV5D+KbgvHN5S7ZqlKBwnoCFW4D0x5abQq
-IufIDG3Mm4QwQPXxG+u6SsCZpaaZM/WuKFsHiFAMezKdq/pwWgjZHhhwtUqUJmVD
-2P1+N6+YairPTMAMJnHv
-=8xvC
+iF4EAREIAAYFAlFG44MACgkQknrdDGLu8JCl3gD/WGwJiGg2zA5N0c5D86Osvh3V
+gh0C3uSV2j1ix0hRwk0BAI/2+nytiBRiQsQEbCmY+sHVpz02LzM4WtAvIrKBtjVe
+=fLan
 -----END PGP SIGNATURE-----
diff --git a/app-admin/bcfg2/bcfg2-1.2.3-r1.ebuild b/app-admin/bcfg2/bcfg2-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..c5985ac99271
--- /dev/null
+++ b/app-admin/bcfg2/bcfg2-1.2.3-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.3-r1.ebuild,v 1.1 2013/03/18 09:50:56 xmw Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+# ssl module required.
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+
+inherit distutils
+
+DESCRIPTION="configuration management tool"
+HOMEPAGE="http://bcfg2.org"
+SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="doc cheetah genshi server"
+
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )"
+RDEPEND="app-portage/gentoolkit
+	cheetah? ( dev-python/cheetah )
+	genshi? ( dev-python/genshi )
+	server? (
+		dev-libs/libgamin[python]
+		dev-python/lxml
+		dev-python/nose
+		virtual/fam )"
+
+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_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Building Bcfg2 documentation"
+		PYTHONPATH="build-$(PYTHON -f --ABI)" \
+			sphinx-build doc doc_output || die
+	fi
+}
+
+src_install() {
+	distutils_src_install --record=PY_SERVER_LIBS --install-scripts "${EPREFIX}/usr/sbin"
+
+	if ! use server; then
+		rm -rf "${ED}usr/share/bcfg2" || die
+		rm -rf "${ED}usr/share/man/man8" || die
+	else
+		newinitd "${FILESDIR}/${PN}-server-1.2.0.rc" bcfg2-server
+	fi
+
+	insinto /etc
+	doins examples/bcfg2.conf
+
+	if use doc; then
+		pushd doc_output > /dev/null
+		insinto /usr/share/doc/${PF}/html
+		doins -r [a-z]* _images _static || die "Failed to install documentation"
+		popd > /dev/null
+	fi
+}
+
+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
+}