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

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 125 insertions, 46 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/Manifest b/sys-libs/libcap-ng/Manifest
index cff754ec295f..a770c881f4ff 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -4,20 +4,20 @@ Hash: SHA1
 AUX libcap-ng-0.6.4-fix_tests_building.patch 671 RMD160 d31281293849d2232892168fe9fc14018e01478e SHA1 13806a44b9b25ee0f6ef1b33b6edfb5fe5d60ac9 SHA256 fe7b2f8a64def178c0641b4b66f94e00cb8f96b0bc6e47f1e1c60b6f891def5a
 AUX libcap-ng-0.6.4-python.patch 3060 RMD160 a72a20753c53f52a824272ae91674b375fcbf4f3 SHA1 1182a780dda839e6d6c49e196dc7be7bf9708b47 SHA256 73cdea90d2d79b0a57532aed6867c9beabb2a5e9b8b91a40e6fed6ab7788c295
 AUX libcap-ng-gentoo.patch 1070 RMD160 23d69ecd9671243c91825af067f72468d6c4a6c1 SHA1 3feea7db14c639aeb61226f20094c8b2ab95613e SHA256 b556f6ed4e8192271e0d8d97d6685fcd9cb1f9200bb4119974e94436417ae4d3
-DIST libcap-ng-0.6.1.tar.gz 399309 RMD160 09cf05f11403ae42efa22b35b4ede1ecf7de4120 SHA1 f023c57900ab6bf5062574df0f030525ff8d215a SHA256 ab38136549e2bbbd5bed8738bc8647b37d0f06df711e526f7ee3ea001fce0b5e
 DIST libcap-ng-0.6.2.tar.gz 358165 RMD160 a925a73e86d0bca0c8324a84df6e46307ca80768 SHA1 9394d5e61042c49cb0fe15bbbd70837bca1a46c9 SHA256 1d230a03c7e6adf1c761730bf27cee694d6658e97581c9507e993c80a1fab0ff
 DIST libcap-ng-0.6.4.tar.gz 361366 RMD160 5f903d9ebede89be07f532ca4d26b6e0971e36bd SHA1 c84f137ccbc272ff2c4dd751048d8a2640a4351d SHA256 9d508706f72ba613e6afdcd02208e2491b3e0d4dff60867a7738ae8d352f0de8
 DIST libcap-ng-0.6.5.tar.gz 361938 RMD160 0e67d255c531f20fdfadb6bde5b7bc6a8671c5e2 SHA1 ca19439f1628c71df399a5ff10c1950316cde9b9 SHA256 293e2e308f08d171f64e8387cdf48b505b0e78d786e2660efd285295e64d6620
-EBUILD libcap-ng-0.6.1.ebuild 951 RMD160 43910b86fb4b12101298926b0c3a8cb2c24fd8e2 SHA1 d21c86aa3515b18e10859f4db0baf0e4618332ad SHA256 148d07c9b15fe29416495a08317514bac9226a934549815fa54c99049d498174
+DIST libcap-ng-0.6.6.tar.gz 367231 RMD160 499c005eba372e6b554cc60fcfb2705871eed47c SHA1 5a48ab9ff121218d1c34bd674e89d64714ec54f5 SHA256 89589a29a6b19068edd650dd4f626c10e84bfe63eacae7b1fd1f98f3ac8ea00d
 EBUILD libcap-ng-0.6.2.ebuild 957 RMD160 aba94b15b627c11e4e00c3253fabed07b8f7a2aa SHA1 73a2258df79b3de4ab8460abb04881e0c9e576f5 SHA256 09cb68dad3c9e45396b5c4153284eb6eea8e0dfc53f1cc62f28413812dcd1da1
 EBUILD libcap-ng-0.6.4.ebuild 2560 RMD160 b130e1a47537bdcb8e654371168d77f8fa9a3396 SHA1 5c2fba04099502dbb2ff377758c015bd6874a58a SHA256 156b5d54241d29c92287e816129339e9485dbdc6baed3a2b29d74d5465922522
 EBUILD libcap-ng-0.6.5.ebuild 2424 RMD160 58edd13b7ed2585ed77d1b13d1cb1b7d267416db SHA1 2f48e7bd8c1d4c8f3c6e74f18264ddfc41144b00 SHA256 d1d8c9fe12fa41e38956d54e3b048fa917465523be1d2166e74756059f2513a0
-MISC ChangeLog 4241 RMD160 7c46dfe97e243fbde8dc8a4a6ce51de58f0c8b27 SHA1 0f05289d3fcf58c23655d28a46579055f761f5e2 SHA256 cc1e60ad577d96b1e248209afeaacd55f2c8322d3ca123e7984545b1f564bd59
+EBUILD libcap-ng-0.6.6.ebuild 2429 RMD160 cf4ed587353a7b06afc10e0c30626f0ada3ee191 SHA1 ec79bbbf94dfc7c01d30162b7d965275f208dcb6 SHA256 f43600ed0b3da556468f128697a8b40e7b0a299a7c322f4e1a81401c9d4a5c00
+MISC ChangeLog 4444 RMD160 837da2eaa96218de0869d3dcb04eeacf09b4a30f SHA1 1dcc70598fa6f78eb089173ed21cc183ecbf592f SHA256 23e16e974d60f26d3373c7e4989736077907ca73b1ff4de43d15e1947146a8c3
 MISC metadata.xml 598 RMD160 4a0562ce9e5fab2b4d7310962390815b518a18a5 SHA1 2b87404da773bdf8e2dfb41844fc6c8c23c4bce4 SHA256 340a9c3dd4c0fe6edafe6685af1c8d9b8d2c668fe0b29c6809cc81dda5d06e9d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4+qPsACgkQuQc30/atMkDulACfQ5jkUPjKuADIEO5swYXGW7ch
-lAAAn3t+gmNX/eunZjrR83ULM5j6h+Nx
-=yY2o
+iEYEARECAAYFAk68UqIACgkQ1564UogppBIYpwCgllElY3x92+ZHbDQvx684Ldj1
+j1wAn1HyAL3XBse+3TFoQ9wa4y+vfrEv
+=Lz96
 -----END PGP SIGNATURE-----
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
+}