Version bump. Clean up old revisions.

(Portage version: 2.2_rc89/cvs/Linux x86_64)

4 files changed, 37 insertions, 73 deletions

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index 80c87e9f02ab..dfa23264cefb 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/devhelp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.116 2010/10/17 16:24:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.117 2010/10/22 20:44:40 eva Exp $
+
+*devhelp-2.32.0 (22 Oct 2010)
+
+  22 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -devhelp-0.23-r1.ebuild, -devhelp-2.28.1.ebuild, +devhelp-2.32.0.ebuild,
+  +files/devhelp-2.32.0-fix-schema.patch:
+  Version bump. Clean up old revisions.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> devhelp-2.30.1.ebuild:
   sparc stable wrt #324077
diff --git a/dev-util/devhelp/devhelp-0.23-r1.ebuild b/dev-util/devhelp/devhelp-0.23-r1.ebuild
deleted file mode 100644
index d542f09c8a1d..000000000000
--- a/dev-util/devhelp/devhelp-0.23-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.23-r1.ebuild,v 1.5 2010/06/23 12:03:12 pacho Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils toolchain-funcs gnome2 python
-
-DESCRIPTION="An API documentation browser for GNOME 2"
-HOMEPAGE="http://live.gnome.org/devhelp"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=gnome-base/gconf-2.6
-	>=x11-libs/gtk+-2.10
-	>=dev-libs/glib-2.10
-	>=x11-libs/libwnck-2.10
-	net-libs/webkit-gtk"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		G2CONF="${G2CONF} --with-compile-warnings=no"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	rm build/py-compile
-	ln -s $(type -P true) build/py-compile
-
-	epatch "${FILESDIR}/${P}-fix-anchor-links.patch"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins/devhelp
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/gedit-2/plugins/devhelp
-}
diff --git a/dev-util/devhelp/devhelp-2.28.1.ebuild b/dev-util/devhelp/devhelp-2.32.0.ebuild
index 2dbe262f425f..23e3657fe452 100644
--- a/dev-util/devhelp/devhelp-2.28.1.ebuild
+++ b/dev-util/devhelp/devhelp-2.32.0.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-2.28.1.ebuild,v 1.7 2010/06/23 12:03:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-2.32.0.ebuild,v 1.1 2010/10/22 20:44:40 eva Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
 
-inherit eutils toolchain-funcs gnome2 python
+inherit eutils gnome2 python toolchain-funcs
 
 DESCRIPTION="An API documentation browser for GNOME 2"
 HOMEPAGE="http://live.gnome.org/devhelp"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=gnome-base/gconf-2.6
-	>=x11-libs/gtk+-2.10
-	>=dev-libs/glib-2.10
+	>=x11-libs/gtk+-2.10:2
+	>=dev-libs/glib-2.10:2
 	>=x11-libs/libwnck-2.10
 	>=net-libs/webkit-gtk-1.1.13
 	>=dev-libs/libunique-1"
@@ -26,13 +26,13 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.9"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog 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
 }
 
 src_prepare() {
@@ -42,26 +42,31 @@ src_prepare() {
 	rm py-compile
 	ln -s $(type -P true) py-compile
 
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed 1 failed"
-
 	# Fix build with older libunique, bug #286890
 	sed -e 's/-DG.*_SINGLE_INCLUDES//' \
 		-e 's/-DG.*_DEPRECATED//' \
 		-i src/Makefile.am src/Makefile.in || die "sed 2 failed"
+
+	# Fix gconf schema
+	epatch "${FILESDIR}/${PN}-2.32.0-fix-schema.patch"
 }
 
 src_install() {
 	gnome2_src_install
 	# Internal library, punt .la file
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libdevhelp-1.so.1
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_need_rebuild
 	python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins/devhelp
+	preserve_old_lib_notify /usr/$(get_libdir)/libdevhelp-1.so.1
 }
 
 pkg_postrm() {
diff --git a/dev-util/devhelp/files/devhelp-2.32.0-fix-schema.patch b/dev-util/devhelp/files/devhelp-2.32.0-fix-schema.patch
new file mode 100644
index 000000000000..0e3fa9b292e3
--- /dev/null
+++ b/dev-util/devhelp/files/devhelp-2.32.0-fix-schema.patch
@@ -0,0 +1,11 @@
+--- a/data/devhelp.schemas.in	2010-10-22 22:36:22.000000000 +0200
++++ b/data/devhelp.schemas.in	2010-10-22 22:36:30.000000000 +0200
+@@ -132,7 +132,7 @@
+       <owner>devhelp</owner>
+       <type>list</type>
+       <list_type>string</list_type>
+-      <default></default>
++      <default>[]</default>
+       <locale name="C">
+          <short>Books disabled</short>
+          <long>List of books disabled by the user.</long>