Add patch for gdk-color handling, thanks gregory benison; move to EAPI=4 and autotools-utils.eclass, handle static-libs

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

4 files changed, 139 insertions, 5 deletions

diff --git a/dev-scheme/guile-gnome-platform/ChangeLog b/dev-scheme/guile-gnome-platform/ChangeLog
index 2b5bbb36c41a..1219e6219df1 100644
--- a/dev-scheme/guile-gnome-platform/ChangeLog
+++ b/dev-scheme/guile-gnome-platform/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-scheme/guile-gnome-platform
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/ChangeLog,v 1.15 2012/02/12 17:55:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/ChangeLog,v 1.16 2012/02/14 19:47:24 jlec Exp $
+
+*guile-gnome-platform-2.16.1-r1 (14 Feb 2012)
+
+  14 Feb 2012; Justin Lecher <jlec@gentoo.org> +files/2.16.1-gdk-color.patch,
+  +guile-gnome-platform-2.16.1-r1.ebuild:
+  Add patch for gdk-color handling, thanks gregory benison; move to EAPI=4 and
+  autotools-utils.eclass, handle static-libs
 
   12 Feb 2012; Justin Lecher <jlec@gentoo.org>
   -guile-gnome-platform-2.15.92.ebuild:
diff --git a/dev-scheme/guile-gnome-platform/Manifest b/dev-scheme/guile-gnome-platform/Manifest
index 5ffc19aecb70..e1a3d6c3f557 100644
--- a/dev-scheme/guile-gnome-platform/Manifest
+++ b/dev-scheme/guile-gnome-platform/Manifest
@@ -5,14 +5,16 @@ AUX 2.15.92-add-atk-overrides.patch 437 RMD160 75983d58ee52e301603e7313f6c0d3184
 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
+AUX 2.16.1-gdk-color.patch 2328 RMD160 b2af19ef3c3d2599a2800ca2199919825a2bb97c SHA1 0f00ae4dfd68ca5c4fb4b64a1750a798d1bbb39c SHA256 d67c2e1adecb32231013ead20e26dd54e1b688394e54d43aa2dc1e1b20add4a1
 DIST guile-gnome-platform-2.16.1.tar.gz 3494333 RMD160 4723f091e015c4fca6986c48fa143e7fd3070631 SHA1 3cf7cc8de6f261e6cf48d34e691706fe4b7f1061 SHA256 4c0856d3a8310af5959fb123f3a011fc6bc1ec1cf0f125629f8a4a741871c57b
+EBUILD guile-gnome-platform-2.16.1-r1.ebuild 1553 RMD160 9c2eb9ec7f2406fac2508c5b864dffbca066157c SHA1 1fce82abcc9c53e00487086134371b7a9c94b832 SHA256 674b7a73fbf840682d35ea17043f685a642143a6281633cf58cfc67a0a83fc99
 EBUILD guile-gnome-platform-2.16.1.ebuild 1490 RMD160 98f4e43277ea422c172e41f188c26de5ad3e22aa SHA1 bda4145beab0940a9d852e7a5664ec80aa41ecf0 SHA256 ddf02265dec406044f5823d19c88ae2dbf763bfb11a198d1a79faa1591fa929d
-MISC ChangeLog 2644 RMD160 1925c4966dad1b5540e8530b84c260d02c8c922b SHA1 d5b7b8c50f8f647d6da8b9ccaab1e222ef70238c SHA256 eed75025e2bfc31f96236ee9d88338ead1df2a539baf762983405261499ac2fe
+MISC ChangeLog 2936 RMD160 09cb6e537b1948a5d9d792902be0a347014530a5 SHA1 ded5645d6ff2a7e40c85e47fb1710ab765c90cea SHA256 9bf89ae2010f8ca2798d98022ad8cb9f2d957b434aae60fd8be2756f6313816b
 MISC metadata.xml 223 RMD160 cb556324d8e509a2a56af1958c326b0da711ade8 SHA1 18aa01ac4384520fba95f5eea780172d83cc1bd2 SHA256 45f07161f92a53816a4ce5da22343f2688a2da30afb9dfc4008856295ea79ce9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk83/S0ACgkQgAnW8HDreRYQfwCeKzHg8y/YvKGy4//8u/quAE1D
-qMAAniEO+ydAT3ISEDonBGIZ+OzDEnak
-=fLOg
+iEYEAREKAAYFAk86ulIACgkQgAnW8HDreRZf1ACeJN0EG7ewLr9FCmOw/3VH8SJl
+dIIAni8lA9Hw8lynTnCQH/btCT9ekGUM
+=TH5y
 -----END PGP SIGNATURE-----
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-gdk-color.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-gdk-color.patch
new file mode 100644
index 000000000000..d7836ac489f9
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/files/2.16.1-gdk-color.patch
@@ -0,0 +1,55 @@
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: gbenison@gmail.com-20080728153014-9cmh3qp4879910dg
+# target_branch: http://arch.gna.org/guile-gnome/bzr/gtk/
+# testament_sha1: 1dd74795aba452934a0810f47bfe1ad34b958e4b
+# timestamp: 2008-07-28 08:36:30 -0700
+# base_revision_id: wingo@pobox.com-20080703151735-je9a72h0nlq3eere
+# 
+# Begin patch
+=== modified file 'gnome/gw/gdk-support.c'
+--- gtk/gnome/gw/gdk-support.c	2008-04-24 11:17:07 +0000
++++ gtk/gnome/gw/gdk-support.c	2008-07-28 15:30:14 +0000
+@@ -228,11 +228,22 @@
+     return ret;
+ }
+ 
++/*
++ * Allocate a new GdkColor* which must be freed using
++ * gdk_color_free().
++ */
++static GdkColor*
++gdk_color_new()
++{
++  GdkColor tmp;
++  return gdk_color_copy(&tmp);
++}
++
+ GdkColor*
+ scm_scm_to_gdk_color (SCM scm)
+ #define FUNC_NAME "%scm->gdk-rectangle"
+ {
+-    GdkColor *ret = g_new0 (GdkColor, 1);
++    GdkColor *ret = gdk_color_new();
+     
+     if (scm_is_string (scm)) {
+         char *chars;
+
+# Begin bundle
+IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZjPJ74AAbHfgEAQUXP//3qA
+AAC////6UAPZV7KKmigbBkSKemTJNjQBMKepo9RkZNGQ00MAAAABoAAAAAEomgmgaCTNBR6NQHpD
+0TTT1GjDAAAAAaAAAAABJIQ0j0TBJ5JiGmAppkZBoZHetMt0dHeL+Zs1essYZwmiipWtmW5noD6t
+JP2bTdtsv1JJPzNyeehztVVSPROr6m0YKZQFaOWu+z06Rud5U/7D6/HzSd7loXjOuOtTyhUB1+CF
+uquimbPJylUSYlaqGEDm3OnfJaLqj2yQ6r3QgKpKtA0pmW2HITLziKOTjm/fVLt6fxQHZtkGFTeB
+FuHcCiRWzsuJDoOcpYPAVFiEB8InMDl4naQHikc4a1XMxmYpaVYnPm2xrL3exYl0MEuEnlJO+JM5
+UFYwKS8BCwsgYhIWS2kuWGPMseMJO8ncXBIuJJ/X3ZRKMVCSIGaSULHRgmhOe9tGooKytZCskgmJ
+VS3QycULqKoxuNQ40lJoxtNxRyHHy7M0nUOE7BicXaUrMD5NrgsTCJtL8C5FPpE4MOJhg9nMJwT3
+DIsLzYUpCYlqPMWnEscKgQYSs2YjyQ6qxhXiYYlgxArte4UW+sCwwi2FpYQLks5oURZypVRHaVFP
+pJwmgV89TYjcTRROinDCUijL3O+eY5U1957/RoOIq5mRPALX3Kin8fYD/w9R85hVuGpzKzOiC8oV
+dPSyI6qB4jHE1b13nz11zltZaFSX1tLIcaRTqymf46deB05hZeUhBjGBqRcFZ2XkTb8hmPQXCMP0
+tfrRiWC4H2BiBEq5zGkSOGJoLiorU6aBWik6E8Rdxl/gYWG3ds790ppnbBuHeVHwr+HA0EfQlKAc
+q/E8AntpuJ1obUmOUEnfKYWm3NSt+oNhgoiNKKE+jOcy30xMx7eHGTLe33vIVOBzpxG8omhwPoNo
+PUmADruvHqaAVsAj5wgV2JksOsiBgWJZJ5ceoZqpB76oTzAbgKgLn8+qwLOWhwi4O5KK3uWHx6y8
+xGhbXvEVnkl2qk3YyJxYRuKNpjChsznCTyZ4PfeDxdm8DFXuCDIZbZWg3Yr6/kuYYAypBkmDrMiE
+4iIZlSOUreq0/wTGBllkoFAYcVIzkYjT/nQq/MW2bYwSTILXX3uG2etAsP61m91rJ9MZK6x94QmG
+YZNAZtZGfFMR1gOijgJD1tiHFaPr3/XjtiadSQ2LOpiSg+seT5OMoANJeQvIZNTBh4134wCOLGE6
+SCzdOZStqOnvfsWpi8GtD3xaP8XckU4UJCYzye+A
diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
new file mode 100644
index 000000000000..535640b2ca06
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/02/14 19:47:24 jlec Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils eutils multilib
+
+DESCRIPTION="Guile Scheme code that wraps the GNOME developer platform"
+HOMEPAGE="http://www.gnu.org/software/guile-gnome/"
+SRC_URI="http://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/g-wrap
+	dev-libs/glib:2
+	dev-scheme/guile:12
+	dev-scheme/guile-cairo
+	dev-scheme/guile-lib
+	gnome-base/gconf:2
+	gnome-base/gnome-vfs:2
+	gnome-base/libbonobo
+	gnome-base/libglade:2.0
+	gnome-base/libgnomecanvas
+	gnome-base/libgnomeui
+	gnome-base/orbit:2
+	x11-libs/gtk+:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+#needs guile with networking
+RESTRICT=test
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	PATCHES=(
+		"${FILESDIR}/${PV}-conflicting-types.patch"
+		"${FILESDIR}/${PV}-gcc45.patch"
+		"${FILESDIR}/${PV}-gdk-color.patch"
+		)
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-Werror
+		)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile \
+		guilegnomedir=/usr/share/guile/site \
+		guilegnomelibdir=/usr/$(get_libdir)
+}
+
+src_install() {
+	autotools-utils_src_install \
+		guilegnomedir=/usr/share/guile/site \
+		guilegnomelibdir=/usr/$(get_libdir)
+}