app-text/sablotron: cleanup, rename patches

- use array for econf args
- add ${PN} prefix to FILESDIR patches
- organize global scope assignments

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

5 files changed, 20 insertions, 26 deletions

diff --git a/app-text/sablotron/files/1.0.3-cxx11.patch b/app-text/sablotron/files/sablotron-1.0.3-cxx11.patch
index edc1e3141d94..edc1e3141d94 100644
--- a/app-text/sablotron/files/1.0.3-cxx11.patch
+++ b/app-text/sablotron/files/sablotron-1.0.3-cxx11.patch
diff --git a/app-text/sablotron/files/1.0.3-drop-register-keyword.patch b/app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch
index 3dcf8c881efa..3dcf8c881efa 100644
--- a/app-text/sablotron/files/1.0.3-drop-register-keyword.patch
+++ b/app-text/sablotron/files/sablotron-1.0.3-drop-register-keyword.patch
diff --git a/app-text/sablotron/files/1.0.3-libsablot-expat.patch b/app-text/sablotron/files/sablotron-1.0.3-libsablot-expat.patch
index e4f6c3fdfab3..614a6d7ffe24 100644
--- a/app-text/sablotron/files/1.0.3-libsablot-expat.patch
+++ b/app-text/sablotron/files/sablotron-1.0.3-libsablot-expat.patch
@@ -2,7 +2,7 @@
 +++ b/src/engine/Makefile.am
 @@ -76,4 +76,5 @@ include_HEADERS = \
  	sabcfg.h
- 
+
  libsablot_la_LDFLAGS = -version-info 100:3:100
 +libsablot_la_LIBADD = @EXPAT_LIBS@
- 
+
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
index 1b8ec6960d0a..0dcfdf96034b 100644
--- a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,8 @@ DOCS=(
 	README README_JS RELEASE src/TODO
 )
 PATCHES=(
-	"${FILESDIR}"/1.0.3-libsablot-expat.patch
-	"${FILESDIR}"/1.0.3-cxx11.patch
+	"${FILESDIR}"/${PN}-1.0.3-libsablot-expat.patch
+	"${FILESDIR}"/${PN}-1.0.3-cxx11.patch
 )
 
 src_prepare() {
diff --git a/app-text/sablotron/sablotron-1.0.3-r3.ebuild b/app-text/sablotron/sablotron-1.0.3-r3.ebuild
index 75dc3320a516..d702dafc4941 100644
--- a/app-text/sablotron/sablotron-1.0.3-r3.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r3.ebuild
@@ -5,13 +5,12 @@ EAPI=8
 
 inherit autotools
 
-MY_PN="Sablot"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
+MY_P="Sablot-${PV}"
 
 DESCRIPTION="An XSLT Parser in C++"
 HOMEPAGE="https://sourceforge.net/projects/sablotron/"
 SRC_URI="mirror://sourceforge/sablotron/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 # Sablotron can optionally be built under GPL, using MPL for now
 LICENSE="MPL-1.1"
@@ -19,22 +18,16 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl"
 
-RDEPEND="
-	>=dev-libs/expat-1.95.6-r1
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	>=dev-perl/XML-Parser-2.3
-"
-DOCS=(
-	README README_JS RELEASE src/TODO
-)
+DEPEND=">=dev-libs/expat-1.95.6-r1"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-perl/XML-Parser-2.3"
+
+DOCS=( README README_JS RELEASE src/TODO )
+
 PATCHES=(
-	"${FILESDIR}"/1.0.3-libsablot-expat.patch
-	"${FILESDIR}"/1.0.3-cxx11.patch
-	"${FILESDIR}"/1.0.3-drop-register-keyword.patch
+	"${FILESDIR}"/${PN}-1.0.3-libsablot-expat.patch
+	"${FILESDIR}"/${PN}-1.0.3-cxx11.patch
+	"${FILESDIR}"/${PN}-1.0.3-drop-register-keyword.patch
 )
 
 src_prepare() {
@@ -45,10 +38,11 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable perl perlconnect) \
+	local myeconfargs=(
+		$(use_enable perl perlconnect)
 		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {