Add patch for gcc-4.5 wrt bug 317747, and port to EAPI 3

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 30 insertions, 9 deletions

diff --git a/dev-scheme/guile-gnome-platform/ChangeLog b/dev-scheme/guile-gnome-platform/ChangeLog
index 29648edd084c..57fc02dddd55 100644
--- a/dev-scheme/guile-gnome-platform/ChangeLog
+++ b/dev-scheme/guile-gnome-platform/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-scheme/guile-gnome-platform
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/ChangeLog,v 1.12 2010/06/27 13:45:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/ChangeLog,v 1.13 2010/07/01 16:27:53 chiiph Exp $
+
+  01 Jul 2010; Tomas Touceda <chiiph@gentoo.org> +files/2.16.1-gcc45.patch,
+  guile-gnome-platform-2.16.1.ebuild:
+  Add patch for gcc-4.5 wrt bug 317747, and port to EAPI 3
 
   27 Jun 2010; <nixnut@gentoo.org> guile-gnome-platform-2.16.1.ebuild:
   ppc stable #317159
diff --git a/dev-scheme/guile-gnome-platform/Manifest b/dev-scheme/guile-gnome-platform/Manifest
index 28e3224de7ef..12954d9c0900 100644
--- a/dev-scheme/guile-gnome-platform/Manifest
+++ b/dev-scheme/guile-gnome-platform/Manifest
@@ -1,9 +1,10 @@
 AUX 2.15.92-add-atk-overrides.patch 437 RMD160 75983d58ee52e301603e7313f6c0d3184f776db0 SHA1 d95ac9bf568f437a423a6e217cdde7daae56c2a7 SHA256 4f4a5b18137f653c124ad77f54684c58ff9f171f56b8e674c0255132e60c1e07
 AUX 2.15.92-add-cairo-fix-from-bzr.patch 3198 RMD160 4991a6e43864dfea8a9189d16a246059f3146119 SHA1 fa5d514c9cfaf45e209eb8d1f71d468ec6dacf57 SHA256 af7624f7a2b0ee679919c1e266201b30a80fd10873aa8d1b459774d39eb10fe1
 AUX 2.16.1-conflicting-types.patch 1584 RMD160 9d21ea18575bb2ff57184c8fc851adaff7a0a1e4 SHA1 102b65b5f945cf016bbe5092409c8e158e6169bb SHA256 8e7738a9f26622f046861b171aef4c01c4670ee89bc7d7aad3128956a7d33d11
+AUX 2.16.1-gcc45.patch 343 RMD160 46942ae46202caf673372f284ec81f55b088e49d SHA1 9d2ceee6d261edde873662cd610260e6f94dd546 SHA256 3e85118a03856fa21f8a28a0c3f51bf36ec199f14e0cbc092006ec4b3a176c2f
 DIST guile-gnome-platform-2.15.92.tar.gz 1170363 RMD160 91e5cba1cdd1ae1f71375eb690cf4c3966d06657 SHA1 123c0706a9ec2aacedf07da2b418cf3b0397abcd SHA256 8c074906ac595ed05ba229aba60d941ea86ffc0ad1738a9ff2ac00bfc2eccc3d
 DIST guile-gnome-platform-2.16.1.tar.gz 3494333 RMD160 4723f091e015c4fca6986c48fa143e7fd3070631 SHA1 3cf7cc8de6f261e6cf48d34e691706fe4b7f1061 SHA256 4c0856d3a8310af5959fb123f3a011fc6bc1ec1cf0f125629f8a4a741871c57b
 EBUILD guile-gnome-platform-2.15.92.ebuild 1404 RMD160 990f4a1e5dd2d2325f142614b0df3b483a08c87b SHA1 5519d3e5bbc2d2767be6e95eef0a535261203ff9 SHA256 ef5a08da6d80bddb857350d0a60229be9c16c81a466a5854a0ba58d0d5f61e15
-EBUILD guile-gnome-platform-2.16.1.ebuild 1403 RMD160 6e264ab38f00c24036f967b7d98104e6d7e9bd51 SHA1 f0b2b4b4975c8c6a805afb08d78a0c85096bdc61 SHA256 11a23d47df112d906a94da64fd6774d8171e0d4dbe58c424b9731188d5b9dbd8
-MISC ChangeLog 2227 RMD160 dac3f0d0d45a76704c8ff687ed51805b7c78467f SHA1 5a8d83607aea121a1d61332ed2df12518cbd9d67 SHA256 431039c7faacac31f078c4a5e4bc920948569e69178b5e69aae44ef9b98a7457
+EBUILD guile-gnome-platform-2.16.1.ebuild 1474 RMD160 cd56e8d242ad1c14dd608bde923cd10ae22c05fd SHA1 a81a315fbc3d125ec14ab5b54eef76b0e610a83b SHA256 7a98ed90939a592f04fb5a648ced8d40ca7c4bbf066eff6b4fe245c740bec96f
+MISC ChangeLog 2401 RMD160 dbe87f44b4358c80828d353b1e461af5f26b8db5 SHA1 1baa3ded4bb650f3848e81965b7ccaa887487b17 SHA256 42314ab65cbf5d9080fab5c5e4f7c99ed4e2f52b59e66742931798ed10db3640
 MISC metadata.xml 223 RMD160 cb556324d8e509a2a56af1958c326b0da711ade8 SHA1 18aa01ac4384520fba95f5eea780172d83cc1bd2 SHA256 45f07161f92a53816a4ce5da22343f2688a2da30afb9dfc4008856295ea79ce9
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch
new file mode 100644
index 000000000000..39c7e94760bd
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch
@@ -0,0 +1,11 @@
+--- common.mk
++++ common.mk
+@@ -50,7 +50,7 @@
+ 	guile-snarf $(GUILE_SNARF_CFLAGS) $< > $@ \
+ 	|| { rm $@; false; }
+ .c.doc:
+-	$(CPP) -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
++	$(CPP) -P -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
+ 	  | grep -E '^\^\^ {.*\^\^ }' > $@ || { rm $@; false; }
+ 
+ %.scm guile-gnome-gw-%.c: %-spec.scm
diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild
index 3dc3b1a8c4ae..156f8ecb1d6a 100644
--- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild
+++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild,v 1.8 2010/06/27 13:45:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild,v 1.9 2010/07/01 16:27:53 chiiph Exp $
 
-inherit eutils multilib
+EAPI="3"
+
+inherit autotools eutils multilib
 
 DESCRIPTION="Guile Scheme code that wraps the GNOME developer platform"
 HOMEPAGE="http://www.gnu.org/software/guile-gnome"
@@ -34,14 +36,17 @@ DEPEND="${RDEPEND}
 #needs guile with networking
 RESTRICT=test
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${PV}-conflicting-types.patch"
+	epatch "${FILESDIR}/${PV}-gcc45.patch"
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf --disable-Werror
+}
+
+src_compile() {
 	emake -j1 guilegnomedir=/usr/share/guile/site \
 		guilegnomelibdir=/usr/$(get_libdir) || die "emake failed."
 }