--- gnuplot-4.2.0-r1.ebuild	2007-07-12 20:03:25.000000000 -0300
+++ gnuplot-4.2.0-r2.ebuild	2007-07-13 22:40:54.000000000 -0300
@@ -13,14 +13,13 @@
 LICENSE="gnuplot"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc emacs gd ggi tetex pdf plotutils png readline svga wxwindows X xemacs"
+IUSE="doc emacs gd ggi tetex pdf plotutils readline svga wxwindows X xemacs"
 
 RDEPEND="
 	xemacs? ( virtual/xemacs )
 	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
 	pdf? ( media-libs/pdflib )
 	ggi? ( media-libs/libggi )
-	png? ( media-libs/libpng )
 	gd? ( >=media-libs/gd-2 )
 	doc? ( virtual/tetex )
 	tetex? ( virtual/tetex )
@@ -73,12 +72,12 @@
 	myconf="${myconf} $(use_with svga linux-vga)"
 	myconf="${myconf} $(use_with gd)"
 	myconf="${myconf} $(use_enable wxwindows wxwidgets)"
-	myconf="${myconf} $(use_with plotutils plot /usr/lib)"
-	myconf="${myconf} $(use_with png png /usr/lib)"
-	myconf="${myconf} $(use_with pdf pdf /usr/lib)"
+	myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
+	myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
 
 	use ggi \
-		&& myconf="${myconf} --with-ggi=/usr/lib --with-xmi=/usr/lib" \
+		&& myconf="${myconf} --with-ggi=/usr/$(get_libdir)
+		--with-xmi=/usr/$(get_libdir)" \
 		|| myconf="${myconf} --without-ggi"
 
 	use readline \
@@ -124,7 +123,7 @@
 	if use xemacs; then
 		cd lisp
 		einfo "Configuring gnuplot-mode for XEmacs..."
-		EMACS="xemacs" econf --with-lispdir="/usr/lib/xemacs/site-packages/${PN}" || die
+		EMACS="xemacs" econf --with-lispdir="/usr/$(get_libdir)/xemacs/site-packages/${PN}" || die
 		make DESTDIR="${D}" install || {
 			ewarn "Compiling/installing gnuplot-mode for xemacs has failed."
 			ewarn "I need xemacs-base to be installed before I can compile"