update extras

5 files changed, 8 insertions, 72 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 8e5e87d029be..d832e5f7fe9a 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.19 2004/03/13 03:56:58 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.20 2004/03/16 02:53:42 pebenito Exp $
+
+  15 Mar 2004; Chris PeBenito <pebenito@gentoo.org>
+  policycoreutils-1.8.ebuild:
+  Update extras.
 
 *policycoreutils-1.8 (12 Mar 2004)
 
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.6 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.6
deleted file mode 100644
index 6e6325678936..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 be5a8cb948137e86ea02b6d72dd0a405 policycoreutils-1.6.tgz 33274
-MD5 7745af898c624e8d9c5080da4c671957 policycoreutils-extra-1.0.tar.bz2 5949
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.8 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.8
index 07f9062c1286..6aeefdce4858 100644
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.8
+++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.8
@@ -1,2 +1,2 @@
 MD5 a0675f8049f06a9c11f080951da57461 policycoreutils-1.8.tgz 34967
-MD5 7745af898c624e8d9c5080da4c671957 policycoreutils-extra-1.0.tar.bz2 5949
+MD5 45a42b348cb95d6cc6577fc1a7eaf43d policycoreutils-extra-1.1.tar.bz2 6460
diff --git a/sys-apps/policycoreutils/policycoreutils-1.6.ebuild b/sys-apps/policycoreutils/policycoreutils-1.6.ebuild
deleted file mode 100644
index 081196b84aa6..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.6.ebuild
+++ /dev/null
@@ -1,66 +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-apps/policycoreutils/policycoreutils-1.6.ebuild,v 1.1 2004/02/24 22:16:25 pebenito Exp $
-
-IUSE="build"
-
-EXTRAS_VER="1.0"
-
-DESCRIPTION="SELinux core utilites"
-HOMEPAGE="http://www.nsa.gov/selinux"
-SRC_URI="http://www.nsa.gov/selinux/archives/${P}.tgz
-	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-DEPEND="sys-libs/libselinux
-	sys-devel/gettext
-	!build? ( sys-libs/pam )"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}
-S2=${WORKDIR}/policycoreutils-extra
-
-src_unpack() {
-	unpack ${A}
-
-	# Change script paths POLICYDIR
-	sed -i -e "s:/etc/security/selinux/src/policy/:${POLICYDIR}:g" ${S}/scripts/restorecon
-	sed -i -e "s:/etc/security/selinux/src/policy/:${POLICYDIR}:g" ${S}/scripts/checkcon
-	sed -i -e "s:/etc/security/selinux/src/policy/:${POLICYDIR}:g" ${S}/scripts/genhomedircon
-
-	# fix up to accept Gentoo CFLAGS
-	local SUBDIRS="load_policy newrole run_init setfiles audit2allow"
-	for i in ${SUBDIRS}; do
-		sed -i -e "s:-Wall:-Wall ${CFLAGS}:g" ${S}/${i}/Makefile \
-			|| die "${i} Makefile CFLAGS fix failed."
-	done
-}
-
-src_compile() {
-	if use build; then
-		einfo "Compiling setfiles"
-		emake -C ${S}/setfiles || die
-	else
-		einfo "Compiling policycoreutils"
-		emake -C ${S} || die
-		einfo "Compiling policycoreutils-extra"
-		emake -C ${S2} || die
-	fi
-}
-
-src_install() {
-	if use build; then
-		dosbin ${S}/setfiles/setfiles
-	else
-		einfo "Installing policycoreutils"
-		make DESTDIR="${D}" -C ${S} install || die
-		einfo "Installing policycoreutils-extra"
-		make DESTDIR="${D}" -C ${S2} install || die
-
-		exeinto /sbin
-		newexe ${FILESDIR}/selinux-init seinit
-	fi
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-1.8.ebuild b/sys-apps/policycoreutils/policycoreutils-1.8.ebuild
index b9e6ea062c47..8f72a7d06796 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.8.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.8.ebuild,v 1.1 2004/03/13 03:56:58 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.8.ebuild,v 1.2 2004/03/16 02:53:42 pebenito Exp $
 
 IUSE="build"
 
-EXTRAS_VER="1.0"
+EXTRAS_VER="1.1"
 
 DESCRIPTION="SELinux core utilites"
 HOMEPAGE="http://www.nsa.gov/selinux"