Add back some tools deleted from upstream libselinux.

6 files changed, 13 insertions, 77 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 75246624bfc7..b13ed97dcaa0 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.39 2005/01/08 03:13:06 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.40 2005/02/14 00:38:20 pebenito Exp $
+
+*policycoreutils-1.20-r1 (13 Feb 2005)
+
+  13 Feb 2005; Chris PeBenito <pebenito@gentoo.org>
+  -policycoreutils-1.16.ebuild, +policycoreutils-1.20-r1.ebuild,
+  -policycoreutils-1.20.ebuild:
+  Add back some tools deleted from upstream libselinux.
 
 *policycoreutils-1.20 (07 Jan 2005)
 
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.16 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.16
deleted file mode 100644
index 93bc71fc58e3..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.16
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 37441e21fefa413b67cd13118022ea3e policycoreutils-1.16.tgz 44139
-MD5 f8838030033c7c223f9451ec800b1be5 policycoreutils-extra-1.8.tar.bz2 9938
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.20 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.20
deleted file mode 100644
index 43a1c369ba47..000000000000
--- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.20
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 21c7265641ef35278aa935afe255447a policycoreutils-1.20.tgz 47062
-MD5 e63b6dc5665520e51c88c08dcf2c71aa policycoreutils-extra-1.11.tar.bz2 10052
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.20-r1 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.20-r1
new file mode 100644
index 000000000000..0c4531f5d7b7
--- /dev/null
+++ b/sys-apps/policycoreutils/files/digest-policycoreutils-1.20-r1
@@ -0,0 +1,2 @@
+MD5 21c7265641ef35278aa935afe255447a policycoreutils-1.20.tgz 47062
+MD5 c9a55e52f3c2eb822bee464972ab305a policycoreutils-extra-1.12.tar.bz2 10171
diff --git a/sys-apps/policycoreutils/policycoreutils-1.16.ebuild b/sys-apps/policycoreutils/policycoreutils-1.16.ebuild
deleted file mode 100644
index 4ef30889f211..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-1.16.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.16.ebuild,v 1.3 2004/10/07 23:24:59 pebenito Exp $
-
-IUSE="build"
-
-inherit eutils
-
-EXTRAS_VER="1.8"
-
-DESCRIPTION="SELinux core utilities"
-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 amd64"
-
-DEPEND=">=sys-libs/libselinux-${PV}
-	sys-libs/libsepol
-	sys-devel/gettext
-	!build? ( sys-libs/pam )"
-
-S2=${WORKDIR}/policycoreutils-extra
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	# add compatibility for number of genhomedircon command line args
-	epatch ${FILESDIR}/policycoreutils-1.16-genhomedircon-compat.diff
-
-	# dont install fixfiles cron script
-	sed -i -e '/^all/s/fixfiles//' ${S}/scripts/Makefile \
-		|| die "fixfiles sed 1 failed"
-	sed -i -e '/fixfiles/d' ${S}/scripts/Makefile \
-		|| die "fixfiles sed 2 failed"
-
-	# fix up to accept Gentoo CFLAGS
-	local SUBDIRS="`cd ${S} && find -type d | cut -d/ -f2`"
-	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
-	fi
-}
diff --git a/sys-apps/policycoreutils/policycoreutils-1.20.ebuild b/sys-apps/policycoreutils/policycoreutils-1.20-r1.ebuild
index 4a847ccfdc7c..4a3c48421ee6 100644
--- a/sys-apps/policycoreutils/policycoreutils-1.20.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-1.20-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.20.ebuild,v 1.1 2005/01/08 03:13:06 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-1.20-r1.ebuild,v 1.1 2005/02/14 00:38:20 pebenito Exp $
 
 IUSE="build nls pam"
 
 inherit eutils
 
-EXTRAS_VER="1.11"
+EXTRAS_VER="1.12"
 SEPOL_VER="1.2"
 
 DESCRIPTION="SELinux core utilities"
@@ -15,7 +15,7 @@ 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 ~amd64"
+KEYWORDS="x86 ppc sparc amd64"
 
 RDEPEND=">=sys-libs/libselinux-${PV}
 	!build? ( pam? ( sys-libs/pam ) >=sys-libs/libsepol-${SEPOL_VER} )