Cleanup ebuild a bit and fix stripping via patch rather than sed.

Package-Manager: portage-2.1.1_pre2-r8

4 files changed, 58 insertions, 34 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 7df4ecb75198..de7f804a4f20 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.37 2006/07/14 14:18:37 solar Exp $
+# 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 $
+
+  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.
 
   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 6574a723603e..b51f518a092c 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,7 +1,14 @@
+-----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
 SHA256 52ddf875d1ab0553b66c83c01cf145f3e4c714a948a52a568dc1a7642ab3ba73 files/1.10-python.patch 2796
+AUX libcap-1.10-nostrip.patch 325 RMD160 f4bb1eedfee569c5ea92836f6944555fb2197e24 SHA1 760505b69d6e5156bcddd85b4b08bce374da2fca SHA256 ee2f10a6b8f9d5d680f19fe58e3dd03f1d8045e0cbf0bef5b9cb9b1c8329dc74
+MD5 4a8be5663ec2abe75b80e914ba6b933d files/libcap-1.10-nostrip.patch 325
+RMD160 f4bb1eedfee569c5ea92836f6944555fb2197e24 files/libcap-1.10-nostrip.patch 325
+SHA256 ee2f10a6b8f9d5d680f19fe58e3dd03f1d8045e0cbf0bef5b9cb9b1c8329dc74 files/libcap-1.10-nostrip.patch 325
 AUX libcap-1.10-python-2.patch 3349 RMD160 6e6ad215052570a7b1c76be5a82519fbcf386fc3 SHA1 5185b46086dcda47d226070d2269ff9e63ba60db SHA256 63e685cff082fef72ca957c8cb3bb09f7aaccee1088f004cb029e67275f10ec7
 MD5 225f8c45bc6ff1df2eb5bee87f4a940f files/libcap-1.10-python-2.patch 3349
 RMD160 6e6ad215052570a7b1c76be5a82519fbcf386fc3 files/libcap-1.10-python-2.patch 3349
@@ -20,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 2339 RMD160 2fa6dab30bfc9e6746a524268b4fceb25c87414f SHA1 d8dbd8c3170628fbfc9150cf7f7836bc5274e5bb SHA256 19923c296d1c28f462a536e651def025526a3b070e0338fd51148ddf205f896d
-MD5 99314bf33078dffca03aff8e61884980 libcap-1.10-r7.ebuild 2339
-RMD160 2fa6dab30bfc9e6746a524268b4fceb25c87414f libcap-1.10-r7.ebuild 2339
-SHA256 19923c296d1c28f462a536e651def025526a3b070e0338fd51148ddf205f896d libcap-1.10-r7.ebuild 2339
-MISC ChangeLog 5075 RMD160 ee590d377718f346e9efc6b58bd7c77c1e492a57 SHA1 4ebebba3871e5ce7b2647a4b28b8ad6b65d2af52 SHA256 8fe7eb0d1576b42ac0ce4a9ce9f1799dd40d2cd18c69fff078fb258c1aa90835
-MD5 8ed3f5ca5c2aee408d2b4e50ba58373b ChangeLog 5075
-RMD160 ee590d377718f346e9efc6b58bd7c77c1e492a57 ChangeLog 5075
-SHA256 8fe7eb0d1576b42ac0ce4a9ce9f1799dd40d2cd18c69fff078fb258c1aa90835 ChangeLog 5075
+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
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -38,3 +45,10 @@ SHA256 0c2c285d91fc3605182cc8a81e65f0a10aa374b1f52b01851113a012daa8de6b files/di
 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)
+
+iD8DBQFEuH0EamhnQswr0vIRAvV7AJ9hm7uzXaJqn5QaK3WvA+fOkIrCMACgswp4
+QQMHzlUFYIdxsjRfFt3fIR0=
+=3218
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libcap/files/libcap-1.10-nostrip.patch b/sys-libs/libcap/files/libcap-1.10-nostrip.patch
new file mode 100644
index 000000000000..9908b75520c3
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-1.10-nostrip.patch
@@ -0,0 +1,15 @@
+let portage do the stripping
+
+http://bugs.gentoo.org/133580
+
+--- libcap-1.10/progs/Makefile
++++ libcap-1.10/progs/Makefile
+@@ -44,7 +44,7 @@ $(PROGS): %: %.o
+ install: all
+ 	mkdir -p -m 0755 $(SBINDIR)
+ 	for p in $(PROGS) ; do \
+-		install -s -m 0755 $$p $(SBINDIR) ; \
++		install -m 0755 $$p $(SBINDIR) ; \
+ 	done
+ 
+ clean:
diff --git a/sys-libs/libcap/libcap-1.10-r7.ebuild b/sys-libs/libcap/libcap-1.10-r7.ebuild
index 1ff396ebaa58..2f3a8daf3330 100644
--- a/sys-libs/libcap/libcap-1.10-r7.ebuild
+++ b/sys-libs/libcap/libcap-1.10-r7.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2006/07/13 15:44:13 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r7.ebuild,v 1.3 2006/07/15 05:27:30 vapier Exp $
 
 inherit flag-o-matic eutils python toolchain-funcs
 
@@ -8,40 +8,31 @@ 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"
+	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"
+IUSE="python"
 
 #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 ) )"
+	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"
+	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
+	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=
-	# -static is never should never be used on shared objects like a lib.
-	#if use static; then
-	#	append-flags -static
-	#	append-ldflags -static
-	#fi
-	if ! tc-is-cross-compiler && ! use nocxx && use python ; then
+	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}"
@@ -52,8 +43,8 @@ src_compile() {
 
 src_install() {
 	into /
-	dosbin progs/sucap progs/execcap progs/setpcaps progs/getpcaps
-	dolib.so libcap/libcap.so.1.10
+	dosbin progs/{sucap,execcap,setpcaps,getpcaps} || die
+	dolib.so libcap/libcap.so.${PV} || die
 	gen_usr_ldscript libcap.so
 	into /usr
 	dolib.a libcap/libcap.a
@@ -64,7 +55,7 @@ src_install() {
 	dodoc CHANGELOG README pgp.keys.asc doc/capability.notes capfaq-0.2.txt
 	doman doc/*.3
 
-	if ! tc-is-cross-compiler && ! use nocxx && use python ; then
+	if ! tc-is-cross-compiler && use python ; then
 		python_version
 		local PYTHONMODDIR="/usr/$(get_libdir)/python${PYVER}/site-packages"
 		exeinto "${PYTHONMODDIR}"