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

(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

4 files changed, 14 insertions, 183 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/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() {