[gentoo-commits] repo/gentoo:master commit in: sci-electronics/geda/, sci-electronics/geda/files/

2024-03-11 Thread Sam James 
commit: 5183cbdcacbf22defb6b4145b78340fbebb22bf2
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 12 06:23:08 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 12 06:44:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5183cbdc

sci-electronics/geda: drop 1.9.2-r1, 1.10.2-r1

Signed-off-by: Sam James  gentoo.org>

 sci-electronics/geda/Manifest  |  1 -
 .../geda/files/geda-1.9.2-fno-common.patch | 97 --
 .../geda/files/geda-1.9.2-guile-2.2.patch  | 16 
 sci-electronics/geda/geda-1.10.2-r1.ebuild | 97 --
 sci-electronics/geda/geda-1.9.2-r1.ebuild  | 95 -
 sci-electronics/geda/metadata.xml  |  3 -
 6 files changed, 309 deletions(-)

diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest
index 4639d6ec8227..c84543cdf7b2 100644
--- a/sci-electronics/geda/Manifest
+++ b/sci-electronics/geda/Manifest
@@ -1,2 +1 @@
 DIST geda-gaf-1.10.2.tar.gz 14441491 BLAKE2B 
d6ecc4bc1390ff457396ae406fdeee909418f63d8c50e537215fa0a1131cfda91339f44ddc2c91ca0f3772f4416be1c4448fea45336c78bb601fb9b4df399b14
 SHA512 
c7beabf019762d9d3b4faa63f1345fb064ebbb6e0203a6c5bcab6b740d20db9f3cedf85c2f99e3ab1cb5396c06886fad1dbd5201eb7bad9e77c03511cf23b1a1
-DIST geda-gaf-1.9.2.tar.gz 10612225 BLAKE2B 
d09accde32f672b984bc2541404efccc886edb15e985bab287b4a619f11fc10cfd2b3ce3074d82c1a61811c4df9e515ecfbc61bd537c6943188b130062bda97f
 SHA512 
5e26ea2ce50bd4f0bdb4594af9cc4510386d29c715c2b4ea99c6522838a08cc2045bf65e8b1da01ab33a266fc9f03da42e28b8cc4d5c030001777ab077e3

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..
--- 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..
--- a/sci-electronics/geda/files/geda-1.9.2-guile-2.2.patch

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/geda/, sci-electronics/geda/files/

2022-03-02 Thread Andrew Ammerlaan 
commit: a060c466975c554fa26dec940b473e67b72bed62
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Mar  2 19:27:06 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Mar  2 19:27:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a060c466

sci-electronics/geda: drop xorn completely

This is an optional CLI utility that is stuck on python2

Closes: https://bugs.gentoo.org/834496
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../geda/files/geda-1.10.2-drop-xorn.patch | 60 ++
 .../{geda-1.10.2.ebuild => geda-1.10.2-r1.ebuild}  | 17 +++---
 2 files changed, 68 insertions(+), 9 deletions(-)

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 ..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/geda-1.10.2.ebuild 
b/sci-electronics/geda/geda-1.10.2-r1.ebuild
similarity index 87%
rename from sci-electronics/geda/geda-1.10.2.ebuild
rename to sci-electronics/geda/geda-1.10.2-r1.ebuild
index 535b6ce530a8..b573743f9c9e 100644
--- a/sci-electronics/geda/geda-1.10.2.ebuild
+++ b/sci-electronics/geda/geda-1.10.2-r1.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="media-gfx/graphviz"
-inherit autotools docs python-single-r1 xdg
+inherit autotools docs xdg
 
 MY_PN=${PN}-gaf
 MY_P=${MY_PN}-${PV}
@@ -19,12 +18,9 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug examples fam nls stroke threads"
+IUSE="debug examples fam nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-# The Xorn python bindings aren't quite working
-RESTRICT="test"
-
 RDEPEND="${PYTHON_DEPS}
dev-libs/glib:2
dev-scheme/guile
@@ -34,7 +30,6 @@ RDEPEND="${PYTHON_DEPS}
x11-libs/gtk+:2
x11-libs/pango
nls? ( virtual/libintl )
-   stroke? ( dev-libs/libstroke )
fam? ( app-admin/gamin )
 "
 
@@ -47,8 +42,14 @@ BDEPEND="
nls? ( sys-devel/gettext )
 "
 
+# Xorn requires python2
+PATCHES=(
+   "${FILESDIR}/${P}-drop-xorn.patch"
+)
+
 src_prepare() {
default
+   rm -r xorn || die
 
if ! use doc ; then
sed -i -e '/^SUBDIRS = /s/docs//' Makefile.in || die
@@ -85,8 +86,6 @@ src_configure() {
$(use_enable doc doxygen)
$(use_enable debug assert)
$(use_enable nls)
-   $(use_enable threads threads posix)
-   $(use_with stroke libstroke)
$(use_with fam libfam)
)

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/geda/, sci-electronics/geda/files/

2020-12-28 Thread David Seifert 
commit: 0b12111fda0e3e00c201e5c52003259788f2ca15
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Dec 28 14:15:42 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec 28 14:15:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b12111f

sci-electronics/geda: Port to EAPI 7

Closes: https://bugs.gentoo.org/707892
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../geda/files/geda-1.9.2-fno-common.patch | 97 ++
 sci-electronics/geda/geda-1.9.2-r1.ebuild  | 75 -
 2 files changed, 132 insertions(+), 40 deletions(-)

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
new file mode 100644
index 000..c509b42904a
--- /dev/null
+++ b/sci-electronics/geda/files/geda-1.9.2-fno-common.patch
@@ -0,0 +1,97 @@
+--- 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/geda-1.9.2-r1.ebuild 
b/sci-electronics/geda/geda-1.9.2-r1.ebuild
index b0b3ffbf999..c85d6f34977 100644
--- a/sci-electronics/geda/geda-1.9.2-r1.ebuild
+++ b/sci-electronics/geda/geda-1.9.2-r1.ebuild
@@ -1,46 +1,47 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils xdg-utils gnome2-utils versionator
+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$(get_version_component_range
 1-2)/${PV}/${MY_P}.tar.gz"
+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"
 
-CDEPEND="
+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
-   >=x11-libs/cairo-1.2.0
-   x11-lib