The ldscript should be called 'libcap.so', and not versioned like it was.

Quoting and other cleanups.

(Portage version: 2.1.1_pre2-r8)

5 files changed, 96 insertions, 1 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 70df109b076f..55c8c45dedc4 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libcap
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.35 2006/07/13 14:42:17 azarah Exp $
+
+*libcap-1.10-r7 (13 Jul 2006)
+
+  13 Jul 2006; Martin Schlemmer <azarah@gentoo.org> +libcap-1.10-r7.ebuild:
+  The ldscript should be called 'libcap.so', and not versioned like it was.
+  Quoting and other cleanups.
 
 *libcap-1.10-r6 (01 Jun 2006)
 
diff --git a/sys-libs/libcap/files/digest-libcap-1.10-r5 b/sys-libs/libcap/files/digest-libcap-1.10-r5
index ec126de2271e..766f3c805465 100644
--- a/sys-libs/libcap/files/digest-libcap-1.10-r5
+++ b/sys-libs/libcap/files/digest-libcap-1.10-r5
@@ -1,2 +1,6 @@
 MD5 4426a413128142cab89eb2e6f13d8571 libcap-1.10.tar.bz2 26686
+RMD160 c1fad30889f0651039efc9db34e72060c4567f71 libcap-1.10.tar.bz2 26686
+SHA256 66c3f033fdc8f9ba0bd9d0ae2d1f2c11f9fa51bf0d1418e5cb75e29e6577a5bc libcap-1.10.tar.bz2 26686
 MD5 b867a0c1db9e8ff568415bbcd1fa65dc libcap_1.10-14.diff.gz 12928
+RMD160 7fbf66ca5795ae8ee05d208d74a76619ad81afae libcap_1.10-14.diff.gz 12928
+SHA256 e8fdb798774d49439dd07a6a2858da08a27e6b8057e0f87456a0bc223b74f706 libcap_1.10-14.diff.gz 12928
diff --git a/sys-libs/libcap/files/digest-libcap-1.10-r6 b/sys-libs/libcap/files/digest-libcap-1.10-r6
index ec126de2271e..766f3c805465 100644
--- a/sys-libs/libcap/files/digest-libcap-1.10-r6
+++ b/sys-libs/libcap/files/digest-libcap-1.10-r6
@@ -1,2 +1,6 @@
 MD5 4426a413128142cab89eb2e6f13d8571 libcap-1.10.tar.bz2 26686
+RMD160 c1fad30889f0651039efc9db34e72060c4567f71 libcap-1.10.tar.bz2 26686
+SHA256 66c3f033fdc8f9ba0bd9d0ae2d1f2c11f9fa51bf0d1418e5cb75e29e6577a5bc libcap-1.10.tar.bz2 26686
 MD5 b867a0c1db9e8ff568415bbcd1fa65dc libcap_1.10-14.diff.gz 12928
+RMD160 7fbf66ca5795ae8ee05d208d74a76619ad81afae libcap_1.10-14.diff.gz 12928
+SHA256 e8fdb798774d49439dd07a6a2858da08a27e6b8057e0f87456a0bc223b74f706 libcap_1.10-14.diff.gz 12928
diff --git a/sys-libs/libcap/files/digest-libcap-1.10-r7 b/sys-libs/libcap/files/digest-libcap-1.10-r7
new file mode 100644
index 000000000000..766f3c805465
--- /dev/null
+++ b/sys-libs/libcap/files/digest-libcap-1.10-r7
@@ -0,0 +1,6 @@
+MD5 4426a413128142cab89eb2e6f13d8571 libcap-1.10.tar.bz2 26686
+RMD160 c1fad30889f0651039efc9db34e72060c4567f71 libcap-1.10.tar.bz2 26686
+SHA256 66c3f033fdc8f9ba0bd9d0ae2d1f2c11f9fa51bf0d1418e5cb75e29e6577a5bc libcap-1.10.tar.bz2 26686
+MD5 b867a0c1db9e8ff568415bbcd1fa65dc libcap_1.10-14.diff.gz 12928
+RMD160 7fbf66ca5795ae8ee05d208d74a76619ad81afae libcap_1.10-14.diff.gz 12928
+SHA256 e8fdb798774d49439dd07a6a2858da08a27e6b8057e0f87456a0bc223b74f706 libcap_1.10-14.diff.gz 12928
diff --git a/sys-libs/libcap/libcap-1.10-r7.ebuild b/sys-libs/libcap/libcap-1.10-r7.ebuild
new file mode 100644
index 000000000000..efb7fe7e00a5
--- /dev/null
+++ b/sys-libs/libcap/libcap-1.10-r7.ebuild
@@ -0,0 +1,75 @@
+# 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-r7.ebuild,v 1.1 2006/07/13 14:42:17 azarah Exp $
+
+inherit flag-o-matic eutils python
+
+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
+		python_version
+		myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/$(get_libdir)/python${PYVER}/site-packages"
+		append-flags "-I/usr/include/python${PYVER}"
+	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
+	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 nocxx && use python ; then
+		python_version
+		local PYTHONMODDIR="/usr/$(get_libdir)/python${PYVER}/site-packages"
+		exeinto "${PYTHONMODDIR}"
+		doexe libcap/libcapmodule.so
+		insinto "${PYTHONMODDIR}"
+		doins libcap/libcap.py
+	fi
+}
+