[patch] quick patch of readme eclass

readme.gentoo.eclass.patch (text/plain), 1.57 KB, created by Brian Harring (RETIRED) on 2013-02-03 09:42:59 UTC

--- /usr/portage/eclass/readme.gentoo.eclass	2013-01-24 14:01:14.000000000 -0800
+++ readme.gentoo.eclass	2013-02-03 01:42:18.635280676 -0800
@@ -55,20 +55,17 @@
 		set -f
 		echo ${DOC_CONTENTS} | fmt > "${T}"/README.gentoo
 		eshopts_pop
-		dodoc "${T}"/README.gentoo
 	else
 		if [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then
 			cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo
-			dodoc "${T}"/README.gentoo
-		else
-			if [[ -f "${FILESDIR}/README.gentoo" ]]; then
-				cp "${FILESDIR}/README.gentoo" "${T}"/README.gentoo
-				dodoc "${T}"/README.gentoo
-			else
-				die "You are not specifying README.gentoo contents!"
-			fi
+		elif [[ -f "${FILESDIR}/README.gentoo" ]]; then
+			cp "${FILESDIR}/README.gentoo" "${T}"/README.gentoo
+        else
+			die "You are not specifying README.gentoo contents!"
 		fi
 	fi
+	dodoc "${T}"/README.gentoo
+	README_GENTOO_DOC_VALUE=$(< "${T}/README.gentoo")
 }
 
 # @FUNCTION: readme.gentoo_print_elog
@@ -85,16 +82,10 @@
 readme.gentoo_print_elog() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	if [[ -f "${T}"/README.gentoo ]]; then
-		if ! [[ -n "${REPLACING_VERSIONS}" ]] || [[ -n "${FORCE_PRINT_ELOG}" ]]; then
-			eshopts_push
-			set -f
-			cat "${T}"/README.gentoo | while read -r ELINE; do elog "${ELINE}"; done
-			eshopts_pop
-		fi
-	else
-		die "README.gentoo wasn't created at src_install!"
+	if [[ -z "${README_GENTOO_DOC_VALUE}" ]]; then
+		die "readme.gentoo_print_elog invoked without matching readme.gentoo_create_doc call!"
 	fi
+	echo -e "${README_GENTOO_DOC_VALUE}" | while read -r ELINE; do elog "${ELINE}"; done
 }