Add dep on pkgconfig for bug #155002; clean up old version

(Portage version: 2.1.2_rc1-r7)
 (Signed Manifest commit)

4 files changed, 18 insertions, 339 deletions

diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index 2c1caf7e8bbf..88455204e7f1 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,7 +1,6 @@
-AUX gtkspell-2.0.10-enchant.patch 8894 RMD160 29b116631863706083357c0b965d9906b6475ccf SHA1 2b884010eb89e580f6ababe1b67e13fe7aa31c1f SHA256 6d1f282b69d10b60e7e8df48497f6e19f0c2186fc7383fd6685f0a6ea539b185
-MD5 b91273fd65f12fdab689ed2beb37c352 files/gtkspell-2.0.10-enchant.patch 8894
-RMD160 29b116631863706083357c0b965d9906b6475ccf files/gtkspell-2.0.10-enchant.patch 8894
-SHA256 6d1f282b69d10b60e7e8df48497f6e19f0c2186fc7383fd6685f0a6ea539b185 files/gtkspell-2.0.10-enchant.patch 8894
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtkspell-2.0.11-enchant.patch 8904 RMD160 5109a1b1fda7d8af38a0d1fbac7ebeb3a51a5697 SHA1 7e18c24b75f0dfdae334cf5b0cc7a697893360de SHA256 9df42ce7c21e548d083e7970a98944225ac54d5db4fef091ecca0e7d1108ae4f
 MD5 56272bca2bff7fda0bfe8be7ff9808b5 files/gtkspell-2.0.11-enchant.patch 8904
 RMD160 5109a1b1fda7d8af38a0d1fbac7ebeb3a51a5697 files/gtkspell-2.0.11-enchant.patch 8904
@@ -16,32 +15,32 @@ RMD160 f6716ab044fb9ecda7e57193a3d658a82ddd10f7 files/gtkspell-2.0.4-enchant.pat
 SHA256 5ebcef66a303147e81e30e65cc396e25f91cb29c410bd670859ff847661e3f6d files/gtkspell-2.0.4-enchant.patch 11806
 DIST gtkspell-2.0.11.tar.gz 347172 RMD160 c5ca1804807f445e246de2b384448a7c7c76855f SHA1 d0e288b2d1456e33083dc7d7c61f013688c5cc65 SHA256 521d6be1e1236706cd491305b10f01d989bf47787ca97242c56c0d2b038e6a12
 DIST gtkspell-2.0.4.tar.gz 197288 RMD160 61b1e62b843b2604045ed9e8a05e8e92070d6f87 SHA256 e3bed8d2a1c5cbb572680cb23fd5f858c7b302e947dca353318959f6a1153e13
-EBUILD gtkspell-2.0.11-r1.ebuild 1005 RMD160 1c692dc92af3b3c6eb50beb65da85075b0d9ed28 SHA1 ed403f60b9feb675ec050b345cfbc19bdfc24a04 SHA256 e54927435d20b1a64a6bf9797fa12f0ddbb6b069d1e6722926933dc232b2d9af
-MD5 b0cb905c4ce0fcfdda13456aeef322e3 gtkspell-2.0.11-r1.ebuild 1005
-RMD160 1c692dc92af3b3c6eb50beb65da85075b0d9ed28 gtkspell-2.0.11-r1.ebuild 1005
-SHA256 e54927435d20b1a64a6bf9797fa12f0ddbb6b069d1e6722926933dc232b2d9af gtkspell-2.0.11-r1.ebuild 1005
-EBUILD gtkspell-2.0.11.ebuild 1006 RMD160 b8f6c29d817e403796632ec2b7acabb6de09883e SHA1 b44413f9bfa36e2b78d3c4be3754a31ae1809c3f SHA256 15b817ce63df26832c67dd19cdd77524c58d7ebc85e5607ae562cc4ebc32f131
-MD5 67a0f89aa2216f0022b20b7cbf976e45 gtkspell-2.0.11.ebuild 1006
-RMD160 b8f6c29d817e403796632ec2b7acabb6de09883e gtkspell-2.0.11.ebuild 1006
-SHA256 15b817ce63df26832c67dd19cdd77524c58d7ebc85e5607ae562cc4ebc32f131 gtkspell-2.0.11.ebuild 1006
+EBUILD gtkspell-2.0.11-r1.ebuild 1024 RMD160 9629b71c30632a4e01f2c66bd1dbd67545f4590a SHA1 17b5607503f24c3d097860faaa733f21a1de6929 SHA256 69d57c39b34de2179a74d11b1ab68c73755213d915e71c8c2e8618e0202e5719
+MD5 fcd5fe14182b554abbd0e1218d50327e gtkspell-2.0.11-r1.ebuild 1024
+RMD160 9629b71c30632a4e01f2c66bd1dbd67545f4590a gtkspell-2.0.11-r1.ebuild 1024
+SHA256 69d57c39b34de2179a74d11b1ab68c73755213d915e71c8c2e8618e0202e5719 gtkspell-2.0.11-r1.ebuild 1024
 EBUILD gtkspell-2.0.4-r1.ebuild 1169 RMD160 232c6fcc296a7fcaac1c3923f596c3d176d20a7d SHA1 a3c6e009ac69ad32ef8203cf1e97c338c7adfaa9 SHA256 4752435dfe92a92575d8bb2c5ed63fb76c88351cf526bc218bda163d4d859e2d
 MD5 837c8b2c0504f33feacb22c9eebacabe gtkspell-2.0.4-r1.ebuild 1169
 RMD160 232c6fcc296a7fcaac1c3923f596c3d176d20a7d gtkspell-2.0.4-r1.ebuild 1169
 SHA256 4752435dfe92a92575d8bb2c5ed63fb76c88351cf526bc218bda163d4d859e2d gtkspell-2.0.4-r1.ebuild 1169
-MISC ChangeLog 5369 RMD160 997f0309dd77434e847b6f9926853fda12b22fe2 SHA1 5a5057ca5969141288d4065a3b6de48d8ac62db3 SHA256 9fbb255cf92317d4fad362c10d0bc4282b9d7502195f5d0244f0dd01407cf150
-MD5 b4102311f00171c34aa92f0e4749b2df ChangeLog 5369
-RMD160 997f0309dd77434e847b6f9926853fda12b22fe2 ChangeLog 5369
-SHA256 9fbb255cf92317d4fad362c10d0bc4282b9d7502195f5d0244f0dd01407cf150 ChangeLog 5369
+MISC ChangeLog 5575 RMD160 1144a6fc4ac8858ba79e4a2d6a13cb106f52ce15 SHA1 86f4204ba824a6837863885e2cb8a2918ac14d54 SHA256 023516135fd5cba8dfa337e10003715499ad385db7d226971a55cee20cd232b0
+MD5 7a6adfc60f06537100280aeafb866017 ChangeLog 5575
+RMD160 1144a6fc4ac8858ba79e4a2d6a13cb106f52ce15 ChangeLog 5575
+SHA256 023516135fd5cba8dfa337e10003715499ad385db7d226971a55cee20cd232b0 ChangeLog 5575
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 45980e49cfff969d1e77692cd314dde2 files/digest-gtkspell-2.0.11 247
-RMD160 0fc169fdb8ce61fe22d0bdcdb8a34f5448a49206 files/digest-gtkspell-2.0.11 247
-SHA256 d06d845c0253ce2c3e1db75cec2be4a8b15619b3591c772add15488d8803f684 files/digest-gtkspell-2.0.11 247
 MD5 45980e49cfff969d1e77692cd314dde2 files/digest-gtkspell-2.0.11-r1 247
 RMD160 0fc169fdb8ce61fe22d0bdcdb8a34f5448a49206 files/digest-gtkspell-2.0.11-r1 247
 SHA256 d06d845c0253ce2c3e1db75cec2be4a8b15619b3591c772add15488d8803f684 files/digest-gtkspell-2.0.11-r1 247
 MD5 53fdc733323c78ef534ae2a7ae7a262c files/digest-gtkspell-2.0.4-r1 244
 RMD160 61ec00cc67195db8496365b5feba80c727ab368f files/digest-gtkspell-2.0.4-r1 244
 SHA256 804dd0d6d0e5cbac7dc0b3c6195e74eeac36a889a09b0bc4f93791de16ff411c files/digest-gtkspell-2.0.4-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFXfvyomPajV0RnrERAhqZAJ9yHzz/LmLf7D3SsMvKVX3bqWtZ9gCdEQ/w
+OAotf2sErexVc4y9N9kcoxI=
+=7Z/q
+-----END PGP SIGNATURE-----
diff --git a/app-text/gtkspell/files/digest-gtkspell-2.0.11 b/app-text/gtkspell/files/digest-gtkspell-2.0.11
deleted file mode 100644
index f4af17382c66..000000000000
--- a/app-text/gtkspell/files/digest-gtkspell-2.0.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 494869f67146a12a3f17a958f51aeb05 gtkspell-2.0.11.tar.gz 347172
-RMD160 c5ca1804807f445e246de2b384448a7c7c76855f gtkspell-2.0.11.tar.gz 347172
-SHA256 521d6be1e1236706cd491305b10f01d989bf47787ca97242c56c0d2b038e6a12 gtkspell-2.0.11.tar.gz 347172
diff --git a/app-text/gtkspell/files/gtkspell-2.0.10-enchant.patch b/app-text/gtkspell/files/gtkspell-2.0.10-enchant.patch
deleted file mode 100644
index ec02ba4e7ce9..000000000000
--- a/app-text/gtkspell/files/gtkspell-2.0.10-enchant.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-diff -ru gtkspell-2.0.10/configure.ac egspell/configure.ac
---- gtkspell-2.0.10/configure.ac	2005-02-27 10:48:18.000000000 -0500
-+++ egspell/configure.ac	2005-05-23 12:23:01.193537669 -0400
-@@ -4,18 +4,12 @@
- AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
- AC_CONFIG_HEADERS([config.h])
- 
--AC_CHECK_HEADER(aspell.h, [AC_DEFINE(HAVE_ASPELL_H,1, 
--   [Define to 1 if you have the <aspell.h> header file.] )] )
--AC_CHECK_HEADER(pspell/pspell.h, [AC_DEFINE(HAVE_PSPELL_H,1, 
--   [Define to 1 if you have the <pspell/pspell.h> header file.] )] )
--AC_CHECK_LIB(aspell, new_aspell_speller, SPELLER_LIB="-laspell",
--   [AC_CHECK_LIB(pspell, new_pspell_manager, SPELLER_LIB="-lpspell",
--      [AC_MSG_ERROR([You must have the aspell or pspell dev libraries to build gtkspell.]) ] ) ] )
-+SPELLER_LIB=-lenchant
-       
- AC_SUBST(SPELLER_LIB)
- GTKSPELL_PACKAGES=gtk+-2.0
- AC_SUBST(GTKSPELL_PACKAGES)
--PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES)
-+PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES enchant >= 0.4.0 )
- AC_SUBST(GTKSPELL_CFLAGS)
- AC_SUBST(GTKSPELL_LIBS)
- 
-diff -ru gtkspell-2.0.10/gtkspell/gtkspell.c egspell/gtkspell/gtkspell.c
---- gtkspell-2.0.10/gtkspell/gtkspell.c	2005-02-27 10:53:26.000000000 -0500
-+++ egspell/gtkspell/gtkspell.c	2005-05-23 12:53:31.615836490 -0400
-@@ -14,37 +14,11 @@
- 
- #define GTKSPELL_MISSPELLED_TAG "gtkspell-misspelled"
- 
--#ifdef HAVE_ASPELL_H
--   #define USING_ASPELL
--   #include <aspell.h>
--#elif defined HAVE_PSPELL_H
--   #define USING_PSPELL
--   #include <pspell/pspell.h>
--   #define AspellSpeller PspellManager
--   #define speller manager
--   #define aspell_speller_check pspell_manager_check
--   #define aspell_speller_add_to_session pspell_manager_add_to_session
--   #define aspell_speller_add_to_personal pspell_manager_add_to_personal
--   #define aspell_speller_save_all_word_lists pspell_manager_save_all_word_lists
--   #define aspell_speller_store_replacement pspell_manager_store_replacement
--   #define AspellWordList PspellWordList
--   #define AspellStringEnumeration PspellStringEmulation
--   #define aspell_speller_suggest pspell_manager_suggest
--   #define aspell_word_list_elements pspell_word_list_elements
--   #define aspell_string_enumeration_next pspell_string_emulation_next
--   #define delete_aspell_string_enumeration delete_pspell_string_emulation
--   #define AspellConfig PspellConfig
--   #define AspellCanHaveError PspellCanHaveError
--   #define new_aspell_config new_pspell_config
--   #define aspell_config_replace pspell_config_replace
--   #define new_aspell_speller new_pspell_manager
--   #define delete_aspell_config delete_pspell_config
--   #define aspell_error_message pspell_error_message
--   #define delete_aspell_speller delete_pspell_manager
--   #define to_aspell_speller to_pspell_manager
--   #define aspell_error_number pspell_error_number
--   #define aspell pspell
--#endif
-+#include <enchant.h>
-+
-+/* prepare for gettext internationalization */
-+#undef _
-+#define _(x) x
- 
- const int debug = 0;
- const int quiet = 0;
-@@ -55,7 +29,8 @@
- 	GtkTextMark *mark_insert_start;
- 	GtkTextMark *mark_insert_end;
- 	gboolean deferred_check;
--	AspellSpeller *speller;
-+	EnchantBroker *broker;
-+	EnchantDict *speller;
- 	GtkTextMark *mark_click;
- };
- 
-@@ -126,10 +101,12 @@
- check_word(GtkSpell *spell, GtkTextBuffer *buffer,
-            GtkTextIter *start, GtkTextIter *end) {
- 	char *text;
-+    if (!spell->speller)
-+        return;
- 	text = gtk_text_buffer_get_text(buffer, start, end, FALSE);
- 	if (debug) g_print("checking: %s\n", text);
- 	if (g_unichar_isdigit(*text) == FALSE) /* don't check numbers */
--		if (aspell_speller_check(spell->speller, text, -1) == FALSE)
-+		if (enchant_dict_check(spell->speller, text, strlen(text)) != 0)
- 			gtk_text_buffer_apply_tag(buffer, spell->tag_highlight, start, end);
- 	g_free(text);
- }
-@@ -304,8 +281,7 @@
- 	get_word_extents_from_mark(buffer, &start, &end, spell->mark_click);
- 	word = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
- 	
--	aspell_speller_add_to_personal(spell->speller, word, strlen(word));
--	aspell_speller_save_all_word_lists(spell->speller);
-+    enchant_dict_add_to_pwl( spell->speller, word, strlen(word));
- 
- 	gtkspell_recheck_all(spell);
- 
-@@ -323,7 +299,7 @@
- 	get_word_extents_from_mark(buffer, &start, &end, spell->mark_click);
- 	word = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
- 	
--	aspell_speller_add_to_session(spell->speller, word, strlen(word));
-+	enchant_dict_add_to_session(spell->speller, word, strlen(word));
- 
- 	gtkspell_recheck_all(spell);
- 
-@@ -337,6 +313,9 @@
- 	GtkTextIter start, end;
- 	GtkTextBuffer *buffer;
- 	
-+    if (!spell->speller)
-+        return;
-+
- 	buffer = gtk_text_view_get_buffer(spell->view);
- 
- 	get_word_extents_from_mark(buffer, &start, &end, spell->mark_click);
-@@ -352,33 +331,33 @@
- 	gtk_text_buffer_delete(buffer, &start, &end);
- 	gtk_text_buffer_insert(buffer, &start, newword, -1);
- 
--	aspell_speller_store_replacement(spell->speller, 
-+	enchant_dict_store_replacement(spell->speller, 
- 			oldword, strlen(oldword),
- 			newword, strlen(newword));
- 
- 	g_free(oldword);
- }
- 
--GtkWidget*
-+static GtkWidget*
- build_suggestion_menu(GtkSpell *spell, GtkTextBuffer *buffer,
-                       const char *word) {
- 	const char *suggestion;
- 	GtkWidget *topmenu, *menu;
- 	GtkWidget *mi;
- 	GtkWidget *hbox;
--	int count = 0;
- 	void *spelldata;
--	const AspellWordList *suggestions;
--	AspellStringEnumeration *elements;
-+    char **suggestions;
-+    size_t n_suggs, i;
- 	char *label;
- 	
- 	topmenu = menu = gtk_menu_new();
- 
--	suggestions = aspell_speller_suggest(spell->speller, word, -1);
--	elements = aspell_word_list_elements(suggestions);
-+    if (!spell->speller)
-+        return topmenu;
- 
--	suggestion = aspell_string_enumeration_next(elements);
--	if (suggestion == NULL) {
-+    suggestions = enchant_dict_suggest(spell->speller, word, strlen(word), &n_suggs);
-+
-+	if (suggestions == NULL || !n_suggs) {
- 		/* no suggestions.  put something in the menu anyway... */
- 		GtkWidget *label;
- 		label = gtk_label_new("");
-@@ -390,8 +369,8 @@
- 		gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), mi);
- 	} else {
- 		/* build a set of menus with suggestions. */
--		while (suggestion != NULL) {
--			if (count == 10) {
-+        for (i = 0; i < n_suggs; i++ ) {
-+			if (i > 0 && i % 10 == 0) {
- 				mi = gtk_menu_item_new();
- 				gtk_widget_show(mi);
- 				gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
-@@ -402,19 +381,16 @@
- 
- 				menu = gtk_menu_new();
- 				gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi), menu);
--				count = 0;
- 			}
--			mi = gtk_menu_item_new_with_label(suggestion);
-+			mi = gtk_menu_item_new_with_label(suggestions[i]);
- 			g_signal_connect(G_OBJECT(mi), "activate",
- 					G_CALLBACK(replace_word), spell);
- 			gtk_widget_show(mi);
- 			gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
--			count++;
--			suggestion = aspell_string_enumeration_next(elements);
- 		}
- 	}
- 
--	delete_aspell_string_enumeration(elements);
-+	enchant_dict_free_suggestions(spell->speller, suggestions);
- 
- 	/* Separator */
- 	mi = gtk_menu_item_new();
-@@ -519,9 +495,6 @@
- 
- static gboolean
- gtkspell_set_language_internal(GtkSpell *spell, const gchar *lang, GError **error) {
--	AspellConfig *config;
--	AspellCanHaveError *err;
--	AspellSpeller *speller;
- 
- 	if (lang == NULL) {
- 		lang = g_getenv("LANG");
-@@ -533,26 +506,25 @@
- 		}
- 	}
- 
--	config = new_aspell_config();
--	if (lang)
--		aspell_config_replace(config, "language-tag", lang);
--	aspell_config_replace(config, "encoding", "utf-8");
--	err = new_aspell_speller(config);
--	delete_aspell_config(config);
-+    if (!spell->broker)
-+        spell->broker = enchant_broker_init();
- 
--	if (aspell_error_number(err) != 0) {
--#ifdef USING_ASPELL
--		g_set_error(error, GTKSPELL_ERROR, GTKSPELL_ERROR_BACKEND,
--				"aspell: %s", aspell_error_message(err));
--#elif defined USING_PSPELL
-+    if (spell->speller) {
-+        enchant_broker_free_dict(spell->broker, spell->speller);
-+        spell->speller = NULL;
-+    }
-+
-+    if (!lang) {
-+        lang = "en";
-+    }
-+
-+    spell->speller = enchant_broker_request_dict(spell->broker, lang );
-+
-+    if (!spell->speller) {
- 		g_set_error(error, GTKSPELL_ERROR, GTKSPELL_ERROR_BACKEND,
--				"pspell: %s", aspell_error_message(err));
--#endif
-+                _("enchant error for language: %s"),lang);
- 		return FALSE;
- 	} 
--	if (spell->speller)
--		delete_aspell_speller(spell->speller);
--	spell->speller = to_aspell_speller(err);
- 
- 	return TRUE;
- }
-@@ -715,8 +687,13 @@
- 	gtk_text_buffer_delete_mark(buffer, spell->mark_insert_end);
- 	gtk_text_buffer_delete_mark(buffer, spell->mark_click);
- 
--	delete_aspell_speller(spell->speller);
- 
-+    if (spell->broker) {
-+        if (spell->speller) {
-+            enchant_broker_free_dict(spell->broker, spell->speller);
-+        }
-+        enchant_broker_free(spell->broker);
-+    }
- 	g_signal_handlers_disconnect_matched(spell->view,
- 			G_SIGNAL_MATCH_DATA,
- 			0, 0, NULL, NULL,
diff --git a/app-text/gtkspell/gtkspell-2.0.11.ebuild b/app-text/gtkspell/gtkspell-2.0.11.ebuild
deleted file mode 100644
index eb97f1448271..000000000000
--- a/app-text/gtkspell/gtkspell-2.0.11.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtkspell/gtkspell-2.0.11.ebuild,v 1.10 2005/11/24 18:41:57 corsair Exp $
-
-inherit libtool eutils
-
-DESCRIPTION="Spell checking widget for GTK2"
-HOMEPAGE="http://gtkspell.sourceforge.net/"
-SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=app-text/enchant-1.1.6"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	doc? ( >=dev-util/gtk-doc-1
-		=app-text/docbook-xml-dtd-4.2* )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-
-	# use enchant as backend
-	epatch ${FILESDIR}/${PN}-2.0.10-enchant.patch
-
-	autoconf || die
-	libtoolize --copy --force
-
-}
-
-src_compile() {
-
-	econf $(use_enable doc gtk-doc) || die
-	emake || die "compile failure"
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-}