Index: uclibc-0.9.28.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.ebuild,v
retrieving revision 1.8
diff -u -b -B -w -p -r1.8 uclibc-0.9.28.ebuild
--- uclibc-0.9.28.ebuild	13 Nov 2005 23:52:11 -0000	1.8
+++ uclibc-0.9.28.ebuild	16 Nov 2005 11:21:56 -0000
@@ -41,7 +41,7 @@ KEYWORDS="-* ~arm ~m68k ~mips ~ppc sh ~s
 IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen userlocales wordexp"
 RESTRICT="nostrip"
 
-DEPEND="virtual/os-headers"
+DEPEND="virtual/os-headers pax-utils"
 RDEPEND=""
 [[ ${CTARGET} == ${CHOST} ]] && PROVIDE="virtual/libc"
 
@@ -204,8 +204,23 @@ src_unpack() {
 		echo 'HAS_FPU=n' >> .config
 	fi
 
-	local moredefs=""
-	use uclibc-compat && moredefs="DL_FINI_CRT_COMPAT MALLOC_GLIBC_COMPAT"
+	local moredefs="DL_FINI_CRT_COMPAT MALLOC_GLIBC_COMPAT"
+	# We need todo this for a few months. .28 is a major upgrade."
+	if !use uclibc-compat && [[ "$UCLIBC_SCAN_COMPAT" == "" ]]; then
+		local fnames=""
+		einfo "Doing a scanelf in paths for bins containing the __uClibc_start_main symbol"
+		fnames="$(scanelf -pyqs__uClibc_start_main -F%F#s)" 
+		if [ "$fnames" == ""  ]; then
+			einfo "This system is clean."
+			einfo "To prevent the scanning of files again in the future you can export UCLIBC_SCAN_COMPAT=1"
+			moredefs=""
+		else
+			ewarn "You need to remerge the packages that contain the following files before you can remerge ${P} without USE=uclibc-compat enabled."
+			ewarn "qfile ${fnames}"
+			echo
+			ewarn "Leaving on ${moredefs}"
+		fi
+	fi
 	for def in ${moredefs} DO_C99_MATH UCLIBC_HAS_{RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} ; do
 		sed -i -e "s:# ${def} is not set:${def}=y:" .config
 	done