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

(Portage version: 2.2_rc52/cvs/Linux i686)

4 files changed, 109 insertions, 5 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/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/
+}