3 files changed, 5 insertions, 86 deletions
diff --git a/sec-policy/selinux-apache/ChangeLog b/sec-policy/selinux-apache/ChangeLog
index a1b32a59dfac..6e6e34c65831 100644
--- a/sec-policy/selinux-apache/ChangeLog
+++ b/sec-policy/selinux-apache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sec-policy/selinux-apache
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/ChangeLog,v 1.35 2012/05/01 11:21:47 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/ChangeLog,v 1.36 2012/05/13 11:50:32 swift Exp $
+
+  13 May 2012; <swift@gentoo.org> -selinux-apache-2.20110726-r1.ebuild,
+  -selinux-apache-2.20110726-r2.ebuild:
+  Removing deprecated ebuilds (cleanup)
 
   01 May 2012; <swift@gentoo.org> selinux-apache-2.20120215-r1.ebuild:
   Pull inherit somewhat down, BASEPOL needs to be mentioned up front
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20110726-r1.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20110726-r1.ebuild
deleted file mode 100644
index 90b78f341517..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20110726-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/selinux-apache-2.20110726-r1.ebuild,v 1.2 2011/10/23 12:43:02 swift Exp $
-IUSE="kerberos"
-MODS="apache"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for Apache HTTPD"
-DEPEND="${DEPEND}
-	kerberos? ( sec-policy/selinux-kerberos )"
-RDEPEND="${DEPEND}"
-
-KEYWORDS="amd64 x86"
-S="${WORKDIR}/"
-
-src_unpack() {
-	selinux-policy-2_src_unpack
-	if ! use kerberos ; then
-		[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted mcs mls";
-		for i in ${POLICY_TYPES}; do
-			sed -i -e "/httpd_keytab_t/d" \
-				"${S}/${i}/apache.fc"
-		done
-	fi
-}
-
-pkg_postinst() {
-	selinux-policy-2_pkg_postinst
-	if use kerberos ; then
-		einfo "If you decide to uninstall Kerberos, you should clear the"
-		einfo "kerberos use flag here, and then emerge this module again."
-		einfo "Failure to do so may result in policy compile errors in the"
-		einfo "future."
-	else
-		einfo "If you install Kerberos later, you should set the kerberos"
-		einfo "use flag here, and then emerge this module again in order to"
-		einfo "get all of the relevant policy changes.  Failure to do so may"
-		einfo "result in errors authenticating against kerberos servers by"
-		einfo "Apache."
-	fi
-}
diff --git a/sec-policy/selinux-apache/selinux-apache-2.20110726-r2.ebuild b/sec-policy/selinux-apache/selinux-apache-2.20110726-r2.ebuild
deleted file mode 100644
index 48e654c41399..000000000000
--- a/sec-policy/selinux-apache/selinux-apache-2.20110726-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apache/selinux-apache-2.20110726-r2.ebuild,v 1.2 2012/02/23 18:44:00 swift Exp $
-IUSE="kerberos"
-MODS="apache"
-BASEPOL="2.20110726-r11"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for Apache HTTPD"
-DEPEND="${DEPEND}
-	kerberos? ( sec-policy/selinux-kerberos )"
-RDEPEND="${DEPEND}"
-
-KEYWORDS="amd64 x86"
-S="${WORKDIR}/"
-
-src_unpack() {
-	selinux-policy-2_src_unpack
-	if ! use kerberos ; then
-		[ -z "${POLICY_TYPES}" ] && local POLICY_TYPES="strict targeted mcs mls";
-		for i in ${POLICY_TYPES}; do
-			sed -i -e "/httpd_keytab_t/d" \
-				"${S}/${i}/apache.fc"
-		done
-	fi
-}
-
-pkg_postinst() {
-	selinux-policy-2_pkg_postinst
-	if use kerberos ; then
-		einfo "If you decide to uninstall Kerberos, you should clear the"
-		einfo "kerberos use flag here, and then emerge this module again."
-		einfo "Failure to do so may result in policy compile errors in the"
-		einfo "future."
-	else
-		einfo "If you install Kerberos later, you should set the kerberos"
-		einfo "use flag here, and then emerge this module again in order to"
-		einfo "get all of the relevant policy changes.  Failure to do so may"
-		einfo "result in errors authenticating against kerberos servers by"
-		einfo "Apache."
-	fi
-}