--- /dev/null	{cset f07c056a-e4c8-486c-9a69-a37b0a42b8c1}
+++ surfraw/files/surfraw-2.1.5-gentoo_pkg_tools.patch	{local clone}
@@ -0,0 +1,37 @@ 
+  Needs a little more thought, or some method which would allow for an upstream
+push without affecting the non-Gentoo users.
+
+Index: surfraw-2.1.5/surfraw-bash-completion.IN
+===================================================================
+--- surfraw-2.1.5/surfraw-bash-completion.IN	{cset 8f95d483-869f-47ba-aba2-f0a12bb9dd07}
@@ -4,7 +4,6 @@ 
 
 inherit bash-completion eutils
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="A fast unix command line interface to WWW"
 HOMEPAGE="http://alioth.debian.org/projects/surfraw/"
 SRC_URI="mirror://debian/pool/main/s/surfraw/${PN}_${PV}.tar.gz"
@@ -17,8 +16,7 @@ IUSE=""
 src_unpack() {
 	unpack ${A}; cd ${S}
 
-	sed -i 's,/lib/,/share/,g' surfraw-bash-completion surfraw.1.in elvi.1sr.in
-	epatch ${FILESDIR}/${PN}-gentoo_pkg_tools.patch
+	epatch ${FILESDIR}/${PN}-2.1.5-gentoo_pkg_tools.patch
 }
 
 src_compile() {
@@ -59,4 +57,8 @@ pkg_postinst() {
 		ewarn "using the 'sr' wrapper script as described above.  If you wish to return to"
 		ewarn "the old behaviour you can add /usr/share/surfraw to your \$PATH"
 	fi
+	# This file was always autogenerated, and is no longer needed.
+	if [ -f ${ROOT}/etc/surfraw_elvi.list ]; then
+		rm -f ${ROOT}/etc/surfraw_elvi.list
+	fi
 }