Version bump. Remove old. Per bug #262212 and #282893.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

5 files changed, 33 insertions, 140 deletions

diff --git a/app-editors/bluefish/ChangeLog b/app-editors/bluefish/ChangeLog
index 2cdd742d21a6..28a5f8b1f8db 100644
--- a/app-editors/bluefish/ChangeLog
+++ b/app-editors/bluefish/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/bluefish
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.62 2009/02/22 11:42:01 hanno Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.63 2009/08/28 08:53:46 scarabeus Exp $
+
+*bluefish-1.3.6 (28 Aug 2009)
+
+  28 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> -bluefish-1.0.ebuild,
+  -bluefish-1.1.6.ebuild, -bluefish-1.3.2.ebuild, +bluefish-1.3.6.ebuild:
+  Version bump. Remove old. Per bug #262212 and #282893.
 
 *bluefish-1.3.2 (22 Feb 2009)
 
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 8dea28a688f5..ca53c873df93 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -2,19 +2,15 @@
 Hash: SHA1
 
 DIST bluefish-1.0.7.tar.bz2 1495619 RMD160 7ce8a7c8873cd0ef84dd6486551976593544a8dc SHA1 c61d6271c49e9fa8c728724e6aadde33a227bdea SHA256 68cb74b993ad31a86083e8eed482b2f5b4d523806538ea9bc42bfa8b4c0a1110
-DIST bluefish-1.0.tar.bz2 1372325 RMD160 e80bc6b7d8871870dee1b253b4046ec3654edf1a SHA1 eebbe96b57fdafa5cbd4d6947e95e9b8501cc2a7 SHA256 15c1407d783d422136702fcc828f672ffbe75d94b7a3614330ad24b5cb7a3943
-DIST bluefish-unstable-1.1.6.tar.bz2 2698543 RMD160 d41aeef4fab7b4c7086f708c40a0ebb66007e4c3 SHA1 055507ec3c1d21febf5c2ec260c023668f5b5961 SHA256 e887656b276d5dba811ed5e1eaf25b08c7cbb1d66e6f80d88adbc3a8aeb3eaee
-DIST bluefish-unstable-1.3.2.tar.bz2 2757669 RMD160 01bdf972bd337b575e0254ed5d2ec32c9d88b27a SHA1 f8ee9282f11da84bfa53650e3dce4848bd4faa19 SHA256 c0da856865e83c4f5ee2732e2e7205f9a5202fe4ba484a058361c1bd60c16464
+DIST bluefish-unstable-1.3.6.tar.bz2 2949996 RMD160 8164a6f8bedcf18f753f3687e0c6d2825302e7c3 SHA1 0f184bc5113e808ad999d8c22d7d88468e7705f5 SHA256 e66e09a9105c033aba50d31b6669567177b34bf02ded9f0b60f2b8c7151063b8
 EBUILD bluefish-1.0.7.ebuild 1080 RMD160 0e179f1289cf5696c01bbf7d94b5969c4682faa2 SHA1 d76f1e627afdea06f5a9ad8106cfa1695d6d5a6d SHA256 de9198b983f79e77e065ad6375807b0c8858266a1264d916c5c117e2b109d3b7
-EBUILD bluefish-1.0.ebuild 891 RMD160 91093142141d07388748ae46215eaf3b0531aac3 SHA1 e715621f049096db6971f6eddac0aa9b933a4f76 SHA256 870d969d329eedbdb981a64a2009380996523a051d661b260f65a5ca87e42a9f
-EBUILD bluefish-1.1.6.ebuild 1980 RMD160 bbc4971aa0d3d3f41d82ee99cf424dbd0c99c956 SHA1 c4b5a696ff393ee85d13d15fbe9f3bdd6e052b49 SHA256 711d4e2edd4bc34c697a4fa658e6def4aad26121140a7aff2abac56ad98e2d53
-EBUILD bluefish-1.3.2.ebuild 1887 RMD160 54df1367529c495a9d96a4bf82e56d402457dd5d SHA1 b29d53856f4046079bd07504de324c5fbf0c0eba SHA256 4c9b88e1d595caef299d33a39969f63db7eea7c8908e4632ca0db4921383f6cf
-MISC ChangeLog 7473 RMD160 4c2a51be5454e77f56386bf05333980d2e33230f SHA1 26baddb75c196086a535762f7552b46613b3438e SHA256 bb640edcc92f6b76843acee075ba2d25e821d0dda0b9c63a73f5049f4faa5249
+EBUILD bluefish-1.3.6.ebuild 1973 RMD160 0a54c875fcf23288bc2a0b80afbd75996f4962a0 SHA1 2514b46305a2988ffbae146ddfe5bc7285e7f0c2 SHA256 45b589c221444f3e23969df00a66f93569e31f7fe72619e07ce014f329ff32fe
+MISC ChangeLog 7717 RMD160 6f70c47bbc6ae42976f04b993b41428a1b628f35 SHA1 1b898f8de3d87bbc9cf6ce5c4180e6e10b81837f SHA256 bceb2ba05050e50ad07673e6a2bc6d816d0d0e95dcc919ac7a60125b02d6944e
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmhOg4ACgkQr2QksT29OyB/TwCeOuS3dArDVJHIErbqhldiRf9H
-QH8An010cqjFmGhhpmbpXRX6gtSwlNjc
-=b+zk
+iEYEARECAAYFAkqXmyIACgkQHB6c3gNBRYdqWwCfXsLqulX8zEeimlQ+covv2V+y
+VmkAoLmymPgXOuUhOtcWcWAi/5U/vd6F
+=I/O4
 -----END PGP SIGNATURE-----
diff --git a/app-editors/bluefish/bluefish-1.0.ebuild b/app-editors/bluefish/bluefish-1.0.ebuild
deleted file mode 100644
index 09a0e4d56088..000000000000
--- a/app-editors/bluefish/bluefish-1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-1.0.ebuild,v 1.10 2008/03/30 22:15:26 hanno Exp $
-
-inherit eutils fdo-mime
-
-IUSE="nls spell"
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer."
-SRC_URI="http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/${P}.tar.bz2"
-HOMEPAGE="http://bluefish.openoffice.nl/"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2
-	dev-libs/libpcre
-	spell? ( app-text/aspell )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	econf --disable-update-databases \
-	       `use_enable nls` || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
-	update-mime-database /usr/share/mime
-}
diff --git a/app-editors/bluefish/bluefish-1.1.6.ebuild b/app-editors/bluefish/bluefish-1.1.6.ebuild
deleted file mode 100644
index 6b8e14c4ddf8..000000000000
--- a/app-editors/bluefish/bluefish-1.1.6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-1.1.6.ebuild,v 1.1 2008/10/26 19:35:09 hanno Exp $
-
-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=">=x11-libs/gtk+-2
-	dev-libs/libpcre
-	spell? ( app-text/aspell )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-libs/glib-2
-	x11-libs/pango
-	gnome-base/gnome-vfs
-	dev-libs/libxml2
-	nls? ( sys-devel/gettext )
-	gnome? ( gnome-base/libgnomeui )
-	python? ( dev-lang/python )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e 's/-s -m 755/-m 755/g' src/Makefile.in
-}
-
-src_compile() {
-	econf --disable-update-databases \
-		--disable-xml-catalog-update \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable gnome libgnomeui) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-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-1.3.2.ebuild b/app-editors/bluefish/bluefish-1.3.6.ebuild
index 75468c33d1ff..751034b8a005 100644
--- a/app-editors/bluefish/bluefish-1.3.2.ebuild
+++ b/app-editors/bluefish/bluefish-1.3.6.ebuild
@@ -1,6 +1,8 @@
 # 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.2.ebuild,v 1.1 2009/02/22 11:42:01 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-1.3.6.ebuild,v 1.1 2009/08/28 08:53:46 scarabeus Exp $
+
+EAPI="2"
 
 inherit eutils fdo-mime
 
@@ -16,33 +18,35 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
-RDEPEND=">=x11-libs/gtk+-2
+RDEPEND="
 	dev-libs/libpcre
-	spell? ( app-text/aspell )"
+	x11-libs/gtk+:2
+	spell? ( app-text/enchant[aspell] )"
 
 DEPEND="${RDEPEND}
+	app-text/enchant[aspell]
+	dev-libs/glib:2
+	dev-libs/libxml2
 	dev-util/pkgconfig
-	>=dev-libs/glib-2
 	x11-libs/pango
-	gnome-base/gnome-vfs
-	dev-libs/libxml2
-	nls? ( sys-devel/gettext )
-	gnome? ( gnome-base/libgnomeui )
+	gnome? ( gnome-extra/gucharmap )
+	nls? ( sys-devel/gettext dev-util/intltool )
 	python? ( dev-lang/python )"
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
-	econf --disable-update-databases \
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-update-databases \
 		--disable-xml-catalog-update \
 		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable gnome libgnomeui) || die
-	emake || die
+		$(use_enable spell spell-check) \
+		$(use_enable python)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 }
 
 pkg_postinst() {