--- /usr/portage/sys-apps/man/man-1.6.ebuild	2005-06-30 12:35:55.000000000 +0200
+++ /usr/local/portage/sys-apps/man/man-1.6.ebuild	2005-07-01 17:52:05.000000000 +0200
@@ -36,6 +36,9 @@
 	# contains two directories that are symlinked together
 	epatch ${FILESDIR}/man-1.5p-defmanpath-symlinks.patch
 
+	# move new messages to end of message file, solves bug #97541
+	epatch ${FILESDIR}/man-1.6-message-order.patch
+
 	# use non-lazy binds for man. And let portage handling stripping.
 	append-ldflags -Wl,-z,now
 	sed -i \
@@ -48,7 +51,16 @@
 	tc-export CC BUILD_CC
 
 	local myconf=
-	use nls && myconf="+lang all" || myconf="+lang none"
+	if use nls; then
+		strip-linguas $(cd man; echo ??)
+		if [[ -z ${LINGUAS} ]] ; then
+			myconf="+lang all"
+		else
+			myconf="+lang ${LINGUAS// /,}"
+		fi
+	else
+		myconf="+lang none"
+	fi
 	./configure \
 		-confdir=/etc \
 		+sgid +fhs \