From 974d0c8532800d9f5688c49b8b0a86735e6717ac Mon Sep 17 00:00:00 2001
From: Alfredo Tupone <tupone@gentoo.org>
Date: Thu, 16 Mar 2023 08:29:46 +0100
Subject: dev-tcltk/iwidgets: fix unterminated quoted string

Closes: https://bugs.gentoo.org/885809
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
---
 dev-tcltk/iwidgets/files/iwidgets-4.1.1-dash.patch | 11 ++++
 dev-tcltk/iwidgets/iwidgets-4.1.1-r1.ebuild        | 70 ---------------------
 dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild        | 72 ++++++++++++++++++++++
 3 files changed, 83 insertions(+), 70 deletions(-)
 create mode 100644 dev-tcltk/iwidgets/files/iwidgets-4.1.1-dash.patch
 delete mode 100644 dev-tcltk/iwidgets/iwidgets-4.1.1-r1.ebuild
 create mode 100644 dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild

(limited to 'dev-tcltk')

diff --git a/dev-tcltk/iwidgets/files/iwidgets-4.1.1-dash.patch b/dev-tcltk/iwidgets/files/iwidgets-4.1.1-dash.patch
new file mode 100644
index 000000000000..0a928506ee6c
--- /dev/null
+++ b/dev-tcltk/iwidgets/files/iwidgets-4.1.1-dash.patch
@@ -0,0 +1,11 @@
+--- a/tclconfig/tcl.m4	2023-03-16 08:23:24.920934671 +0100
++++ b/tclconfig/tcl.m4	2023-03-16 08:24:06.288775313 +0100
+@@ -794,7 +794,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
diff --git a/dev-tcltk/iwidgets/iwidgets-4.1.1-r1.ebuild b/dev-tcltk/iwidgets/iwidgets-4.1.1-r1.ebuild
deleted file mode 100644
index 4bcb21331fc0..000000000000
--- a/dev-tcltk/iwidgets/iwidgets-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit virtualx autotools
-
-BASE_URI_ITCLTK="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-4-source"
-ITCL_VER=4.1.1
-ITK_VER=4.1.0
-
-DESCRIPTION="Widget collection for incrTcl/incrTk"
-HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
-SRC_URI="
-	mirror://sourceforge/incrtcl/%5BIncr%20Widgets%5D/${PV}/${P}.tar.gz
-	${BASE_URI_ITCLTK}/itcl%20${ITCL_VER}/itcl${ITCL_VER}.tar.gz
-	${BASE_URI_ITCLTK}/itk%20${ITK_VER}/itk${ITK_VER}.tar.gz"
-
-LICENSE="HPND Old-MIT tcltk"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-tcltk/itcl-${ITCL_VER}
-	>=dev-tcltk/itk-${ITK_VER}"
-RDEPEND="${DEPEND}"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	stat64 # used to test for Large File Support
-)
-
-src_prepare() {
-	default
-	sed \
-		-e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \
-		-i Makefile.in || die
-
-	eautoreconf
-
-	# Bug 115470
-	rm doc/panedwindow.n
-
-	rm tests/hierarchy.test || die
-}
-
-src_configure() {
-	(cd ../itcl${ITCL_VER}; ./configure)
-	econf \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
-		--with-itcl="${WORKDIR}"/itcl${ITCL_VER} \
-		--with-itk="${WORKDIR}"/itk${ITK_VER}
-}
-
-src_compile() {
-	:
-}
-
-src_test() {
-	virtx default
-}
-
-src_install() {
-	default
-
-	# demos are in the wrong place:
-	mv "${ED}/usr/$(get_libdir)/${PN}${PV}/demos" "${ED}/usr/share/doc/${PF}/"
-}
diff --git a/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild b/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild
new file mode 100644
index 000000000000..bec5525391f4
--- /dev/null
+++ b/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit virtualx autotools
+
+BASE_URI_ITCLTK="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-4-source"
+ITCL_VER=4.1.1
+ITK_VER=4.1.0
+
+DESCRIPTION="Widget collection for incrTcl/incrTk"
+HOMEPAGE="http://incrtcl.sourceforge.net/itcl/"
+SRC_URI="
+	mirror://sourceforge/incrtcl/%5BIncr%20Widgets%5D/${PV}/${P}.tar.gz
+	${BASE_URI_ITCLTK}/itcl%20${ITCL_VER}/itcl${ITCL_VER}.tar.gz
+	${BASE_URI_ITCLTK}/itk%20${ITK_VER}/itk${ITK_VER}.tar.gz"
+
+LICENSE="HPND Old-MIT tcltk"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-tcltk/itcl-${ITCL_VER}
+	>=dev-tcltk/itk-${ITK_VER}"
+RDEPEND="${DEPEND}"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	stat64 # used to test for Large File Support
+)
+
+PATCHES=( "${FILESDIR}"/${P}-dash.patch )
+
+src_prepare() {
+	default
+	sed \
+		-e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \
+		-i Makefile.in || die
+
+	eautoreconf
+
+	# Bug 115470
+	rm doc/panedwindow.n
+
+	rm tests/hierarchy.test || die
+}
+
+src_configure() {
+	(cd ../itcl${ITCL_VER}; ./configure)
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
+		--with-itcl="${WORKDIR}"/itcl${ITCL_VER} \
+		--with-itk="${WORKDIR}"/itk${ITK_VER}
+}
+
+src_compile() {
+	:
+}
+
+src_test() {
+	virtx default
+}
+
+src_install() {
+	default
+
+	# demos are in the wrong place:
+	mv "${ED}/usr/$(get_libdir)/${PN}${PV}/demos" "${ED}/usr/share/doc/${PF}/"
+}
-- 
cgit v1.2.3-65-gdbad