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

Package-Manager: portage-2.1.10.29/cvs/Linux x86_64

9 files changed, 19 insertions, 183 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/Manifest b/x11-libs/rep-gtk/Manifest
index 124c42d29ac8..02ccd2bdd062 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -1,34 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX libtool.patch 522 RMD160 837fdd9d7a0b169987627aa448e5bcd8376e548d SHA1 b7c7a72e1e062fbb0ccee312b4a6b4f07000b05d SHA256 e505074ce431b7ff43dbb3babbc7d506c9384108e58ea6f4e4e896238bc30f41
-AUX rep-gtk-0.18-gtk24.patch 1580 RMD160 965dcad6e21139e662a76dd3ee8835903b333d47 SHA1 183e30bb0a42c9d2ae5f7460d491bec45c6e013a SHA256 5534baae84f6ecb5ca2ca960baa8ffb361bab89ddc0ba184b1f741c07df6e7c5
-AUX rep-gtk-0.18-gtk26.patch 623 RMD160 b0bdbe0978799760a08baafd43a151604918e35b SHA1 6c6a49d195a190bddae4f61ad0465512d1f6b76f SHA256 383a8d401e54394c59fb340af594df3789853cbd389d91b1fb2aefc8c2bc1083
-AUX rep-gtk-0.18.4-libdir.patch 204 RMD160 7e372851f137f2a6d3eb47c163efb8c57aee85f1 SHA1 25fd9665e87bb07caab43453e03349465c7162f1 SHA256 3b7e86ed10d633e534af1ad52401829972d7b5a1678e7a47156e27c0563c71ee
-AUX rep-gtk-0.18.4-locale.patch 354 RMD160 1844550786b5866ed541cb9bc8ee4c6128bd2a41 SHA1 eb2e288cd0a00ae54e9a622d1771f3f75d9bc3cc SHA256 776ee0510ddb3b6ddc9152d7092da0d13956f83367f10d178763fc30f6b79306
 AUX rep-gtk-0.90.7-implicit-def-new.patch 414 RMD160 812cdf021de678c94f660c857083e9c176301639 SHA1 ff93168eded6339ad332f3d4f4d473ac693ee6ab SHA256 aa78618fffadafec7e7d828262b73cdcd5780bfd39ae690a55204d5a31f1ae87
-DIST rep-gtk-0.18.tar.gz 147665 RMD160 b6bd4210a26b2464b73295fb7009e7a75b5c1c8b SHA1 9410c348bd0736a86063c6b0a46c2d7f9b0a8f4a SHA256 837e4c0e15d146388e0e1b83d792c02d4e54f46cf9702664a3878bd23a4ea045
 DIST rep-gtk-0.90.3.tar.bz2 575225 RMD160 cbb7a33d8dde2f407f73f4937e192c01c93654a4 SHA1 376850fe901b109c607ce6bd5896113bf6e6c901 SHA256 aa244a2cc760e0f3b46061f3c322c8f5a684a0d00a1f24938615558130f0f05a
 DIST rep-gtk-0.90.7.tar.xz 244368 RMD160 8f88a6ef46b02d6ed942e2466c6bbb655c09dc2b SHA1 30736e88533e176f88677723f12095be983e1926 SHA256 d25d2763323bbdf7b3541c7215b29c00c9e06ad336cf84a69daafa3910481c0f
-EBUILD rep-gtk-0.18-r3.ebuild 1618 RMD160 d9ba4291bb8c3774d67866f60c9cf812e5bca863 SHA1 97f6f4284a131059796eb855eff938b384d21e41 SHA256 5bf6a5563898289b8f43bda18086ffd81ce2a09811684b602e7af62ee224a086
 EBUILD rep-gtk-0.90.3.ebuild 916 RMD160 cf4e6b108495cb45c4bd6f9c2b70dc7b3644bb2c SHA1 c9d1d57148a33c8f110970f5716573493f86bbdb SHA256 1bb27bf69619f4e260c153464a2b362f724365493d5857fdfd64f445e564ae2e
-EBUILD rep-gtk-0.90.7.ebuild 1135 RMD160 ca260bbb73bd21510182dabc0b4ed27f331ac1c9 SHA1 21f6a09b2ba7ce452b0d02bb390b9241eb3fa1ea SHA256 761eea8b07a6bc0ed595f12c330f1b2ffb9d621d8651cf014339fbb27cd4343e
-MISC ChangeLog 9984 RMD160 da3b8a4e1da2617e71513d8d141196933f1f5799 SHA1 64bb87c962728cab5978f81c1641e1af1ff6b038 SHA256 4eaade2f9e36617df9f5551ccb3e45ee1c009f037f27a768428301cf14c22e6b
+EBUILD rep-gtk-0.90.7.ebuild 1168 RMD160 6994f949378269df589f6c58dc33302e73754ae8 SHA1 9d91c3de7a38c3df1873af9e2e825054b7f0ab87 SHA256 0b0b989d5216b424ff0136bd00d6ca632b0c9ae349efe62f68495e991954e5ef
+MISC ChangeLog 10351 RMD160 5761fea1d90b65e24b221b81e1d59ca05708d6d2 SHA1 608c3f2b4fb3bdc9392b9d411d9a335322e40a41 SHA256 53c069f2283449643aa5e33b68bb9cb47e35fd31ae41641fcbda308d6e2dc7bb
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOmw3rAAoJEF0huFKJUZL59eAP/iG9vnJCa1Fl51QU9ZPqSzHt
-SeojQay6qYL7JQ4vKoSRJu00q8KT/gwm0Vfn7zMUhahq5YG+iC3xwx92C1caSA5r
-FWkNaDqFYXX7CTEpD4zjqtlU0TGIRZz2/GVDW7XCtas1KskYWpH6G99sZmLWNn9D
-Iv11w6Git8KomXxcNlOidWe/V6SUqcl5il3MPDOzz0fSpDBkgvcJ9QfHT4CNMUxX
-1us51daByi+mpB6kC4Zn6lybOG18EietTzy9Q03MiuNVDswbh7ezUkowK5WFiBPg
-L1NmTUQ5yH6Rj9mxWgrhjUPmeoJ7Lmkaz+UXn1ufupAQxk5KWycC7e7tD41S73hj
-lWHIOIeg7yDn78MYakPbfkW4N1gW2Jagob4JDsJm16PHEiCPu4bClu6D4psdizQS
-XPswfAiUGXBel7jFiuzjOHjkjKxzFjAdryf2Nb+LI+OPFCxFAIJlrxm/A3V5d5WR
-e1jDNBG+ITRj7qgBFrOMVACGXsYAponyyQXBHXtcB08JuFpzoORhDHhpUFp2Sxjb
-Ukq1m6Aovgyou2GTiE6JOE9hU2PAZxYpsFZcuvJ/iMtrPpiAZ+Ye5iHGWx3PYqHJ
-PT1ojsxDq1GVRo8QLOS0xNj9h8Ol4sNXFoeB7eMv+xo3beYU0JztSTr9TtkTz96O
-CMVeGyot4xa/OF8Wmz54
-=R2m8
+iEYEARECAAYFAk6dx20ACgkQCaWpQKGI+9TPawCeMbIrFLmEmgEWZJ6a7Xe9/yrl
+ezUAn0IzAlrEGk/QIJdmcn5bgHqaW0EB
+=7zXT
 -----END PGP SIGNATURE-----
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"