Version bump bug #389253 (also fixes test failure, see bug #370473).

(Portage version: 2.1.10.11/cvs/Linux x86_64)

3 files changed, 118 insertions, 39 deletions

diff --git a/sys-libs/libcap-ng/ChangeLog b/sys-libs/libcap-ng/ChangeLog
index 0425b8476661..be467f31299e 100644
--- a/sys-libs/libcap-ng/ChangeLog
+++ b/sys-libs/libcap-ng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libcap-ng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/ChangeLog,v 1.31 2011/08/07 15:02:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/ChangeLog,v 1.32 2011/11/10 22:39:14 mrness Exp $
+
+*libcap-ng-0.6.6 (10 Nov 2011)
+
+  10 Nov 2011; Alin Năstac <mrness@gentoo.org> -libcap-ng-0.6.1.ebuild,
+  +libcap-ng-0.6.6.ebuild:
+  Version bump bug #389253 (also fixes test failure, see bug #370473).
 
   07 Aug 2011; Raúl Porcel <armin76@gentoo.org> libcap-ng-0.6.1.ebuild,
   libcap-ng-0.6.2.ebuild, libcap-ng-0.6.4.ebuild, libcap-ng-0.6.5.ebuild:
diff --git a/sys-libs/libcap-ng/libcap-ng-0.6.1.ebuild b/sys-libs/libcap-ng/libcap-ng-0.6.1.ebuild
deleted file mode 100644
index 6a548d2b2d60..000000000000
--- a/sys-libs/libcap-ng/libcap-ng-0.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.6.1.ebuild,v 1.6 2011/08/07 15:02:12 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="http://people.redhat.com/sgrubb/libcap-ng/"
-SRC_URI="http://people.redhat.com/sgrubb/libcap-ng/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86"
-IUSE="python"
-
-COMMON_DEPEND="sys-apps/attr"
-RDEPEND="${COMMON_DEPEND}
-	python? ( dev-lang/python )"
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers
-	python? ( dev-lang/swig dev-lang/python )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-gentoo.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable python) || die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-
-	dodoc ChangeLog README
-}
diff --git a/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild b/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild
new file mode 100644
index 000000000000..d4dc1a880489
--- /dev/null
+++ b/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild,v 1.1 2011/11/10 22:39:14 mrness Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils autotools flag-o-matic python
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="http://people.redhat.com/sgrubb/libcap-ng/"
+SRC_URI="http://people.redhat.com/sgrubb/libcap-ng/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="python"
+
+RDEPEND="sys-apps/attr
+	python? ( dev-lang/python )"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	python? ( dev-lang/swig )"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+pkg_setup() {
+	use python && python_pkg_setup
+}
+
+src_prepare() {
+	# Disable byte-compilation of Python modules.
+	echo "#!/bin/sh" > py-compile
+
+	# Python bindings are built/tested/installed manually.
+	sed -e "/^SUBDIRS/s/ python//" -i bindings/Makefile.am
+
+	eautoreconf
+
+	use sparc && replace-flags -O? -O0
+}
+
+src_configure() {
+	econf $(use_with python)
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		python_copy_sources bindings/python
+
+		building() {
+			emake \
+				CFLAGS="${CFLAGS}" \
+				PYTHON_VERSION="$(python_get_version)" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_execute_function -s --source-dir bindings/python building
+	fi
+}
+
+src_test() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		ewarn "Skipping tests due to root permissions."
+		return
+	fi
+
+	default
+
+	if use python; then
+		testing() {
+			emake \
+				PYTHON_VERSION="$(python_get_version)" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				TESTS_ENVIRONMENT="PYTHONPATH=..:../.libs" \
+				check
+		}
+		python_execute_function -s --source-dir bindings/python testing
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+
+	if use python; then
+		installation() {
+			emake \
+				DESTDIR="${D}" \
+				PYTHON_VERSION="$(python_get_version)" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install
+		}
+		python_execute_function -s --source-dir bindings/python installation
+
+		python_clean_installation_image
+	fi
+
+	dodoc ChangeLog README
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize capng.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup capng.py
+}