fix shared lib install #140410

Package-Manager: portage-2.1.1_pre2-r8

4 files changed, 93 insertions, 17 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index de7f804a4f20..cb6005106fab 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for sys-libs/libcap
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.38 2006/07/15 05:27:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.39 2006/07/15 09:21:27 vapier Exp $
+
+*libcap-1.10-r8 (15 Jul 2006)
 
   15 Jul 2006; Mike Frysinger <vapier@gentoo.org>
-  +files/libcap-1.10-nostrip.patch, libcap-1.10-r7.ebuild:
-  Cleanup ebuild a bit and fix stripping via patch rather than sed.
+  +files/libcap-1.10-nostrip.patch, libcap-1.10-r8.ebuild:
+  Cleanup ebuild a bit, fix stripping via patch rather than sed, and fixup
+  library install #140410.
 
   14 Jul 2006; <solar@gentoo.org> -libcap-1.10-r6.ebuild:
   - removed broken libcap-1.10-r6 from the tree. It is causing way to many
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index b51f518a092c..b7dfba75f02a 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -27,14 +27,14 @@ EBUILD libcap-1.10-r5.ebuild 2133 RMD160 a30a4583b6853106a0c634ec2ba3be35b46836e
 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-r7.ebuild 2079 RMD160 739ffd4539fe10d6e370f89423d7b92920594aad SHA1 9d2526339bcc58d45b6450778fbe4a38744d735d SHA256 dba97cae111f50e1535946c8ac18a5557956d1cb96743a370ec21d49fa8a2b3f
-MD5 9c128a1f422b40a972254afc98c1a6bf libcap-1.10-r7.ebuild 2079
-RMD160 739ffd4539fe10d6e370f89423d7b92920594aad libcap-1.10-r7.ebuild 2079
-SHA256 dba97cae111f50e1535946c8ac18a5557956d1cb96743a370ec21d49fa8a2b3f libcap-1.10-r7.ebuild 2079
-MISC ChangeLog 5254 RMD160 4c2ce64a7b486d6c75be0f46f4e5114615acab7d SHA1 b7149b5c18bdd6de9d99813f655a289cd8239fdb SHA256 72d823f9126df9add040911d78aa80605a17c5b4ff1546392dbc2b8e3a7e4987
-MD5 d1ead455d72402a8fb04c400ee1571bb ChangeLog 5254
-RMD160 4c2ce64a7b486d6c75be0f46f4e5114615acab7d ChangeLog 5254
-SHA256 72d823f9126df9add040911d78aa80605a17c5b4ff1546392dbc2b8e3a7e4987 ChangeLog 5254
+EBUILD libcap-1.10-r8.ebuild 2136 RMD160 3c44061c68c60ae368e30e4c83eba7620ebf7c5b SHA1 6d7bff54083be7b85f915cd646acf69f31f00a58 SHA256 ae0a5368b189a63411c21c64fb700b10a40303cccccf15d90030b9a8486b4cde
+MD5 cc14a9a1fb208db8690b30df574a2c0d libcap-1.10-r8.ebuild 2136
+RMD160 3c44061c68c60ae368e30e4c83eba7620ebf7c5b libcap-1.10-r8.ebuild 2136
+SHA256 ae0a5368b189a63411c21c64fb700b10a40303cccccf15d90030b9a8486b4cde libcap-1.10-r8.ebuild 2136
+MISC ChangeLog 5319 RMD160 8cc8022566d847d677423bcc3aad8b7b9df76e96 SHA1 fdb05e81ea7f2cc28f4c9f880f53ce4b2d0c8a57 SHA256 c3c80079d71b1cbeaef18bb4b797610506625d34ddba1bba1fbc4e01c3b36775
+MD5 b997603bd8ca87c28554fc25531037c6 ChangeLog 5319
+RMD160 8cc8022566d847d677423bcc3aad8b7b9df76e96 ChangeLog 5319
+SHA256 c3c80079d71b1cbeaef18bb4b797610506625d34ddba1bba1fbc4e01c3b36775 ChangeLog 5319
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -42,13 +42,13 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 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-r7 479
-RMD160 ea3f38f4e3ac734b57ec52bf61e09d058e027dbf files/digest-libcap-1.10-r7 479
-SHA256 0c2c285d91fc3605182cc8a81e65f0a10aa374b1f52b01851113a012daa8de6b files/digest-libcap-1.10-r7 479
+MD5 ad5f4999ea61a88174e7e84d9a8f84f4 files/digest-libcap-1.10-r8 479
+RMD160 ea3f38f4e3ac734b57ec52bf61e09d058e027dbf files/digest-libcap-1.10-r8 479
+SHA256 0c2c285d91fc3605182cc8a81e65f0a10aa374b1f52b01851113a012daa8de6b files/digest-libcap-1.10-r8 479
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEuH0EamhnQswr0vIRAvV7AJ9hm7uzXaJqn5QaK3WvA+fOkIrCMACgswp4
-QQMHzlUFYIdxsjRfFt3fIR0=
-=3218
+iD8DBQFEuLPZamhnQswr0vIRApQrAJ9lbOvW7DRW6Z8zgWm2X/muuhGVfQCgmL1o
+tESediIKSSpN2ra84AMQSb0=
+=TXnA
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libcap/files/digest-libcap-1.10-r8 b/sys-libs/libcap/files/digest-libcap-1.10-r8
new file mode 100644
index 000000000000..766f3c805465
--- /dev/null
+++ b/sys-libs/libcap/files/digest-libcap-1.10-r8
@@ -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-r8.ebuild b/sys-libs/libcap/libcap-1.10-r8.ebuild
new file mode 100644
index 000000000000..c4ee262f1647
--- /dev/null
+++ b/sys-libs/libcap/libcap-1.10-r8.ebuild
@@ -0,0 +1,67 @@
+# 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-r8.ebuild,v 1.1 2006/07/15 09:21:27 vapier Exp $
+
+inherit flag-o-matic eutils python multilib toolchain-funcs
+
+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="python"
+
+#patch is in recent 2.2 kernels so it works there
+DEPEND="virtual/os-headers
+	python? ( >=virtual/python-2.2.1 >=dev-lang/swig-1.3.10 )"
+RDEPEND="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
+	epatch "${FILESDIR}"/libcap-1.10-nostrip.patch
+	sed -i -e 's|WARNINGS=-ansi|WARNINGS=|' Make.Rules
+}
+
+src_compile() {
+	local myflags=
+	if ! tc-is-cross-compiler && 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,execcap,setpcaps,getpcaps} || die
+	dolib.so libcap/libcap.so.${PV} || die
+	dosym libcap.so.${PV} /$(get_libdir)/libcap.so
+	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 ! tc-is-cross-compiler && 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
+}