--- /usr/portage/x11-libs/xview/xview-3.2-r6.ebuild	2008-06-18 05:07:30.000000000 +0400
+++ xview-3.2-r7.ebuild	2008-12-02 21:05:29.000000000 +0300
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r6.ebuild,v 1.5 2008/06/18 00:44:24 darkside Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
-MY_PN="${P}p1.4-18c"
+MY_PN="${P}p1.4-19c"
 GCC_PATCHVER="0.1"
 
 DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Workstations"
@@ -12,13 +12,13 @@
 LICENSE="sun-openlook"
 # We use the xview tarball available from the X organization, but xfree86 appears
 # to be up and available more often so we use that (it's their primary mirror).
-SRC_URI="http://physionet.caregroup.harvard.edu/physiotools/xview/${MY_PN}.tar.gz
+SRC_URI="http://physionet.caregroup.harvard.edu/physiotools/xview/src/${MY_PN}.tar.gz
 		mirror://gentoo/${P}-gcc-4.1-v${GCC_PATCHVER}.patch.bz2"
 		# mirror://debian/pool/main/x/xview/${SRC_PATCH}.gz
 
 SLOT="0"
 IUSE=""
-KEYWORDS="-alpha -amd64 ~ppc ~sparc x86"
+KEYWORDS="-alpha -amd64 ~ppc ~sparc ~x86"
 
 RDEPEND="x11-libs/libXpm
 	x11-proto/xextproto
@@ -31,7 +31,7 @@
 	x11-misc/gccmakedep
 	x11-misc/imake"
 
-S="${WORKDIR}/${MY_PN}"
+S=${WORKDIR}/${MY_PN}
 
 src_unpack() {
 	unpack ${A}
@@ -44,7 +44,6 @@
 	#    anyway.
 	#
 	# SRC_PATCH="${PN}_3.2p1.4-16woody2.diff"
-	epatch "${FILESDIR}"/CAN-2005-0076.patch
 	epatch "${FILESDIR}"/lseek.diff
 	epatch "${DISTDIR}"/${P}-gcc-4.1-v${GCC_PATCHVER}.patch.bz2
 
@@ -57,26 +56,29 @@
 	# (#120910) Look for imake in the right place
 	sed -i -e 's:\/X11::' imake || die "imake sed failed"
 
-	sed -i -e 's:/usr/X11R6:/usr:' "${S}"/config/XView.cf "${S}"/Build-LinuxXView.bash
+	sed -i -e 's:/usr/X11R6:/usr:' "${S}/config/XView.cf" "${S}/Build-XView.bash"
+
+	# Nasty hacks to force CC and CFLAGS
+	sed -e "s:^\(IMAKEINCLUDE=.*\)\"$:\1 -DCcCmd=$(tc-getCC)\":" \
+		-e "s:usr/lib/X11/config:usr/$(get_libdir)/X11/config:" -i Build-XView.bash
+	sed -e "s:\(.*STD_DEFINES =.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.obj
+	sed -e "s:\(.*define LibXViewDefines .*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.cf
+	sed -e "s:^\(MORECCFLAGS.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i clients/olvwm-4.1/Imakefile
 }
 
 src_compile() {
-	# Create the makefile
-	imake -DUseInstalled -I"${S}"/config -I/usr/$(get_libdir)/X11/config \
-		|| die "imake failed"
-
 	export OPENWINHOME="/usr"
 	export X11DIR="/usr"
 
 	# This is crazy and I know it, but wait till you read the code in
-	# Build-LinuxXView.bash.
-	bash Build-LinuxXView.bash libs \
+	# Build-XView.bash.
+	bash Build-XView.bash libs \
 		|| die "building libs failed"
-	bash Build-LinuxXView.bash clients \
+	bash Build-XView.bash clients \
 		|| die "building clients failed"
-	bash Build-LinuxXView.bash contrib \
+	bash Build-XView.bash contrib \
 		|| die "building contrib failed"
-	bash Build-LinuxXView.bash olvwm \
+	bash Build-XView.bash olvwm \
 		|| die "building olvwm failed"
 }
 
@@ -85,13 +87,13 @@
 	export X11DIR="/usr"
 	export DESTDIR="${D}"
 
-	bash Build-LinuxXView.bash instlibs \
+	bash Build-XView.bash instlibs \
 		|| die "installing libs failed"
-	bash Build-LinuxXView.bash instclients \
+	bash Build-XView.bash instclients \
 		|| die "installing clients failed"
-	bash Build-LinuxXView.bash instcontrib \
+	bash Build-XView.bash instcontrib \
 		|| die "installing contrib failed"
-	bash Build-LinuxXView.bash instolvwm \
+	bash Build-XView.bash instolvwm \
 		|| die "installing olvwm failed"
 	cd "${D}"/usr