Bump to EAPI=4, drop la file and do not build static lib. Quote unquoted variables.

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64

4 files changed, 33 insertions, 24 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/Manifest b/dev-libs/gdome2/Manifest
index 5c5d1c9d255f..f9f6428783ab 100644
--- a/dev-libs/gdome2/Manifest
+++ b/dev-libs/gdome2/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gdome2-0.8.1-docs-destdir.patch 276 RMD160 b1e5687fb36a48a674133dceb0e553df9c89564f SHA1 dc19ea7d9cace44ad6167865d8f03601603294a9 SHA256 acfa17bc85299f8395ca8ed571cfb335eeac44224948c873880ed54e58d7b75c
 AUX gdome2-0.8.1-gdome2-config.patch 417 RMD160 bfcc8343b99a19544c6844acf38ae3944479c12b SHA1 482b8184dbc81d1f3698118bdf0ea55ebf311472 SHA256 003d85ee32f236b6f68ae6606862decd995ecd32a94b1c496d0fcd8934d3390b
 DIST gdome2-0.8.1.tar.gz 518965 RMD160 5cc3ff29e0ed040e3bbd02cba4d95b9b634c4072 SHA1 e9a3e4140c873d8232635ad10bb135ef7803c408 SHA256 f4bb80a2ef8e5fd9397ab8aa36d059d0b32e98c4bcf185c7952a7e3874d1d543
-EBUILD gdome2-0.8.1-r2.ebuild 1072 RMD160 27914f0ce17f1bd2f1422734079640bc06ba478b SHA1 b9f52c32f9c9e2d471f5673110c393191b7eb7b6 SHA256 5f460ee03ae6d75e932207f4cbea1a6080521cbf74fdd8c15dc6eb1968018993
-EBUILD gdome2-0.8.1-r3.ebuild 1042 RMD160 7504aa43104e6023fa87762ab795679cf4cebce7 SHA1 b5d2c57d7736202025c8dc3f4091ad09e4862e88 SHA256 361dcbfa88cec99eb484235de517388c4fcaccf16975bada5327250aad3ad31c
-MISC ChangeLog 3850 RMD160 ee3f6f680d21c8c4f26a069e12cfe2516b276184 SHA1 9030244e06351f7b9d759dca08c400e0328f633a SHA256 e8575f7b440d600326051095d7066eb6374c089bd1682b5f0de8a03ef7f407dd
+EBUILD gdome2-0.8.1-r2.ebuild 1074 RMD160 d5f281d2fab04d4976f397fc46856332bdb87637 SHA1 301e333dba2117bd003f377db67bb5aa98709dc3 SHA256 ffe83c26f58dfc5b23f3476fc54b580bd3fe8b518ffc7ce6393aecf895a9f44d
+EBUILD gdome2-0.8.1-r3.ebuild 1136 RMD160 983c63bb58b96b0841470a4ca881460f15edb18f SHA1 7bee1a747e3e86e1bdb240bae3d9f48ee1e0820b SHA256 922a817e61a8975e38fb034bf26cce2dc5de439656d544ac06238a3f7b74ddc5
+MISC ChangeLog 4038 RMD160 455d22d9e03d86b9e6e28e897c9aaa014fe31603 SHA1 e65524b5b0353eb4dd47ea6b581d2168a84dd450 SHA256 a46eff1c919c688158d861c9e8e8f63427cffb1602a29dac21ce5850188f8ae8
 MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59C64ACgkQfXuS5UK5QB0z3QQAhA5hkBP9qh9dqG3tLQiTvMnh
-hkDv1UkOI6oi+10cauFfmLf8hiYdYweSt9Rg378O7Lo1O/pURZ752hcvOmu0f3UF
-9MMso8nm0vOXQWwgxNXfMcSSe4qNS025zxmaczAHyy4xxRbh+ArwZHRq6ktXir1p
-h0V147gBtmtRjcfdItU=
-=qLWU
+iEYEARECAAYFAk6iwAcACgkQ1fmVwcYIWAZlRACgg/7FZcYsUjMzNJ4cRH6NmR1w
+4ucAoOk+J2PKhAs9Y59L/n/LQ0Q/TSmm
+=MuES
 -----END PGP SIGNATURE-----
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
 }