Fix gdk-pixbuf dependency (bug #387041 by Jack Lloyd), update homepage as older one is obsolete, drop old.

(Portage version: 2.1.10.29/cvs/Linux x86_64)

8 files changed, 12 insertions, 159 deletions

diff --git a/x11-libs/rep-gtk/ChangeLog b/x11-libs/rep-gtk/ChangeLog
index 6fea43157076..97b8fec142f9 100644
--- a/x11-libs/rep-gtk/ChangeLog
+++ b/x11-libs/rep-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/rep-gtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/ChangeLog,v 1.70 2011/10/16 17:01:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/ChangeLog,v 1.71 2011/10/18 18:37:27 pacho Exp $
+
+  18 Oct 2011; Pacho Ramos <pacho@gentoo.org> -rep-gtk-0.18-r3.ebuild,
+  -files/rep-gtk-0.18.4-locale.patch, -files/rep-gtk-0.18.4-libdir.patch,
+  -files/rep-gtk-0.18-gtk24.patch, -files/rep-gtk-0.18-gtk26.patch,
+  -files/libtool.patch, rep-gtk-0.90.7.ebuild:
+  Fix gdk-pixbuf dependency (bug #387041 by Jack Lloyd), update homepage as
+  older one is obsolete, drop old.
 
   16 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> rep-gtk-0.90.7.ebuild:
   ppc stable wrt #385699
diff --git a/x11-libs/rep-gtk/files/libtool.patch b/x11-libs/rep-gtk/files/libtool.patch
deleted file mode 100644
index b243f425f0ba..000000000000
--- a/x11-libs/rep-gtk/files/libtool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur rep-gtk-0.18.orig/Makefile.in rep-gtk-0.18/Makefile.in
---- rep-gtk-0.18.orig/Makefile.in	2002-02-13 08:50:27.000000000 +0100
-+++ rep-gtk-0.18/Makefile.in	2005-09-19 22:52:34.000000000 +0200
-@@ -84,7 +84,7 @@
- 	rep compiler -f compile-batch $<
- 
- libglade-gnome-support.lo : libglade-support.c
--	$(rep_LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) \
-+	$(rep_LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(CFLAGS) \
- 	 @GNOME_LIBGLADE_CFLAGS@ -DGLADE_GNOME=1 $< -o $@
- 
- install : all installdirs
diff --git a/x11-libs/rep-gtk/files/rep-gtk-0.18-gtk24.patch b/x11-libs/rep-gtk/files/rep-gtk-0.18-gtk24.patch
deleted file mode 100644
index 5ae02b56ad4c..000000000000
--- a/x11-libs/rep-gtk/files/rep-gtk-0.18-gtk24.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Only in rep-gtk-0.18-gtk2_patched: config.h
-diff -aur rep-gtk-0.18/gtk-compat.c rep-gtk-0.18-gtk2_patched/gtk-compat.c
---- rep-gtk-0.18/gtk-compat.c	2002-07-12 00:19:22.000000000 -0400
-+++ rep-gtk-0.18-gtk2_patched/gtk-compat.c	2004-03-27 00:59:32.109529224 -0500
-@@ -64,7 +64,7 @@
- 
- GtkWidget*
- gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
--						gchar            *label)
-+						const gchar            *label)
- {
-   GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
-   return gtk_radio_menu_item_new_with_label (g, label);
-@@ -72,7 +72,7 @@
- 
- GtkWidget*
- gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
--						   gchar            *label)
-+						   const gchar            *label)
- {
-   GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
-   return gtk_radio_menu_item_new_with_mnemonic (g, label);
-diff -aur rep-gtk-0.18/rep-gtk.h rep-gtk-0.18-gtk2_patched/rep-gtk.h
---- rep-gtk-0.18/rep-gtk.h	2003-02-12 03:51:45.000000000 -0500
-+++ rep-gtk-0.18-gtk2_patched/rep-gtk.h	2004-03-27 00:59:35.512011968 -0500
-@@ -291,10 +291,10 @@
- 
- GtkWidget*
- gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
--						gchar            *label);
-+						const gchar      *label);
- GtkWidget*
- gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
--						   gchar            *label);
-+						   const gchar            *label);
- GtkWidget* gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group);
- GtkWidget* gtk_pixmap_new_interp (char *file, GtkWidget *intended_parent);
- 
diff --git a/x11-libs/rep-gtk/files/rep-gtk-0.18-gtk26.patch b/x11-libs/rep-gtk/files/rep-gtk-0.18-gtk26.patch
deleted file mode 100644
index 6325445f53d3..000000000000
--- a/x11-libs/rep-gtk/files/rep-gtk-0.18-gtk26.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Remove reference to gtk internal functions.  These functions are no longer
-available in recent versions of gtk, and sawfish doesn't use them anyway.  
-Bug 48439, patch from fn_x
-
-13 Mar 2005 agriffis
-
---- gtk.defs.orig	2005-01-14 02:58:25.104563416 +0100
-+++ gtk.defs	2005-01-14 02:58:53.158298600 +0100
-@@ -1717,15 +1717,6 @@
-   ((GtkWindow window)
-    (string geometry)))
- 
--;; XXX GtkWindowGroup
--
--;; XXX marked as internal
--(define-func _gtk_window_internal_set_focus
--  none
--  ((GtkWindow window)
--   (GtkWidget focus))
--  (scm-name "gtk-window-set-focus"))
--
- ;;; HandleBox
- 
- (define-object GtkHandleBox (GtkBin))
diff --git a/x11-libs/rep-gtk/files/rep-gtk-0.18.4-libdir.patch b/x11-libs/rep-gtk/files/rep-gtk-0.18.4-libdir.patch
deleted file mode 100644
index 388d1d157d7f..000000000000
--- a/x11-libs/rep-gtk/files/rep-gtk-0.18.4-libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rep-gtk-0.18.4/Makefile.in
-+++ rep-gtk-0.18.4/Makefile.in
-@@ -34,7 +34,7 @@
- DESTDIR=
- installdir=$(repexecdir)
- 
--libdir=@prefix@/@libdir@
-+libdir=@libdir@
- 
- top_srcdir=@top_srcdir@
- top_builddir=.
diff --git a/x11-libs/rep-gtk/files/rep-gtk-0.18.4-locale.patch b/x11-libs/rep-gtk/files/rep-gtk-0.18.4-locale.patch
deleted file mode 100644
index 515f09b92ce4..000000000000
--- a/x11-libs/rep-gtk/files/rep-gtk-0.18.4-locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rep-gtk-0.18.4/Makefile.in
-+++ rep-gtk-0.18.4/Makefile.in
-@@ -51,7 +51,7 @@
- 	$(rep_DL_LD) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(REP_GTK_LIBS)
- 
- %-glue.c : %.defs build-gtk.jlc
--	rep build-gtk.jlc -f build-gtk-batch $< $@
-+	LC_ALL=C rep build-gtk.jlc -f build-gtk-batch $< $@
- 
- build-gtk.jlc : build-gtk.jl
- 	rep compiler -f compile-batch $<
diff --git a/x11-libs/rep-gtk/rep-gtk-0.18-r3.ebuild b/x11-libs/rep-gtk/rep-gtk-0.18-r3.ebuild
deleted file mode 100644
index 5c62a9af2f58..000000000000
--- a/x11-libs/rep-gtk/rep-gtk-0.18-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/rep-gtk-0.18-r3.ebuild,v 1.11 2011/03/27 13:00:49 nirbheek Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="A GTK+/libglade/GNOME language binding for the librep Lisp environment"
-HOMEPAGE="http://rep-gtk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rep-gtk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="gtk-2.0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86"
-IUSE="gnome"
-
-RDEPEND=">=dev-libs/librep-0.13
-	>=gnome-base/libglade-2.0.0:2.0
-	>=x11-libs/gtk+-2.0.3:2
-	gnome? ( >=gnome-base/libbonobo-2.0.0
-		>=gnome-base/libbonoboui-2.0.0
-		>=gnome-base/libgnome-2.0.0
-		>=gnome-base/libgnomeui-2.0.0
-		>=gnome-base/libgnomecanvas-2.0.0 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix for bug 45646 to sync up rep-gtk headers with gtk+
-	if has_version '>=x11-libs/gtk+-2.4'; then
-		epatch "${FILESDIR}/rep-gtk-0.18-gtk24.patch"
-	fi
-
-	# Remove reference to gtk internal functions.  These functions are no
-	# longer available in recent versions of gtk, and sawfish doesn't use
-	# them anyway.  Bug 48439
-	epatch "${FILESDIR}/rep-gtk-0.18-gtk26.patch"
-
-	epatch "${FILESDIR}/libtool.patch"
-}
-
-src_compile() {
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--with-libglade \
-		--with-gdk-pixbuf \
-		$(use_with gnome) || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS BUGS ChangeLog HACKING README* TODO
-}
diff --git a/x11-libs/rep-gtk/rep-gtk-0.90.7.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.7.ebuild
index 26a8136c40af..79467a54a45c 100644
--- a/x11-libs/rep-gtk/rep-gtk-0.90.7.ebuild
+++ b/x11-libs/rep-gtk/rep-gtk-0.90.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/rep-gtk-0.90.7.ebuild,v 1.4 2011/10/16 17:01:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/rep-gtk-0.90.7.ebuild,v 1.5 2011/10/18 18:37:27 pacho Exp $
 
 EAPI="4"
 
 inherit eutils multilib
 
 DESCRIPTION="A GTK+/libglade/GNOME language binding for the librep Lisp environment"
-HOMEPAGE="http://rep-gtk.sourceforge.net/"
+HOMEPAGE="http://sawfish.wikia.com/wiki/Main_Page"
 SRC_URI="http://download.tuxfamily.org/librep/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
@@ -17,7 +17,8 @@ IUSE=""
 
 RDEPEND=">=dev-libs/librep-0.90.5
 	>=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.24.0:2"
+	>=x11-libs/gtk+-2.24.0:2
+	>=x11-libs/gdk-pixbuf-2.23:2"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"