summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-04-25 15:42:48 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2010-04-25 15:42:48 +0000
commit641cd601ae139939e51be89bae82a7679d1786eb (patch)
tree49bf42d8ff75c7f77e68473896953397373de66e /net-fs
parentForce python2 fixing bug #312253 (diff)
downloadgentoo-2-641cd601ae139939e51be89bae82a7679d1786eb.tar.gz
gentoo-2-641cd601ae139939e51be89bae82a7679d1786eb.tar.bz2
gentoo-2-641cd601ae139939e51be89bae82a7679d1786eb.zip
Delete calls to deprecated python_version().
(Portage version: HEAD/cvs/Linux x86_64)
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/samba/ChangeLog6
-rw-r--r--net-fs/samba/samba-3.0.37.ebuild15
2 files changed, 11 insertions, 10 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 82ccd5808716..f3ab54bf812f 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-fs/samba
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.407 2010/04/08 10:05:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.408 2010/04/25 15:42:48 arfrever Exp $
+
+ 25 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ samba-3.0.37.ebuild:
+ Delete calls to deprecated python_version().
08 Apr 2010; Patrick Lauer <patrick@gentoo.org> samba-3.5.2.ebuild:
Fix typo #313813
diff --git a/net-fs/samba/samba-3.0.37.ebuild b/net-fs/samba/samba-3.0.37.ebuild
index 1bfc5f0fdb0c..e716bfdc6a35 100644
--- a/net-fs/samba/samba-3.0.37.ebuild
+++ b/net-fs/samba/samba-3.0.37.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.37.ebuild,v 1.7 2009/11/21 20:01:08 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.37.ebuild,v 1.8 2010/04/25 15:42:48 arfrever Exp $
inherit autotools eutils pam python multilib versionator confutils
@@ -79,9 +79,8 @@ src_compile() {
local mylangs
local mymod_shared
- python_version
myconf="--with-python=no"
- use python && myconf="--with-python=${python}"
+ use python && myconf="--with-python=$(PYTHON -a)"
use winbind && mymod_shared="--with-shared-modules=idmap_rid"
if use ldap ; then
@@ -210,7 +209,7 @@ src_install() {
if use python ; then
emake DESTDIR="${D}" python_install || die "emake installpython failed"
# We're doing that manually
- find "${D}/usr/$(get_libdir)/python${PYVER}/site-packages" -iname "*.pyc" -delete
+ find "${D}$(python_get_sitedir)" -iname "*.pyc" -delete
fi
cd "${S}/source"
@@ -311,8 +310,7 @@ pkg_preinst() {
pkg_postinst() {
if use python ; then
- python_version
- python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/samba
+ python_mod_optimize $(python_get_sitedir)/samba
fi
if use swat ; then
@@ -345,7 +343,6 @@ pkg_postinst() {
pkg_postrm() {
if use python ; then
- python_version
- python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/samba
+ python_mod_cleanup $(python_get_sitedir)/samba
fi
}