Version bump. Bug #76349.

5 files changed, 136 insertions, 29 deletions

diff --git a/sci-electronics/geda/ChangeLog b/sci-electronics/geda/ChangeLog
index 9df8f01d8100..d1ca82379952 100644
--- a/sci-electronics/geda/ChangeLog
+++ b/sci-electronics/geda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/geda
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.2 2004/12/27 20:48:51 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.3 2005/01/02 17:43:45 plasmaroo Exp $
+
+*geda-20041228 (02 Jan 2005)
+
+  02 Jan 2005; <plasmaroo@gentoo.org> +geda-20041228.ebuild,
+  +files/geda-20041228-glib26.patch:
+  Version bump. Bug #76349.
 
 *geda-20040111-r1 (27 Dec 2004)
 
diff --git a/sci-electronics/geda/files/digest-geda-20040111 b/sci-electronics/geda/files/digest-geda-20040111
deleted file mode 100644
index 3fea480a1751..000000000000
--- a/sci-electronics/geda/files/digest-geda-20040111
+++ /dev/null
@@ -1,11 +0,0 @@
-MD5 200b4977d0925ffc9d34e8032191cc57 geda-20040111.tar.gz 329653
-MD5 9365e50da62d2f1458c26a4d3e8034cc geda-docs-20040111.tar.gz 2825662
-MD5 a6b26dd9c0a372625db63d06e1d60ac3 geda-examples-20040111.tar.gz 243997
-MD5 9bbeb64aea9455468d5aef16685a03de geda-gnetlist-20040111.tar.gz 303503
-MD5 1826f8615615129883ab01d766877323 geda-gschem-20040111.tar.gz 1433206
-MD5 869fee36c0edcd9beb904e208d9a782a geda-gsymcheck-20040111.tar.gz 130161
-MD5 e43b43997d7f428017a28ad5aa9fa931 geda-setup-20040111.tar.gz 333587
-MD5 97ff0fa7bfabf150dc047c733d7b8c34 geda-symbols-20040111.tar.gz 576541
-MD5 3fac8212be7f362db2dd4d6a8806d58f geda-utils-20040111.tar.gz 243338
-MD5 e0f644647e16786de1af907cd847d492 libgeda-20040111.tar.gz 966834
-MD5 f057ee687f3da618eaff9988959a0b9c Makefile 25702
diff --git a/sci-electronics/geda/files/digest-geda-20041228 b/sci-electronics/geda/files/digest-geda-20041228
new file mode 100644
index 000000000000..0f7b7bfa2a7a
--- /dev/null
+++ b/sci-electronics/geda/files/digest-geda-20041228
@@ -0,0 +1,12 @@
+MD5 0e5d6d7dc950a5f7e4247be46b8c609c geda-20041228.tar.gz 390623
+MD5 0f6d1bb7b94812ea0d1a81aff11e080a geda-docs-20041228.tar.gz 2802436
+MD5 efe27da23f5fb6a836b4bcc01f16b5c6 geda-examples-20041228.tar.gz 244265
+MD5 12e28d5d70d8da10fb27f2e966e5a906 geda-gattrib-20041228.tar.gz 309312
+MD5 0c87828b96480120c09bfb5bfd6df9e9 geda-gnetlist-20041228.tar.gz 311215
+MD5 f63d6fc5b1c24bf28122b5d0eeb3e1dd geda-gschem-20041228.tar.gz 1464961
+MD5 2776af00f395be4dd5c81f0dba2fbdab geda-gsymcheck-20041228.tar.gz 131057
+MD5 d463b9314a5c0fa9be3081d97509c681 geda-setup-20041228.tar.gz 343643
+MD5 906f3486c1824cfea96f66cd6eedecca geda-symbols-20041228.tar.gz 647981
+MD5 0c416f20a56bf300fb0bfc5b3ed3ac4b geda-utils-20041228.tar.gz 244490
+MD5 375fbebdeb82079c970eab4b3ae41e42 libgeda-20041228.tar.gz 992149
+MD5 14fc5156084bf8ddc6e381b8cb793d9c geda-20041228.Makefile 30839
diff --git a/sci-electronics/geda/files/geda-20041228-glib26.patch b/sci-electronics/geda/files/geda-20041228-glib26.patch
new file mode 100644
index 000000000000..9e9301fa9605
--- /dev/null
+++ b/sci-electronics/geda/files/geda-20041228-glib26.patch
@@ -0,0 +1,91 @@
+diff -ur geda-gschem-20041228/docs/g_register.texi geda-gschem-20041228.plasmaroo/docs/g_register.texi
+--- geda-gschem-20041228/docs/g_register.texi	2004-12-29 04:09:32.000000000 +0000
++++ geda-gschem-20041228.plasmaroo/docs/g_register.texi	2005-01-02 14:27:32.671563448 +0000
+@@ -212,7 +212,7 @@
+ 
+   /* keymapping callbacks */
+   gh_new_procedure0_0 ("file-new-window", g_key_file_new_window);
+-  gh_new_procedure0_0 ("file-new", g_key_file_new);
++  gh_new_procedure0_0 ("file-new", geda_key_file_new);
+   gh_new_procedure0_0 ("file-open", g_key_file_open);
+   gh_new_procedure0_0 ("file-script", g_key_file_script);
+   gh_new_procedure0_0 ("file-save", g_key_file_save);
+diff -ur geda-gschem-20041228/docs/gschemdoc.info-1 geda-gschem-20041228.plasmaroo/docs/gschemdoc.info-1
+--- geda-gschem-20041228/docs/gschemdoc.info-1	2004-12-29 04:09:39.000000000 +0000
++++ geda-gschem-20041228.plasmaroo/docs/gschemdoc.info-1	2005-01-02 14:27:56.345964392 +0000
+@@ -4568,7 +4568,7 @@
+ 
+   /* keymapping callbacks */
+   gh_new_procedure0_0 ("file-new-window", g_key_file_new_window);
+-  gh_new_procedure0_0 ("file-new", g_key_file_new);
++  gh_new_procedure0_0 ("file-new", geda_key_file_new);
+   gh_new_procedure0_0 ("file-open", g_key_file_open);
+   gh_new_procedure0_0 ("file-script", g_key_file_script);
+   gh_new_procedure0_0 ("file-save", g_key_file_save);
+diff -ur geda-gschem-20041228/include/prototype.h geda-gschem-20041228.plasmaroo/include/prototype.h
+--- geda-gschem-20041228/include/prototype.h	2004-12-29 02:06:45.000000000 +0000
++++ geda-gschem-20041228.plasmaroo/include/prototype.h	2005-01-02 14:23:02.919571984 +0000
+@@ -27,7 +27,7 @@
+ /* g_key.c */
+ void set_window_current_key(TOPLEVEL *w_current);
+ void g_key_execute(int state, int keyval);
+-SCM g_key_file_new(void);
++SCM geda_key_file_new(void);
+ SCM g_key_file_new_window(void);
+ SCM g_key_file_open(void);
+ SCM g_key_file_script(void);
+diff -ur geda-gschem-20041228/noweb/g_key.nw geda-gschem-20041228.plasmaroo/noweb/g_key.nw
+--- geda-gschem-20041228/noweb/g_key.nw	2003-10-20 04:37:25.000000000 +0100
++++ geda-gschem-20041228.plasmaroo/noweb/g_key.nw	2005-01-02 14:24:38.940974512 +0000
+@@ -322,7 +322,7 @@
+ hack */
+ DEFINE_G_KEY(cancel)
+ 
+-@ %def DEFINE_G_KEY g_key_file_new g_key_file_new_window g_key_file_open g_key_file_script g_key_file_save g_key_file_save_as g_key_file_save_all g_key_file_print g_key_file_write_png g_key_file_close g_key_file_quit g_key_edit_undo g_key_edit_redo g_key_edit_select g_key_edit_copy g_key_edit_copy_hotkey g_key_edit_move g_key_edit_move_hotkey g_key_edit_delete g_key_edit_rotate_90 g_key_edit_rotate_90_hotkey g_key_edit_mirror g_key_edit_mirror_hotkey g_key_edit_stretch g_key_edit_stretch_hotkey g_key_edit_slot g_key_edit_color g_key_edit_edit g_key_edit_text g_key_edit_lock g_key_edit_unlock g_key_edit_linetype g_key_edit_filltype g_key_edit_translate g_key_edit_embed g_key_edit_unembed g_key_edit_show_hidden g_key_buffer_copy1 g_key_buffer_copy2 g_key_buffer_copy3 g_key_buffer_copy4 g_key_buffer_copy5 g_key_buffer_cut1 g_key_buffer_cut2 g_key_buffer_cut3 g_key_buffer_cut4 g_key_buffer_cut5 g_key_buffer_paste1 g_key_buffer_paste2 g_key_buffer_paste3 g_key_buffer_paste4 g_key_buffer_paste5 g_key_buffer_paste1_hotkey g_key_buffer_paste2_hotkey g_key_buffer_paste3_hotkey g_key_buffer_paste4_hotkey g_key_buffer_paste5_hotkey g_key_view_redraw g_key_view_zoom_full g_key_view_zoom_extents g_key_view_zoom_in g_key_view_zoom_out g_key_view_zoom_in_hotkey g_key_view_zoom_out_hotkey g_key_view_zoom_box g_key_view_zoom_box_hotkey g_key_view_pan g_key_view_pan_hotkey g_key_view_update_cues g_key_page_manager g_key_page_next g_key_page_prev g_key_page_new g_key_page_close g_key_page_revert g_key_page_discard g_key_page_print g_key_add_component g_key_add_attribute g_key_add_attribute_hotkey g_key_add_net g_key_add_net_hotkey g_key_add_bus g_key_add_bus_hotkey g_key_add_text g_key_add_line g_key_add_line_hotkey g_key_add_box g_key_add_box_hotkey g_key_add_circle g_key_add_circle_hotkey g_key_add_arc g_key_add_arc_hotkey g_key_add_pin g_key_add_pin_hotkey g_key_hierarchy_down_schematic g_key_hierarchy_down_symbol g_key_hierarchy_up g_key_hierarchy_documentation g_key_attributes_attach g_key_attributes_detach g_key_attributes_show_name g_key_attributes_show_value g_key_attributes_show_both g_key_attributes_visibility_toggle g_key_script_console g_key_options_text_size g_key_options_afeedback g_key_options_grid g_key_options_snap g_key_options_snap_size g_key_options_rubberband g_key_options_show_log_window g_key_options_show_coord_window g_key_misc g_key_misc2 g_key_misc3 g_key_help_about g_key_help_manual g_key_help_hotkeys g_key_cancel
++@ %def DEFINE_G_KEY geda_key_file_new g_key_file_new_window g_key_file_open g_key_file_script g_key_file_save g_key_file_save_as g_key_file_save_all g_key_file_print g_key_file_write_png g_key_file_close g_key_file_quit g_key_edit_undo g_key_edit_redo g_key_edit_select g_key_edit_copy g_key_edit_copy_hotkey g_key_edit_move g_key_edit_move_hotkey g_key_edit_delete g_key_edit_rotate_90 g_key_edit_rotate_90_hotkey g_key_edit_mirror g_key_edit_mirror_hotkey g_key_edit_stretch g_key_edit_stretch_hotkey g_key_edit_slot g_key_edit_color g_key_edit_edit g_key_edit_text g_key_edit_lock g_key_edit_unlock g_key_edit_linetype g_key_edit_filltype g_key_edit_translate g_key_edit_embed g_key_edit_unembed g_key_edit_show_hidden g_key_buffer_copy1 g_key_buffer_copy2 g_key_buffer_copy3 g_key_buffer_copy4 g_key_buffer_copy5 g_key_buffer_cut1 g_key_buffer_cut2 g_key_buffer_cut3 g_key_buffer_cut4 g_key_buffer_cut5 g_key_buffer_paste1 g_key_buffer_paste2 g_key_buffer_paste3 g_key_buffer_paste4 g_key_buffer_paste5 g_key_buffer_paste1_hotkey g_key_buffer_paste2_hotkey g_key_buffer_paste3_hotkey g_key_buffer_paste4_hotkey g_key_buffer_paste5_hotkey g_key_view_redraw g_key_view_zoom_full g_key_view_zoom_extents g_key_view_zoom_in g_key_view_zoom_out g_key_view_zoom_in_hotkey g_key_view_zoom_out_hotkey g_key_view_zoom_box g_key_view_zoom_box_hotkey g_key_view_pan g_key_view_pan_hotkey g_key_view_update_cues g_key_page_manager g_key_page_next g_key_page_prev g_key_page_new g_key_page_close g_key_page_revert g_key_page_discard g_key_page_print g_key_add_component g_key_add_attribute g_key_add_attribute_hotkey g_key_add_net g_key_add_net_hotkey g_key_add_bus g_key_add_bus_hotkey g_key_add_text g_key_add_line g_key_add_line_hotkey g_key_add_box g_key_add_box_hotkey g_key_add_circle g_key_add_circle_hotkey g_key_add_arc g_key_add_arc_hotkey g_key_add_pin g_key_add_pin_hotkey g_key_hierarchy_down_schematic g_key_hierarchy_down_symbol g_key_hierarchy_up g_key_hierarchy_documentation g_key_attributes_attach g_key_attributes_detach g_key_attributes_show_name g_key_attributes_show_value g_key_attributes_show_both g_key_attributes_visibility_toggle g_key_script_console g_key_options_text_size g_key_options_afeedback g_key_options_grid g_key_options_snap g_key_options_snap_size g_key_options_rubberband g_key_options_show_log_window g_key_options_show_coord_window g_key_misc g_key_misc2 g_key_misc3 g_key_help_about g_key_help_manual g_key_help_hotkeys g_key_cancel
+ 
+ 
+ @section Function @code{g_get_selected_filename()}
+diff -ur geda-gschem-20041228/noweb/g_register.nw geda-gschem-20041228.plasmaroo/noweb/g_register.nw
+--- geda-gschem-20041228/noweb/g_register.nw	2004-12-29 02:00:39.000000000 +0000
++++ geda-gschem-20041228.plasmaroo/noweb/g_register.nw	2005-01-02 14:24:21.204670840 +0000
+@@ -195,7 +195,7 @@
+ 
+   /* keymapping callbacks */
+   gh_new_procedure0_0 ("file-new-window", g_key_file_new_window);
+-  gh_new_procedure0_0 ("file-new", g_key_file_new);
++  gh_new_procedure0_0 ("file-new", geda_key_file_new);
+   gh_new_procedure0_0 ("file-open", g_key_file_open);
+   gh_new_procedure0_0 ("file-script", g_key_file_script);
+   gh_new_procedure0_0 ("file-save", g_key_file_save);
+diff -ur geda-gschem-20041228/src/g_register.c geda-gschem-20041228.plasmaroo/src/g_register.c
+--- geda-gschem-20041228/src/g_register.c	2004-12-29 04:08:28.000000000 +0000
++++ geda-gschem-20041228.plasmaroo/src/g_register.c	2005-01-02 14:24:58.141055656 +0000
+@@ -156,7 +156,7 @@
+ 
+   /* keymapping callbacks */
+   gh_new_procedure0_0("file-new-window", g_key_file_new_window);
+-  gh_new_procedure0_0("file-new", g_key_file_new);
++  gh_new_procedure0_0("file-new", geda_key_file_new);
+   gh_new_procedure0_0("file-open", g_key_file_open);
+   gh_new_procedure0_0("file-script", g_key_file_script);
+   gh_new_procedure0_0("file-save", g_key_file_save);
+diff -ur geda-gschem-20041228/src/g_key.c geda-gschem-20041228.plasmaroo/src/g_key.c
+--- geda-gschem-20041228/src/g_key.c	2005-01-02 14:42:52.506727248 +0000
++++ geda-gschem-20041228.plasmaroo/src/g_key.c	2005-01-02 14:42:54.388441184 +0000
+@@ -104,7 +104,14 @@
+ 	return SCM_BOOL_T;				\
+ }
+ 
+-DEFINE_G_KEY(file_new)
++#define DEFINE_GEDA_KEY(name)				\
++SCM geda_key_ ## name(void)				\
++{							\
++	i_callback_ ## name(global_window_current, 0, NULL);	\
++	return SCM_BOOL_T;				\
++}
++
++DEFINE_GEDA_KEY(file_new)
+ 
+     DEFINE_G_KEY(file_new_window)
+ 
diff --git a/sci-electronics/geda/geda-20040111.ebuild b/sci-electronics/geda/geda-20041228.ebuild
index dc4e9075a8ab..595f8db35e19 100644
--- a/sci-electronics/geda/geda-20040111.ebuild
+++ b/sci-electronics/geda/geda-20041228.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-20040111.ebuild,v 1.11 2004/12/28 18:55:24 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-20041228.ebuild,v 1.1 2005/01/02 17:43:45 plasmaroo Exp $
+
+inherit eutils
 
 S=${WORKDIR}
 
@@ -9,6 +11,7 @@ DESCRIPTION="geda is a metapackage which compiles all the necessary components y
 SRC_URI="http://www.geda.seul.org/devel/${PV}/geda-${PV}.tar.gz
 	 http://www.geda.seul.org/devel/${PV}/geda-docs-${PV}.tar.gz
 	 http://www.geda.seul.org/devel/${PV}/geda-examples-${PV}.tar.gz
+	 http://www.geda.seul.org/devel/${PV}/geda-gattrib-${PV}.tar.gz
 	 http://www.geda.seul.org/devel/${PV}/geda-gnetlist-${PV}.tar.gz
 	 http://www.geda.seul.org/devel/${PV}/geda-gschem-${PV}.tar.gz
 	 http://www.geda.seul.org/devel/${PV}/geda-gsymcheck-${PV}.tar.gz
@@ -16,15 +19,14 @@ SRC_URI="http://www.geda.seul.org/devel/${PV}/geda-${PV}.tar.gz
 	 http://www.geda.seul.org/devel/${PV}/geda-symbols-${PV}.tar.gz
 	 http://www.geda.seul.org/devel/${PV}/geda-utils-${PV}.tar.gz
 	 http://www.geda.seul.org/devel/${PV}/libgeda-${PV}.tar.gz
-	 http://www.geda.seul.org/devel/${PV}/Makefile"
+	 http://dev.gentoo.org/~plasmaroo/patches/geda/${P}.Makefile"
 
 IUSE=""
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 SLOT="0"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=dev-libs/glib-1.2.10
+DEPEND=">=dev-libs/glib-1.2.10
 	>=x11-libs/gtk+-2.2
 	 =x11-libs/gtk+-1.2*
 	virtual/x11
@@ -33,20 +35,21 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	>=sci-libs/libgdgeda-2.0.15
 
 	>=sci-libs/libgeda-${PV}
-	>=sci-electronics/gerbv-0.15
+	>=sci-electronics/gerbv-1.00
 	>=sci-electronics/gnucap-0.33
 	>=sci-electronics/gtkwave-2.0.0_pre20030319
 	>=sci-electronics/gwave-20031224
-	>=sci-electronics/iverilog-0.7
+	>=sci-electronics/iverilog-0.8
 	>=sci-electronics/tclspice-0.2.15
 	>=sci-electronics/vbs-1.4.0
-	>=sci-electronics/ng-spice-rework-15"
+	>=sci-electronics/ng-spice-rework-15
+	>=sci-electronics/gnetman-0.0.1_pre20041222"
 
 src_unpack() {
-
 	unpack geda-${PV}.tar.gz
 	unpack geda-docs-${PV}.tar.gz
 	unpack geda-examples-${PV}.tar.gz
+	unpack geda-gattrib-${PV}.tar.gz
 	unpack geda-gnetlist-${PV}.tar.gz
 	unpack geda-gschem-${PV}.tar.gz
 	unpack geda-gsymcheck-${PV}.tar.gz
@@ -54,24 +57,30 @@ src_unpack() {
 	unpack geda-symbols-${PV}.tar.gz
 	unpack geda-utils-${PV}.tar.gz
 	unpack libgeda-${PV}.tar.gz
-
-	cp ${DISTDIR}/Makefile ${S}
-	sed -i -e 's:prefix=${HOME}/geda:prefix=/usr:' ${S}/Makefile
-
+	for file in $(find geda-gnetlist-${PV} -name "*.scm"); do
+		sed -e 's:/usr/X11R6/lib/X11/pcb/m4:/usr/share/pcb/m4:g' \
+			-i ${file}
+	done
+	cp ${DISTDIR}/${P}.Makefile Makefile
+	sed -i -e 's:prefix=$(HOME)/geda:prefix=/usr:' Makefile || die 'Failed to patch Makefile!'
+	epatch ${FILESDIR}/${P}-glib26.patch || die 'Failed to apply GLib 2.6 compatibility patch!'
 }
 
 src_install () {
-
 	make DESTDIR=${D} install || die
-	make DESTDIR=${D} libgeda_uninstall || die
+
+	cd libgeda-${PV}
+	make DESTDIR=${D} uninstall || sh
 	rm ${D}/usr/include -Rf
 
+	cd ${S}
 	dodoc geda-${PV}/AUTHORS geda-${PV}/README
+
+	dodoc geda-gattrib-${PV}/{AUTHORS,README}
 	dodoc geda-examples-${PV}/README
 	dodoc geda-gnetlist-${PV}/AUTHORS geda-gnetlist-${PV}/BUGS
 	dodoc geda-gschem-${PV}/AUTHORS geda-gschem-${PV}/BUGS
 	dodoc geda-gsymcheck-${PV}/AUTHORS
 	dodoc geda-symbols-${PV}/AUTHORS
 	dodoc geda-utils-${PV}/AUTHORS geda-utils-${PV}/README*
-
 }