Try to handle documentation in a better way (should prevent bug #363597 reported by Lars Wendler). Rekeyword on ~ia64 as seems it was dropped by accident.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 39 insertions, 12 deletions

diff --git a/dev-cpp/libxmlpp/ChangeLog b/dev-cpp/libxmlpp/ChangeLog
index 5731bac8c1e5..f386398897a0 100644
--- a/dev-cpp/libxmlpp/ChangeLog
+++ b/dev-cpp/libxmlpp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/libxmlpp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/ChangeLog,v 1.106 2011/03/22 20:00:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/ChangeLog,v 1.107 2011/04/14 17:55:19 pacho Exp $
+
+  14 Apr 2011; Pacho Ramos <pacho@gentoo.org> libxmlpp-2.32.0-r1.ebuild,
+  libxmlpp-2.33.2.ebuild:
+  Try to handle documentation in a better way (should prevent bug #363597
+  reported by Lars Wendler). Rekeyword on ~ia64 as seems it was dropped by
+  accident.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> libxmlpp-2.32.0.ebuild:
   Marking libxmlpp-2.32.0 ppc stable for bug 353436
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.32.0-r1.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.32.0-r1.ebuild
index f409011c0b01..720e0c73f7b6 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.32.0-r1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.32.0-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-2.32.0-r1.ebuild,v 1.1 2011/03/21 01:23:24 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-2.32.0-r1.ebuild,v 1.2 2011/04/14 17:55:19 pacho Exp $
 
 EAPI="3"
+GCONF_DEBUG="no"
 
 inherit autotools gnome2
 
@@ -24,9 +25,16 @@ RDEPEND=">=dev-libs/libxml2-2.6.1
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( >=dev-cpp/mm-common-0.9.3 )"
-
-DOCS="AUTHORS ChangeLog NEWS README*"
+	doc? ( || (
+		<dev-cpp/glibmm-2.27.97:2[doc?]
+		>=dev-cpp/mm-common-0.9.3
+	) )
+"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable doc documentation)"
+	DOCS="AUTHORS ChangeLog NEWS README*"
+}
 
 src_prepare() {
 	gnome2_src_prepare
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.33.2.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.33.2.ebuild
index d71a5ee90447..e4ea3455aa95 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.33.2.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.33.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-2.33.2.ebuild,v 1.2 2011/02/22 17:43:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-2.33.2.ebuild,v 1.3 2011/04/14 17:55:19 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 autotools
 
 MY_PN="${PN/pp/++}"
 MY_P="${MY_PN}-${PV}"
@@ -17,16 +17,22 @@ SRC_URI="mirror://gnome/sources/libxml++/${PV%.*}/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/libxml2-2.6.1
 	>=dev-cpp/glibmm-2.4"
-
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README*"
+	dev-util/pkgconfig
+	doc? ( || (
+		<dev-cpp/glibmm-2.27.97:2[doc?]
+		>=dev-cpp/mm-common-0.9.3
+	) )
+"
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable doc documentation)"
+	DOCS="AUTHORS ChangeLog NEWS README*"
+}
 
 src_prepare() {
 	gnome2_src_prepare
@@ -34,6 +40,13 @@ src_prepare() {
 	# don't waste time building the examples
 	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
 		-i Makefile.am Makefile.in || die "sed Makefile.in failed"
+
+	# doc-install.pl was removed from glibmm, and is provided by mm-common now
+	# This should not be needed if the tarball is generated with mm-common-0.9.3
+	if use doc && has_version '>=dev-cpp/glibmm-2.27.97'; then
+		mm-common-prepare --copy --force
+		eautoreconf
+	fi
 }
 
 src_install() {