8 files changed, 159 insertions, 212 deletions
diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest
index d10e265b6bb7..c84543cdf7b2 100644
--- a/sci-electronics/geda/Manifest
+++ b/sci-electronics/geda/Manifest
@@ -1 +1 @@
-DIST geda-gaf-1.9.2.tar.gz 10612225 BLAKE2B d09accde32f672b984bc2541404efccc886edb15e985bab287b4a619f11fc10cfd2b3ce3074d82c1a61811c4df9e515ecfbc61bd537c6943188b130062bda97f SHA512 5e26ea2cffffe50bd4f0bdb4594af9cc4510386d29c715c2b4ea99c6522838a08cc2045bf65e8b1da01ab33a266fc9f03da42e28b8cc4d5c030001777ab077e3
+DIST geda-gaf-1.10.2.tar.gz 14441491 BLAKE2B d6ecc4bc1390ff457396ae406fdeee909418f63d8c50e537215fa0a1131cfda91339f44ddc2c91ca0f3772f4416be1c4448fea45336c78bb601fb9b4df399b14 SHA512 c7beabf019762d9d3b4faa63f1345fb064ebbb6e0203a6c5bcab6b740d20db9f3cedf85c2f99e3ab1cb5396c06886fad1dbd5201eb7bad9e77c03511cf23b1a1
diff --git a/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch b/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch
new file mode 100644
index 000000000000..f1532677bd53
--- /dev/null
+++ b/sci-electronics/geda/files/geda-1.10.2-drop-xorn.patch
@@ -0,0 +1,60 @@
+diff --git a/Makefile.am b/Makefile.am
+index 161083c..d54eded 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@ if ENABLE_GATTRIB
+ GATTRIB_DIR=gattrib
+ endif
+ SUBDIRS = libgeda libgedacairo gaf gschem ${GATTRIB_DIR} \
+-	gsymcheck gnetlist-legacy utils symbols docs examples contrib xorn
++	gsymcheck gnetlist-legacy utils symbols docs examples contrib
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+diff --git a/Makefile.in b/Makefile.in
+index 31778d8..59789e6 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -180,7 +180,7 @@ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+ DIST_SUBDIRS = libgeda libgedacairo gaf gschem gattrib gsymcheck \
+-	gnetlist-legacy utils symbols docs examples contrib xorn
++	gnetlist-legacy utils symbols docs examples contrib
+ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ 	$(top_srcdir)/build-tools/ar-lib \
+ 	$(top_srcdir)/build-tools/compile \
+@@ -454,7 +454,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ @ENABLE_GATTRIB_TRUE@GATTRIB_DIR = gattrib
+ SUBDIRS = libgeda libgedacairo gaf gschem ${GATTRIB_DIR} \
+-	gsymcheck gnetlist-legacy utils symbols docs examples contrib xorn
++	gsymcheck gnetlist-legacy utils symbols docs examples contrib
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+diff --git a/autogen.sh b/autogen.sh
+index 7b82f04..4d81174 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -225,4 +225,4 @@ fi
+   run_tool "$AUTOHEADER" &&
+   run_tool "$AUTOMAKE" -Wall --copy --add-missing --gnu &&
+   run_tool "$AUTOCONF" &&
+-  (cd xorn && autoreconf -if))
++  )
+ 
+ #####################################################################
+diff --git a/configure.ac b/configure.ac
+index 1f19064..257ee20 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -197,8 +197,6 @@ AX_LIBGEDACAIRO([1:3:0])
+ export GEDADATADIR
+ export GEDARCDIR
+ 
+-AC_CONFIG_SUBDIRS([xorn])
+-
+ #####################################################################
+ # Generate output
+ #####################################################################
diff --git a/sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch b/sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch
new file mode 100644
index 000000000000..d351b84b390f
--- /dev/null
+++ b/sci-electronics/geda/files/geda-1.10.2-fix-gtk-sheet.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/834834
+From: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
+--- a/gattrib/src/gtksheet_2_2.c
++++ b/gattrib/src/gtksheet_2_2.c
+@@ -8102,7 +8102,9 @@
+     return;
+   }
+ 
+-  gtk_sheet_get_cell_area(sheet, row, col, &area);
++  if (!gtk_sheet_get_cell_area(sheet, row, col, &area))
++    return;
++
+   child = gtk_sheet_put(sheet, widget, area.x, area.y);
+   child->attached_to_cell = TRUE;
+   child->row = row;
diff --git a/sci-electronics/geda/files/geda-1.9.2-fno-common.patch b/sci-electronics/geda/files/geda-1.9.2-fno-common.patch
deleted file mode 100644
index c509b42904a8..000000000000
--- a/sci-electronics/geda/files/geda-1.9.2-fno-common.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/gschem/include/globals.h
-+++ b/gschem/include/globals.h
-@@ -27,7 +27,7 @@
- extern GList *global_window_list;
- 
- /* Manager for recently used files */
--GtkRecentManager *recent_manager;
-+extern GtkRecentManager *recent_manager;
- 
- /* colors */
- extern GdkColor white;
---- a/gschem/src/globals.c
-+++ b/gschem/src/globals.c
-@@ -28,6 +28,8 @@
- /* window list */
- GList *global_window_list = NULL;
- 
-+GtkRecentManager *recent_manager = NULL;
-+
- char *rc_filename     = NULL;
- char *output_filename = NULL;
- 
---- a/gattrib/include/globals.h
-+++ b/gattrib/include/globals.h
-@@ -88,7 +88,7 @@
-  * structs.h
-  */
- /*------------------------------------------------------------------*/
--TOPLEVEL *pr_current;
-+extern TOPLEVEL *pr_current;
- 
- /*------------------------------------------------------------------*/
- /*!
-@@ -97,7 +97,7 @@ TOPLEVEL *pr_current;
-  * callbacks.  It is defined in structs.h
-  */
- /*------------------------------------------------------------------*/
--SHEET_DATA *sheet_head;
-+extern SHEET_DATA *sheet_head;
- 
- /*------------------------------------------------------------------
-  * GTKsheet includes: stuff for dealing with windows.
-@@ -106,18 +106,18 @@ SHEET_DATA *sheet_head;
- #define DEFAULT_SPACE 8
- #define NUM_SHEETS 3            /* Components, Nets, and Pins */
- 
--GtkWidget *window;              /* Main window */
--GtkWidget *notebook;
-+extern GtkWidget *window;              /* Main window */
-+extern GtkWidget *notebook;
- 
--GtkSheet **sheets;             /* These are the spreadsheet widgets themselves */
-+extern GtkSheet **sheets;             /* These are the spreadsheet widgets themselves */
- 
--GtkWidget **scrolled_windows;
--GtkWidget *entry;
--GtkWidget *location;
--GtkWidget *left_button;
--GtkWidget *center_button;
--GtkWidget *right_button;
--GtkWidget *label;
-+extern GtkWidget **scrolled_windows;
-+extern GtkWidget *entry;
-+extern GtkWidget *location;
-+extern GtkWidget *left_button;
-+extern GtkWidget *center_button;
-+extern GtkWidget *right_button;
-+extern GtkWidget *label;
- 
- /* command line switch settings */
- extern int verbose_mode;
---- a/gattrib/src/globals.c
-+++ b/gattrib/src/globals.c
-@@ -34,6 +34,23 @@
- #include "../include/prototype.h"  /* function prototypes */
- #include "../include/globals.h"
- 
-+TOPLEVEL *pr_current;
-+
-+SHEET_DATA *sheet_head;
-+
-+GtkWidget *window;
-+GtkWidget *notebook;
-+
-+GtkSheet **sheets;
-+
-+GtkWidget **scrolled_windows;
-+GtkWidget *entry;
-+GtkWidget *location;
-+GtkWidget *left_button;
-+GtkWidget *center_button;
-+GtkWidget *right_button;
-+GtkWidget *label;
-+
- /* command line arguments */
- int verbose_mode=FALSE; //!< Reflects the value of the command line flag
- int quiet_mode=FALSE;   //!< Reflects the value of the command line flag
diff --git a/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch b/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch
deleted file mode 100644
index 631673367801..000000000000
--- a/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- geda-gaf-1.9.2/m4/geda-guile.m4
-+++ geda-gaf-1.9.2/m4/geda-guile.m4
-@@ -35,8 +35,13 @@
-   GUILE_MIN_TEENY=`echo ${GUILE_MIN_VER} | sed -e 's;.*\.;;'`
- 
-   _found_pkg_config_guile=yes
-+  PKG_CHECK_MODULES(GUILE, [guile-2.2 >= $GUILE_MIN_VER],
-+                           [GUILE_PKG_NAME=guile-2.2], [_found_pkg_config_guile=no])
-+
-+  if test "${_found_pkg_config_guile}" = "no" ; then
-   PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER],
-                            [GUILE_PKG_NAME=guile-2.0], [_found_pkg_config_guile=no])
-+  fi
- 
-   if test "${_found_pkg_config_guile}" = "no" ; then
-    PKG_CHECK_MODULES(GUILE, [guile-1.8 >= $GUILE_MIN_VER],
diff --git a/sci-electronics/geda/geda-1.10.2-r2.ebuild b/sci-electronics/geda/geda-1.10.2-r2.ebuild
new file mode 100644
index 000000000000..24b2e1b10dd4
--- /dev/null
+++ b/sci-electronics/geda/geda-1.10.2-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="
+	media-gfx/graphviz
+	media-gfx/imagemagick
+	virtual/latex-base
+"
+inherit autotools docs xdg
+
+MY_PN=${PN}-gaf
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package"
+HOMEPAGE="http://geda-project.org/ http://wiki.geda-project.org/geda:gaf"
+SRC_URI="http://ftp.geda-project.org/${MY_PN}/stable/v$(ver_cut 1-2)/${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~x86"
+IUSE="debug fam nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2
+	dev-scheme/guile
+	sci-electronics/electronics-menu
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+	nls? ( virtual/libintl )
+	fam? ( app-admin/gamin )
+"
+
+DEPEND="${RDEPEND}
+	dev-util/desktop-file-utils
+	x11-misc/shared-mime-info"
+BDEPEND="
+	sys-apps/groff
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	# Xorn requires python2
+	"${FILESDIR}/${P}-drop-xorn.patch"
+
+	"${FILESDIR}/${PN}-1.10.2-fix-gtk-sheet.patch"
+)
+
+src_prepare() {
+	default
+	rm -r xorn || die
+
+	# remove compressed files, compressed by portage in install phase
+	rm docs/wiki/media/geda/gsch2pcb-libs.tar.gz || die
+	rm docs/wiki/media/geda/pcb_plugin_template.tar.gz || die
+	rm docs/wiki/media/pcb/plugin_debug_window.tar.gz || die
+
+	# -Wmaybe-uninitialized is made fatal, which is not ideal for building
+	# releases. Upstream is working on fixing these anyway.
+	sed -i '/Werror_maybe_uninitialized_IF_SUPPORTED/d' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-rpath
+		--disable-update-xdg-database
+		$(use_enable doc doxygen)
+		$(use_enable debug assert)
+		$(use_enable nls)
+		$(use_with fam libfam)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/sci-electronics/geda/geda-1.9.2-r1.ebuild b/sci-electronics/geda/geda-1.9.2-r1.ebuild
deleted file mode 100644
index e4657a2c3eeb..000000000000
--- a/sci-electronics/geda/geda-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-MY_PN=${PN}-gaf
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="GPL Electronic Design Automation (gEDA):gaf core package"
-HOMEPAGE="http://wiki.geda-project.org/geda:gaf"
-SRC_URI="http://ftp.geda-project.org/${MY_PN}/unstable/v$(ver_cut 1-2)/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug doc examples nls stroke threads"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-scheme/guile
-	sci-electronics/electronics-menu
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	nls? ( virtual/libintl )
-	stroke? ( dev-libs/libstroke )"
-
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	x11-misc/shared-mime-info"
-BDEPEND="
-	sys-apps/groff
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-guile-2.2.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_prepare() {
-	default
-
-	if ! use doc ; then
-		sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die
-	fi
-	if ! use examples ; then
-		sed -i -e 's/\texamples$//' Makefile.in || die
-	fi
-
-	# add missing GIO_LIB Bug #684870
-	sed -i -e 's/gsymcheck_LDFLAGS =/gsymcheck_LDFLAGS = $(GIO_LIBS)/' \
-		gsymcheck/src/Makefile.am || die
-
-	sed -i -e 's/gnetlist_LDFLAGS =/gnetlist_LDFLAGS = $(GIO_LIBS)/' \
-		gnetlist/src/Makefile.am || die
-
-	sed -i -e 's/gschlas_LDFLAGS =/gschlas_LDFLAGS = $(GIO_LIBS)/' \
-		utils/gschlas/Makefile.am || die
-
-	sed -i -e 's/sarlacc_schem_LDFLAGS =/sarlacc_schem_LDFLAGS = $(GIO_LIBS)/' \
-		contrib/sarlacc_schem/Makefile.am || die
-
-	rm docs/wiki/media/geda/gsch2pcb-libs.tar.gz || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-doxygen
-		--disable-rpath
-		--disable-update-xdg-database
-		$(use_enable debug assert)
-		$(use_enable nls)
-		$(use_enable threads threads posix)
-		$(use_with stroke libstroke)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-electronics/geda/metadata.xml b/sci-electronics/geda/metadata.xml
index 41090aecc004..db3ca30f3bbe 100644
--- a/sci-electronics/geda/metadata.xml
+++ b/sci-electronics/geda/metadata.xml
@@ -18,7 +18,4 @@
 		The gEDA/gaf suite (this package) provides schematic capture,
 		netlisting, bill of materials generation, and many other features.
 	</longdescription>
-	<use>
-		<flag name="stroke">enable mouse gesture support</flag>
-	</use>
 </pkgmetadata>