clean extra ebuilds

6 files changed, 7 insertions, 123 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 7e771aa6a418..df1088d986bc 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.23 2004/04/27 22:14:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.24 2004/05/03 22:19:22 mr_bones_ Exp $
+
+  03 May 2004; Michael Sterrett <mr_bones_@gentoo.org> libcap-1.10-r2.ebuild,
+  libcap-1.10.ebuild:
+  clean extra ebuilds
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> libcap-1.10-r2.ebuild,
   libcap-1.10.ebuild:
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 04882c2fee09..e2c9750cfc94 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,13 +1,9 @@
-MD5 7ed0d58ea02e8ecbb0fc95d9d56a1d91 libcap-1.10.ebuild 2083
+MD5 52c8adefebe3a6d4d0996bbde60639f0 ChangeLog 3282
 MD5 90ad48e6fad2a1984cfa8d9ffc42c2c8 libcap-1.10-r3.ebuild 1867
-MD5 1be4b5716e6f56bdb03a12e4461930f1 libcap-1.10-r2.ebuild 1614
-MD5 90c8dedf7a0d9da8cdcbb883423bdd41 ChangeLog 3158
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 2ccfc25ef490b4359ad0155e43d58284 libcap-1.10-r4.ebuild 2131
-MD5 f55c8f8c068940da50e21f4d4b840422 files/digest-libcap-1.10 63
-MD5 8f279ebf325d1b8efb6ad3c3a0d8cb5d files/libcap-1.10-python.patch 3353
 MD5 1a4b48f5a76c206e51c3b2321abd87e1 files/digest-libcap-1.10-r3 129
-MD5 f55c8f8c068940da50e21f4d4b840422 files/digest-libcap-1.10-r2 63
+MD5 8f279ebf325d1b8efb6ad3c3a0d8cb5d files/libcap-1.10-python.patch 3353
 MD5 3aa7335821ba75c0994083995b0331f2 files/libcap-1.10-syscall.patch 1051
 MD5 3d5209ddce54c89ac8f60d158a5c5037 files/1.10-python.patch 2681
 MD5 2f1adcade85a501a8b4d47ddeb66ec9b files/digest-libcap-1.10-r4 129
diff --git a/sys-libs/libcap/files/digest-libcap-1.10 b/sys-libs/libcap/files/digest-libcap-1.10
deleted file mode 100644
index b64fd78bbd27..000000000000
--- a/sys-libs/libcap/files/digest-libcap-1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4426a413128142cab89eb2e6f13d8571 libcap-1.10.tar.bz2 26686
diff --git a/sys-libs/libcap/files/digest-libcap-1.10-r2 b/sys-libs/libcap/files/digest-libcap-1.10-r2
deleted file mode 100644
index b64fd78bbd27..000000000000
--- a/sys-libs/libcap/files/digest-libcap-1.10-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4426a413128142cab89eb2e6f13d8571 libcap-1.10.tar.bz2 26686
diff --git a/sys-libs/libcap/libcap-1.10-r2.ebuild b/sys-libs/libcap/libcap-1.10-r2.ebuild
deleted file mode 100644
index 3bb3d90fd042..000000000000
--- a/sys-libs/libcap/libcap-1.10-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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-r2.ebuild,v 1.11 2004/04/27 22:14:47 agriffis Exp $
-
-inherit base eutils
-
-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"
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~x86 mips ~hppa ~sparc ~ppc alpha ~amd64"
-IUSE="python"
-
-#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"
-
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/libcap-1.10-python.patch
-	epatch ${FILESDIR}/libcap-1.10-syscall.patch
-	sed -i 's|WARNINGS=-ansi|WARNINGS=|' Make.Rules
-}
-
-PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`"
-
-src_compile() {
-	local myflags
-	myflags=""
-	if use python; then
-		myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/lib/python${PYTHONVER}/site-packages"
-		CFLAGS="${CFLAGS} -I/usr/include/python${PYTHONVER}"
-	fi
-
-	emake COPTFLAG="${CFLAGS}" DEBUG="" ${myflags} || die
-}
-
-src_install() {
-	local myflags
-	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
-	dodoc CHANGELOG README License pgp.keys.asc doc/capability.notes
-}
diff --git a/sys-libs/libcap/libcap-1.10.ebuild b/sys-libs/libcap/libcap-1.10.ebuild
deleted file mode 100644
index 1e355dbeb565..000000000000
--- a/sys-libs/libcap/libcap-1.10.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.ebuild,v 1.18 2004/04/27 22:14:47 agriffis Exp $
-
-inherit base flag-o-matic eutils
-
-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"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa amd64"
-IUSE="python"
-
-#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 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# hardened-gcc needs this PIC patch to remove .TEXT relocations from the libcap library
-	has_version "sys-devel/hardened-gcc" && epatch ${FILESDIR}/${PF}-syscall.patch
-	epatch ${FILESDIR}/${PF}-python.patch
-}
-
-src_compile() {
-	PYTHONVER="`python -V 2>&1 | sed 's/^Python //'|sed 's/\([0-9]*\.[0-9]*\).*/\1/'`"
-
-	# filter-flags the PIC option only if hcc is not found active
-	# and thats way the syscall removal patch will not be applied
-	if ! has_version sys-devel/hardened-gcc
-	then
-		filter-flags -fPIC
-	fi
-
-	local myflags=""
-	if [ `use python` ]; then
-		myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/lib/python${PYTHONVER}/site-packages"
-		append-flags -I/usr/include/python${PYTHONVER}
-	fi
-
-	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode
-	has_version "sys-devel/hardened-gcc" && append-flags "-yet_exec"
-
-	emake COPTFLAG="${CFLAGS}" DEBUG="" ${myflags} || die
-}
-
-src_install() {
-	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
-	dodoc CHANGELOG README License pgp.keys.asc doc/capability.notes
-}