commit: a060c466975c554fa26dec940b473e67b72bed62 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Wed Mar 2 19:27:06 2022 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Wed Mar 2 19:27:18 2022 +0000 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 <andrewammerlaan <AT> 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 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/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) )
