Version bump, drop old

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 17 insertions, 189 deletions

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index 330c98f927cb..e26eaeebc9e8 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/devhelp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.152 2013/04/17 17:23:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.153 2013/05/15 12:14:39 pacho Exp $
+
+*devhelp-3.8.2 (15 May 2013)
+
+  15 May 2013; Pacho Ramos <pacho@gentoo.org> +devhelp-3.8.2.ebuild,
+  -devhelp-3.4.1.ebuild, -devhelp-3.8.0.ebuild,
+  -files/devhelp-3.4.1-gsettings-fonts.patch:
+  Version bump, drop old
 
 *devhelp-3.8.1 (17 Apr 2013)
 
diff --git a/dev-util/devhelp/devhelp-3.4.1.ebuild b/dev-util/devhelp/devhelp-3.4.1.ebuild
deleted file mode 100644
index 1dfcd58d48e3..000000000000
--- a/dev-util/devhelp/devhelp-3.4.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.4.1.ebuild,v 1.11 2012/12/17 16:27:10 ago Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2"
-
-inherit eutils gnome2 python toolchain-funcs
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="http://live.gnome.org/devhelp"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND=">=gnome-base/gconf-2.6:2
-	>=dev-libs/glib-2.25.11:2
-	>=x11-libs/gtk+-3.0.2:3
-	>=net-libs/webkit-gtk-1.6:3"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		G2CONF="${G2CONF} --with-compile-warnings=no"
-	fi
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Use gsettings-desktop-schemas instead of obsolete libgnome's
-	# /desktop/gnome/interface/* gconf keys for fonts; bug #396637,
-	# https://bugzilla.gnome.org/show_bug.cgi?id=646402
-	epatch "${FILESDIR}/devhelp-3.4.1-gsettings-fonts.patch"
-
-	gnome2_src_prepare
-
-	python_clean_py-compile_files
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libdevhelp-2.so.1
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/gedit/plugins
-	# Keep all the notify calls around so that users get reminded to delete them
-	preserve_old_lib_notify /usr/$(get_libdir)/libdevhelp-1.so.1
-	preserve_old_lib_notify /usr/$(get_libdir)/libdevhelp-2.so.1
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gedit/plugins
-}
diff --git a/dev-util/devhelp/devhelp-3.8.0.ebuild b/dev-util/devhelp/devhelp-3.8.2.ebuild
index 7c36dd0478c9..55adb7832891 100644
--- a/dev-util/devhelp/devhelp-3.8.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.8.0.ebuild,v 1.1 2013/03/28 17:00:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.8.2.ebuild,v 1.1 2013/05/15 12:14:39 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -17,21 +17,25 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 IUSE="gedit"
 
 # FIXME: automagic python dependency
-COMMON_DEPEND=">=dev-libs/glib-2.32:2
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
 	>=x11-libs/gtk+-3.5.6:3
-	>=net-libs/webkit-gtk-1.10.0:3"
+	>=net-libs/webkit-gtk-1.10.0:3
+"
 RDEPEND="${COMMON_DEPEND}
 	gedit? (
 		${PYTHON_DEPS}
 		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		x11-libs/gtk+[introspection] )
-	gnome-base/gsettings-desktop-schemas"
+	gnome-base/gsettings-desktop-schemas
+"
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 	>=sys-devel/gettext-0.17
 	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 pkg_setup() {
 	python-single-r1_pkg_setup
diff --git a/dev-util/devhelp/files/devhelp-3.4.1-gsettings-fonts.patch b/dev-util/devhelp/files/devhelp-3.4.1-gsettings-fonts.patch
deleted file mode 100644
index c2d91d372e92..000000000000
--- a/dev-util/devhelp/files/devhelp-3.4.1-gsettings-fonts.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From d761ce906fab110d38d9e71d4c25a334d79b9869 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mu=C5=BCy=C5=82o?= <galtgendo@o2.pl>
-Date: Thu, 3 May 2012 00:15:50 -0400
-Subject: [PATCH] stop using obsoleted default keys
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646402
----
- src/dh-preferences.c |   36 ++++++++----------------------------
- src/dh-util.c        |   14 ++++++++------
- 2 files changed, 16 insertions(+), 34 deletions(-)
-
-diff --git a/src/dh-preferences.c b/src/dh-preferences.c
-index 7d75ebf..0f33810 100644
---- a/src/dh-preferences.c
-+++ b/src/dh-preferences.c
-@@ -287,41 +287,21 @@ preferences_connect_conf_listeners (void)
- }
- #endif
- 
--/* FIXME: Use the functions in dh-util.c for this. */
- static void
- preferences_fonts_get_font_names (gboolean   use_system_fonts,
-                                   gchar    **variable,
-                                   gchar    **fixed)
- {
--	gchar   *var_font_name;
--        gchar   *fixed_font_name;
--	IgeConf *conf;
--
--	conf = ige_conf_get ();
-+	gchar   *name;
-+	gdouble  size;
- 
--	if (use_system_fonts) {
--#ifdef GDK_WINDOWING_QUARTZ
--                var_font_name = g_strdup ("Lucida Grande 14");
--                fixed_font_name = g_strdup ("Monaco 14");
--#else
--		ige_conf_get_string (conf,
--                                     DH_CONF_SYSTEM_VARIABLE_FONT,
--                                     &var_font_name);
--		ige_conf_get_string (conf,
--                                     DH_CONF_SYSTEM_FIXED_FONT,
--                                     &fixed_font_name);
--#endif
--	} else {
--		ige_conf_get_string (conf,
--                                     DH_CONF_VARIABLE_FONT,
--                                     &var_font_name);
--                ige_conf_get_string (conf,
--                                     DH_CONF_FIXED_FONT,
--                                     &fixed_font_name);
--	}
-+	dh_util_font_get_variable (&name, &size, use_system_fonts);
-+	*variable = g_strdup_printf ("%s %u", name, (guint)size);
-+	g_free (name);
- 
--	*variable = var_font_name;
--	*fixed = fixed_font_name;
-+	dh_util_font_get_fixed (&name, &size, use_system_fonts);
-+	*fixed = g_strdup_printf ("%s %u", name, (guint)size);
-+	g_free (name);
- }
- 
- static void
-diff --git a/src/dh-util.c b/src/dh-util.c
-index 74312d2..08151a3 100644
---- a/src/dh-util.c
-+++ b/src/dh-util.c
-@@ -603,6 +603,7 @@ dh_util_font_get_variable (gchar    **name,
- {
- 	IgeConf *conf;
- 	gchar   *name_and_size;
-+	GSettings *settings;
- 
- 	conf = ige_conf_get ();
- 
-@@ -610,9 +611,9 @@ dh_util_font_get_variable (gchar    **name,
- #ifdef GDK_WINDOWING_QUARTZ
-                 name_and_size = g_strdup ("Lucida Grande 14");
- #else
--		ige_conf_get_string (conf,
--                                     DH_CONF_SYSTEM_VARIABLE_FONT,
--                                     &name_and_size);
-+		settings = g_settings_new ("org.gnome.desktop.interface");
-+		name_and_size = g_settings_get_string (settings, "font-name");
-+		g_object_unref (settings);
- #endif
- 	} else {
- 		ige_conf_get_string (conf,
-@@ -635,6 +636,7 @@ dh_util_font_get_fixed (gchar    **name,
- {
- 	IgeConf *conf;
- 	gchar   *name_and_size;
-+	GSettings *settings;
- 
- 	conf = ige_conf_get ();
- 
-@@ -642,9 +644,9 @@ dh_util_font_get_fixed (gchar    **name,
- #ifdef GDK_WINDOWING_QUARTZ
-                 name_and_size = g_strdup ("Monaco 14");
- #else
--		ige_conf_get_string (conf,
--                                     DH_CONF_SYSTEM_FIXED_FONT,
--                                     &name_and_size);
-+		settings = g_settings_new ("org.gnome.desktop.interface");
-+		name_and_size = g_settings_get_string (settings, "monospace-font-name");
-+		g_object_unref (settings);
- #endif
- 	} else {
- 		ige_conf_get_string (conf,
--- 
-1.7.8.6
-