Version bump to the latest. Solve issues with non-working translations. Fixes bugs #362035 #370309 and #392295.

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

5 files changed, 48 insertions, 94 deletions

diff --git a/app-editors/bluefish/ChangeLog b/app-editors/bluefish/ChangeLog
index 1d5166ea396f..4312cb6aef1c 100644
--- a/app-editors/bluefish/ChangeLog
+++ b/app-editors/bluefish/ChangeLog
@@ -1,6 +1,14 @@
 # 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.77 2011/06/05 09:33:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/ChangeLog,v 1.78 2011/12/30 13:44:14 scarabeus Exp $
+
+*bluefish-2.2.1 (30 Dec 2011)
+
+  30 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/bluefish-2.0.0-gucharmap-automagic.patch, -bluefish-2.0.3.ebuild,
+  +bluefish-2.2.1.ebuild, metadata.xml:
+  Version bump to the latest. Solve issues with non-working translations. Fixes
+  bugs #362035 #370309 and #392295.
 
 *bluefish-2.0.3 (05 Jun 2011)
 
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 52b2cdd8fc49..1422b0f03cfe 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,19 +1,26 @@
 -----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.3.tar.bz2 3477615 RMD160 0a82d8973b201014bcc03fbe09896472bfcdf3c1 SHA1 ab6b16d50faca169c25001d5a26ca8b84ddb1019 SHA256 d6637cc6bf4863f1eeff7504ebeb143f31fbe239b2f2d1f32e7487e141541ffe
+DIST bluefish-2.2.1.tar.bz2 3501247 RMD160 75626423216cdd9bb621f3063baba278ce3bbd76 SHA1 f7b2e9915e196c971c6bcca04d8d6b87efab1ae6 SHA256 4366133f3ff6b9c51943b1498188262b94a3fe2d4cf9118b6b42aac599634921
 EBUILD bluefish-1.0.7.ebuild 1086 RMD160 c9da51d0e8bd8ef9f58f3dca86b7e59738569c9a SHA1 7fd4ccad5fa3ef8fb496cc30a17d086712e690ee SHA256 42ed735538ed7077b7a6789ab8125b7a543dab55be0fbe991c85040ed02efc29
-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 279 RMD160 0669c42453caf9cc1ad64d66ece23886cace62c2 SHA1 17177f82981fba3d71a85e5712b7aa32c7b41362 SHA256 aea1b7f4ca0be9101ab0f7a32dc52ad000a3c0372cd716eee71a5095f12a75ca
+EBUILD bluefish-2.2.1.ebuild 2340 RMD160 13d4841b93889848e4df3f9bbbcedf67abbd158b SHA1 e5253ee62bd7f1ea59e1ddd77bc3b180f2df5c45 SHA256 3f1ebcd54e7e7918f4422c974bc83456e331a18440dfda1290c9f4623c51d3a3
+MISC ChangeLog 10567 RMD160 333ee8d501fb22ce4a1affc4b7544eb5a46f2aad SHA1 c60351359062cdb91cf813ceb121638a4e5a6077 SHA256 d23109fb0987023d2ba4d0169dd76e1866735bdd4c124c58f6dfce81eb4e5e57
+MISC metadata.xml 280 RMD160 171726d2d0fcb9beb0b2d7a7e75d2c15d22afb79 SHA1 33bba8d611eae0db1d1e41f44ed54418854306ba SHA256 3de3cccd04eb1d07a8604da2de861f76a9fad4535b41f8bfbd2e0180bb2a95a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk58/GEACgkQfXuS5UK5QB0f3AP/X6h5/xQ9C/crHUzNsfcozF9t
-tp76koR9HCzDKt7AeN21bawokpgAFMBvpm1yNTJPRN3dmThpGD6l0iMOJflMvMab
-mzFeBaTJPX/n3lb6uQss+cDjbKPQT+KXOQpHe1ntPOlIX0eNnwIylcZTXkg/yG6Y
-8U+vTqqVVSUvwZ45ZtM=
-=J2Y3
+iQIcBAEBAgAGBQJO/cB/AAoJEOSiRoyO7jvo+gkQAJ8AGDIdPL6enR40wZR05IQH
+RGkAPP3RxlZYjobutRmYnP/Q0EqyHHk7M5ws5mg6JhpyEwA2zWf6WoRgOPaCKB8K
+laeyAFsQ+sDJ6MFGinrARw5sTFgd2ROP4ahzvcDBGWRAkbHXgfpLbQ/QuOh0bC5J
+mvtElJ7QSWl4/cNtteytqUJb6EdzjpMJ4pudLdlAnVsUI7p15D3i4yYSZn8Qjjf5
+VzoiTbz+oKptTjZ/aG8NmAziVzfEIBV+xQ4HPRm05Ov1qC/DI4j+DGcnW7HoOU/t
+3uy5iyWYJQ1dDLyQ5FA6wzoYlmROnY9z8+dFW2HiGBeVvYLC5xfx/4UvJLNBi96v
+pghh1iv+cXXS+M9kZEI6HXz0VAfXNckouYdC/2EGBBFpXSrQVpqj3s10CSDb/am0
+IasKhNE8dwgyIHMjFKNYpiBZgkOnsr0olwPFAFRjXL+rpzec4UQMCt4TaAYmtw6r
+S78Dv094IDcTxelzIjck+uWQmDAMoCD2w3JGSJ0yIiCx2+sLVp74JoboZhTTIWlo
+Z4YdMwwmmWiE3vgF1ZgmwnYMeVkzliFW29YOQSGMv/iSajCBZYpEVLh/DB8d8r2W
+Fu77X9xyej8VagBHHYmKXCh8FvCx9yWWS7di44Pd2ZDl1l2GdnfzIqiEkzG2v7XI
+D41RftYuhHHsD5hCnOzg
+=Ttr7
 -----END PGP SIGNATURE-----
diff --git a/app-editors/bluefish/bluefish-2.0.3.ebuild b/app-editors/bluefish/bluefish-2.2.1.ebuild
index af33f26e651f..c150305975f9 100644
--- a/app-editors/bluefish/bluefish-2.0.3.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.1.ebuild
@@ -1,8 +1,8 @@
 # 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.3.ebuild,v 1.1 2011/06/05 09:33:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-2.2.1.ebuild,v 1.1 2011/12/30 13:44:14 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
 PYTHON_DEPEND="python? 2"
 
@@ -17,19 +17,27 @@ HOMEPAGE="http://bluefish.openoffice.nl/"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-IUSE="gucharmap nls python spell"
+IUSE="gtk3 nls python spell"
 
 RDEPEND="
-	>=x11-libs/gtk+-2.12:2
+	gtk3? (
+		x11-libs/gtk+:3
+		gnome-extra/gucharmap:2.90
+	)
+	!gtk3? (
+		>=x11-libs/gtk+-2.12:2
+		gnome-extra/gucharmap:0
+	)
 	spell? ( app-text/enchant )"
-
 DEPEND="${RDEPEND}
 	>=dev-libs/glib-2.16:2
 	dev-libs/libxml2:2
 	dev-util/pkgconfig
 	x11-libs/pango
-	gucharmap? ( gnome-extra/gucharmap )
-	nls? ( sys-devel/gettext dev-util/intltool )"
+	nls? (
+		sys-devel/gettext
+		dev-util/intltool
+	)"
 
 S=${WORKDIR}/${MY_P}
 
@@ -40,32 +48,23 @@ pkg_setup() {
 	fi
 }
 
-src_prepare () {
-	intltoolize --copy --force || die "intltoolize failed"
-	for po_dir in src/plugin_*/po ; do
-		cp po/Makefile.in.in ${po_dir}
-	done
-
-	# 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
-}
+# Never eautoreconf this package as gettext breaks completely (no translations
+# even if it compiles afterwards)!
 
 src_configure() {
 	econf \
-		--docdir="/usr/share/doc/${PF}" \
+		--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 gucharmap charmap) \
+		$(use_with !gtk3 gtk2) \
 		$(use_enable python)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
diff --git a/app-editors/bluefish/files/bluefish-2.0.0-gucharmap-automagic.patch b/app-editors/bluefish/files/bluefish-2.0.0-gucharmap-automagic.patch
deleted file mode 100644
index d6097c6d6e00..000000000000
--- a/app-editors/bluefish/files/bluefish-2.0.0-gucharmap-automagic.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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])
- 
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
index e7e7c2341e85..3e6273fe0bbc 100644
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<maintainer><email>hanno@gentoo.org</email></maintainer>
 	<use>
-		<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
+		<flag name="gtk3">Enable gtk3 frontend instead of gtk2 one</flag>
 	</use>
 </pkgmetadata>