Index: lyx-1.4.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.1-r1.ebuild,v
retrieving revision 1.6
diff -u -u -r1.6 lyx-1.4.1-r1.ebuild
--- lyx-1.4.1-r1.ebuild	24 Jun 2006 01:17:29 -0000	1.6
+++ lyx-1.4.1-r1.ebuild	31 Jul 2006 21:24:50 -0000
@@ -56,28 +56,25 @@
 	dev-lang/python
 	>=sys-devel/autoconf-2.58
 	cjk? ( =x11-libs/qt-3* )
-	!cjk? (
-		qt3? ( =x11-libs/qt-3* )
-		!qt3? ( =x11-libs/xforms-1* )
-	)
-	gtk? (
-		>=dev-cpp/gtkmm-2.4
-		>=dev-cpp/libglademm-2.4
-	)"
+	!cjk? ( qt3? ( =x11-libs/qt-3* )
+		!qt3? (
+			gtk? ( >=dev-cpp/gtkmm-2.4
+				>=dev-cpp/libglademm-2.4 )
+			!gtk? ( =x11-libs/xforms-1* ) ) )"
 
 src_unpack() {
 	unpack ${P}.tar.bz2 || die "unpacking lyx failed"
 	unpack latex-xft-fonts-0.1.tar.gz || die "unpacking xft-fonts failed"
-	cd ${S}
+	cd "${S}"
-	epatch ${FILESDIR}/${P}-gentoo.patch || die
+	epatch "${FILESDIR}"/${P}-gentoo.patch || die
 	# bug #125309
-	epatch ${FILESDIR}/${P}-dvips-R0.patch || die
+	epatch "${FILESDIR}"/${P}-dvips-R0.patch || die
 	if use cjk ; then
 		einfo
 		einfo "CJK-LyX now only supports the qt frontend"
 		einfo "the xforms frontend has been removed."
 		einfo
-		epatch ${DISTDIR}/CJK-LyX-qt-${PV}-2.patch || die
+		epatch "${DISTDIR}"/CJK-LyX-qt-${PV}-2.patch || die
 	fi
 	elibtoolize || die "elibtoolize failed "
 }
@@ -94,7 +91,7 @@
 		ewarn "GTK support for lyx is currently not feature complete."
 		ewarn "Don't report any bugs about missing or faulty features to gentoo,"
 		ewarn "instead you have the option of turning GTK support off by removing"
-		ewarn "the gtk use flag or enable the gt use flag"
+		ewarn "the gtk use flag or enable the qt3 use flag"
 		ewarn "(or help implement the missing features at lyx.org)"
 		ewarn
 		myconf="$myconf --with-frontend=gtk"
@@ -105,7 +102,7 @@
 	export WANT_AUTOCONF=2.5
 
 	append-flags "$(test-flags -fno-stack-protector -fno-stack-protector-all)"
-	filter-flags "-Os"
+	replace-flags "-Os" "-O2"
 	econf \
 		$(use_enable nls) \
 		$(use_enable debug) \
@@ -123,32 +120,32 @@
 	dodoc README* UPGRADING ChangeLog NEWS ANNOUNCE ABOUT-NLS ${DISTDIR}/preferences
 
 	insinto /usr/share/lyx/bind
-	doins ${DISTDIR}/hebrew.bind
+	doins "${DISTDIR}"/hebrew.bind
 
-	domenu ${FILESDIR}/lyx.desktop
+	domenu "${FILESDIR}"/lyx.desktop
 
 	# install the latex-xft fonts, which should fix
 	# the problems outlined in bug #15629
 	# <obz@gentoo.org>
-	cd ${WORKDIR}/latex-xft-fonts-0.1
+	cd "${WORKDIR}"/latex-xft-fonts-0.1
-	make DESTDIR=${D} install || die "Font installation failed"
+	make DESTDIR="${D}" install || die "Font installation failed"
 
-	mkfontscale ${D}/usr/share/fonts/latex-xft-fonts
+	mkfontscale "${D}"/usr/share/fonts/latex-xft-fonts
 	mkfontdir -e /usr/share/fonts/encodings \
 		-e /usr/share/fonts/encodings/large \
-		-e /usr/X11R6/$(get_libdir)/X11/fonts/encodings \
+		-e /usr/$(get_libdir)/X11/fonts/encodings \
-		${D}/usr/share/fonts/latex-xft-fonts
+		"${D}"/usr/share/fonts/latex-xft-fonts
-	HOME=/root fc-cache -f ${D}/usr/share/fonts/latex-xft-fonts
+	HOME=/root fc-cache -f "${D}"/usr/share/fonts/latex-xft-fonts
 
 	# bug #102310
 	if use gnome ; then
 		insinto /usr/share/icons/gnome/48x48/mimetypes
-		doins ${FILESDIR}/gnome-mime-application-x-lyx.png
+		doins "${FILESDIR}"/gnome-mime-application-x-lyx.png
 	fi
 
 	# fix for bug 91108
 	dodir /usr/share/texmf/tex/latex
-	cd ${D}/usr/share/texmf/tex/latex
+	cd "${D}"/usr/share/texmf/tex/latex
 	ln -s ../../../lyx/tex lyx
 }
 
@@ -170,7 +167,7 @@
 	einfo "3. use lyx's qt interface (compile with USE=qt3) for maximum effect."
 	einfo ""
 
-	if ! useq qt3 ; then
+	if ! use qt3 ; then
 		einfo ""
 		einfo "If you have a multi-head setup not using xinerama you can only use lyx"
 		einfo "on the 2nd head if not using qt (maybe due to a xforms bug). See bug #40392."