--- /usr/portage/app-text/fbreader/fbreader-0.12.10.ebuild	2012-06-02 10:31:05.000000000 +0200
+++ /usr/local/portage/app-text/fbreader/fbreader-0.12.10-r2.ebuild	2012-07-05 05:19:47.394671923 +0200
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs flag-o-matic
 
 DESCRIPTION="E-Book Reader. Supports many e-book formats."
 HOMEPAGE="http://www.fbreader.org/"
@@ -15,16 +15,19 @@
 KEYWORDS="amd64 ~ppc x86"
 
 IUSE="debug gtk +qt4"
-DEPEND="dev-libs/expat
-	dev-libs/liblinebreak
-	net-misc/curl
-	dev-libs/fribidi
+RDEPEND="
 	app-arch/bzip2
 	dev-db/sqlite
-	qt4? ( x11-libs/qt-gui:4 )
+	dev-libs/expat
+	dev-libs/fribidi
+	dev-libs/liblinebreak
+	net-misc/curl
+	virtual/jpeg
 	gtk? ( >=x11-libs/gtk+-2.4:2 )
-	"
-RDEPEND="${DEPEND}"
+	qt4? ( x11-libs/qt-gui:4 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 REQUIRED_USE=" ^^ ( qt4 gtk )"
 
@@ -35,8 +38,20 @@
 	sed -i "s:^Name=E-book reader:Name=FBReader:" fbreader/desktop/desktop || die "sed failed"
 	sed -i "s:^Name\[ru\]=.*$:Name\[ru\]=FBReader:" fbreader/desktop/desktop || die "sed failed"
 	sed -i "s:^Icon=FBReader.png:Icon=FBReader:" fbreader/desktop/desktop || die "sed failed"
-	sed -i "/^	LDFLAGS += -s$/ d" makefiles/config.mk || die "sed failed"
-	sed -i "/^LDFLAGS =$/ d" makefiles/arch/desktop.mk || die "sed failed"
+
+	# patch CFFLAGS for fribidi
+	if ! use debug; then
+		sed -i "s:^\(\\s\+CFLAGS +=\) -O3\$:\1 ${CXXFLAGS} `pkg-config --cflags fribidi`:" \
+			makefiles/config.mk || die "sed failed"
+		# patch LDFLAGS
+		sed -i "s:^\(\\s\+LDFLAGS +=\) -\(s\|pg\)\$:\1 ${LDFLAGS}:" makefiles/config.mk || die "sed failed"
+	else
+		# preserve -O0 -g for target-status "debug"
+		filter-flags -O* -g
+		append-cxxflags -O0 -g
+		sed -i "s:^\(\\s\+CFLAGS +=\) -O0 -g\$:\1 ${CXXFLAGS} `pkg-config --cflags fribidi`:" \
+			makefiles/config.mk || die "sed failed"
+	fi
 
 	echo "TARGET_ARCH = desktop" > makefiles/target.mk
 	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk