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

Quoting and other cleanups.

Package-Manager: portage-2.1.1_pre2-r8

6 files changed, 125 insertions, 13 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/Manifest b/sys-libs/libcap/Manifest
index 572b141276f6..0564136e9b0d 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -14,8 +17,8 @@ AUX libcap-1.10-syscall.patch 1051 RMD160 b369627ad27c14559fdf6e6225c6f0ee607c3e
 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
+DIST libcap-1.10.tar.bz2 26686 RMD160 c1fad30889f0651039efc9db34e72060c4567f71 SHA1 04e699788d98c9ceffaf1292f22a88189ac3d7b7 SHA256 66c3f033fdc8f9ba0bd9d0ae2d1f2c11f9fa51bf0d1418e5cb75e29e6577a5bc
+DIST libcap_1.10-14.diff.gz 12928 RMD160 7fbf66ca5795ae8ee05d208d74a76619ad81afae SHA1 e6661aec051ccb201061839d275f2282968d8b93 SHA256 e8fdb798774d49439dd07a6a2858da08a27e6b8057e0f87456a0bc223b74f706
 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
@@ -24,17 +27,31 @@ EBUILD libcap-1.10-r6.ebuild 2329 RMD160 9a42135c8b900669cb4ded857fc1e971446d46c
 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
+EBUILD libcap-1.10-r7.ebuild 2205 RMD160 9c7d2f50610b0696ccaf2157f5f6493fd1c504fc SHA1 4aa8f6cbefd94b93e4f687f289c21bfc5559fba8 SHA256 22e31c98d1809be850cf7e497bd1400c95d9fc3203910d5101f6d57d8b020f9a
+MD5 7b8f3f20d790803b7d94ac8422f71f07 libcap-1.10-r7.ebuild 2205
+RMD160 9c7d2f50610b0696ccaf2157f5f6493fd1c504fc libcap-1.10-r7.ebuild 2205
+SHA256 22e31c98d1809be850cf7e497bd1400c95d9fc3203910d5101f6d57d8b020f9a libcap-1.10-r7.ebuild 2205
+MISC ChangeLog 4777 RMD160 7d71debd284f3ad7d0544813c2cdf80e720b27a7 SHA1 3c62810fdb4275563ba5f7e41ae30e5efea027a0 SHA256 9508f72958e38c243834a15b20834fdd6ccdc9014e4373a190719e965ede5c9b
+MD5 1eeab755c086062e290358311a5de4c2 ChangeLog 4777
+RMD160 7d71debd284f3ad7d0544813c2cdf80e720b27a7 ChangeLog 4777
+SHA256 9508f72958e38c243834a15b20834fdd6ccdc9014e4373a190719e965ede5c9b ChangeLog 4777
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 2f1adcade85a501a8b4d47ddeb66ec9b files/digest-libcap-1.10-r5 129
-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
+MD5 ad5f4999ea61a88174e7e84d9a8f84f4 files/digest-libcap-1.10-r5 479
+RMD160 ea3f38f4e3ac734b57ec52bf61e09d058e027dbf files/digest-libcap-1.10-r5 479
+SHA256 0c2c285d91fc3605182cc8a81e65f0a10aa374b1f52b01851113a012daa8de6b files/digest-libcap-1.10-r5 479
+MD5 ad5f4999ea61a88174e7e84d9a8f84f4 files/digest-libcap-1.10-r6 479
+RMD160 ea3f38f4e3ac734b57ec52bf61e09d058e027dbf files/digest-libcap-1.10-r6 479
+SHA256 0c2c285d91fc3605182cc8a81e65f0a10aa374b1f52b01851113a012daa8de6b files/digest-libcap-1.10-r6 479
+MD5 ad5f4999ea61a88174e7e84d9a8f84f4 files/digest-libcap-1.10-r7 479
+RMD160 ea3f38f4e3ac734b57ec52bf61e09d058e027dbf files/digest-libcap-1.10-r7 479
+SHA256 0c2c285d91fc3605182cc8a81e65f0a10aa374b1f52b01851113a012daa8de6b files/digest-libcap-1.10-r7 479
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEtlxD1ZcsMnZjRyIRAuWhAJ9KLS54HLWBloZMN0c6F3NULxZFyQCfd+eK
+F260T0LCCBmhkgWN2B+Upug=
+=VMlu
+-----END PGP SIGNATURE-----
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
+}
+