From: Marinus Schraal Date: Thu, 11 Nov 2004 01:42:50 +0000 (+0000) Subject: mark x86 & cleanup X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77f62401b45620e7ef48775606079a8ab243c1e3;p=gentoo.git mark x86 & cleanup --- diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest index 3529ae956321..a12f3130c496 100644 --- a/app-editors/gedit/Manifest +++ b/app-editors/gedit/Manifest @@ -1,18 +1,11 @@ -MD5 d00723f0fd44f6ac948dce3bd4dd5a52 ChangeLog 8999 MD5 0d0b886c6d1f81ec1c30752210de8e70 gedit-0.9.6-r1.ebuild 903 MD5 e571e4929f75c136060c2ffb2e91c9f0 gedit-2.4.1.ebuild 1204 -MD5 eb67912bf9e81408c283f720c3ff1c29 gedit-2.6.0.ebuild 859 -MD5 660c99bff4054f5e62a0accf906fe63b gedit-2.6.1-r1.ebuild 1015 -MD5 c8c3159eef4c62a9d93191924d9b316d gedit-2.6.1.ebuild 867 MD5 53c4a4fea63a806cda1ccc089789b00b gedit-2.6.2.ebuild 868 -MD5 b7be57955648bf8b99fbd0bc1adfb3b9 gedit-2.8.0.ebuild 873 +MD5 d00723f0fd44f6ac948dce3bd4dd5a52 ChangeLog 8999 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 0a48993425eb004342109f7486f2db07 gedit-2.8.0.ebuild 872 +MD5 871bd845733e2e5c91dd3b17f1103037 files/gedit-2.4.0-64bit-fix.patch 433 MD5 b1cd4f5d4adf64b0c6ce68ebe818a495 files/digest-gedit-0.9.6-r1 64 MD5 a3fb1841d3eff85ac58e00977c2c009c files/digest-gedit-2.4.1 65 -MD5 e3f41ced499666436b48a9c143e048d3 files/digest-gedit-2.6.0 65 -MD5 eb7fc2623c2ebfe67125e5bc1fd3850d files/digest-gedit-2.6.1 65 -MD5 eb7fc2623c2ebfe67125e5bc1fd3850d files/digest-gedit-2.6.1-r1 65 MD5 6d591a38f842abf41b8f4462dea4ec3f files/digest-gedit-2.6.2 65 MD5 3559e65cd6237e86af0f0074bdfc4c6d files/digest-gedit-2.8.0 65 -MD5 871bd845733e2e5c91dd3b17f1103037 files/gedit-2.4.0-64bit-fix.patch 433 -MD5 f6238e63bd76f7217d37c9993476dba5 files/gedit-2.6.1-highlight_fix.patch 6941 diff --git a/app-editors/gedit/files/digest-gedit-2.6.0 b/app-editors/gedit/files/digest-gedit-2.6.0 deleted file mode 100644 index 50534bcafb28..000000000000 --- a/app-editors/gedit/files/digest-gedit-2.6.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 1c023363f917b99a57ee866da67dd66b gedit-2.6.0.tar.bz2 2261888 diff --git a/app-editors/gedit/files/digest-gedit-2.6.1 b/app-editors/gedit/files/digest-gedit-2.6.1 deleted file mode 100644 index 0fbc24800ba4..000000000000 --- a/app-editors/gedit/files/digest-gedit-2.6.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 4b70327b3a4c11727a4443ae6516b31c gedit-2.6.1.tar.bz2 2165844 diff --git a/app-editors/gedit/files/digest-gedit-2.6.1-r1 b/app-editors/gedit/files/digest-gedit-2.6.1-r1 deleted file mode 100644 index 0fbc24800ba4..000000000000 --- a/app-editors/gedit/files/digest-gedit-2.6.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 4b70327b3a4c11727a4443ae6516b31c gedit-2.6.1.tar.bz2 2165844 diff --git a/app-editors/gedit/files/gedit-2.6.1-highlight_fix.patch b/app-editors/gedit/files/gedit-2.6.1-highlight_fix.patch deleted file mode 100644 index 55e6f630e3eb..000000000000 --- a/app-editors/gedit/files/gedit-2.6.1-highlight_fix.patch +++ /dev/null @@ -1,179 +0,0 @@ -diff -NurdB gedit-2.6.1-orig/gedit/dialogs/gedit-preferences-dialog.c gedit-2.6.1/gedit/dialogs/gedit-preferences-dialog.c ---- gedit-2.6.1-orig/gedit/dialogs/gedit-preferences-dialog.c 2004-07-07 15:30:17 -0500 -+++ gedit-2.6.1/gedit/dialogs/gedit-preferences-dialog.c 2004-07-07 15:30:33 -0500 -@@ -867,69 +867,6 @@ - } - - static void --styles_cb (GtkWidget *treeview, -- GeditPreferencesDialog *dlg) --{ -- GtkSourceTagStyle *style; -- -- style = get_selected_style (dlg); -- g_return_if_fail (style != NULL); -- -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->bold_togglebutton), -- style->bold); -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->italic_togglebutton), -- style->italic); -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->underline_togglebutton), -- style->underline); -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->strikethrough_togglebutton), -- style->strikethrough); -- -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->foreground_checkbutton), -- style->mask & GTK_SOURCE_TAG_STYLE_USE_FOREGROUND); -- -- if ((style->mask & GTK_SOURCE_TAG_STYLE_USE_FOREGROUND) == GTK_SOURCE_TAG_STYLE_USE_FOREGROUND) -- { -- gtk_color_button_set_color (GTK_COLOR_BUTTON (dlg->foreground_colorbutton), -- &style->foreground); -- } -- else -- { -- GdkColor text_color; -- -- text_color = gedit_prefs_manager_get_text_color (); -- gtk_color_button_set_color (GTK_COLOR_BUTTON (dlg->foreground_colorbutton), -- &text_color); -- } -- -- gtk_widget_set_sensitive (dlg->foreground_colorbutton, -- style->mask & GTK_SOURCE_TAG_STYLE_USE_FOREGROUND); -- -- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->background_checkbutton), -- style->mask & GTK_SOURCE_TAG_STYLE_USE_BACKGROUND); -- -- if ((style->mask & GTK_SOURCE_TAG_STYLE_USE_BACKGROUND) == GTK_SOURCE_TAG_STYLE_USE_BACKGROUND) -- { -- gtk_color_button_set_color (GTK_COLOR_BUTTON (dlg->background_colorbutton_2), -- &style->background); -- } -- else -- { -- GdkColor background_color; -- -- background_color = gedit_prefs_manager_get_background_color (); -- gtk_color_button_set_color (GTK_COLOR_BUTTON (dlg->background_colorbutton_2), -- &background_color); -- } -- -- gtk_widget_set_sensitive (dlg->background_colorbutton_2, -- style->mask & GTK_SOURCE_TAG_STYLE_USE_BACKGROUND); -- -- gtk_widget_set_sensitive (dlg->reset_button, !style->is_default); -- -- gtk_source_tag_style_free (style); --} -- --static void - style_button_toggled (GtkToggleButton *button, - GeditPreferencesDialog *dlg) - { -@@ -1037,6 +974,105 @@ - } - - static void -+styles_cb (GtkWidget *treeview, -+ GeditPreferencesDialog *dlg) -+{ -+ GtkSourceTagStyle *style; -+ -+ style = get_selected_style (dlg); -+ g_return_if_fail (style != NULL); -+ -+ /* we must block callbacks while setting the new values */ -+ g_signal_handlers_block_by_func (G_OBJECT (dlg->bold_togglebutton), -+ G_CALLBACK (style_button_toggled), dlg); -+ g_signal_handlers_block_by_func (G_OBJECT (dlg->italic_togglebutton), -+ G_CALLBACK (style_button_toggled), dlg); -+ g_signal_handlers_block_by_func (G_OBJECT (dlg->underline_togglebutton), -+ G_CALLBACK (style_button_toggled), dlg); -+ g_signal_handlers_block_by_func (G_OBJECT (dlg->strikethrough_togglebutton), -+ G_CALLBACK (style_button_toggled), dlg); -+ g_signal_handlers_block_by_func (G_OBJECT (dlg->foreground_checkbutton), -+ G_CALLBACK (style_button_toggled), dlg); -+ g_signal_handlers_block_by_func (G_OBJECT (dlg->background_checkbutton), -+ G_CALLBACK (style_button_toggled), dlg); -+ g_signal_handlers_block_by_func (G_OBJECT (dlg->foreground_colorbutton), -+ G_CALLBACK (style_color_set), dlg); -+ g_signal_handlers_block_by_func (G_OBJECT (dlg->background_colorbutton_2), -+ G_CALLBACK (style_color_set), dlg); -+ -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->bold_togglebutton), -+ style->bold); -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->italic_togglebutton), -+ style->italic); -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->underline_togglebutton), -+ style->underline); -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->strikethrough_togglebutton), -+ style->strikethrough); -+ -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->foreground_checkbutton), -+ style->mask & GTK_SOURCE_TAG_STYLE_USE_FOREGROUND); -+ -+ if ((style->mask & GTK_SOURCE_TAG_STYLE_USE_FOREGROUND) == GTK_SOURCE_TAG_STYLE_USE_FOREGROUND) -+ { -+ gtk_color_button_set_color (GTK_COLOR_BUTTON (dlg->foreground_colorbutton), -+ &style->foreground); -+ } -+ else -+ { -+ GdkColor text_color; -+ -+ text_color = gedit_prefs_manager_get_text_color (); -+ gtk_color_button_set_color (GTK_COLOR_BUTTON (dlg->foreground_colorbutton), -+ &text_color); -+ } -+ -+ gtk_widget_set_sensitive (dlg->foreground_colorbutton, -+ style->mask & GTK_SOURCE_TAG_STYLE_USE_FOREGROUND); -+ -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->background_checkbutton), -+ style->mask & GTK_SOURCE_TAG_STYLE_USE_BACKGROUND); -+ -+ if ((style->mask & GTK_SOURCE_TAG_STYLE_USE_BACKGROUND) == GTK_SOURCE_TAG_STYLE_USE_BACKGROUND) -+ { -+ gtk_color_button_set_color (GTK_COLOR_BUTTON (dlg->background_colorbutton_2), -+ &style->background); -+ } -+ else -+ { -+ GdkColor background_color; -+ -+ background_color = gedit_prefs_manager_get_background_color (); -+ gtk_color_button_set_color (GTK_COLOR_BUTTON (dlg->background_colorbutton_2), -+ &background_color); -+ } -+ -+ gtk_widget_set_sensitive (dlg->background_colorbutton_2, -+ style->mask & GTK_SOURCE_TAG_STYLE_USE_BACKGROUND); -+ -+ gtk_widget_set_sensitive (dlg->reset_button, !style->is_default); -+ -+ /* reenable callbacks */ -+ g_signal_handlers_unblock_by_func (G_OBJECT (dlg->bold_togglebutton), -+ G_CALLBACK (style_button_toggled), dlg); -+ g_signal_handlers_unblock_by_func (G_OBJECT (dlg->italic_togglebutton), -+ G_CALLBACK (style_button_toggled), dlg); -+ g_signal_handlers_unblock_by_func (G_OBJECT (dlg->underline_togglebutton), -+ G_CALLBACK (style_button_toggled), dlg); -+ g_signal_handlers_unblock_by_func (G_OBJECT (dlg->strikethrough_togglebutton), -+ G_CALLBACK (style_button_toggled), dlg); -+ g_signal_handlers_unblock_by_func (G_OBJECT (dlg->foreground_checkbutton), -+ G_CALLBACK (style_button_toggled), dlg); -+ g_signal_handlers_unblock_by_func (G_OBJECT (dlg->background_checkbutton), -+ G_CALLBACK (style_button_toggled), dlg); -+ g_signal_handlers_unblock_by_func (G_OBJECT (dlg->foreground_colorbutton), -+ G_CALLBACK (style_color_set), dlg); -+ g_signal_handlers_unblock_by_func (G_OBJECT (dlg->background_colorbutton_2), -+ G_CALLBACK (style_color_set), dlg); -+ -+ gtk_source_tag_style_free (style); -+} -+ -+static void - reset_button_clicked (GtkButton *button, - GeditPreferencesDialog *dlg) - { diff --git a/app-editors/gedit/gedit-2.6.0.ebuild b/app-editors/gedit/gedit-2.6.0.ebuild deleted file mode 100644 index c5b1b1784429..000000000000 --- a/app-editors/gedit/gedit-2.6.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.6.0.ebuild,v 1.8 2004/07/03 19:20:07 kloeri Exp $ - -inherit gnome2 - -DESCRIPTION="A text editor for the Gnome2 desktop" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc ~sparc mips alpha hppa ~amd64 ~ia64" -IUSE="spell" - -RDEPEND=">=gnome-base/libglade-2 - >=dev-libs/popt-1.5 - >=gnome-base/eel-2.5 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2.5 - >=gnome-base/libgnomeprintui-2.5 - >=x11-libs/gtksourceview-0.9 - spell? ( virtual/aspell-dict )" -# FIXME : spell autodetect only -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/pkgconfig-0.12.0 - >=app-text/scrollkeeper-0.3.11 - >=dev-util/intltool-0.29" - -DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README THANKS TODO" diff --git a/app-editors/gedit/gedit-2.6.1-r1.ebuild b/app-editors/gedit/gedit-2.6.1-r1.ebuild deleted file mode 100644 index b73fcf9276b4..000000000000 --- a/app-editors/gedit/gedit-2.6.1-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.6.1-r1.ebuild,v 1.1 2004/07/07 21:03:11 leonardop Exp $ - -inherit eutils gnome2 - -DESCRIPTION="A text editor for the Gnome2 desktop" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64" -IUSE="spell" - -RDEPEND=">=gnome-base/libglade-2.3.6 - >=dev-libs/popt-1.5 - >=gnome-base/eel-2.6 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2.6 - >=gnome-base/libgnomeprintui-2.6 - >=x11-libs/gtksourceview-1 - spell? ( virtual/aspell-dict )" -# FIXME : spell autodetect only -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/pkgconfig-0.12.0 - >=app-text/scrollkeeper-0.3.11 - >=dev-util/intltool-0.29" - -DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README THANKS TODO" - -src_unpack() { - unpack ${A} - cd ${S} - - # Fix preferences dialog issues. See bug #50654. - epatch ${FILESDIR}/${P}-highlight_fix.patch -} diff --git a/app-editors/gedit/gedit-2.6.1.ebuild b/app-editors/gedit/gedit-2.6.1.ebuild deleted file mode 100644 index cf1b0e8ad599..000000000000 --- a/app-editors/gedit/gedit-2.6.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.6.1.ebuild,v 1.4 2004/06/24 21:54:09 agriffis Exp $ - -inherit gnome2 - -DESCRIPTION="A text editor for the Gnome2 desktop" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa amd64 ~ia64" -IUSE="spell" - -RDEPEND=">=gnome-base/libglade-2.3.6 - >=dev-libs/popt-1.5 - >=gnome-base/eel-2.6 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2.6 - >=gnome-base/libgnomeprintui-2.6 - >=x11-libs/gtksourceview-1 - spell? ( virtual/aspell-dict )" -# FIXME : spell autodetect only -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/pkgconfig-0.12.0 - >=app-text/scrollkeeper-0.3.11 - >=dev-util/intltool-0.29" - -DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README THANKS TODO" diff --git a/app-editors/gedit/gedit-2.8.0.ebuild b/app-editors/gedit/gedit-2.8.0.ebuild index 7bd3d84481b0..fecf105efaba 100644 --- a/app-editors/gedit/gedit-2.8.0.ebuild +++ b/app-editors/gedit/gedit-2.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.8.0.ebuild,v 1.1 2004/09/16 15:54:37 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.8.0.ebuild,v 1.2 2004/11/11 01:42:50 foser Exp $ inherit eutils gnome2 @@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64" +KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64" IUSE="spell" RDEPEND=">=gnome-base/libglade-2.3.6