Version bump. Add patch from bug 237634. LICENSE updated to GPL-3.

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

5 files changed, 124 insertions, 7 deletions

diff --git a/x11-libs/guile-gtk/ChangeLog b/x11-libs/guile-gtk/ChangeLog
index be54988dff6a..488efb9f825f 100644
--- a/x11-libs/guile-gtk/ChangeLog
+++ b/x11-libs/guile-gtk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/guile-gtk
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/ChangeLog,v 1.31 2007/10/14 10:33:07 hkbst Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/ChangeLog,v 1.32 2009/12/05 13:13:50 ulm Exp $
+
+*guile-gtk-2.1 (05 Dec 2009)
+
+  05 Dec 2009; Ulrich Mueller <ulm@gentoo.org> guile-gtk-2.0.ebuild,
+  +files/guile-gtk-2.0-g-object-ref.diff, +guile-gtk-2.1.ebuild:
+  Version bump. Add patch from bug 237634, thanks to Christian Becke
+  <christianbecke@gmail.com>. LICENSE updated to GPL-3. Proxy commit for
+  Tomás Touceda (chiiph).
 
   14 Oct 2007; Marijn Schouten <hkBst@gentoo.org> guile-gtk-2.0.ebuild:
   inherit eutils, bug 195732
diff --git a/x11-libs/guile-gtk/Manifest b/x11-libs/guile-gtk/Manifest
index c886db61853b..3ae8cd216a5e 100644
--- a/x11-libs/guile-gtk/Manifest
+++ b/x11-libs/guile-gtk/Manifest
@@ -1,11 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX guile-gtk-0.19-Makefile.in.patch 556 RMD160 72b626b414a22de64987a442d73309b3b8fa30ff SHA1 55f6745826baaea37560fbb8659ced162a601372 SHA256 edfa2c0a22e339d19428499e03b05817a7cb13bfe1c1a5bbaab9843729d48cd7
+AUX guile-gtk-2.0-g-object-ref.diff 1239 RMD160 5f7f7b567bf26ed1ca247bb031067e9deb3843c6 SHA1 5838fcb4fbed6af1a33cb72498eeedd281c31205 SHA256 fb68d90e21c8d7fb2b73c55a068b5528ae56c82336b200012f97b8abe56242fc
 DIST guile-gtk-0.41.tar.gz 697414 RMD160 6dc9f8e942c64ff8d10af561f1d7b6a577588b0b SHA1 850767d4239811a2ed83e8dee8d72246a0aed44b SHA256 1193faf62d176470d9eea846c590da019d2b980c8472960fdd8f2c55d502193d
 DIST guile-gtk-0.60.tar.gz 752981 RMD160 0e620e18745fcd936ee1b8ec61d9881506f7294d SHA1 dd25377098d61fc1030a769caa5e5777a4abd9e8 SHA256 d1abec5b47220acbfb85a59885167799ea3e6151b6f3706964659f48f21258be
 DIST guile-gtk-1.2-0.31.tar.gz 375504 RMD160 505041a1722e7a382be373609830a9ab6e94a4d6 SHA1 c745891e6f38b0e3f723db1d9b478da451d797c8 SHA256 560ab6245dcbccbb5585e9c4ad3a85ef78607a747ed0adcd7a1e5d61736a2ab5
 DIST guile-gtk-2.0.tar.gz 771154 RMD160 6491960b187e0ac7d75394a4981411d26c21310d SHA1 a0625b735cc1f36917f431952d04cdf047496740 SHA256 8c95e5a3e92ac76927d14879d5e27897481d8aa0b087504bc20c8307ce8b269c
+DIST guile-gtk-2.1.tar.gz 781985 RMD160 2a59cba70d5b9c014eb23c72e38e4c518b1bfa9e SHA1 e587bf31c08deac34bf58c8e0f9bac8c239529fb SHA256 9ad30cdfcae688837785774b2149f0ec82f464412017aeeb045b4336ef2416cc
 EBUILD guile-gtk-1.2.0.31.ebuild 805 RMD160 caa60d73352b9dc409826f6059660caddcf75211 SHA1 8aced768b5eced808ae771636ef08319d045d7a9 SHA256 6aba0c31b92db38acdef931335ffeb843b0428919622ca652091ac507b544769
 EBUILD guile-gtk-1.2.0.41.ebuild 796 RMD160 e87298f93d46146e7da32d16bb9194fcb4217ad4 SHA1 389bb28e15f7176d002efc1efb460a72c0bfdc1e SHA256 cab996b11517033bd1c86d77dcca3ef66e18c0dd5e568279fa7cfe29faf2e1e0
 EBUILD guile-gtk-1.2.0.60.ebuild 776 RMD160 4d97b12f93a114e92f0edba93166002afc4b0e62 SHA1 69e08f490ebf6ff177faaac46c6fb8c8687e3462 SHA256 9f824a51a044c4bed34293662b88ea69d21e7f3dbabe0ec55f8c571ac8b19be5
-EBUILD guile-gtk-2.0.ebuild 965 RMD160 62df663d6c95b015c55ee8096d413df69e83ea49 SHA1 53a5b39a30be57720b544d34ba6fffcbc9681fb3 SHA256 b16c1b46ef16e93b7012a9d63dc9a8596009108465984bfac5bf4873b95a0eb4
-MISC ChangeLog 3783 RMD160 d5f1cdba651314f1eb20abda6ef480187ba7d48c SHA1 ed0dee341dec7ab309da3899aa1fd6bdd516d22d SHA256 86d0c47ebd03c44bf37ca2165ebd655f5d0f0983e388935d548f44908ba427b0
+EBUILD guile-gtk-2.0.ebuild 1080 RMD160 84fc8d60671c7a9a2fe5d51cbcb9f7c83228effb SHA1 902f4e69061b7c3075449828e1288772fe786dc8 SHA256 a9de52a986a831f8b7cddb7764fe42b4e8bdd33c08748fcc2e5de5c03f4dd169
+EBUILD guile-gtk-2.1.ebuild 1085 RMD160 879e419dc8943c1bdebb1ec82ee1c34690eebba0 SHA1 27014648687ed82e2b19dfafe46d7a1fa36a299f SHA256 697cb25aa0d9d8bce20c6c2e0cc8cea60e664eb78144e0bd37c4dfde92627e76
+MISC ChangeLog 4115 RMD160 b91363fe0056c84b94b33f1c48f082d12475bf8a SHA1 a6e4367ddb6bd38724a84b42aa4ee5699158f6a9 SHA256 3119034abe80bb85f6b1f145dd715416d19c18baf669b6d2c4255cba74624f71
 MISC metadata.xml 383 RMD160 594d1ff2899049ee525b97cfa541c7aeb3cc6d2d SHA1 75b1a5d6f5fdd1a328498f7e82c54ab62f6163c0 SHA256 703a18a1572fa929ca3f575b294703022e2f771d3fff0b22e895cd452076feaa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEARECAAYFAksaXS4ACgkQOeoy/oIi7uwtlQCgjzYTv5THhj4bvslOGFmPmcto
+oeAAnAwp1+cn9NmrQ51n4tj9qTivndty
+=IO56
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff b/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff
new file mode 100644
index 000000000000..bd582117f621
--- /dev/null
+++ b/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff
@@ -0,0 +1,45 @@
+--- guile-gtk-2.0.orig/gtk-gl/gdk-gl.defs
++++ guile-gtk-2.0/gtk-gl/gdk-gl.defs
+@@ -22,14 +22,14 @@
+ ;--- Types ... --------------------------------------------------------
+ 
+ (define-struct GdkGLContext
+-  (copy gdk_gl_context_ref)
+-  (free gdk_gl_context_unref)
++  (copy g_object_ref)
++  (free g_object_unref)
+   (size "0")
+   (canonical-name "Gdk" "GL" "Context"))
+ 
+ (define-struct GdkGLPixmap
+-  (copy gdk_gl_pixmap_ref)
+-  (free gdk_gl_pixmap_unref)
++  (copy g_object_ref)
++  (free g_object_unref)
+   (size "0")
+   (canonical-name "Gdk" "GL" "Pixmap"))
+ 
+--- guile-gtk-2.0.orig/gtk-gl/gdk-gl-glue.c
++++ guile-gtk-2.0/gtk-gl/gdk-gl-glue.c
+@@ -83,8 +83,8 @@
+ 
+ sgtk_boxed_info sgtk_gdk_gl_context_info = {
+   { "GdkGLContext", GTK_TYPE_BOXED, NULL },
+-  (void *(*)(void*))gdk_gl_context_ref,
+-  (void (*)(void*))gdk_gl_context_unref,
++  (void *(*)(void*))g_object_ref,
++  (void (*)(void*))g_object_unref,
+   (void (*)(SCM)) NULL,
+   0
+ };
+@@ -100,8 +100,8 @@
+ 
+ sgtk_boxed_info sgtk_gdk_gl_pixmap_info = {
+   { "GdkGLPixmap", GTK_TYPE_BOXED, NULL },
+-  (void *(*)(void*))gdk_gl_pixmap_ref,
+-  (void (*)(void*))gdk_gl_pixmap_unref,
++  (void *(*)(void*))g_object_ref,
++  (void (*)(void*))g_object_unref,
+   (void (*)(SCM)) NULL,
+   0
+ };
diff --git a/x11-libs/guile-gtk/guile-gtk-2.0.ebuild b/x11-libs/guile-gtk/guile-gtk-2.0.ebuild
index 80a333d45479..b9f5698f76a3 100644
--- a/x11-libs/guile-gtk/guile-gtk-2.0.ebuild
+++ b/x11-libs/guile-gtk/guile-gtk-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/guile-gtk-2.0.ebuild,v 1.7 2009/05/05 07:48:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/guile-gtk-2.0.ebuild,v 1.8 2009/12/05 13:13:50 ulm Exp $
 
 inherit virtualx eutils
 
@@ -21,16 +21,23 @@ DEPEND="${RDEPEND}"
 pkg_setup() {
 	if has_version =dev-scheme/guile-1.8*; then
 		local flags="deprecated"
-		built_with_use dev-scheme/guile ${flags} || die "guile must be built with \"${flags}\" use flag"
+		built_with_use dev-scheme/guile ${flags} \
+			|| die "guile must be built with \"${flags}\" use flag"
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-g-object-ref.diff"
+}
+
 src_test() {
 	Xemake check || die "tests failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc README AUTHORS ChangeLog NEWS TODO
 	insinto /usr/share/doc/${PF}/examples
 	doins -r examples/
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1.ebuild
new file mode 100644
index 000000000000..45ac2ec0703b
--- /dev/null
+++ b/x11-libs/guile-gtk/guile-gtk-2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/guile-gtk-2.1.ebuild,v 1.1 2009/12/05 13:13:50 ulm Exp $
+
+inherit virtualx eutils
+
+DESCRIPTION="GTK+ bindings for guile"
+HOMEPAGE="http://www.gnu.org/software/guile-gtk/"
+SRC_URI="ftp://ftp.gnu.org/gnu/guile-gtk/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-scheme/guile
+	=x11-libs/gtk+-2*
+	=gnome-base/libglade-2*
+	>=x11-libs/gtkglarea-1.90"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if has_version =dev-scheme/guile-1.8*; then
+		local flags="deprecated"
+		built_with_use dev-scheme/guile ${flags} \
+			|| die "guile must be built with \"${flags}\" use flag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-2.0-g-object-ref.diff"
+}
+
+src_test() {
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README AUTHORS ChangeLog NEWS TODO
+	insinto /usr/share/doc/${PF}/examples
+	doins -r examples/
+}