Fix prrll installation, 298803 and remoed broken test, #298802

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 48 insertions, 13 deletions

diff --git a/x11-libs/guile-gtk/ChangeLog b/x11-libs/guile-gtk/ChangeLog
index d28479a12ef2..f83102a061c4 100644
--- a/x11-libs/guile-gtk/ChangeLog
+++ b/x11-libs/guile-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/guile-gtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/ChangeLog,v 1.34 2010/06/28 21:35:34 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/ChangeLog,v 1.35 2010/06/28 22:28:32 jlec Exp $
+
+  28 Jun 2010; Justin Lecher <jlec@gentoo.org> +files/2.1-brokentest.patch,
+  guile-gtk-2.1.ebuild, +files/2.1-prll-install.patch:
+  Fix prrll installation, 298803 and remoed broken test, #298802
 
   28 Jun 2010; Christoph Mende <angelos@gentoo.org> guile-gtk-2.1.ebuild:
   Stable on amd64 wrt bug #326019
diff --git a/x11-libs/guile-gtk/files/2.1-brokentest.patch b/x11-libs/guile-gtk/files/2.1-brokentest.patch
new file mode 100644
index 000000000000..9fe058cc6b12
--- /dev/null
+++ b/x11-libs/guile-gtk/files/2.1-brokentest.patch
@@ -0,0 +1,18 @@
+diff --git a/tests/gdk.scm b/tests/gdk.scm
+index 6e08f9f..36941f5 100644
+--- a/tests/gdk.scm
++++ b/tests/gdk.scm
+@@ -1106,13 +1106,6 @@
+ ;; gdk-selection-property-get
+ ;;
+ 
+-(malloced-steady  ;; with nothing ever requested
+- (lambda ()
+-   (let* ((win    sample-win)
+-	  (want   '(#f NONE 0))
+-	  (got    (gdk-selection-property-get win)))
+-     (test "gdk-selection-property-get" sample-win want got))))
+-
+ (malloced-steady  ;; on a destroyed window
+  (lambda ()
+    (let* ((win    (gdk-window-new #f 100 100 '() 'input-output 'toplevel))
diff --git a/x11-libs/guile-gtk/files/2.1-prll-install.patch b/x11-libs/guile-gtk/files/2.1-prll-install.patch
new file mode 100644
index 000000000000..b00fc29ca34a
--- /dev/null
+++ b/x11-libs/guile-gtk/files/2.1-prll-install.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 822a170..37f43b5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -72,7 +72,7 @@ gdkdefs = gdk-2.0.defs
+ defsdir = $(datadir)/guile-gtk/
+ defs_DATA = $(gtkdefs) $(gdkdefs) 
+ 
+-install-exec-local:
++install-exec-hook:
+ 	rm -f $(DESTDIR)$(bindir)/build-guile-gtk
+ 	rm -f $(DESTDIR)$(bindir)/guile-gtk
+ 	ln $(DESTDIR)$(bindir)/build-guile-gtk-2.0 $(DESTDIR)$(bindir)/build-guile-gtk
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1.ebuild
index b7b7cedf1b59..1ecd2bf5ad2e 100644
--- a/x11-libs/guile-gtk/guile-gtk-2.1.ebuild
+++ b/x11-libs/guile-gtk/guile-gtk-2.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/x11-libs/guile-gtk/guile-gtk-2.1.ebuild,v 1.4 2010/06/28 21:35:34 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/guile-gtk/guile-gtk-2.1.ebuild,v 1.5 2010/06/28 22:28:32 jlec Exp $
 
-inherit virtualx eutils
+EAPI="2"
+
+inherit autotools eutils virtualx
 
 DESCRIPTION="GTK+ bindings for guile"
 HOMEPAGE="http://www.gnu.org/software/guile-gtk/"
@@ -18,9 +20,6 @@ RDEPEND="dev-scheme/guile
 	>=x11-libs/gtkglarea-1.90"
 DEPEND="${RDEPEND}"
 
-# needs X
-RESTRICT="test"
-
 pkg_setup() {
 	if has_version =dev-scheme/guile-1.8*; then
 		local flags="deprecated"
@@ -29,19 +28,20 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.0-g-object-ref.diff"
+	epatch "${FILESDIR}"/${PV}-prll-install.patch
+	epatch "${FILESDIR}"/${PV}-brokentest.patch
+	eautoreconf
 }
 
-#src_test() {
-#	Xemake check || die "tests failed"
-#}
+src_test() {
+	Xemake check || die "tests failed"
+}
 
 src_install() {
 	# bug #298803
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc README AUTHORS ChangeLog NEWS TODO
 	insinto /usr/share/doc/${PF}/examples
 	doins -r examples/