finally finish static support from bug #22495, slight cleanup and latest debian patch.

5 files changed, 139 insertions, 10 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 0ed3152c5e4a..3b4c55cc986c 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/libcap
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.21 2004/04/05 18:16:47 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.22 2004/04/25 20:00:41 robbat2 Exp $
+
+*libcap-1.10-r4 (25 Apr 2004)
+
+  25 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> libcap-1.10-r4.ebuild,
+  files/libcap-1.10-r4-staticfix.diff:
+  finally finish static support from bug #22495, slight cleanup and latest
+  debian patch.
 
   05 Apr 2004; Jason Wever <weeve@gentoo.org> libcap-1.10-r3.ebuild:
   Stable on sparc.
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 43f3124a310b..c889a0efe314 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,11 +1,14 @@
-MD5 3d5209ddce54c89ac8f60d158a5c5037 files/1.10-python.patch 2681
-MD5 f55c8f8c068940da50e21f4d4b840422 files/digest-libcap-1.10 63
+MD5 70749994351ba18312b84176569ce540 libcap-1.10-r3.ebuild 1866
+MD5 6c1ed4dd7dcadf5f6f6d8d48edcb6b26 libcap-1.10.ebuild 2072
+MD5 da4083ee6d7b703475bc16293018cf9f libcap-1.10-r2.ebuild 1603
+MD5 da0976b28dc423d74ab9e108ef69294f libcap-1.10-r4.ebuild 2127
+MD5 7d6baf5f9b15fadb1c20394850f61ca5 ChangeLog 3039
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 3aa7335821ba75c0994083995b0331f2 files/libcap-1.10-syscall.patch 1051
+MD5 8f279ebf325d1b8efb6ad3c3a0d8cb5d files/libcap-1.10-python.patch 3353
 MD5 f55c8f8c068940da50e21f4d4b840422 files/digest-libcap-1.10-r2 63
 MD5 1a4b48f5a76c206e51c3b2321abd87e1 files/digest-libcap-1.10-r3 129
-MD5 8f279ebf325d1b8efb6ad3c3a0d8cb5d files/libcap-1.10-python.patch 3353
-MD5 3aa7335821ba75c0994083995b0331f2 files/libcap-1.10-syscall.patch 1051
-MD5 43822480c109f38a0e1c1e6f25fde0d2 ChangeLog 2800
-MD5 7c4c3b838a30b7480359ef680480c6cc libcap-1.10-r2.ebuild 1604
-MD5 90ad48e6fad2a1984cfa8d9ffc42c2c8 libcap-1.10-r3.ebuild 1867
-MD5 c28135a251d345bb9ebce8b7950c0810 libcap-1.10.ebuild 2073
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 2f1adcade85a501a8b4d47ddeb66ec9b files/digest-libcap-1.10-r4 129
+MD5 3d5209ddce54c89ac8f60d158a5c5037 files/1.10-python.patch 2681
+MD5 f55c8f8c068940da50e21f4d4b840422 files/digest-libcap-1.10 63
+MD5 1f60409beeba2a799bfbc44a8b826f11 files/libcap-1.10-r4-staticfix.diff 2113
diff --git a/sys-libs/libcap/files/digest-libcap-1.10-r4 b/sys-libs/libcap/files/digest-libcap-1.10-r4
new file mode 100644
index 000000000000..ec126de2271e
--- /dev/null
+++ b/sys-libs/libcap/files/digest-libcap-1.10-r4
@@ -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/files/libcap-1.10-r4-staticfix.diff b/sys-libs/libcap/files/libcap-1.10-r4-staticfix.diff
new file mode 100644
index 000000000000..2e8d7e0a5835
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-1.10-r4-staticfix.diff
@@ -0,0 +1,55 @@
+diff -ur libcap-1.10.orig/libcap/Makefile libcap-1.10/libcap/Makefile
+--- libcap-1.10.orig/libcap/Makefile	2004-04-25 12:15:02.000000000 -0700
++++ libcap-1.10/libcap/Makefile	2004-04-25 12:40:47.000000000 -0700
+@@ -34,6 +34,7 @@
+ #
+ LIBNAME=libcap
+ PYTHONMODNAME=libcapmodule.so
++STATLIBNAME=$(LIBNAME).a
+ #
+ 
+ FILES=cap_alloc cap_proc cap_extint cap_flag cap_text cap_sys
+@@ -48,9 +49,9 @@
+ MINLIBNAME=$(MAJLIBNAME).$(MINOR)
+ 
+ ifdef PYTHON
+-all: $(MINLIBNAME) $(LIBNAME).a $(PYTHONMODNAME)
++all: $(MINLIBNAME) $(STATLIBNAME) $(PYTHONMODNAME)
+ else
+-all: $(MINLIBNAME) $(LIBNAME).a
++all: $(MINLIBNAME) $(STATLIBNAME)
+ endif
+ 
+ _makenames: _makenames.c cap_names.sed
+@@ -63,8 +64,8 @@
+ 	@echo "=> making cap_names.c from <sys/capability.h>"
+ 	@sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define \([^ \t]*\)[ \t]*\([^ \t]*\)/  \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < include/sys/capability.h | fgrep -v 0x > cap_names.sed #   @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define CAP_\([^ \t]*\)[ \t]*\([^ \t]*\)/  \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < /usr/include/linux/capability.h | fgrep -v 0x > cap_names.sed
+ 
+-$(LIBNAME).a: $(OBJS)
+-	ar cruv $(LIBNAME).a $(OBJS)
++$(STATLIBNAME): $(OBJS)
++	ar csruv $(STATLIBNAME) $(OBJS)
+ 
+ $(MINLIBNAME): $(LOBJS)
+ 	$(CC) -shared -fPIC -Wl,-soname,$(MAJLIBNAME) -o $@ $(LOBJS)
+@@ -88,7 +89,7 @@
+ 	mkdir -p -m 0755 $(INCDIR)/sys
+ 	install -m 0644 include/sys/capability.h $(INCDIR)/sys
+ 	mkdir -p -m 0755 $(LIBDIR)
+-	install -m 0644 $(LIBNAME).a $(LIBDIR)
++	install -m 0644 $(STATLIBNAME) $(LIBDIR)
+ 	install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
+ 	ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
+ 	ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME).so
+@@ -100,7 +101,10 @@
+ 
+ clean:
+ 	$(LOCALCLEAN)
+-	rm -f $(OBJS) $(LOBJS) $(LIBNAME).a $(LIBNAME).so*
++	rm -f $(OBJS) $(LOBJS) $(STATLIBNAME) $(LIBNAME).so*
+ 	rm -f cap_names.h cap_names.sed _makenames libcap_wrap.c
+ 	cd include/sys && $(LOCALCLEAN)
++ifdef PYTHON
++	rm libcap.py libcap_wrap.o libcapmodule.so 
++endif
+ 
diff --git a/sys-libs/libcap/libcap-1.10-r4.ebuild b/sys-libs/libcap/libcap-1.10-r4.ebuild
new file mode 100644
index 000000000000..15c9ce799a7a
--- /dev/null
+++ b/sys-libs/libcap/libcap-1.10-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r4.ebuild,v 1.1 2004/04/25 20:00:41 robbat2 Exp $
+
+inherit base 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="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
+IUSE="python pic static"
+
+#patch is in recent 2.2 kernels so it works there
+DEPEND="virtual/glibc
+	virtual/os-headers
+	python? ( >=virtual/python-2.2.1 >=dev-lang/swig-1.3.10 )"
+RDEPEND="python? ( >=virtual/python-2.2.1 )
+	virtual/glibc"
+
+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 python ; then
+		myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/lib/python${PYTHONVER}/site-packages"
+		append-flags -I/usr/include/python${PYTHONVER}
+	fi
+
+	use pic && append-flags -fPIC
+	use alpha && append-flags -fPIC
+	use amd64 && append-flags -fPIC
+	use hppa && append-flags -fPIC
+
+	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 python ; then
+		myflags="${myflags} PYTHON=1 PYTHONMODDIR=${D}/usr/lib/python${PYTHONVER}/site-packages"
+	fi
+	make install FAKEROOT="${D}" man_prefix=/usr/share ${myflags} || die
+	dodir /usr/lib
+	mv ${D}/lib/libcap.a ${D}/usr/lib
+	dodoc CHANGELOG README pgp.keys.asc doc/capability.notes capfaq-0.2.txt
+}