Fix QA error with pre-stripped binaries being installed, and clean up the horrible mess in src_install.

Package-Manager: portage-2.1_rc3-r3

4 files changed, 121 insertions, 7 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index c6d5d47ea21f..70df109b076f 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libcap
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.33 2005/02/09 23:06:17 vapier Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.34 2006/06/01 01:45:23 robbat2 Exp $
+
+*libcap-1.10-r6 (01 Jun 2006)
+
+  01 Jun 2006; Robin H. Johnson <robbat2@gentoo.org> +libcap-1.10-r6.ebuild:
+  Fix QA error with pre-stripped binaries being installed, and clean up the
+  horrible mess in src_install.
 
 *libcap-1.10-r5 (09 Feb 2005)
 
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index df664bb68cef..572b141276f6 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,8 +1,40 @@
-MD5 a3a7e29412444976ea4e51394b1eba53 ChangeLog 4346
+AUX 1.10-python.patch 2796 RMD160 b8fa02d2141048c95bcd07854f3b1a079475467b SHA1 c2514ea37904469fc0e6ee7d9534210f917910b5 SHA256 52ddf875d1ab0553b66c83c01cf145f3e4c714a948a52a568dc1a7642ab3ba73
+MD5 c91cacf89f9e42e3f7ae3fc8c4fb8501 files/1.10-python.patch 2796
+RMD160 b8fa02d2141048c95bcd07854f3b1a079475467b files/1.10-python.patch 2796
+SHA256 52ddf875d1ab0553b66c83c01cf145f3e4c714a948a52a568dc1a7642ab3ba73 files/1.10-python.patch 2796
+AUX libcap-1.10-python-2.patch 3349 RMD160 6e6ad215052570a7b1c76be5a82519fbcf386fc3 SHA1 5185b46086dcda47d226070d2269ff9e63ba60db SHA256 63e685cff082fef72ca957c8cb3bb09f7aaccee1088f004cb029e67275f10ec7
+MD5 225f8c45bc6ff1df2eb5bee87f4a940f files/libcap-1.10-python-2.patch 3349
+RMD160 6e6ad215052570a7b1c76be5a82519fbcf386fc3 files/libcap-1.10-python-2.patch 3349
+SHA256 63e685cff082fef72ca957c8cb3bb09f7aaccee1088f004cb029e67275f10ec7 files/libcap-1.10-python-2.patch 3349
+AUX libcap-1.10-r4-staticfix.diff 2113 RMD160 b99eb439f6254ce468d6ed492dcbf4129eb5ea62 SHA1 e57457517434854274e95fe42f208c6be9ecf73e SHA256 5496a53d3f24bd7a07936dcd470f33615832edbf193d9aebd94590413f34ef7d
+MD5 1f60409beeba2a799bfbc44a8b826f11 files/libcap-1.10-r4-staticfix.diff 2113
+RMD160 b99eb439f6254ce468d6ed492dcbf4129eb5ea62 files/libcap-1.10-r4-staticfix.diff 2113
+SHA256 5496a53d3f24bd7a07936dcd470f33615832edbf193d9aebd94590413f34ef7d files/libcap-1.10-r4-staticfix.diff 2113
+AUX libcap-1.10-syscall.patch 1051 RMD160 b369627ad27c14559fdf6e6225c6f0ee607c3e8d SHA1 e8ce4d9b32903f2799f29524ab40b82bc023ac9c SHA256 d07ade0e8c784074d23cd8a26c5619178f8aa16174543d41bd4e2a9aaf266254
+MD5 3aa7335821ba75c0994083995b0331f2 files/libcap-1.10-syscall.patch 1051
+RMD160 b369627ad27c14559fdf6e6225c6f0ee607c3e8d files/libcap-1.10-syscall.patch 1051
+SHA256 d07ade0e8c784074d23cd8a26c5619178f8aa16174543d41bd4e2a9aaf266254 files/libcap-1.10-syscall.patch 1051
+DIST libcap-1.10.tar.bz2 26686
+DIST libcap_1.10-14.diff.gz 12928
+EBUILD libcap-1.10-r5.ebuild 2133 RMD160 a30a4583b6853106a0c634ec2ba3be35b46836e5 SHA1 16e179bb67868e63a7f94a97b1ed01b366aef11e SHA256 0c0136d5e00da643a60c3ea99fcbfc66799ad5863429ea901d1bc0d6951cd709
 MD5 ef17e2df46a45e05b5d7be352e3444c4 libcap-1.10-r5.ebuild 2133
+RMD160 a30a4583b6853106a0c634ec2ba3be35b46836e5 libcap-1.10-r5.ebuild 2133
+SHA256 0c0136d5e00da643a60c3ea99fcbfc66799ad5863429ea901d1bc0d6951cd709 libcap-1.10-r5.ebuild 2133
+EBUILD libcap-1.10-r6.ebuild 2329 RMD160 9a42135c8b900669cb4ded857fc1e971446d46cc SHA1 07adaab0d781252266ed552b2e0d002270d5ed0c SHA256 55fb4da87e17a44487f1c62c4d6d6be1df553b46c81f8184c71180cbf870ce4d
+MD5 ef5095f2738bb7224757a0894be24242 libcap-1.10-r6.ebuild 2329
+RMD160 9a42135c8b900669cb4ded857fc1e971446d46cc libcap-1.10-r6.ebuild 2329
+SHA256 55fb4da87e17a44487f1c62c4d6d6be1df553b46c81f8184c71180cbf870ce4d libcap-1.10-r6.ebuild 2329
+MISC ChangeLog 4564 RMD160 3b606d9e0253a37130d358dc6d8a32bf3c2057dd SHA1 9ef80e85f90cec38f7f0f96699d50410f39efec7 SHA256 865b7736920d82dcadffbf7aca05a649d983b9c67b550f9b71c330f68f50cc36
+MD5 31750d21739d1053ec7db59222965749 ChangeLog 4564
+RMD160 3b606d9e0253a37130d358dc6d8a32bf3c2057dd ChangeLog 4564
+SHA256 865b7736920d82dcadffbf7aca05a649d983b9c67b550f9b71c330f68f50cc36 ChangeLog 4564
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 c91cacf89f9e42e3f7ae3fc8c4fb8501 files/1.10-python.patch 2796
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
 MD5 2f1adcade85a501a8b4d47ddeb66ec9b files/digest-libcap-1.10-r5 129
-MD5 3aa7335821ba75c0994083995b0331f2 files/libcap-1.10-syscall.patch 1051
-MD5 1f60409beeba2a799bfbc44a8b826f11 files/libcap-1.10-r4-staticfix.diff 2113
-MD5 225f8c45bc6ff1df2eb5bee87f4a940f files/libcap-1.10-python-2.patch 3349
+RMD160 0ae26bc038a5df8c0b489c5eaadadab50b24b95b files/digest-libcap-1.10-r5 129
+SHA256 6685dce3a6a3e420f2e2d4c092669b43500cfaed2c82fe0981d526c64c3d861a files/digest-libcap-1.10-r5 129
+MD5 2f1adcade85a501a8b4d47ddeb66ec9b files/digest-libcap-1.10-r6 129
+RMD160 0ae26bc038a5df8c0b489c5eaadadab50b24b95b files/digest-libcap-1.10-r6 129
+SHA256 6685dce3a6a3e420f2e2d4c092669b43500cfaed2c82fe0981d526c64c3d861a files/digest-libcap-1.10-r6 129
diff --git a/sys-libs/libcap/files/digest-libcap-1.10-r6 b/sys-libs/libcap/files/digest-libcap-1.10-r6
new file mode 100644
index 000000000000..ec126de2271e
--- /dev/null
+++ b/sys-libs/libcap/files/digest-libcap-1.10-r6
@@ -0,0 +1,2 @@
+MD5 4426a413128142cab89eb2e6f13d8571 libcap-1.10.tar.bz2 26686
+MD5 b867a0c1db9e8ff568415bbcd1fa65dc libcap_1.10-14.diff.gz 12928
diff --git a/sys-libs/libcap/libcap-1.10-r6.ebuild b/sys-libs/libcap/libcap-1.10-r6.ebuild
new file mode 100644
index 000000000000..8c51f382951e
--- /dev/null
+++ b/sys-libs/libcap/libcap-1.10-r6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r6.ebuild,v 1.1 2006/06/01 01:45:23 robbat2 Exp $
+
+inherit flag-o-matic eutils
+
+DEB_PVER=14
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="http://www.kernel.org/pub/linux/libs/security/linux-privs/"
+SRC_URI="http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/${P}.tar.bz2
+		mirror://debian/pool/main/libc/libcap/libcap_${PV}-${DEB_PVER}.diff.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nocxx python static"
+
+#patch is in recent 2.2 kernels so it works there
+DEPEND="virtual/os-headers
+		!nocxx? ( python? ( >=virtual/python-2.2.1
+		                    >=dev-lang/swig-1.3.10 ) )"
+RDEPEND="!nocxx? ( python? ( >=virtual/python-2.2.1 ) )"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd ${S}
+	epatch ${DISTDIR}/libcap_${PV}-${DEB_PVER}.diff.gz
+	epatch ${FILESDIR}/${PV}-python.patch
+	epatch ${FILESDIR}/libcap-1.10-r4-staticfix.diff
+	sed -i.orig  \
+		-e 's|WARNINGS=-ansi|WARNINGS=|' \
+		-e 's|^LDFLAGS=-s.*|LDFLAGS = |' \
+		-e '/^COPTFLAGS/d' \
+		Make.Rules
+}
+
+src_compile() {
+	local myflags=""
+	if use static; then
+		append-flags -static
+		append-ldflags -static
+	fi
+	if ! use nocxx && use python ; then
+		local PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`"
+		myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/$(get_libdir)/python${PYTHONVER}/site-packages"
+		append-flags -I/usr/include/python${PYTHONVER}
+	fi
+
+	emake COPTFLAG="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${myflags} || die
+}
+
+src_install() {
+	into /
+	dosbin progs/sucap progs/execcap progs/setpcaps progs/getpcaps
+	dolib.so libcap/libcap.so.1.10
+	gen_usr_ldscript libcap.so.1.10
+	into /usr
+	dolib.a libcap/libcap.a
+
+	insinto /usr/include/sys
+	doins libcap/include/sys/capability.h
+
+	dodoc CHANGELOG README pgp.keys.asc doc/capability.notes capfaq-0.2.txt
+	doman doc/*.3
+
+	if use python; then
+		local PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`"
+		local PYTHONMODDIR=/usr/$(get_libdir)/python${PYTHONVER}/site-packages
+		exeinto ${PYTHONMODDIR}
+		doexe libcap/libcapmodule.so
+		insinto ${PYTHONMODDIR}
+		doins libcap/libcap.py
+	fi
+}