3 files changed, 26 insertions, 15 deletions
diff --git a/dev-libs/gdome2/ChangeLog b/dev-libs/gdome2/ChangeLog
index b6fddf35ff53..fc0eb24ceb40 100644
--- a/dev-libs/gdome2/ChangeLog
+++ b/dev-libs/gdome2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/gdome2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdome2/ChangeLog,v 1.31 2009/12/14 19:54:51 vostorga Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdome2/ChangeLog,v 1.32 2011/10/22 13:07:13 eva Exp $
+
+  22 Oct 2011; Gilles Dartiguelongue <eva@gentoo.org> gdome2-0.8.1-r2.ebuild,
+  gdome2-0.8.1-r3.ebuild:
+  Bump to EAPI=4, drop la file and do not build static lib. Quote unquoted
+  variables.
 
   14 Dec 2009; Víctor Ostorga <vostorga@gentoo.org> gdome2-0.8.1-r3.ebuild:
   Dropping doc USE flag because it is useless, bug 265176
diff --git a/dev-libs/gdome2/gdome2-0.8.1-r2.ebuild b/dev-libs/gdome2/gdome2-0.8.1-r2.ebuild
index 7ad8a9d5f9d9..ce0a41ee6d4e 100644
--- a/dev-libs/gdome2/gdome2-0.8.1-r2.ebuild
+++ b/dev-libs/gdome2/gdome2-0.8.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdome2/gdome2-0.8.1-r2.ebuild,v 1.2 2007/01/03 19:39:45 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdome2/gdome2-0.8.1-r2.ebuild,v 1.3 2011/10/22 13:07:13 eva Exp $
 
 inherit eutils gnome2 autotools
 
@@ -24,16 +24,16 @@ DOCS="AUTHORS ChangeLog INSTALL MAINTAINERS NEWS README*"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Fix broken GLIB_CONFIG in configure.in, see #114542
-	epatch ${FILESDIR}/gdome2-0.8.1-gdome2-config.patch
+	epatch "${FILESDIR}"/gdome2-0.8.1-gdome2-config.patch
 	eautoconf || die
 
 	# make docs honor DESTDIR
 	epatch "${FILESDIR}/${P}-docs-destdir.patch"
 
 	# prevent gtk-fixxref from running (will cause sandbox violation)
-	cd ${S}/gtk-doc
+	cd "${S}"/gtk-doc
 	sed -e 's:gtkdoc-fixxref:#gtkdoc-fixxref:' -i Makefile.in
 }
diff --git a/dev-libs/gdome2/gdome2-0.8.1-r3.ebuild b/dev-libs/gdome2/gdome2-0.8.1-r3.ebuild
index 7e270f447d6c..a5e36e6de922 100644
--- a/dev-libs/gdome2/gdome2-0.8.1-r3.ebuild
+++ b/dev-libs/gdome2/gdome2-0.8.1-r3.ebuild
@@ -1,8 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdome2/gdome2-0.8.1-r3.ebuild,v 1.2 2009/12/14 19:54:51 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gdome2/gdome2-0.8.1-r3.ebuild,v 1.3 2011/10/22 13:07:13 eva Exp $
 
-inherit eutils gnome2 autotools
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
 
 DESCRIPTION="The DOM C library for the GNOME project"
 HOMEPAGE="http://gdome2.cs.unibo.it/"
@@ -21,12 +25,12 @@ RDEPEND=">=dev-libs/glib-2.2.0
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README*"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-static"
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README*"
+}
 
+src_prepare() {
 	# Fix broken GLIB_CONFIG in configure.in, see #114542
 	epatch "${FILESDIR}/${P}-gdome2-config.patch"
 
@@ -37,4 +41,6 @@ src_unpack() {
 	sed -i -e 's:gtkdoc-fixxref:#gtkdoc-fixxref:' gtk-doc/Makefile* || die
 
 	eautoconf
+
+	gnome2_src_prepare
 }