summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-10-16 01:13:16 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-10-16 01:13:16 +0000
commit47c99daebfd168d48ea743ccd8e59dd888f9ce26 (patch)
treefb13a15922503836a7c076616f42761ddab0106e /app-admin/bcfg2
parentVersion bump. (diff)
downloadgentoo-2-47c99daebfd168d48ea743ccd8e59dd888f9ce26.tar.gz
gentoo-2-47c99daebfd168d48ea743ccd8e59dd888f9ce26.tar.bz2
gentoo-2-47c99daebfd168d48ea743ccd8e59dd888f9ce26.zip
Support installation for multiple Python ABIs (bug #308265).
(Portage version: 2.2_rc96_p20/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/bcfg2')
-rw-r--r--app-admin/bcfg2/ChangeLog6
-rw-r--r--app-admin/bcfg2/bcfg2-1.1.0.ebuild29
2 files changed, 22 insertions, 13 deletions
diff --git a/app-admin/bcfg2/ChangeLog b/app-admin/bcfg2/ChangeLog
index 84cbbd737bbe..6a5e916e0193 100644
--- a/app-admin/bcfg2/ChangeLog
+++ b/app-admin/bcfg2/ChangeLog
@@ -1,6 +1,10 @@
# 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.14 2010/10/16 00:54:21 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.15 2010/10/16 01:13:16 arfrever Exp $
+
+ 16 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ bcfg2-1.1.0.ebuild:
+ Support installation for multiple Python ABIs (bug #308265).
16 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-bcfg2-1.0.1.ebuild:
diff --git a/app-admin/bcfg2/bcfg2-1.1.0.ebuild b/app-admin/bcfg2/bcfg2-1.1.0.ebuild
index c0c48db52b21..8f7c049d76a0 100644
--- a/app-admin/bcfg2/bcfg2-1.1.0.ebuild
+++ b/app-admin/bcfg2/bcfg2-1.1.0.ebuild
@@ -1,8 +1,12 @@
# 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.1.0.ebuild,v 1.1 2010/10/07 21:52:10 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.1.0.ebuild,v 1.2 2010/10/16 01:13:16 arfrever Exp $
-EAPI=3
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+# ssl module required.
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
inherit distutils
@@ -20,20 +24,21 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="server"
DEPEND="app-portage/gentoolkit
- >=dev-lang/python-2.6
server? (
dev-python/lxml
app-admin/gam-server )"
RDEPEND="${DEPEND}"
+PYTHON_MODNAME="Bcfg2"
+
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/sbin/bcfg2-*
- rm -rf "${ED}"/usr/share/bcfg2
- rm -rf "${ED}"/usr/share/man/man8
+ rm -rf "${ED}"usr/sbin/bcfg2-*
+ rm -rf "${ED}"usr/share/bcfg2
+ rm -rf "${ED}"usr/share/man/man8
fi
# Install a server init.d script
@@ -42,14 +47,14 @@ src_install() {
fi
insinto /etc
- doins "${S}"/examples/bcfg2.conf
+ doins 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"
-}
+ distutils_pkg_postinst
-pkg_postrm () {
- python_mod_cleanup
+ if use server; then
+ einfo "If this is a new installation, you probably need to run:"
+ einfo " bcfg2-admin init"
+ fi
}