--- gnuplot-4.2.5.ebuild	2009-04-01 20:22:58.000000000 +0200
+++ gnuplot-4.2.5-r1.ebuild	2009-04-01 20:38:03.000000000 +0200
@@ -5,7 +5,7 @@
 EAPI=2
 WX_GTK_VER="2.8"
 
-inherit autotools elisp-common eutils multilib wxwidgets
+inherit autotools elisp-common eutils multilib wxwidgets flag-o-matic
 
 MY_P="${P/_/.}"
 
@@ -61,6 +61,8 @@
 	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch
 	# Support for lua/TikZ terminal
 	epatch "${WORKDIR}"/${P}-lua-term.patch
+	# Fixes a bug when calling PKG_PROG_PKG_CONFIG the first time
+	epatch "${FILESDIR}"/${P}-PKG_PROG_PKG_CONFIG.patch
 	# Add Gentoo version identification since the licence requires it
 	epatch "${FILESDIR}"/${PN}-gentoo-version.patch
 
@@ -103,7 +105,8 @@
 	use xemacs && TEMACS=xemacs
 	use emacs && TEMACS=emacs
 
-	CFLAGS="${CFLAGS} -DGENTOO_REVISION=\\\"${PR}\\\"" \
+	append-flags -DGENTOO_REVISION="\\\"${PR}\\\""
+
 	EMACS=${TEMACS} \
 		econf ${myconf} || die
 }