From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1397060-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 14829158090
for <garchives@archives.gentoo.org>; Mon, 16 May 2022 03:03:46 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 56679E07F9;
Mon, 16 May 2022 03:03:45 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 3E949E07F9
for <gentoo-commits@lists.gentoo.org>; Mon, 16 May 2022 03:03:45 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2D478341279
for <gentoo-commits@lists.gentoo.org>; Mon, 16 May 2022 03:03:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A2B2D3A5
for <gentoo-commits@lists.gentoo.org>; Mon, 16 May 2022 03:03:41 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1652669899.48f0bcf5cda0b4bcc6678889c4297a5548adf242.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/bluefish/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-editors/bluefish/bluefish-2.2.12.ebuild
X-VCS-Directories: app-editors/bluefish/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 48f0bcf5cda0b4bcc6678889c4297a5548adf242
X-VCS-Branch: master
Date: Mon, 16 May 2022 03:03:41 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 77a863a1-a8ad-4e28-bee7-66f867b5376c
X-Archives-Hash: 02ae67bccbbbe0b7fb56dc5655a1cedd
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."
}