Version bump to 2.2.3. Fixes bug#433123.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 117 insertions, 58 deletions

diff --git a/app-editors/bluefish/ChangeLog b/app-editors/bluefish/ChangeLog
index aa9ad61ccdd6..5638a8eb348d 100644
--- a/app-editors/bluefish/ChangeLog
+++ b/app-editors/bluefish/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/bluefish
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.88 2012/07/29 16:41:52 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.89 2013/02/10 11:47:38 scarabeus Exp $
+
+*bluefish-2.2.3 (10 Feb 2013)
+
+  10 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org> +bluefish-2.2.3.ebuild,
+  -bluefish-1.0.7.ebuild:
+  Version bump to 2.2.3. Fixes bug#433123.
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> bluefish-2.2.2.ebuild:
   alpha/ia64/sparc stable wrt #408189
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index a6bffa869f8a..b185f8ec5d58 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST bluefish-1.0.7.tar.bz2 1495619 SHA256 68cb74b993ad31a86083e8eed482b2f5b4d523806538ea9bc42bfa8b4c0a1110 SHA512 9fed20b0e216eece7127b29581fe90986288d8983632d3b7215e12d3f36e0eca7802b475fe4b9f8227f7393ecdb0190fd410704ccf220bd4477fcd48dede5738 WHIRLPOOL 8585685078d9f450a74c59c5867b6e3a3adeee0ca24165ce8ad18030b3a9ceabb14af18d58905c5127b7e3e0c5435c30c06f4990f9e454a92d99714d82cf6958
 DIST bluefish-2.2.2.tar.bz2 3548284 SHA256 1e9f171657cd7d34e31d7ff8608b10dded56dcb4831bc75d6ab75cd826f97b84 SHA512 da256577489796cc963757c2f97a7bdf1ed34bc240fc09e74e27f1ed009dcca4e46785d0359230edac0a87d677195f23c7af3ad92d0e90c2e2912c3600a41c73 WHIRLPOOL 097bc3238f7adc15f16c5b21ddee60dc1f7ce12e4bcc128be81cfafca68f121994458bc4ca88b91f9e5ae9fb7fc74494e137ae8c891619369d79bd12661accfe
-EBUILD bluefish-1.0.7.ebuild 1084 SHA256 99ef02fc22b2778fb09d16d3092b274bafdcac48b46af73d3d20a43f5f571a18 SHA512 414045318a5dff7b2becdaf3d9e2c56bc6bb415c5cffa07a7685291998388686b82d6d584014013fb92e1ba25ab873634da62dae45f18837283f158a7ea59f77 WHIRLPOOL 5d719bbc2dc3f0678e463c217c0d27f6aeed7c30577a097de3a89edfe7541a7eb4f6cb1a4fbcdcf9fb3cd46e8ef1a63a1929e5a2f74687634954bb1b8dddc1f2
+DIST bluefish-2.2.3.tar.bz2 3635489 SHA256 be284cd972d82b56a55f9b9588b3c0ff18702318822f45c7598c336de8a4d6ea SHA512 92fc251728a4fc0404b27c52f6d8f143158d6e6625001d645ffa18c4c8e18a83826ca399deb966a7cdc0bd145c3c21eac6c0fdba5a84dd90c388985aabfa8538 WHIRLPOOL a1cba1ea85b9f8cfcfb04a07d4f44dab52a8dcedeea8c319ec62878be4615d995987a4587eb27eab8eaed32547a2302ba768afdd6091bb744ac624b6f1b38040
 EBUILD bluefish-2.2.2.ebuild 2309 SHA256 6a9d4147376c3bf6d027ed7b1da5bc8c9ca19baf5a9d737f40e5c7d897a814ce SHA512 99d15b841734f8cd5b0b13a59c4a113f16b8f0ba266e28b130a990c50b24e458c65ce13898c635c43a59b99795c26d07bcec6bab09026466397cfab020ac7b9f WHIRLPOOL e1d91381005a1e0e55ab83c5f0db46109a3abd0b59fb69cb6dc14da706f563f7a03081ce37880a65a034ffcbff7ff0cca11b2b5042f2643a741c98bb870ff2c0
-MISC ChangeLog 11883 SHA256 238bda4a1c06c83248a39c6d75317e87f104d4008e2f4230ad7d2614abc728a9 SHA512 0fd3462c9c29e3916f5c5b5d471ab42f8673f057ac05467b2f55352e66282d17b0f84b67e6c91077dae73f9af59f6667943bad13192d61cf0dc4a09451dad7e5 WHIRLPOOL 5cd6041e304aeb33e5b721d8b92e7640ff5cf3c18a4dedabe0e7a0902ad738d7ffa25774b30a08b68852ff1e9d8427dd3331db458a117bba769aa8444805639c
+EBUILD bluefish-2.2.3.ebuild 2318 SHA256 f52395324c28e8266147490dd99da1bce6881fd7ac1bc47f18be762411290e0e SHA512 031394e39829da6efa33ed03b3cd73040fcea6e5e3561219988d87b186e6b7db4f0778e2619e49d3829cc604f403c5fc701af0e1236da7bf6b3c32e3204f08ce WHIRLPOOL 3e4f958dd5027689f4649a2870c6a1eeac3097d2a577c1c0a13d17037de75ff5e7550839462f43aa2f32d46f26d1879e80ebd838740d03166fb5c6fa6f35ea62
+MISC ChangeLog 12065 SHA256 5fcbbceb88fbf9557a97e77a977e7b9ad607aee3f8e1949377fa8533f2b66b9c SHA512 e1e3d27f09a1fc421df9b8d6c7280dc7b29430dab8bba7c52db9e7ea909dbc6e754ab219830f05a1dd03036d47ebedfc601f2c4f6f3d80c27d07683d6b47f512 WHIRLPOOL 84e3a2f914c6e32f4ee5f22708f945b880767d0dc5f52190c10008427b7da7d9c303d0618ccf5c5151725334f4c249b628bbed200493bdd1e559ad7794b4f08b
 MISC metadata.xml 197 SHA256 7fae28d9d438390f73cf96e12bbdd5349f06a2c91647216b715b3ab5d5f4ca53 SHA512 5417f61a298363c9b7fd1aeed97fe8e5384f142b1a8b2b8872eacb4ef985b98fb3a867beadce4837e7fff7e564bbd0dea143b2c6beb97eacda9d475b2d14c1f1 WHIRLPOOL cf9cd20bac564059ef97cc3bb0d6a2f922b7477749a9814768e896f7b6236739ba2755b5b1037ceafb6e2b164faebb119339b6f64537564cb57bac74cd31a892
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAVZ9cACgkQuQc30/atMkB5GwCguFZgO948s62Qxq3/XS5S4MX/
-QmcAn0O+/aKmJfYULKl2R8tsZ7AhehHf
-=TPlQ
+iQIcBAEBCAAGBQJRF4jmAAoJEOSiRoyO7jvo/voQAIhFFGmGCHE0U+xFzU0pVj3d
+Z8wNiFEUjGWCsdxZVcNmQYAiM9P4REVjnliBDcfeDtiAvuCZAFo8n4MCPpne/WqF
+kdE5f/nKvdF4KXjv9RDkGUHlgYTVNeRE6SAEzcK8DEspRnjGDc2bZ6eCHGXnChMW
+tEMRjqm2VotL+TM2eELdJi+JHj9SyONzsNurtHmChhlaILU28sT+R+UUEmlFOwYj
+F8yKaclrkzBim+UAxjLRb874SruyBH7hZcG7F8xrLfm6tZh6S8v6JRh2P0YAGyew
++U6VchHVaasFK2geJwTdFC0BWNZkY6WwcVmep61WCi3oE6lLMbX/TwrQ/gnKls2g
+xKcoh//32EyvjdIKf6plKyC6ujr9glQC6VL+YMwKMg/+dNyrHCOXtx2/pkMi5sTI
+iPAz2d2bmCwPTIWCkbt1nUUDQxGdE0msfJgDXQq585lXQEUYrXMCAhcXuGaeslGe
+ieGj2K9cz/xeR+DlRfyIJavA0ursjgIl3aKmE40gZndxliEm/lhayBGvnz05YEFP
+IJhi+r9gRwpLeNY210Cdy/HdxCni6H7i2HAuz6ccNgodzydGGT4KMFFOQylj+3AK
+2JPUIXbE+rcfgH5AbczSWbbOZzboiXcGbjT+Yk5q10pI2GqjSah7CMoIkH5wCZBU
+s0spCdfeeSU6zKJdRFZS
+=cQ8u
 -----END PGP SIGNATURE-----
diff --git a/app-editors/bluefish/bluefish-1.0.7.ebuild b/app-editors/bluefish/bluefish-1.0.7.ebuild
deleted file mode 100644
index dd3b15eb597c..000000000000
--- a/app-editors/bluefish/bluefish-1.0.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-1.0.7.ebuild,v 1.8 2012/05/03 18:33:02 jdhore Exp $
-
-EAPI=1
-inherit eutils fdo-mime
-
-IUSE="nls spell gnome"
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer."
-SRC_URI="http://www.bennewitz.com/bluefish/stable/source/${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}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	gnome? ( gnome-base/libgnomeui )"
-
-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 \
-		`use_enable nls` \
-		`use_with gnome libgnomeui` || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-editors/bluefish/bluefish-2.2.3.ebuild b/app-editors/bluefish/bluefish-2.2.3.ebuild
new file mode 100644
index 000000000000..f2eb2049ed6c
--- /dev/null
+++ b/app-editors/bluefish/bluefish-2.2.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.2.3.ebuild,v 1.1 2013/02/10 11:47:38 scarabeus Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+
+inherit 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="nls python spell"
+
+RDEPEND="
+	x11-libs/gtk+:3
+	gnome-extra/gucharmap:2.90
+	sys-libs/zlib
+	spell? ( app-text/enchant )"
+DEPEND="${RDEPEND}
+	>=dev-libs/glib-2.16:2
+	dev-libs/libxml2: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 python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+# Never eautoreconf this package as gettext breaks completely (no translations
+# even if it compiles afterwards)!
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-dependency-tracking \
+		--disable-update-databases \
+		--disable-xml-catalog-update \
+		$(use_enable nls) \
+		$(use_enable spell spell-check) \
+		$(use_enable python)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+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."
+}