public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/bluefish/
Date: Mon, 16 May 2022 03:03:41 +0000 (UTC)	[thread overview]
Message-ID: <1652669899.48f0bcf5cda0b4bcc6678889c4297a5548adf242.sam@gentoo> (raw)

commit:     48f0bcf5cda0b4bcc6678889c4297a5548adf242
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 02:57:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 16 02:58:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f0bcf5

app-editors/bluefish: add Python 3.10

Closes: https://bugs.gentoo.org/832585
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/bluefish/bluefish-2.2.12.ebuild | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/app-editors/bluefish/bluefish-2.2.12.ebuild b/app-editors/bluefish/bluefish-2.2.12.ebuild
index 2580098daeac..5e75105359f7 100644
--- a/app-editors/bluefish/bluefish-2.2.12.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.12.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 MY_P=${P/_/-}
 inherit autotools python-single-r1 xdg
@@ -18,8 +18,7 @@ SLOT="0"
 IUSE="gucharmap nls python spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="
-	sys-libs/zlib
+RDEPEND="sys-libs/zlib
 	x11-libs/gtk+:3
 	gucharmap? ( gnome-extra/gucharmap:2.90 )
 	python? ( ${PYTHON_DEPS} )
@@ -30,8 +29,8 @@ BDEPEND=">=dev-libs/glib-2.24:2
 	dev-libs/libxml2:2
 	virtual/pkgconfig
 	nls? (
-		sys-devel/gettext
 		dev-util/intltool
+		sys-devel/gettext
 	)"
 
 S="${WORKDIR}/${MY_P}"
@@ -39,21 +38,22 @@ S="${WORKDIR}/${MY_P}"
 # there actually is just some broken manpage checkup -> not bother
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" )
-
-# eautoreconf seems to no longer kill translation files.
 src_prepare() {
 	default
+
+	# eautoreconf seems to no longer kill translation files.
 	eautoreconf
 	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
 }
 
 src_configure() {
-	econf \
+	CONFIG_SHELL="${BROOT}/bin/bash" econf \
 		--disable-update-databases \
 		--disable-xml-catalog-update \
 		--with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \
@@ -66,27 +66,30 @@ src_configure() {
 
 src_install() {
 	default
+
 	find "${ED}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
+
 	einfo "Adding XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
+	"${EPREFIX}"/usr/bin/xmlcatalog  --noout \
 		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
 		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
 		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
-		/etc/xml/catalog \
+		"${EROOT}"/etc/xml/catalog \
 		|| ewarn "Failed to add XML catalog entries."
 }
 
 pkg_postrm() {
 	xdg_pkg_postrm
+
 	einfo "Removing XML catalog entries..."
-	/usr/bin/xmlcatalog  --noout \
+	"${EPREFIX}"/usr/bin/xmlcatalog  --noout \
 		--del 'Bluefish/DTD/Bflang' \
 		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
 		--del 'http://bluefish.openoffice.nl/DTD' \
-		/etc/xml/catalog \
+		"${EROOT}"/etc/xml/catalog \
 		|| ewarn "Failed to remove XML catalog entries."
 }


             reply	other threads:[~2022-05-16  3:03 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-16  3:03 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-18  8:18 [gentoo-commits] repo/gentoo:master commit in: app-editors/bluefish/ Sam James
2024-07-18  8:18 Sam James
2024-06-10 15:06 Hanno Böck
2023-06-01 17:14 Arthur Zamarin
2023-06-01 17:07 Arthur Zamarin
2023-05-27 11:27 Arthur Zamarin
2023-05-07 20:49 Matt Turner
2023-05-01 12:37 Sam James
2023-05-01 12:37 Sam James
2023-02-24 19:58 Arthur Zamarin
2023-02-24 19:58 Arthur Zamarin
2022-11-23  1:58 Sam James
2022-11-23  1:56 Sam James
2022-05-28 23:02 Sam James
2022-04-03 10:50 Conrad Kostecki
2021-02-07 20:19 Andreas Sturmlechner
2021-02-02 23:51 Sam James
2021-02-02 23:46 Sam James
2021-01-31 21:51 Sam James
2020-12-11  7:58 Joonas Niilola
2020-08-22  9:15 Michał Górny
2020-08-22  8:04 Michał Górny
2020-02-02 19:35 Mart Raudsepp
2019-04-27 16:06 Lars Wendler
2019-04-25 13:35 Lars Wendler
2019-01-27 10:15 Pacho Ramos
2018-05-26 12:42 Mikle Kolyada
2018-04-14  1:03 Aaron Bauman
2018-04-14  1:03 Aaron Bauman
2018-03-06  8:17 Jonas Stein
2018-02-11 10:01 Michał Górny
2017-07-19  8:27 Amy Liffey
2017-07-19  5:09 Amy Liffey
2017-04-19  8:03 David Seifert
2016-07-28 12:55 Lars Wendler
2016-03-29  6:06 Sam Jorna

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1652669899.48f0bcf5cda0b4bcc6678889c4297a5548adf242.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox