fix gtk1 locale problem 'n cleanup

11 files changed, 19 insertions, 256 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 437af5286dcd..8bf6d0e081f5 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.83 2003/11/16 00:18:05 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.84 2003/12/07 15:03:55 foser Exp $
+
+  07 Dec 2003; foser <foser@gentoo.org> gtk+-1.2.10-r10.ebuild :
+  Fix sysconfdir to /etc to fix gtkrc problems described in #34279
 
   14 Nov 2003; Aron Griffis <agriffis@gentoo.org> gtk+-1.2.10-r10.ebuild:
   Stable on ia64
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index d6d5ea66e01f..16cb70bdd008 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,20 +1,13 @@
-MD5 a8b2620040e95214452dea4e9a746697 ChangeLog 13619
-MD5 3ce151bde10c607d0928598f54ba7d97 gtk+-1.2.10-r10.ebuild 1853
-MD5 d9cb8ab454327ffa0a26501e687127cc gtk+-2.2.1-r1.ebuild 2438
-MD5 9f86b5b174549b5348c439235ed161d3 gtk+-2.2.1.ebuild 2324
-MD5 585e120a65e4aa064bef5a64378f2cb4 gtk+-2.2.4-r1.ebuild 2519
+MD5 b382ca8f2677e68f36ff8945fdcfc111 gtk+-2.2.4-r1.ebuild 2518
+MD5 338e748767803d5ff133bf24829cd8d7 gtk+-1.2.10-r10.ebuild 1849
+MD5 c0d9963ef6e87c15222ed8eabe160b53 ChangeLog 13751
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
-MD5 dab380359be57a8b0234710651374e96 files/digest-gtk+-2.2.1 64
-MD5 dab380359be57a8b0234710651374e96 files/digest-gtk+-2.2.1-r1 64
-MD5 a4bb1381a10a526da3a6f968a8b3a4a2 files/digest-gtk+-2.2.4-r1 64
+MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
-MD5 c979d9262eccf5bdf8dbfa50b8d57b13 files/gtk+-2-xftprefs.patch 6711
-MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
 MD5 897d9bcb56e9f9303b1e35c6f521ae35 files/gtk+-2.2-notificationarea_loop.patch 440
-MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
-MD5 a0e14ed281fc891fd169e2bf7e247ad4 files/gtk+-2.2.1-gdkpixbuf-bigendian.patch 724
-MD5 c63b9c6e57c8c554b32a8e40e46d1291 files/gtk+-2.2.1-scrollfix.patch 504
-MD5 60abaa583c04f16be6d0703cc9684e45 files/gtk+-2.2.2-gtkwidget_pixmap_expose.patch 757
+MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
+MD5 c979d9262eccf5bdf8dbfa50b8d57b13 files/gtk+-2-xftprefs.patch 6711
 MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
+MD5 a4bb1381a10a526da3a6f968a8b3a4a2 files/digest-gtk+-2.2.4-r1 64
+MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.2.1 b/x11-libs/gtk+/files/digest-gtk+-2.2.1
deleted file mode 100644
index 4674a66630c4..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dfd5755fddb26a46c96bfaa813280ac4 gtk+-2.2.1.tar.bz2 6515939
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.2.1-r1 b/x11-libs/gtk+/files/digest-gtk+-2.2.1-r1
deleted file mode 100644
index 4674a66630c4..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dfd5755fddb26a46c96bfaa813280ac4 gtk+-2.2.1.tar.bz2 6515939
diff --git a/x11-libs/gtk+/files/gtk+-2.2.1-gdkpixbuf-bigendian.patch b/x11-libs/gtk+/files/gtk+-2.2.1-gdkpixbuf-bigendian.patch
deleted file mode 100644
index aa5ffd48ffb6..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.2.1-gdkpixbuf-bigendian.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- gdk/gdkpixbuf-drawable.c.orig	2003-02-05 19:43:30.000000000 -0600
-+++ gdk/gdkpixbuf-drawable.c	2003-02-05 19:44:43.000000000 -0600
-@@ -982,7 +982,7 @@
- #ifdef LITTLE
-   register guint16 *s;	/* read 1 pixels at once */
- #else
--  register guint8 *s;
-+  register guint16 *s;
- #endif
-   register guint32 *o;
- 
-@@ -995,7 +995,7 @@
- #ifdef LITTLE
-       s = (guint16 *) srow;
- #else
--      s = srow;
-+      s = (guint16 *) srow;
- #endif
-       o = (guint32 *) orow;
-       for (xx = x1; xx < x2; xx++)
-@@ -1145,8 +1145,11 @@
- 	  *o++ = 0xff;
- 	  s += 4;
- #else
--	  *o++ = (*s << 8) | 0xff; /* untested */
--	  s++;
-+	  *o++ = s[1];
-+	  *o++ = s[2];
-+	  *o++ = s[3];
-+	  *o++ = 0xff;
-+	  s += 4;
- #endif
- 	}
-       srow += bpl;
diff --git a/x11-libs/gtk+/files/gtk+-2.2.1-scrollfix.patch b/x11-libs/gtk+/files/gtk+-2.2.1-scrollfix.patch
deleted file mode 100644
index b45dcddc081f..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.2.1-scrollfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk+-2.2.1/gtk/gtktreeview.c.scrollfix	2003-02-20 20:23:15.000000000 -0500
-+++ gtk+-2.2.1/gtk/gtktreeview.c	2003-02-20 20:24:52.000000000 -0500
-@@ -4166,8 +4166,7 @@
-       need_redraw = TRUE;
-     }
- 
--  if (tree_view->priv->scroll_to_path &&
--      ! GTK_RBNODE_FLAG_SET (tree_view->priv->tree->root, GTK_RBNODE_DESCENDANTS_INVALID))
-+  if (tree_view->priv->scroll_to_path)
-     {
-       gtk_tree_row_reference_free (tree_view->priv->scroll_to_path);
-       tree_view->priv->scroll_to_path = NULL;
diff --git a/x11-libs/gtk+/files/gtk+-2.2.2-gtkwidget_pixmap_expose.patch b/x11-libs/gtk+/files/gtk+-2.2.2-gtkwidget_pixmap_expose.patch
deleted file mode 100644
index 0913c7e89453..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.2.2-gtkwidget_pixmap_expose.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur gtk+-2.2.2/gtk/gtkwidget.c gtk+-2.2.2.patched/gtk/gtkwidget.c
---- gtk+-2.2.2/gtk/gtkwidget.c	2003-06-09 03:54:48.000000000 +0200
-+++ gtk+-2.2.2.patched/gtk/gtkwidget.c	2003-06-16 00:14:23.000000000 +0200
-@@ -3041,6 +3041,13 @@
- static gboolean
- event_window_is_still_viewable (GdkEvent *event)
- {
-+   /* Some programs, such as gnome-theme-manager, fake widgets
-+   * into exposing onto a pixmap by sending expose events with
-+   * event->window pointing to a pixmap
-+   */
-+  if (GDK_IS_PIXMAP (event->any.window))
-+    return event->type == GDK_EXPOSE;
-+
-   /* Check that we think the event's window is viewable before
-    * delivering the event, to prevent suprises. We do this here
-    * at the last moment, since the event may have been queued
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild
index ec3e09b80d33..a04009487c72 100644
--- a/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild
+++ b/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild,v 1.12 2003/11/15 02:41:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r10.ebuild,v 1.13 2003/12/07 15:03:55 foser Exp $
 
 inherit eutils libtool
 
@@ -19,7 +19,7 @@ IUSE="nls debug"
 DEPEND="virtual/x11
 	=dev-libs/glib-1.2*
 	nls? ( sys-devel/gettext
-	dev-util/intltool )"
+		dev-util/intltool )"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -47,7 +47,7 @@ src_compile() {
 	fi
 
 	econf \
-		--sysconfdir=/etc/X11 \
+		--sysconfdir=/etc \
 		--with-xinput=xfree \
 		--with-x \
 		${myconf} || die
@@ -74,9 +74,11 @@ src_install() {
 }
 
 pkg_postinst() {
+
 	ewarn "Older versions added /etc/X11/gtk/gtkrc which changed settings for"
 	ewarn "all themes it seems.  Please remove it manually as it will not due"
 	ewarn "to /env protection."
 	echo ""
 	einfo "The old gtkrc is available through the new Gentoo gtk theme."
+
 }
diff --git a/x11-libs/gtk+/gtk+-2.2.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.2.1-r1.ebuild
deleted file mode 100644
index 1c8ab0c978af..000000000000
--- a/x11-libs/gtk+/gtk+-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.1-r1.ebuild,v 1.6 2003/09/07 00:23:27 msterret Exp $
-
-inherit eutils libtool flag-o-matic
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="x86 ~ppc ~alpha ~sparc ~amd64"
-IUSE="tiff doc jpeg debug"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.2.0
-	>=dev-libs/atk-1.2.0
-	>=x11-libs/pango-1.1.3
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-src_unpack() {
-	unpack ${A}
-
-	# Turn of --export-symbols-regex for now, since it removes
-	# the wrong symbols
-	cd ${S}; epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch
-	# should speed up metacity
-	cd ${S}; epatch ${FILESDIR}/gtk+-wm.patch
-	# beautifying patch for disabled icons
-	epatch ${FILESDIR}/${P}-disable_icons_smooth_alpha.patch
-	# fixing expose loops in GtkTreeView (gnome #106311)
-	epatch ${FILESDIR}/${P}-scrollfix.patch
-
-	if [ "${ARCH}" == "ppc" ]
-	then
-		einfo "Fixing endianness issue in gdkpixbuf for 24-bit and 15-bit displays"
-		cd ${S}; epatch ${FILESDIR}/gtk+-2.2.1-gdkpixbuf-bigendian.patch
-	fi
-
-	autoconf || die
-}
-
-src_compile() {
-	# bug 8762
-	replace-flags "-O3" "-O2"
-
-	elibtoolize
-
-	local myconf=""
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
-	use jpeg ||  myconf="${myconf} --without-libjpeg"
-	use tiff ||  myconf="${myconf} --without-libtiff"
-	use debug && myconf="${myconf}  --enable-debug"
-
-	econf --with-gdktarget=x11 ${myconf} || die
-
-	# gtk+ isn't multithread friendly due to some obscure code generation bug
-	make || die
-}
-
-src_install() {
-	dodir /etc/gtk-2.0
-
-	make DESTDIR=${D} \
-		prefix=/usr \
-		sysconfdir=/etc \
-		infodir=/usr/share/info \
-		mandir=/usr/share/man \
-		install || die
-
-	dodoc AUTHORS COPYING ChangeLog* HACKING INSTALL NEWS* README*
-}
-
-pkg_postinst() {
-	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
-	gdk-pixbuf-query-loaders >	/etc/gtk-2.0/gdk-pixbuf.loaders
-
-	einfo "For your gtk themes to work correctly after an update,"
-	einfo "you might have to rebuild your theme engines."
-	einfo "Executing 'qpkg -I -nc gtk-engines | xargs emerge' should do the trick (requires gentoolkit)"
-}
diff --git a/x11-libs/gtk+/gtk+-2.2.1.ebuild b/x11-libs/gtk+/gtk+-2.2.1.ebuild
deleted file mode 100644
index 835e86966ce3..000000000000
--- a/x11-libs/gtk+/gtk+-2.2.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.1.ebuild,v 1.17 2003/09/07 00:23:27 msterret Exp $
-
-inherit eutils libtool flag-o-matic
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="x86 ppc alpha sparc hppa amd64"
-IUSE="tiff doc jpeg debug"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.2.0
-	>=dev-libs/atk-1.2.0
-	>=x11-libs/pango-1.1.3
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-src_unpack() {
-	unpack ${A}
-
-	# Turn of --export-symbols-regex for now, since it removes
-	# the wrong symbols
-	cd ${S}; epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch
-	# should speed up metacity
-	cd ${S}; epatch ${FILESDIR}/gtk+-wm.patch
-	# beautifying patch for disabled icons
-	epatch ${FILESDIR}/${P}-disable_icons_smooth_alpha.patch
-
-	if [ "${ARCH}" == "ppc" ]
-	then
-		einfo "Fixing endianness issue in gdkpixbuf for 24-bit and 15-bit displays"
-		cd ${S}; epatch ${FILESDIR}/gtk+-2.2.1-gdkpixbuf-bigendian.patch
-	fi
-}
-
-src_compile() {
-	# bug 8762
-	replace-flags "-O3" "-O2"
-
-	elibtoolize
-
-	local myconf=""
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
-	use jpeg ||  myconf="${myconf} --without-libjpeg"
-	use tiff ||  myconf="${myconf} --without-libtiff"
-	use debug && myconf="${myconf}  --enable-debug"
-
-	econf --with-gdktarget=x11 ${myconf} || die
-
-	# gtk+ isn't multithread friendly due to some obscure code generation bug
-	make || die
-}
-
-src_install() {
-	dodir /etc/gtk-2.0
-
-	make DESTDIR=${D} \
-		prefix=/usr \
-		sysconfdir=/etc \
-		infodir=/usr/share/info \
-		mandir=/usr/share/man \
-		install || die
-
-	dodoc AUTHORS COPYING ChangeLog* HACKING INSTALL NEWS* README*
-}
-
-pkg_postinst() {
-	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
-	gdk-pixbuf-query-loaders >	/etc/gtk-2.0/gdk-pixbuf.loaders
-
-	einfo "For your gtk themes to work correctly after an update,"
-	einfo "you might have to rebuild your theme engines."
-	einfo "Executing 'qpkg -I -nc gtk-engines | xargs emerge' should do the trick (requires gentoolkit)"
-}
diff --git a/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild b/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild
index 6f9ea6f87a95..6c7485d05038 100644
--- a/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild,v 1.11 2003/11/16 00:18:05 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild,v 1.12 2003/12/07 15:03:55 foser Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="ia64 x86 ppc alpha sparc amd64 hppa"
+KEYWORDS="x86 ppc alpha sparc amd64 hppa ia64"
 IUSE="doc tiff jpeg"
 
 # virtual/x11