| 1 |
commit: 7202f433d3ad4bebb6005cf76c91508cdb260255 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 7 20:13:49 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 7 20:18:56 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7202f433 |
| 7 |
|
| 8 |
app-editors/bluefish: Drop IUSE=gtk3 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/769020 |
| 11 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
app-editors/bluefish/bluefish-2.2.12.ebuild | 25 +++++++------------------ |
| 15 |
app-editors/bluefish/metadata.xml | 9 ++++----- |
| 16 |
2 files changed, 11 insertions(+), 23 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-editors/bluefish/bluefish-2.2.12.ebuild b/app-editors/bluefish/bluefish-2.2.12.ebuild |
| 19 |
index 5e884616586..625cc993be5 100644 |
| 20 |
--- a/app-editors/bluefish/bluefish-2.2.12.ebuild |
| 21 |
+++ b/app-editors/bluefish/bluefish-2.2.12.ebuild |
| 22 |
@@ -5,9 +5,8 @@ EAPI=7 |
| 23 |
|
| 24 |
PYTHON_COMPAT=( python3_{7..9} ) |
| 25 |
|
| 26 |
-inherit autotools python-single-r1 xdg |
| 27 |
- |
| 28 |
MY_P=${P/_/-} |
| 29 |
+inherit autotools python-single-r1 xdg |
| 30 |
|
| 31 |
DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer" |
| 32 |
HOMEPAGE="http://bluefish.openoffice.nl/" |
| 33 |
@@ -16,16 +15,13 @@ SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2" |
| 34 |
LICENSE="GPL-2" |
| 35 |
KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86" |
| 36 |
SLOT="0" |
| 37 |
-IUSE="+gtk3 gucharmap nls python spell" |
| 38 |
+IUSE="gucharmap nls python spell" |
| 39 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 40 |
|
| 41 |
RDEPEND=" |
| 42 |
sys-libs/zlib |
| 43 |
- !gtk3? ( x11-libs/gtk+:2 ) |
| 44 |
- gtk3? ( |
| 45 |
- x11-libs/gtk+:3 |
| 46 |
- gucharmap? ( gnome-extra/gucharmap:2.90 ) |
| 47 |
- ) |
| 48 |
+ x11-libs/gtk+:3 |
| 49 |
+ gucharmap? ( gnome-extra/gucharmap:2.90 ) |
| 50 |
python? ( ${PYTHON_DEPS} ) |
| 51 |
spell? ( >=app-text/enchant-1.4:0 )" |
| 52 |
DEPEND="${RDEPEND} |
| 53 |
@@ -44,17 +40,10 @@ S="${WORKDIR}/${MY_P}" |
| 54 |
RESTRICT="test" |
| 55 |
|
| 56 |
pkg_setup() { |
| 57 |
- if ! use gtk3 && use gucharmap ; then |
| 58 |
- ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled." |
| 59 |
- ewarn "Disabling charmap plugin." |
| 60 |
- fi |
| 61 |
- |
| 62 |
use python && python-single-r1_pkg_setup |
| 63 |
} |
| 64 |
|
| 65 |
-PATCHES=( |
| 66 |
- "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" |
| 67 |
-) |
| 68 |
+PATCHES=( "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" ) |
| 69 |
|
| 70 |
# eautoreconf seems to no longer kill translation files. |
| 71 |
src_prepare() { |
| 72 |
@@ -68,8 +57,8 @@ src_configure() { |
| 73 |
--disable-update-databases \ |
| 74 |
--disable-xml-catalog-update \ |
| 75 |
--with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \ |
| 76 |
- $(use_with !gtk3 gtk2) \ |
| 77 |
- $(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \ |
| 78 |
+ --without-gtk2 \ |
| 79 |
+ $(use_with gucharmap charmap) \ |
| 80 |
$(use_enable nls) \ |
| 81 |
$(use_enable spell spell-check) \ |
| 82 |
$(use_enable python) |
| 83 |
|
| 84 |
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml |
| 85 |
index 52c7b254214..56419257845 100644 |
| 86 |
--- a/app-editors/bluefish/metadata.xml |
| 87 |
+++ b/app-editors/bluefish/metadata.xml |
| 88 |
@@ -1,10 +1,9 @@ |
| 89 |
<?xml version="1.0" encoding="UTF-8"?> |
| 90 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 91 |
<pkgmetadata> |
| 92 |
-<!-- maintainer-needed --> |
| 93 |
+ <!-- maintainer-needed --> |
| 94 |
<use> |
| 95 |
- <flag name="gtk3">Enable GTK3 interface (default)</flag> |
| 96 |
- <flag name="gucharmap">Enable gucharmap dictionary plugin</flag> |
| 97 |
- <flag name="spell">Enable spell checking capabilities via enchant library</flag> |
| 98 |
-</use> |
| 99 |
+ <flag name="gucharmap">Enable gucharmap dictionary plugin</flag> |
| 100 |
+ <flag name="spell">Enable spell checking capabilities via enchant library</flag> |
| 101 |
+ </use> |
| 102 |
</pkgmetadata> |
Archives