From 6c920a1252b184911834aefd27b071c7c233e42b Mon Sep 17 00:00:00 2001 From: Daniel Pielmeier Date: Fri, 22 Jan 2010 23:57:51 +0000 Subject: Version bump. Fixes Bug #298146. Thanks to Jesús Guerrero for reporting. Remove old. Package-Manager: portage-2.1.6.13/cvs/Linux i686 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-editors/bluefish/ChangeLog | 12 +++- app-editors/bluefish/Manifest | 7 +- app-editors/bluefish/bluefish-1.3.7.ebuild | 72 ------------------- app-editors/bluefish/bluefish-2.0.0_rc1.ebuild | 80 ++++++++++++++++++++++ .../bluefish-2.0.0_rc1-gucharmap-automagic.patch | 60 ++++++++++++++++ 5 files changed, 154 insertions(+), 77 deletions(-) delete mode 100644 app-editors/bluefish/bluefish-1.3.7.ebuild create mode 100644 app-editors/bluefish/bluefish-2.0.0_rc1.ebuild create mode 100644 app-editors/bluefish/files/bluefish-2.0.0_rc1-gucharmap-automagic.patch (limited to 'app-editors/bluefish') diff --git a/app-editors/bluefish/ChangeLog b/app-editors/bluefish/ChangeLog index d8dfc6fbe812..0e8373d5b4bf 100644 --- a/app-editors/bluefish/ChangeLog +++ b/app-editors/bluefish/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-editors/bluefish -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.66 2009/11/17 18:49:57 billie Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.67 2010/01/22 23:57:50 billie Exp $ + +*bluefish-2.0.0_rc1 (22 Jan 2010) + + 22 Jan 2010; Daniel Pielmeier -bluefish-1.3.7.ebuild, + +bluefish-2.0.0_rc1.ebuild, + +files/bluefish-2.0.0_rc1-gucharmap-automagic.patch: + Version bump. Fixes Bug #298146. Thanks to Jesús Guerrero for reporting. + Remove old. *bluefish-1.3.8 (17 Nov 2009) diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest index 21f78e2cffec..5c9410f9778d 100644 --- a/app-editors/bluefish/Manifest +++ b/app-editors/bluefish/Manifest @@ -1,9 +1,10 @@ AUX bluefish-1.3.8-gucharmap-automagic.patch 1851 RMD160 d054e112b1c8f56e8a75954ec7bad15383cad8d3 SHA1 ad8409d297d7b01478cdd85f2257d60b088cd7ed SHA256 9e5f9136de8f94d72271f85af9db21e3f2ffa9632509615fa6143f1aef973d86 +AUX bluefish-2.0.0_rc1-gucharmap-automagic.patch 1851 RMD160 f153df7601b246ac3713ba405edde9c777c008e5 SHA1 9e5bf17258fa02dc5ae4ba6a1e5bdbd75060dcb4 SHA256 8aef6c347b2f1a92badd7549447fe172f85f3f17292e7956583cc0dc2e12fcdb DIST bluefish-1.0.7.tar.bz2 1495619 RMD160 7ce8a7c8873cd0ef84dd6486551976593544a8dc SHA1 c61d6271c49e9fa8c728724e6aadde33a227bdea SHA256 68cb74b993ad31a86083e8eed482b2f5b4d523806538ea9bc42bfa8b4c0a1110 -DIST bluefish-unstable-1.3.7.tar.bz2 2944754 RMD160 9bd69bbea98d1ff3aef193b9f2cf5b8c1d646263 SHA1 5f194db78b42abcd4cf24bab295d2ebc1a91b18c SHA256 fbeaa23d8520f07ed5f75a05f55d0647564fa4e8236e0303768d6003873e30a4 +DIST bluefish-2.0.0-rc1.tar.gz 4479387 RMD160 79885b3a987255001955b33f487757dfa2dc2fcf SHA1 a30bed03954590f74af7c121418addfb0af2c637 SHA256 9f249efd369a613909e7b35e924a8818966106bf84189e5d55f1a8c86d4ec57c DIST bluefish-unstable-1.3.8.tar.bz2 3054876 RMD160 c42ad8265ea1c2ab52cc60c3cb1c4007d842c191 SHA1 7d929ebe872e2475941304dc44076f0fbaf5f4eb SHA256 5378f42f5f43f400e04522f4f314a5a828bf190fdf34668faf974fe39c29ce68 EBUILD bluefish-1.0.7.ebuild 1080 RMD160 0e179f1289cf5696c01bbf7d94b5969c4682faa2 SHA1 d76f1e627afdea06f5a9ad8106cfa1695d6d5a6d SHA256 de9198b983f79e77e065ad6375807b0c8858266a1264d916c5c117e2b109d3b7 -EBUILD bluefish-1.3.7.ebuild 1947 RMD160 ddc3028bf422c33b9ac84c0d7822264e1fbfea38 SHA1 ee1daad6905e1d0ef3200c92e0638353164e7d71 SHA256 cf8d9d5afe1ddd20bd911e9735521016fd8a4e4a312690ec7315ab67056a6ffe EBUILD bluefish-1.3.8.ebuild 2189 RMD160 c9d3ca0d2ed343349bcfa29a83abf49d1d6ffe99 SHA1 0f8a4dc180e62301516f381d114f5f3db3199bf9 SHA256 fc30931e3828bf0d8a6e71f1d97327b884b689660cbca48476acbaf0cd5e711c -MISC ChangeLog 8279 RMD160 6132facdafdc3f6f0eb5115731c92ef18efd1a30 SHA1 48af4591d088824d83bf5a47b63466265c1b661e SHA256 89652256f5e68db90133146438b94f8df89ffb5f716bf676eb3a3953d3a6f36f +EBUILD bluefish-2.0.0_rc1.ebuild 2154 RMD160 ec76e1f0a236dafb63d23561989f7c059ab027bc SHA1 eb9a3863d3e1c9c766cb618b8403a44645f92f17 SHA256 b12173ea0bfe135d7b39e0f05a1f38ff26f25e9a0aca48acde549da1990457d4 +MISC ChangeLog 8566 RMD160 dd2218cf6aafd64140470591465103fd8a13dcd1 SHA1 5684a596d132ceda6cb299bb84d7ac41e4dd6a92 SHA256 5137fffb55dcca3d7b5f621f00166c42fdc4d24e6ca55a2944683e43215eafe9 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669 diff --git a/app-editors/bluefish/bluefish-1.3.7.ebuild b/app-editors/bluefish/bluefish-1.3.7.ebuild deleted file mode 100644 index 2c8923595b34..000000000000 --- a/app-editors/bluefish/bluefish-1.3.7.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-1.3.7.ebuild,v 1.1 2009/09/23 12:31:43 scarabeus Exp $ - -EAPI="2" - -inherit eutils fdo-mime - -IUSE="nls spell gnome python" - -MY_P="${PN}-unstable-${PV}" - -DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer." -SRC_URI="http://www.bennewitz.com/bluefish/devel/source/${MY_P}.tar.bz2" -HOMEPAGE="http://bluefish.openoffice.nl/" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -SLOT="0" - -RDEPEND=" - dev-libs/libpcre - x11-libs/gtk+:2 - spell? ( app-text/enchant[aspell] )" - -DEPEND="${RDEPEND} - dev-libs/glib:2 - dev-libs/libxml2 - dev-util/pkgconfig - x11-libs/pango - gnome? ( gnome-extra/gucharmap ) - nls? ( sys-devel/gettext dev-util/intltool ) - python? ( dev-lang/python )" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - econf \ - --disable-dependency-tracking \ - --disable-update-databases \ - --disable-xml-catalog-update \ - $(use_enable nls) \ - $(use_enable spell spell-check) \ - $(use_enable python) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_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() { - 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.0.0_rc1.ebuild b/app-editors/bluefish/bluefish-2.0.0_rc1.ebuild new file mode 100644 index 000000000000..d4af5679dd9e --- /dev/null +++ b/app-editors/bluefish/bluefish-2.0.0_rc1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.0.0_rc1.ebuild,v 1.1 2010/01/22 23:57:50 billie Exp $ + +EAPI=2 + +inherit autotools eutils fdo-mime + +IUSE="nls spell gnome python" + +MY_P=${P/_/-} + +DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer." +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +HOMEPAGE="http://bluefish.openoffice.nl/" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +SLOT="0" + +RDEPEND=" + dev-libs/libpcre + x11-libs/gtk+:2 + spell? ( app-text/enchant[aspell] )" + +DEPEND="${RDEPEND} + dev-libs/glib:2 + dev-libs/libxml2 + dev-util/pkgconfig + x11-libs/pango + gnome? ( gnome-extra/gucharmap ) + nls? ( sys-devel/gettext dev-util/intltool ) + python? ( dev-lang/python )" + +S=${WORKDIR}/${MY_P} + +src_prepare () { + # Fixes automagic installation of charmap plugin + # Upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=570990 + epatch "${FILESDIR}"/${P}-gucharmap-automagic.patch + eautoreconf +} + +src_configure() { + econf \ + --disable-dependency-tracking \ + --disable-update-databases \ + --disable-xml-catalog-update \ + $(use_enable nls) \ + $(use_enable spell spell-check) \ + $(use_enable gnome charmap) \ + $(use_enable python) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_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() { + 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/files/bluefish-2.0.0_rc1-gucharmap-automagic.patch b/app-editors/bluefish/files/bluefish-2.0.0_rc1-gucharmap-automagic.patch new file mode 100644 index 000000000000..d6097c6d6e00 --- /dev/null +++ b/app-editors/bluefish/files/bluefish-2.0.0_rc1-gucharmap-automagic.patch @@ -0,0 +1,60 @@ +--- configure.ac.old 2009-12-17 03:11:30.000000000 +0100 ++++ configure.ac 2010-01-23 00:16:11.000000000 +0100 +@@ -421,29 +421,38 @@ + + PKG_CHECK_MODULES([BLUEFISH_REQUIRED], [$BF_dependencies]) + +-# optionally build the charmap plugin if gucharmap is available +-PKG_CHECK_MODULES( +- [CHARMAP_PLUGIN], +- [gucharmap-2], +- [ +- build_charmap_plugin=yes +- AC_DEFINE([HAVE_LIBGUCHARMAP_2], [1], [Define to 1 if you have the `gucharmap-2' library (-lgucharmap).]) +- ], +- [PKG_CHECK_MODULES( ++# build the charmap plugin ++ ++AC_ARG_ENABLE( ++ [charmap], ++ AC_HELP_STRING( ++ [--enable-charmap], ++ [enable (or disable) the charmap plugin needs gucharmap @<:@default=no@:>@] ++ ) ++) ++ ++if test "x$enable_charmap" != "xno"; then ++ PKG_CHECK_MODULES( + [CHARMAP_PLUGIN], +- [gucharmap >= 2.20], ++ [gucharmap-2], + [ + build_charmap_plugin=yes +- AC_DEFINE([HAVE_LIBGUCHARMAP], [1], [Define to 1 if you have the `gucharmap' library (-lgucharmap).]) ++ AC_DEFINE([HAVE_LIBGUCHARMAP_2], [1], [Define to 1 if you have the `gucharmap-2' library (-lgucharmap).]) + ], +- [ +- build_charmap_plugin=no +- AC_MSG_WARN([Disabling the building of the charmap plugin.]) +- AC_MSG_WARN([Install gucharmap/gucharmap2 (>= 2.20) library/headers to build the plugin.]) +- ] +- )] +-) +-AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xyes"]) ++ [PKG_CHECK_MODULES( ++ [CHARMAP_PLUGIN], ++ [gucharmap >= 2.20], ++ [ ++ build_charmap_plugin=yes ++ AC_DEFINE([HAVE_LIBGUCHARMAP], [1], [Define to 1 if you have the `gucharmap' library (-lgucharmap).]) ++ ], ++ )] ++ ) ++ AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xyes"]) ++else ++ AM_CONDITIONAL([ENABLE_CHARMAP_PLUGIN], [test "x$build_charmap_plugin" = "xno"]) ++ AC_MSG_NOTICE([Disable building charmap plugin.]) ++fi + + AC_SEARCH_LIBS([nanosleep], [posix4 rt]) + -- cgit v1.2.3-65-gdbad