summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-libs/libselinux')
-rw-r--r--sys-libs/libselinux/ChangeLog8
-rw-r--r--sys-libs/libselinux/libselinux-2.0.71.ebuild16
-rw-r--r--sys-libs/libselinux/libselinux-2.0.85.ebuild16
3 files changed, 18 insertions, 22 deletions
diff --git a/sys-libs/libselinux/ChangeLog b/sys-libs/libselinux/ChangeLog
index 223b8dfd8ce7..85c748bbc9ad 100644
--- a/sys-libs/libselinux/ChangeLog
+++ b/sys-libs/libselinux/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/libselinux
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.64 2009/08/02 01:50:32 pebenito Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/ChangeLog,v 1.65 2010/04/16 19:33:16 arfrever Exp $
+
+ 16 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ libselinux-2.0.71.ebuild, libselinux-2.0.85.ebuild:
+ Delete calls to deprecated python_version().
02 Aug 2009; Chris PeBenito <pebenito@gentoo.org>
libselinux-2.0.71.ebuild, libselinux-2.0.85.ebuild:
diff --git a/sys-libs/libselinux/libselinux-2.0.71.ebuild b/sys-libs/libselinux/libselinux-2.0.71.ebuild
index f0c6338d8a5e..39060c10d159 100644
--- a/sys-libs/libselinux/libselinux-2.0.71.ebuild
+++ b/sys-libs/libselinux/libselinux-2.0.71.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/sys-libs/libselinux/libselinux-2.0.71.ebuild,v 1.3 2009/08/02 01:50:32 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.0.71.ebuild,v 1.4 2010/04/16 19:33:16 arfrever Exp $
IUSE="ruby"
RUBY_OPTIONAL="yes"
@@ -39,9 +39,8 @@ src_unpack() {
}
src_compile() {
- python_version
emake LDFLAGS="-fPIC ${LDFLAGS}" all || die
- emake PYLIBVER="python${PYVER}" LDFLAGS="-fPIC ${LDFLAGS}" pywrap || die
+ emake PYLIBVER="python$(python_get_version)" LDFLAGS="-fPIC ${LDFLAGS}" pywrap || die
if use ruby; then
emake rubywrap || die
@@ -52,9 +51,8 @@ src_compile() {
}
src_install() {
- python_version
python_need_rebuild
- make DESTDIR="${D}" PYLIBVER="python${PYVER}" install install-pywrap || die
+ make DESTDIR="${D}" PYLIBVER="python$(python_get_version)" install install-pywrap || die
if use ruby; then
emake DESTDIR="${D}" install-rubywrap || die
@@ -62,11 +60,9 @@ src_install() {
}
pkg_postinst() {
- python_version
- python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+ python_mod_optimize $(python_get_sitedir)
}
pkg_postrm() {
- python_version
- python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages
+ python_mod_cleanup $(python_get_sitedir)
}
diff --git a/sys-libs/libselinux/libselinux-2.0.85.ebuild b/sys-libs/libselinux/libselinux-2.0.85.ebuild
index 588a1728e9bc..323ba4fdfcf8 100644
--- a/sys-libs/libselinux/libselinux-2.0.85.ebuild
+++ b/sys-libs/libselinux/libselinux-2.0.85.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/sys-libs/libselinux/libselinux-2.0.85.ebuild,v 1.2 2009/08/02 01:50:32 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libselinux/libselinux-2.0.85.ebuild,v 1.3 2010/04/16 19:33:16 arfrever Exp $
IUSE="ruby"
RUBY_OPTIONAL="yes"
@@ -39,9 +39,8 @@ src_unpack() {
}
src_compile() {
- python_version
emake LDFLAGS="-fPIC ${LDFLAGS}" all || die
- emake PYLIBVER="python${PYVER}" LDFLAGS="-fPIC ${LDFLAGS}" pywrap || die
+ emake PYLIBVER="python$(python_get_version)" LDFLAGS="-fPIC ${LDFLAGS}" pywrap || die
if use ruby; then
emake rubywrap || die
@@ -52,9 +51,8 @@ src_compile() {
}
src_install() {
- python_version
python_need_rebuild
- make DESTDIR="${D}" PYLIBVER="python${PYVER}" install install-pywrap || die
+ make DESTDIR="${D}" PYLIBVER="python$(python_get_version)" install install-pywrap || die
if use ruby; then
emake DESTDIR="${D}" install-rubywrap || die
@@ -62,11 +60,9 @@ src_install() {
}
pkg_postinst() {
- python_version
- python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+ python_mod_optimize $(python_get_sitedir)
}
pkg_postrm() {
- python_version
- python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages
+ python_mod_cleanup $(python_get_sitedir)
}