Version bump to 2.0.3. Drop older overshadowed versions. Fixes bug #359127.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

5 files changed, 21 insertions, 194 deletions

diff --git a/app-editors/bluefish/ChangeLog b/app-editors/bluefish/ChangeLog
index e8b12a426ba2..1d5166ea396f 100644
--- a/app-editors/bluefish/ChangeLog
+++ b/app-editors/bluefish/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/bluefish
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.76 2011/03/29 12:10:55 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.77 2011/06/05 09:33:51 scarabeus Exp $
+
+*bluefish-2.0.3 (05 Jun 2011)
+
+  05 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -bluefish-2.0.0.ebuild,
+  -bluefish-2.0.1.ebuild, -bluefish-2.0.2.ebuild, +bluefish-2.0.3.ebuild:
+  Version bump to 2.0.3. Drop older overshadowed versions. Fixes bug #359127.
 
   29 Mar 2011; Christoph Mende <angelos@gentoo.org> bluefish-1.0.7.ebuild:
   Fixed slot deps
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 6ad752f83198..13f860743380 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX bluefish-2.0.0-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-2.0.0.tar.bz2 3287346 RMD160 6ec7ea007784fedd53cd5c604aa2c8e397717a1d SHA1 b92d79291f262d1bb01337f055ad16093cf4905b SHA256 c0e41ba6a7d78392e5c62cf79744078f435d5e4188c58c406495c503871c916e
-DIST bluefish-2.0.1.tar.bz2 3282350 RMD160 86d0aa91faf0dbeef2d15d258005513defd746c2 SHA1 5e00afd98cc65b41140188525031bba39c196e91 SHA256 0036ea859a510950cec2601c7fa21b2acbeba3f6086c41e162f2e1b15ae7a503
-DIST bluefish-2.0.2.tar.bz2 3365789 RMD160 f44e9a95d563aa607d49305fadcc0031e8512700 SHA1 4483b4f011d2f227fd0235512330162447a68201 SHA256 6cd3023ee21226bd2095f12172337abcdde85f613d3db01c443ae16fbaaeb056
+DIST bluefish-2.0.3.tar.bz2 3477615 RMD160 0a82d8973b201014bcc03fbe09896472bfcdf3c1 SHA1 ab6b16d50faca169c25001d5a26ca8b84ddb1019 SHA256 d6637cc6bf4863f1eeff7504ebeb143f31fbe239b2f2d1f32e7487e141541ffe
 EBUILD bluefish-1.0.7.ebuild 1086 RMD160 c9da51d0e8bd8ef9f58f3dca86b7e59738569c9a SHA1 7fd4ccad5fa3ef8fb496cc30a17d086712e690ee SHA256 42ed735538ed7077b7a6789ab8125b7a543dab55be0fbe991c85040ed02efc29
-EBUILD bluefish-2.0.0.ebuild 2211 RMD160 bf2e0bafc214e9213e169368a1d17ca23ecaa199 SHA1 87317c7854280b02a77c05fb59e130f6923305d8 SHA256 979380a32b4d75c50570c53582c04ae2ec775a07f5bc6b4e517f726d3cf4b495
-EBUILD bluefish-2.0.1.ebuild 2492 RMD160 73f333699ec2d572e5d79bb2a68d5657c3de5739 SHA1 556fdcaa0a0f233a70ae808544cf88eeb6ad605c SHA256 d5c0c229f70244d0f28fd7855fa567b90970abb0d06e19fa2915598edcdca544
-EBUILD bluefish-2.0.2.ebuild 2493 RMD160 ca11c9371ac375378ba3186130862039e3f751c2 SHA1 8664d2a8b623c9637910251615e1268d1b95fb29 SHA256 dcc7331c4e32033150bf3e7395df9a62745971d0d93e82834a54efe56a48642a
-MISC ChangeLog 9984 RMD160 c613008e501ce8267d855d0cd0f921189825a707 SHA1 0bc942f979e2ac857d7d96003d8d3009f51e2314 SHA256 5f8897f7662e2d2d7aca083f7ce0ef7431c3daf3ae743f2ee6683dee8678d0d6
+EBUILD bluefish-2.0.3.ebuild 2557 RMD160 8d39cd2c011ca5184e688b00e2848665b17d43ee SHA1 62a009c041a5d8fc84fecff9adc4ad7e37f4b7a1 SHA256 6a9e2475c532df997f62c5f83f50a8304e5a41dc4ded3b7740b8d775c02beac4
+MISC ChangeLog 10249 RMD160 b5aaec17d6fcbf3fe35da91092313ac2a3d5f0c5 SHA1 f39290a51b710fe6521b20cf52fe0b681502a9a8 SHA256 33543fb1ef1c80a588669280e8c11a4e6ce02f2fcd7316f43630dd9a7d6f352d
 MISC metadata.xml 301 RMD160 010d22a5d88b8d2cd8a9c369fb92fb2a49658fa9 SHA1 1bcc1537dc4b498e06b02ff51e46ec9b8d34292d SHA256 051132afb420b1381f42d67a58b894696124a93bf88dbf9023459a3a6be4d84d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2RzFUACgkQmWq1bYTyC0M2agEAj2cl8heioJskmizZC9q9tLPN
-fEFo19rSMzRXz/x9pGcA/24NDzps2wvro7H3DavrZVGPwX/zx/wQbHTY16TVbwCw
-=45FD
+iEYEARECAAYFAk3rTYQACgkQHB6c3gNBRYe4XQCfdbZj8ra3ePyG8PrownZpGBgk
+cAQAn13XDABwbbqCpxzQzQJIcT8wFKKg
+=PMJw
 -----END PGP SIGNATURE-----
diff --git a/app-editors/bluefish/bluefish-2.0.0.ebuild b/app-editors/bluefish/bluefish-2.0.0.ebuild
deleted file mode 100644
index 0b8d170e3fd0..000000000000
--- a/app-editors/bluefish/bluefish-2.0.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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.ebuild,v 1.1 2010/02/15 18:46:45 billie Exp $
-
-EAPI=2
-
-inherit autotools eutils fdo-mime
-
-IUSE="gucharmap nls python spell"
-
-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"
-
-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
-	gucharmap? ( 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 \
-		--enable-splash-screen \
-		$(use_enable nls) \
-		$(use_enable spell spell-check) \
-		$(use_enable gucharmap 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/bluefish-2.0.1.ebuild b/app-editors/bluefish/bluefish-2.0.1.ebuild
deleted file mode 100644
index 6ddd141ed3f8..000000000000
--- a/app-editors/bluefish/bluefish-2.0.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.1.ebuild,v 1.3 2010/08/03 23:09:25 hanno Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="python? 2"
-
-inherit autotools eutils fdo-mime python
-
-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="gucharmap nls python spell"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	spell? ( app-text/enchant[aspell] )"
-
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-util/pkgconfig
-	x11-libs/pango
-	gucharmap? ( gnome-extra/gucharmap )
-	nls? ( sys-devel/gettext dev-util/intltool )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use python ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare () {
-	if use nls ; then
-		intltoolize --copy --force || die "intltoolize failed"
-		for po_dir in src/plugin_*/po ; do
-			cp po/Makefile.in.in ${po_dir}
-		done
-	fi
-
-	# Fixes automagic installation of charmap plugin
-	# Upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=570990
-	epatch "${FILESDIR}"/${PN}-2.0.0-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 gucharmap 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() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_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.0.2.ebuild b/app-editors/bluefish/bluefish-2.0.3.ebuild
index 999c0a2084ae..af33f26e651f 100644
--- a/app-editors/bluefish/bluefish-2.0.2.ebuild
+++ b/app-editors/bluefish/bluefish-2.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.0.2.ebuild,v 1.1 2010/11/30 03:38:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.0.3.ebuild,v 1.1 2011/06/05 09:33:51 scarabeus Exp $
 
-EAPI=2
+EAPI=3
 
 PYTHON_DEPEND="python? 2"
 
@@ -20,12 +20,12 @@ SLOT="0"
 IUSE="gucharmap nls python spell"
 
 RDEPEND="
-	x11-libs/gtk+:2
+	>=x11-libs/gtk+-2.12:2
 	spell? ( app-text/enchant )"
 
 DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	dev-libs/libxml2
+	>=dev-libs/glib-2.16:2
+	dev-libs/libxml2:2
 	dev-util/pkgconfig
 	x11-libs/pango
 	gucharmap? ( gnome-extra/gucharmap )
@@ -66,6 +66,7 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
 pkg_postinst() {