Version bump, remove old, drop .la files and set GNOME_ORG_MODULE properly to simplify ebuild a bit.

(Portage version: 2.1.10.14/cvs/Linux x86_64)

3 files changed, 51 insertions, 43 deletions

diff --git a/dev-cpp/libxmlpp/ChangeLog b/dev-cpp/libxmlpp/ChangeLog
index e22ba651d67b..d07079aa4a14 100644
--- a/dev-cpp/libxmlpp/ChangeLog
+++ b/dev-cpp/libxmlpp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.111 2011/07/16 17:53:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/ChangeLog,v 1.112 2011/09/09 19:44:08 pacho Exp $
+
+*libxmlpp-2.34.2 (09 Sep 2011)
+
+  09 Sep 2011; Pacho Ramos <pacho@gentoo.org> -libxmlpp-2.22.0.ebuild,
+  +libxmlpp-2.34.2.ebuild:
+  Version bump, remove old, drop .la files and set GNOME_ORG_MODULE properly to
+  simplify ebuild a bit.
 
   16 Jul 2011; Markus Meier <maekke@gentoo.org> libxmlpp-2.34.1.ebuild:
   x86 stable, bug #372353
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.22.0.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.22.0.ebuild
deleted file mode 100644
index 823e14ede364..000000000000
--- a/dev-cpp/libxmlpp/libxmlpp-2.22.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-2.22.0.ebuild,v 1.7 2008/05/21 10:10:31 armin76 Exp $
-
-inherit gnome2 eutils
-
-MY_PN="${PN/pp/++}"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
-HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
-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"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/libxml2-2.6.1
-	>=dev-cpp/glibmm-2.4"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-DOCS="AUTHORS ChangeLog NEWS README*"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# don't waste time building the examples
-	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
-		die "sed Makefile.in failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	rm -fr "${D}"/usr/share/doc/libxml++*
-	use doc && dohtml docs/reference/${PV%.*}/html/*
-}
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.34.2.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.34.2.ebuild
new file mode 100644
index 000000000000..c0e4eab5ac68
--- /dev/null
+++ b/dev-cpp/libxmlpp/libxmlpp-2.34.2.ebuild
@@ -0,0 +1,43 @@
+# 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.34.2.ebuild,v 1.1 2011/09/09 19:44:08 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="${PN/pp/++}"
+
+inherit gnome2
+
+DESCRIPTION="C++ wrapper for the libxml2 XML parser library"
+HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
+
+LICENSE="LGPL-2.1"
+SLOT="2.6"
+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"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable doc documentation)"
+	DOCS="AUTHORS ChangeLog NEWS README*"
+}
+
+src_prepare() {
+	gnome2_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"
+}
+
+src_install() {
+	gnome2_src_install
+
+	rm -fr "${ED}"usr/share/doc/libxml++*
+	use doc && dohtml docs/reference/html/*
+}