Version bump. Clean up old revisions.

Package-Manager: portage-2.2_rc89/cvs/Linux x86_64

5 files changed, 51 insertions, 78 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/Manifest b/dev-util/devhelp/Manifest
index 7aeb4a9c1262..3acf56aea8fe 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,10 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX devhelp-0.21-xulrunner19.patch 1299 RMD160 2e3801569bf600a3f7cd3a96fa88b4697ca09f4d SHA1 aa517228fc0f62b8396d137eead6223fb72a98bb SHA256 920fe91fc14d4d1a3f6bd668c7575d7a83fb16159a676c60c9941e89518e2fb5
 AUX devhelp-0.23-fix-anchor-links.patch 4786 RMD160 6199792bcb910cd9e9ad49f4f788c0d1ca37b1f5 SHA1 d92e5d5bc8b18619a8f29397bc2f73463ef4cf66 SHA256 a1a691ad38163bae41189f8a0b0a1225b028832e818e1748ab597d797d431a70
-DIST devhelp-0.23.tar.bz2 521287 RMD160 324b74336570291c1a966e63c2d7450f3ae7b678 SHA1 a7ed9c56cd77bb46fb041df539285ce3012ad177 SHA256 60f336ac396f67a0cce70d71ea931545727ab48e9d09bf36415098965f9a7ef2
-DIST devhelp-2.28.1.tar.bz2 473458 RMD160 688296616f35ac9af8d0849f6c5b230359ead0ab SHA1 8ebaf23722f823eed57b8b6d9fcf83e7b3eaf327 SHA256 09a0f048cc5b4517e92d74d6ffcd4a17f4bb2c4c236739154fb24b60958862d9
+AUX devhelp-2.32.0-fix-schema.patch 424 RMD160 32c3009b653c55d1002c42a0808409c74dbc6431 SHA1 c844213a63d60cf031040a4676d17b89dcae07d2 SHA256 4438ed134cc923c62b3beebac732a8be7b61e23cca43f5469e8885e2513c2da6
 DIST devhelp-2.30.1.tar.bz2 489222 RMD160 2ce6762a7838afad03f237ab0ac662cae426163c SHA1 51eda53f04080eaae75b6e62e222b98fe5bb0d6f SHA256 a72d75fae489bc957f15ef203a6bf8fc9cf80f2730444912dc568476018d5335
-EBUILD devhelp-0.23-r1.ebuild 1417 RMD160 912a89955df06065aa8f1532ecb72845f5140a42 SHA1 b5788d604207e3e07816896a0d0b958aaafa7856 SHA256 30f5674a982109f654dc9bdc0eb8a118ecb057c427ab8b81e8a520a2f198c903
-EBUILD devhelp-2.28.1.ebuild 1721 RMD160 96f3827e95467a5f15e0c8c427f5ee76ac71ed32 SHA1 1c165b8c32cab4ee10c751a44281b5d5b81a0fd1 SHA256 b5c0c0006f24172f41b460df0bc31b267faecef20e74c54f165f996601bbfd48
+DIST devhelp-2.32.0.tar.bz2 503689 RMD160 934697815ec13a5629db775bb3b8585c80c8c6f0 SHA1 8a7c15a17ccfb0b39b1f1f8b57f77e544fb3b2b8 SHA256 61b342cbaf27379be9baa5df1f34c9464916601ec4378fa7e1c76fcc686553e4
 EBUILD devhelp-2.30.1.ebuild 1578 RMD160 bdacffa4d481eb0e654393144a6acadb3d6e2241 SHA1 a300ceca06621193335a01be21f0f4bb38f4d14f SHA256 6bc2a713c6e931041d2b629327f38eed7888e7a4aadb3bc3cf902eb15e114112
-MISC ChangeLog 15139 RMD160 5a2968441d5be3010cb68f0f9db19a15f2eb35d4 SHA1 5a34e15bc3ff32804fd07207c6631e0677387494 SHA256 8f216056883998efcf08a13cbb1262f973ce755cf2bf3b9aee851271cf089930
+EBUILD devhelp-2.32.0.ebuild 1841 RMD160 3c876b2b1a74e75514fc80f66503a2aba4f626da SHA1 3fd7f5b035d54ef5f09f032362e60480f10e84ed SHA256 80caea9e9eaf44588470ec8f217e8d308279525f7e17e63a321975df4b2eb20d
+MISC ChangeLog 15378 RMD160 b74a276ca25ac8b83dfb8dad2b6e8e8486749716 SHA1 e7b01ac55a2d2f85a59b233658df38c49cca57ac SHA256 65e175731f9aa914e42d5d6f3547dc15235c16223b600ffcedbf17803e7c26dd
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzB98MACgkQ1fmVwcYIWAZ5SgCgzTug4YmCRaLZ3+u8xSB4YutD
+Dp0An2FLfVQnJ2ALmtQZrva988Hs5KGs
+=FVXg
+-----END PGP SIGNATURE-----
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>