New release: 2.8.4

(Portage version: 2.0.52-r1)

5 files changed, 33 insertions, 126 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 950046595cc0..9e6706b9b4df 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.187 2005/09/17 01:26:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.188 2005/09/28 17:58:23 leonardop Exp $
+
+*gtk+-2.8.4 (27 Sep 2005)
+
+  27 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -files/gtk+-2.8.3-misc_fixes.patch, -gtk+-2.8.3-r1.ebuild,
+  +gtk+-2.8.4.ebuild:
+  New version.
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> gtk+-2.6.8.ebuild:
   Mark 2.6.8 stable on alpha
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 74663cb9a77f..76c8a52bdcb5 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,31 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
-MD5 c1c2383136241d07ee2937ee8613299b gtk+-2.8.3-r1.ebuild 3587
-MD5 63f2497b7c323a98016561afb448384d gtk+-2.6.7.ebuild 2839
-MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
 MD5 a0d0542c6230baa08ec8d392e9fa4460 ChangeLog 26855
-MD5 e904402cdc252011ea4345d8cacf0437 gtk+-2.6.8.ebuild 2838
 MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
+MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
 MD5 d9750f9180ebd11501fbbe1768786b73 gtk+-2.6.10.ebuild 2826
-MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
-MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
-MD5 f56b08a8f40b528e72b6406ea337c51c files/digest-gtk+-2.6.10 212
+MD5 63f2497b7c323a98016561afb448384d gtk+-2.6.7.ebuild 2839
+MD5 e904402cdc252011ea4345d8cacf0437 gtk+-2.6.8.ebuild 2838
+MD5 c1c2383136241d07ee2937ee8613299b gtk+-2.8.3-r1.ebuild 3587
+MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
+MD5 28193d4e762dfca369f6b647321fbe32 gtk+-2.8.4.ebuild 3539
+MD5 260084c025cc386ead751a98e4f5b582 .gtk+-2.8.4.ebuild.swp 16384
+MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
+MD5 f56b08a8f40b528e72b6406ea337c51c files/digest-gtk+-2.6.10 212
 MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
-MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
-MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
-MD5 b328f4f7c0afc275b18aad14dbe0f181 files/gtk+-2.8.3-misc_fixes.patch 2856
 MD5 71f1edf217fe1b660ed78cd89f9832b2 files/digest-gtk+-2.6.8 208
 MD5 d08a7fb70155059b3c3460cf44a99e9a files/digest-gtk+-2.8.3-r1 140
+MD5 8ce5bd0f5dbad6c743caeda87abd734d files/digest-gtk+-2.8.4 140
+MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
+MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
+MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDNNfLgIKl8Uu19MoRAr5xAJ9KhSuduacoBZOG5e0cHO+vSFeBlQCggSqu
-qulBZt7klaUXDpoaS96gSjQ=
-=3Tz0
------END PGP SIGNATURE-----
+MD5 b328f4f7c0afc275b18aad14dbe0f181 files/gtk+-2.8.3-misc_fixes.patch 2856
+MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
+MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.3-r1 b/x11-libs/gtk+/files/digest-gtk+-2.8.4
index 303fa12976b1..4f6d021c0fa9 100644
--- a/x11-libs/gtk+/files/digest-gtk+-2.8.3-r1
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.4
@@ -1,2 +1,2 @@
-MD5 1e7a49eaf078af8aeb84369a5fefa8c0 gtk+-2.8.3.tar.bz2 11765089
+MD5 ae14972d22ac338d87c56b6075dfd2a4 gtk+-2.8.4.tar.bz2 11822425
 MD5 0c7c66269cbac694971341dd2b2adf3d gtk+-2-smoothscroll-r6.patch.bz2 3718
diff --git a/x11-libs/gtk+/files/gtk+-2.8.3-misc_fixes.patch b/x11-libs/gtk+/files/gtk+-2.8.3-misc_fixes.patch
deleted file mode 100644
index 61ce74d0b9f2..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.8.3-misc_fixes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -NurdB gtk+-2.8.3/gtk/gtkentry.c gtk+-2.8.3-patched/gtk/gtkentry.c
---- gtk+-2.8.3/gtk/gtkentry.c	2005-08-20 20:57:01.000000000 -0500
-+++ gtk+-2.8.3-patched/gtk/gtkentry.c	2005-09-04 13:50:37.000000000 -0500
-@@ -1049,6 +1049,18 @@
-   gtk_entry_reset_im_context (entry);
-   gtk_entry_reset_layout (entry);
- 
-+  if (entry->blink_timeout)
-+    {
-+      g_source_remove (entry->blink_timeout);
-+      entry->blink_timeout = 0;
-+    }
-+
-+  if (entry->recompute_idle)
-+    {
-+      g_source_remove (entry->recompute_idle);
-+      entry->recompute_idle = 0;
-+    }
-+
-   if (!entry->visible)
-     {
-       /* We want to trash the text here because the entry might be leaked.  */
-diff -NurdB gtk+-2.8.3/gtk/gtkfilechooserdefault.c gtk+-2.8.3-patched/gtk/gtkfilechooserdefault.c
---- gtk+-2.8.3/gtk/gtkfilechooserdefault.c	2005-08-23 07:48:05.000000000 -0500
-+++ gtk+-2.8.3-patched/gtk/gtkfilechooserdefault.c	2005-09-04 13:47:51.000000000 -0500
-@@ -1617,13 +1617,16 @@
-       if (impl->local_only)
- 	{
- 	  GtkFilePath *base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
--	  gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path);
--	  gtk_file_path_free (base_path);
--
--	  if (!is_local)
-+	  if (base_path != NULL)
- 	    {
--	      gtk_file_system_volume_free (impl->file_system, volume);
--	      continue;
-+	      gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path);
-+	      gtk_file_path_free (base_path);
-+	      
-+	      if (!is_local)
-+		{
-+		  gtk_file_system_volume_free (impl->file_system, volume);
-+		  continue;
-+		}
- 	    }
- 	}
- 
-@@ -6645,8 +6648,11 @@
-     }
- 
-   path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
--  change_folder_and_display_error (impl, path);
--  gtk_file_path_free (path);
-+  if (path != NULL)
-+    {
-+      change_folder_and_display_error (impl, path);
-+      gtk_file_path_free (path);
-+    }
- 
-  out:
- 
-diff -NurdB gtk+-2.8.3/gtk/gtkmain.c gtk+-2.8.3-patched/gtk/gtkmain.c
---- gtk+-2.8.3/gtk/gtkmain.c	2005-08-19 11:46:57.000000000 -0500
-+++ gtk+-2.8.3-patched/gtk/gtkmain.c	2005-09-04 13:49:34.000000000 -0500
-@@ -1256,7 +1256,7 @@
-    *  in the user_data field of GdkWindow's.
-    *  Ignore the event if we don't have a widget for it, except
-    *  for GDK_PROPERTY_NOTIFY events which are handled specialy.
--   *  Though this happens rarely, bogus events can occour
-+   *  Though this happens rarely, bogus events can occur
-    *  for e.g. destroyed GdkWindows. 
-    */
-   event_widget = gtk_get_event_widget (event);
-@@ -2044,7 +2044,7 @@
- 
-   widget = NULL;
-   if (event && event->any.window && 
--      !GDK_WINDOW_DESTROYED (event->any.window))
-+      (event->type == GDK_DESTROY || !GDK_WINDOW_DESTROYED (event->any.window)))
-     gdk_window_get_user_data (event->any.window, (void**) &widget);
-   
-   return widget;
diff --git a/x11-libs/gtk+/gtk+-2.8.3-r1.ebuild b/x11-libs/gtk+/gtk+-2.8.4.ebuild
index 156edbb05115..17cd4d638443 100644
--- a/x11-libs/gtk+/gtk+-2.8.3-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.3-r1.ebuild,v 1.1 2005/09/05 00:25:46 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.4.ebuild,v 1.1 2005/09/28 17:58:23 leonardop Exp $
 
 inherit gnome.org flag-o-matic eutils debug
 
@@ -12,7 +12,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc tiff jpeg static"
+IUSE="debug doc jpeg tiff"
 
 RDEPEND="|| ( (
 		x11-libs/libXrender
@@ -25,6 +25,7 @@ RDEPEND="|| ( (
 		x11-libs/libXrandr
 		x11-libs/libXfixes )
 		virtual/x11 )
+
 	>=dev-libs/glib-2.7.1
 	>=x11-libs/pango-1.9
 	>=dev-libs/atk-1.0.1
@@ -55,17 +56,13 @@ pkg_setup() {
 	# An arch specific config directory is used on multilib systems
 	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
 	use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
 }
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Patches from upstream CVS repository for GNOME bugs #310270,
-	# #314980 and #315135.
-	epatch ${FILESDIR}/${P}-misc_fixes.patch
-
 	# beautifying patch for disabled icons
 	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
 	# add smoothscroll support for usability reasons
@@ -94,9 +91,8 @@ src_compile() {
 	local myconf="$(use_enable doc gtk-doc) \
 		$(use_with jpeg libjpeg) \
 		$(use_with tiff libtiff) \
-		$(use_enable static) \
-		--with-libpng \
-		--with-gdktarget=x11 \
+		--with-libpng            \
+		--with-gdktarget=x11     \
 		--with-xinput"
 
 	# Passing --disable-debug is not recommended for production use
@@ -113,9 +109,6 @@ src_compile() {
 }
 
 src_install() {
-
-	dodir ${GTK2_CONFDIR}
-
 	make DESTDIR="${D}" install || die "Installation failed"
 
 	# Enable xft in environment as suggested by <utx@gentoo.org>
@@ -123,12 +116,9 @@ src_install() {
 	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
 
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
 }
 
 pkg_postinst() {
-
-	gtk-query-immodules-2.0  > /${GTK2_CONFDIR}/gtk.immodules
-	gdk-pixbuf-query-loaders > /${GTK2_CONFDIR}/gdk-pixbuf.loaders
-
+	gtk-query-immodules-2.0  > ${GTK2_CONFDIR}/gtk.immodules
+	gdk-pixbuf-query-loaders > ${GTK2_CONFDIR}/gdk-pixbuf.loaders
 }