Add suggestion to install devhelp, bug #416495.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 25 insertions, 83 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 1ba316720866..a1e02c6d021a 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/glade
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.175 2012/10/28 15:47:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.176 2012/11/26 19:59:15 eva Exp $
+
+  26 Nov 2012; Gilles Dartiguelongue <eva@gentoo.org> -glade-3.10.2.ebuild,
+  glade-3.12.2.ebuild:
+  Add suggestion to install devhelp, bug #416495.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> glade-3.12.1.ebuild:
   ia64/sh/sparc stable wrt #427544
diff --git a/dev-util/glade/glade-3.10.2.ebuild b/dev-util/glade/glade-3.10.2.ebuild
deleted file mode 100644
index aeaf7508c026..000000000000
--- a/dev-util/glade/glade-3.10.2.ebuild
+++ /dev/null
@@ -1,70 +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/glade/glade-3.10.2.ebuild,v 1.9 2012/05/04 17:51:44 jdhore Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-
-inherit gnome2 versionator
-
-DESCRIPTION="GNOME GUI Builder"
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="3.10"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc +introspection python"
-
-RDEPEND=">=x11-libs/gtk+-3.0.2:3
-	>=dev-libs/libxml2-2.4.0:2
-	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )
-	python? ( >=dev-python/pygobject-2.27.0:2 )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.41.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-	>=app-text/gnome-doc-utils-0.18
-	app-text/docbook-xml-dtd:4.1.2
-	doc? ( >=dev-util/gtk-doc-1.13 )
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-maintainer-mode
-		--disable-static
-		--enable-libtool-lock
-		--disable-scrollkeeper
-		$(use_enable introspection)
-		$(use_enable python)"
-}
-
-src_prepare() {
-	# to avoid file collision with glade:3, rename GNOME help module from
-	# glade to glade-3.10, and gladeui documentation from gladeui to gladeui-2
-	local i
-	sed -e 's:DOC_MODULE = glade:DOC_MODULE = glade-3.10:' -i help/Makefile.in \
-		|| die "sed of help/Makefile.in failed"
-	sed -e 's:/glade.xml:/glade-3.10.xml:g' -i help/*/*.po \
-		|| die "sed of help .po files failed"
-	for i in help/*/glade.xml ; do
-		mv ${i} ${i/glade/glade-3.10} || die "mv ${i} failed"
-	done
-	sed -e 's:DOC_MODULE = gladeui:DOC_MODULE = gladeui-2:' -i doc/Makefile.in \
-		|| die "sed of doc/Makefile.in failed"
-	for i in doc/gladeui-* doc/gladeui.* ; do
-		mv ${i} ${i/gladeui/gladeui-2} || die "mv ${i} failed"
-	done
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	# modify Name in .desktop file to avoid confusion with other slots
-	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
-		-i data/glade.desktop || die "sed of data/glade.desktop failed"
-	gnome2_src_install
-}
diff --git a/dev-util/glade/glade-3.12.2.ebuild b/dev-util/glade/glade-3.12.2.ebuild
index 36d8a329f488..22b22d85bb06 100644
--- a/dev-util/glade/glade-3.12.2.ebuild
+++ b/dev-util/glade/glade-3.12.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.12.2.ebuild,v 1.1 2012/09/22 10:06:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.12.2.ebuild,v 1.2 2012/11/26 19:59:15 eva Exp $
 
 EAPI="4"
-GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2 versionator
 
@@ -42,16 +42,6 @@ DEPEND="${RDEPEND}
 #	dev-libs/gobject-introspection-common
 #	gnome-base/gnome-common
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-libtool-lock
-		--disable-scrollkeeper
-		$(use_enable introspection)
-		$(use_enable python)"
-}
-
 src_prepare() {
 	# To avoid file collison with other slots, rename help module.
 	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
@@ -60,6 +50,16 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+src_configure() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	G2CONF="${G2CONF}
+		--disable-static
+		--enable-libtool-lock
+		$(use_enable introspection)
+		$(use_enable python)"
+	gnome2_src_configure
+}
+
 src_install() {
 	# modify Name in .desktop file to avoid confusion with other slots
 	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
@@ -69,3 +69,11 @@ src_install() {
 		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
 	gnome2_src_install
 }
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! has_version dev-util/devhelp ; then
+		elog "You may want to install dev-util/devhelp for integration API"
+		elog "documentation support."
+	fi
+}