[patch] initial patch for eclass

mono.eclass.diff (text/plain), 1.76 KB, created by Jonathan Callen (RETIRED) on 2011-08-27 20:05:32 UTC

--- /var/portage/eclass/mono.eclass	2011-03-26 22:00:12.974505546 -0400
+++ mono.eclass	2011-08-27 16:03:40.548731209 -0400
@@ -37,46 +37,14 @@ unset MONO_AOT_CACHE
 egacinstall() {
 	use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
 	gacutil -i "${1}" \
-		-root "${ED}"/usr/$(get_libdir) \
-		-gacdir /usr/$(get_libdir) \
+		-root "${ED}"/usr/lib \
+		-gacdir /usr/lib \
 		-package ${2:-${GACPN:-${PN}}} \
 		|| die "installing ${1} into the Global Assembly Cache failed"
 }
 
 mono_multilib_comply() {
-	use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
-	local dir finddirs=() mv_command=${mv_command:-mv}
-	if [[ -d "${ED}/usr/lib" && "$(get_libdir)" != "lib" ]]
-	then
-		if ! [[ -d "${ED}"/usr/"$(get_libdir)" ]]
-		then
-			mkdir "${ED}"/usr/"$(get_libdir)" || die "Couldn't mkdir ${ED}/usr/$(get_libdir)"
-		fi
-		${mv_command} "${ED}"/usr/lib/* "${ED}"/usr/"$(get_libdir)"/ || die "Moving files into correct libdir failed"
-		rm -rf "${ED}"/usr/lib
-		for dir in "${ED}"/usr/"$(get_libdir)"/pkgconfig "${ED}"/usr/share/pkgconfig
-		do
-
-			if [[ -d "${dir}" && "$(find "${dir}" -name '*.pc')" != "" ]]
-			then
-				pushd "${dir}" &> /dev/null
-				sed  -i -r -e 's:/(lib)([^a-zA-Z0-9]|$):/'"$(get_libdir)"'\2:g' \
-					*.pc \
-					|| die "Sedding some sense into pkgconfig files failed."
-				popd "${dir}" &> /dev/null
-			fi
-		done
-		if [[ -d "${ED}/usr/bin" ]]
-		then
-			for exe in "${ED}/usr/bin"/*
-			do
-				if [[ "$(file "${exe}")" == *"shell script text"* ]]
-				then
-					sed -r -i -e ":/lib(/|$): s:/lib(/|$):/$(get_libdir)\1:" \
-						"${exe}" || die "Sedding some sense into ${exe} failed"
-				fi
-			done
-		fi
-
-	fi
+	# Do nothing, the installation location is *already correct*:
+	# it should be /usr/lib as the installed files are *not* ABI-specific
+	:
 }