Make sure we install a linker script in /usr/lib alongside the static library.

Package-Manager: portage-2.0.51-r15

4 files changed, 70 insertions, 18 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 8be17061d846..c6d5d47ea21f 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2005/02/03 17:22:29 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.33 2005/02/09 23:06:17 vapier Exp $
+
+*libcap-1.10-r5 (09 Feb 2005)
+
+  09 Feb 2005; Mike Frysinger <vapier@gentoo.org> +libcap-1.10-r5.ebuild:
+  Make sure we install a linker script in /usr/lib alongside the static library.
 
   03 Feb 2005; <solar@gentoo.org> -libcap-1.10-r3.ebuild,
   libcap-1.10-r4.ebuild:
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 4423df8e60fa..a70436e03eaf 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1b29df8b31ed473c7e085e408cf1ba3b libcap-1.10-r4.ebuild 2119
-MD5 2331b097be505712e83a06e49961a846 ChangeLog 4158
+MD5 a3a7e29412444976ea4e51394b1eba53 ChangeLog 4346
+MD5 ad5704ba695fd130c911b444b51731ce libcap-1.10-r5.ebuild 2153
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 3aa7335821ba75c0994083995b0331f2 files/libcap-1.10-syscall.patch 1051
-MD5 225f8c45bc6ff1df2eb5bee87f4a940f files/libcap-1.10-python-2.patch 3349
-MD5 2f1adcade85a501a8b4d47ddeb66ec9b files/digest-libcap-1.10-r4 129
 MD5 c91cacf89f9e42e3f7ae3fc8c4fb8501 files/1.10-python.patch 2796
+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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iQCVAwUBQgJdu54WFLgrx1GWAQLh1wP6AiG+hwWkB2XEbW2lSDleTjpp/kWRArj7
-tHVifm4QVLXtn6HM2IpGajkvTzFt9IxeZ8jy97kUgHgSCYDDwdjJY0zAxnhOOuk6
-XB0186IB7WO4BKV2Yp3Xh8wtPK4MPa+6j85NVIyl1nKz0LQGm3wub2E0S5uX+fVp
-/+AlLGnKs5w=
-=P5fE
------END PGP SIGNATURE-----
+MD5 225f8c45bc6ff1df2eb5bee87f4a940f files/libcap-1.10-python-2.patch 3349
diff --git a/sys-libs/libcap/files/digest-libcap-1.10-r5 b/sys-libs/libcap/files/digest-libcap-1.10-r5
new file mode 100644
index 000000000000..ec126de2271e
--- /dev/null
+++ b/sys-libs/libcap/files/digest-libcap-1.10-r5
@@ -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-r5.ebuild b/sys-libs/libcap/libcap-1.10-r5.ebuild
new file mode 100644
index 000000000000..c7fb90697721
--- /dev/null
+++ b/sys-libs/libcap/libcap-1.10-r5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r5.ebuild,v 1.3 2005/02/09 23:06:17 vapier 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
+	http://ftp.debian.org/debian/pool/main/libc/libcap/libcap_${PV}-${DEB_PVER}.diff.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE="nocxx python static"
+
+#patch is in recent 2.2 kernels so it works there
+DEPEND="virtual/libc
+	virtual/os-headers
+	!nocxx? ( python? ( >=virtual/python-2.2.1 >=dev-lang/swig-1.3.10 ) )"
+RDEPEND="!nocxx? ( python? ( >=virtual/python-2.2.1 ) )
+	virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${WORKDIR}/libcap_${PV}-${DEB_PVER}.diff
+	epatch ${FILESDIR}/${PV}-python.patch
+	epatch ${FILESDIR}/libcap-1.10-r4-staticfix.diff
+	sed -i 's|WARNINGS=-ansi|WARNINGS=|' Make.Rules
+}
+
+src_compile() {
+	local PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`"
+	local myflags=""
+	use static && CFLAGS="${CFLAGS} -static" && LDFLAGS="${LDFLAGS} -static"
+	if ! use nocxx && use python ; then
+		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}" DEBUG="" ${myflags} || die
+}
+
+src_install() {
+	local PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`"
+	local myflags=""
+	if ! use nocxx && use python ; then
+		myflags="${myflags} PYTHON=1 PYTHONMODDIR=${D}/usr/$(get_libdir)/python${PYTHONVER}/site-packages"
+	fi
+	make install FAKEROOT="${D}" man_prefix=/usr/share LIBDIR="${D}/$(get_libdir)" ${myflags} || die
+	dodir /usr/$(get_libdir)
+	mv "${D}"/$(get_libdir)/libcap.a "${D}"/usr/$(get_libdir)
+	gen_usr_ldscript libcap.so
+	dodoc CHANGELOG README pgp.keys.asc doc/capability.notes capfaq-0.2.txt
+}