From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- app-editors/bluefish/Manifest | 6 +- app-editors/bluefish/bluefish-2.2.10.ebuild | 105 ---------------------------- app-editors/bluefish/bluefish-2.2.12.ebuild | 29 +++----- app-editors/bluefish/metadata.xml | 9 ++- 4 files changed, 15 insertions(+), 134 deletions(-) delete mode 100644 app-editors/bluefish/bluefish-2.2.10.ebuild (limited to 'app-editors/bluefish') diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest index 579c7b038c02..f4e4cf29ee36 100644 --- a/app-editors/bluefish/Manifest +++ b/app-editors/bluefish/Manifest @@ -1,6 +1,4 @@ AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889 -DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5970c72584b683779f5bcaf921a8925c6275c647125f73990e99a0175e3c92c0cc286590fbd08e938c6fd1d8c32cef SHA512 ddfad4c595d371dfd7ca5551c1771c2d82dbffcc90acda31bbd2a048730e24e2d1e37fbe847e5005d96acefdf5f38cb93785d23817e59624ecd7ea10bfbc3aeb DIST bluefish-2.2.12.tar.bz2 4180228 BLAKE2B 9e05a4618c37951da6a669e9bd4e0dd7e9993ea764dd467f875039b28cdc6d71ae70d1a87df7f0c63f850ebbff6ceeb8550d1d036bab32b7435f362d5b137147 SHA512 f0eb6496d371db8a9b4aee33ddf67e5e87bcc86ff283704cac115be7f00609b1ccbd47ff2d8f8b0bc30f234a339069cc1f7cb1f8809d97f94f0b0e09e4f16754 -EBUILD bluefish-2.2.10.ebuild 2556 BLAKE2B 910fea9618911f35362e3162fb4c16e1eea08c954898500bf30256b49c194513aef6185b506d91fa1996b795d9dbfc96a4b14411ab677c364c4bf3bf176a6598 SHA512 e84bd7bc879ec41696fceb944a525d8d6b7ffbe0a339f1c6da3c20cd96bbfa551a832800095d794a4c0837aeeb359371db6d7698de01130459be375dd855eb04 -EBUILD bluefish-2.2.12.ebuild 2621 BLAKE2B b966f08b414d5ff14b122bfb523148eac36a2fd013a4a410d36b732c3b1f432e00d6b03774b2e40036faaff94154495d813dccf52a9012eb43274d5e9d608651 SHA512 50b04c1ed5b327949ab31fe2663ecc57d6f01fd2ab766086169466f0a49f25a25f07ae2584d060442485ba60f00939937feba59454fd469b0c6da5da506bf137 -MISC metadata.xml 386 BLAKE2B d8663af89654394ea695c309c2ebbf2d3beba02463b2e57a0f91d7699af0e6457fa0ef0aa238f76359d3531bf4831475978fdd8ab4eb943dccc295e294b2eb4d SHA512 589c6c5db0ad2b93d2b44284faa19845b48e790252ecf5983fb3ba2c2b749894a382eea6dffe053413c0b29b86063a8906b88ae6f165b1cc9fc79742ae2fc188 +EBUILD bluefish-2.2.12.ebuild 2375 BLAKE2B 4286418c0d2eaeae6c0e29f716106ffbb7a4278ce442acc7d901d6bcd48689ebe6ce8a94c246cf469645604b42ae8c71d22cd0b2fe4cd937c64ebcffdafb7d98 SHA512 ef0f87314fccc6edeff188d58d88128847f95b3e859c149106cf7179d16a32e13e6cf67421976601595fe6d02904f2324c217c1fbfa2627808e4aa93f20be4a0 +MISC metadata.xml 332 BLAKE2B a13f903b297465140112ca70818c0e4f42c4a1ea65f4bf2366cac8aa45634e6a1be5469d247811991b1a058feb0a170fd29e717d7267329522efdf9a8027678c SHA512 15c42425322a7fd4c8f6ccc253d36010d51d140fe005e3e0c2b6c1baa8d3b239758333eb337c4031efff501a89b5243c060d616af1f2b56a6f6e3ffe09c2d4e3 diff --git a/app-editors/bluefish/bluefish-2.2.10.ebuild b/app-editors/bluefish/bluefish-2.2.10.ebuild deleted file mode 100644 index 324637670ba0..000000000000 --- a/app-editors/bluefish/bluefish-2.2.10.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools gnome2-utils xdg-utils - -MY_P=${P/_/-} - -DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer" -SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2" -HOMEPAGE="http://bluefish.openoffice.nl/" - -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86" -SLOT="0" -IUSE="+gtk3 gucharmap nls spell" - -RDEPEND=" - sys-libs/zlib - !gtk3? ( x11-libs/gtk+:2 ) - gtk3? ( - x11-libs/gtk+:3 - gucharmap? ( gnome-extra/gucharmap:2.90 ) - ) - spell? ( >=app-text/enchant-1.4:0 )" -DEPEND="${RDEPEND} - dev-libs/libxml2:2 - >=dev-libs/glib-2.24:2 - virtual/pkgconfig - x11-libs/pango - nls? ( - sys-devel/gettext - dev-util/intltool - )" - -S="${WORKDIR}/${MY_P}" - -# there actually is just some broken manpage checkup -> not bother -RESTRICT="test" - -pkg_setup() { - if ! use gtk3 && use gucharmap ; then - ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled." - ewarn "Disabling charmap plugin." - fi -} - -PATCHES=( - "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" -) - -# eautoreconf seems to no longer kill translation files. -src_prepare() { - default - eautoreconf - sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile" -} - -src_configure() { - econf \ - --disable-update-databases \ - --disable-xml-catalog-update \ - $(use_with !gtk3 gtk2) \ - $(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \ - $(use_enable nls) \ - $(use_enable spell spell-check) \ - --disable-python -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - - einfo "Adding XML catalog entries..." - /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 \ - || ewarn "Failed to add XML catalog entries." -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - einfo "Removing XML catalog entries..." - /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 \ - || ewarn "Failed to remove XML catalog entries." -} diff --git a/app-editors/bluefish/bluefish-2.2.12.ebuild b/app-editors/bluefish/bluefish-2.2.12.ebuild index 9b1dfeae212d..625cc993be5c 100644 --- a/app-editors/bluefish/bluefish-2.2.12.ebuild +++ b/app-editors/bluefish/bluefish-2.2.12.ebuild @@ -1,31 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -inherit autotools python-single-r1 xdg - MY_P=${P/_/-} +inherit autotools python-single-r1 xdg DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer" HOMEPAGE="http://bluefish.openoffice.nl/" SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86" SLOT="0" -IUSE="+gtk3 gucharmap nls python spell" +IUSE="gucharmap nls python spell" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" sys-libs/zlib - !gtk3? ( x11-libs/gtk+:2 ) - gtk3? ( - x11-libs/gtk+:3 - gucharmap? ( gnome-extra/gucharmap:2.90 ) - ) + x11-libs/gtk+:3 + gucharmap? ( gnome-extra/gucharmap:2.90 ) python? ( ${PYTHON_DEPS} ) spell? ( >=app-text/enchant-1.4:0 )" DEPEND="${RDEPEND} @@ -44,17 +40,10 @@ S="${WORKDIR}/${MY_P}" RESTRICT="test" pkg_setup() { - if ! use gtk3 && use gucharmap ; then - ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled." - ewarn "Disabling charmap plugin." - fi - use python && python-single-r1_pkg_setup } -PATCHES=( - "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" -) +PATCHES=( "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" ) # eautoreconf seems to no longer kill translation files. src_prepare() { @@ -68,8 +57,8 @@ src_configure() { --disable-update-databases \ --disable-xml-catalog-update \ --with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \ - $(use_with !gtk3 gtk2) \ - $(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \ + --without-gtk2 \ + $(use_with gucharmap charmap) \ $(use_enable nls) \ $(use_enable spell spell-check) \ $(use_enable python) diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml index 52c7b2542143..56419257845e 100644 --- a/app-editors/bluefish/metadata.xml +++ b/app-editors/bluefish/metadata.xml @@ -1,10 +1,9 @@ - + - Enable GTK3 interface (default) - Enable gucharmap dictionary plugin - Enable spell checking capabilities via enchant library - + Enable gucharmap dictionary plugin + Enable spell checking capabilities via enchant library + -- cgit v1.2.3