[gentoo-commits] proj/hardened-dev:master commit in: eclass/

["Sven Vermeulen" <sven.vermeulen@siphos.be>]

commit:     36526e28cee3266ed5e62b56933fbc41e1ef3410
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Tue May  1 11:26:20 2012 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Tue May  1 11:26:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=36526e28

Simplify eclass further, drop use of trigger file

---
 eclass/selinux-policy-2.eclass |   37 +++++++++----------------------------
 1 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
index c6f993a..07ee6c2 100644
--- a/eclass/selinux-policy-2.eclass
+++ b/eclass/selinux-policy-2.eclass
@@ -138,44 +138,27 @@ selinux-policy-2_src_prepare() {
 	fi
 
 	# Copy additional files to the 3rd_party/ location
-	if [[ "$(declare -p POLICY_FILES 2>/dev/null 2>&1)" == "declare -a"* ]];
+	if [[ "$(declare -p POLICY_FILES 2>/dev/null 2>&1)" == "declare -a"* ]] ||
+	   [[ -n ${POLICY_FILES} ]];
 	then
-		add_interfaces=1;
+	    add_interfaces=1;
 		cd "${S}/refpolicy/policy/modules"
-		for POLFILE in "${POLICY_FILES[@]}";
+		for POLFILE in ${POLICY_FILES[@]};
 		do
-			cp "${FILESDIR}/${POLFILE}" 3rd_party/ || die "Could not copy over ${POLFILE} to 3rd_party/ location";
+			cp "${FILESDIR}/${POLFILE}" 3rd_party/ || die "Could not copy ${POLFILE} to 3rd_party/ location";
 		done
-	else
-		if [[ -n ${POLICY_FILES} ]];
-		then
-			add_interfaces=1;
-			cd "${S}/refpolicy/policy/modules"
-			for POLFILE in ${POLICY_FILES};
-			do
-				cp "${FILESDIR}/${POLFILE}" 3rd_party/ || die "Could not copy ${POLFILE} into 3rd_party/ location";
-			done
-		fi
 	fi
 
 	# Apply the additional patches refered to by the module ebuild.
 	# But first some magic to differentiate between bash arrays and strings
-	if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]];
+	if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]] ||
+	   [[ -n ${POLICY_PATCH} ]];
 	then
 		cd "${S}/refpolicy/policy/modules"
-		for POLPATCH in "${POLICY_PATCH[@]}";
+		for POLPATCH in ${POLICY_PATCH[@]};
 		do
 			epatch "${POLPATCH}"
 		done
-	else
-		if [[ -n ${POLICY_PATCH} ]];
-		then
-			cd "${S}/refpolicy/policy/modules"
-			for POLPATCH in ${POLICY_PATCH};
-			do
-				epatch "${POLPATCH}"
-			done
-		fi
 	fi
 
 	# Collect only those files needed for this particular module
@@ -195,8 +178,6 @@ selinux-policy-2_src_prepare() {
 
 		cp ${modfiles} "${S}"/${i} \
 			|| die "Failed to copy the module files to ${S}/${i}"
-
-		[ ${add_interfaces} -eq 1 ] && touch "${S}"/${i}/.install_interfaces;
 	done
 }
 
@@ -224,7 +205,7 @@ selinux-policy-2_src_install() {
 			insinto ${BASEDIR}/${i}
 			doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}"
 
-			if [[ -f "${S}/${i}/.install_interfaces" ]];
+			if [[ "${POLICY_FILES[@]}" == *"${j}.if"* ]];
 			then
 				insinto ${BASEDIR}/${i}/include/3rd_party
 				doins "${S}"/${i}/${j}.if || die "Failed to add ${j}.if to ${i}"