Version bump including upstream fixes to not require mm-common at buildtime ever. Remove old.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

3 files changed, 18 insertions, 22 deletions

diff --git a/dev-cpp/libxmlpp/ChangeLog b/dev-cpp/libxmlpp/ChangeLog
index f386398897a0..c6f72a2e91e6 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.107 2011/04/14 17:55:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/ChangeLog,v 1.108 2011/04/20 12:30:29 pacho Exp $
+
+*libxmlpp-2.34.1 (20 Apr 2011)
+
+  20 Apr 2011; Pacho Ramos <pacho@gentoo.org> -libxmlpp-2.33.2.ebuild,
+  +libxmlpp-2.34.1.ebuild:
+  Version bump including upstream fixes to not require mm-common at buildtime
+  ever. Remove old.
 
   14 Apr 2011; Pacho Ramos <pacho@gentoo.org> libxmlpp-2.32.0-r1.ebuild,
   libxmlpp-2.33.2.ebuild:
diff --git a/dev-cpp/libxmlpp/Manifest b/dev-cpp/libxmlpp/Manifest
index 2a4b701caa48..aedf6ab5a00c 100644
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@@ -5,18 +5,18 @@ AUX libxmlpp-1.0.5-gcc43.patch 236 RMD160 dee2cfb87f80ef24086c8e239774471465bbd1
 DIST libxml++-1.0.5.tar.bz2 303965 RMD160 073cff2d7a07ca62552c001d9560a21bcc447d35 SHA1 e90e66beff0af2e2f2a320ffbf8f4c1a3790bc44 SHA256 512b71e38d8b3593e716774a5bb8d074531ae0509cc947eba8f98af60c5d5563
 DIST libxml++-2.22.0.tar.bz2 1485168 RMD160 834588297451c6dc291ea6327a22699fed8ba76c SHA1 8c69339e1b472bd5e541e30fdaa47b152bc186bc SHA256 614954876e016e684d5638c00842451cdd2a4f55717b4e699cd7050a95d79de2
 DIST libxml++-2.32.0.tar.bz2 831918 RMD160 5f4662c7c83d3892f04fd35c53f609e06b194ef7 SHA1 ac4b3a03cd1d5ab3d4ce35486a1c9ee771f7ad4a SHA256 7989e285ca6fe63379121a2afea8dd4806abef6ecf1cb84f4fc4e9de18b43c25
-DIST libxml++-2.33.2.tar.bz2 1265916 RMD160 55799aa901b2ddcd074d9645257938c0c24a3b43 SHA1 264b480eccc5e2b1ceac34edfd019a33af5ec867 SHA256 88aab1fdf6d298083664cc69327a714592c61d5cff58674dca8b930b6fddd37d
+DIST libxml++-2.34.1.tar.bz2 1286110 RMD160 0cc22e3d1cbda34933eaec1407ca2a4caefa3388 SHA1 17adf3bd443b2c174fa3a13a8a86ca03803ed062 SHA256 664f3636c425554bf5e7d1b60253244e2d723899be8a971fc54332148bfce040
 EBUILD libxmlpp-1.0.5.ebuild 1113 RMD160 acbc014f6d3ca22ee1edd40041c5252b714ed8b9 SHA1 8ef92a2a04053cc20d8dfefb867021e8cff2d312 SHA256 517ae1147b9987f03f222d9f0693d14df1fa6f4a7916ad2cec4790f817fc5a89
 EBUILD libxmlpp-2.22.0.ebuild 1052 RMD160 e43f60cf4011a28d91252e75c57332c222df8e72 SHA1 f62731e29df1928c2105c238b3f78ae0f707863c SHA256 5b1018fce82a9211b64e97f7f20791477590e957c60093069a6e63dbe96ceed0
 EBUILD libxmlpp-2.32.0-r1.ebuild 1529 RMD160 e21712451c9bc91de7275627e895798a31c4394d SHA1 6c691b5c25e8a55f33000f32712da2083c1382f7 SHA256 c0bddcdf50bd850bc15b8b11ea75c88043b1f0c96eb96743337628106c4c36d6
 EBUILD libxmlpp-2.32.0.ebuild 1075 RMD160 221eb904943e9411e960558c60acd40533349a76 SHA1 9b9ae9669d330317dad633f7d1704eb8feb69a13 SHA256 a6acd24e997ae4b6dec1d4d1ef5f88ea9087c2e38d04e4e2ee999d6293fc62bc
-EBUILD libxmlpp-2.33.2.ebuild 1524 RMD160 13b6e480e6211a2e5254466d53efb91d0a970291 SHA1 4db5ef784ecdcdc1cbbe8d3e49b827ba739b808b SHA256 63cd7c245c50372d24df230afc7aa78c5cc389f0505e01189be6cdf8c78cc5dd
-MISC ChangeLog 15423 RMD160 5e6b0c548b624600d271b3388b8056d9645d4ca7 SHA1 d3316fdb7cb4f32e4983d0cd323bef11b9005899 SHA256 67fce6643b74b4721142ae9dbde71cef72955a99292aa454dcb14de4907c2fe1
+EBUILD libxmlpp-2.34.1.ebuild 1166 RMD160 634961bd6208361f1c9b6d20b0002cf72a3d4019 SHA1 ba918c2ea0f05b7d5ce8dc724230b3e623525cb9 SHA256 d73fdd9c073314af0a2e758562ac40ca55e79330cbafaf4792026d62200c4850
+MISC ChangeLog 15652 RMD160 7ad566629c32f153721529405f0ed48a28901a31 SHA1 5e8a5e5b7dd2d54bde4470475c4a70ad76a4a7e6 SHA256 3df0698d42a734b8df8d6e54edbb95e88764aaa642e263aaa43c92c99ec07d64
 MISC metadata.xml 162 RMD160 e3b9e3d8ece920d890bf37c43a6bcd9757539556 SHA1 6ee3bb3e0cce43428124dfa192af30ddb055d95f SHA256 7d0ce82d5ca3b20cb1c4641c7b7aae7082fd6be059b85fab9699095fd965f2e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2nNQ0ACgkQCaWpQKGI+9SYagCeJPv0k33phibc+2e8RnyDlW4G
-5aUAnjr12EjkV98gkavrEWcPpmDy5BlI
-=sQtM
+iEYEARECAAYFAk2u0eoACgkQCaWpQKGI+9T1rgCeL3VbdiI/SAsjEjNGoYXufT2P
+NEgAn2PWYvnhErNIYspQ+GsIKxwfO802
+=SbXz
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.33.2.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.34.1.ebuild
index e4ea3455aa95..bb86048cc496 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.33.2.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.34.1.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.3 2011/04/14 17:55:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-2.34.1.ebuild,v 1.1 2011/04/20 12:30:29 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2 autotools
+inherit gnome2
 
 MY_PN="${PN/pp/++}"
 MY_P="${MY_PN}-${PV}"
@@ -23,12 +23,8 @@ IUSE="doc"
 RDEPEND=">=dev-libs/libxml2-2.6.1
 	>=dev-cpp/glibmm-2.4"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( || (
-		<dev-cpp/glibmm-2.27.97:2[doc?]
-		>=dev-cpp/mm-common-0.9.3
-	) )
-"
+	dev-util/pkgconfig"
+
 pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable doc documentation)"
 	DOCS="AUTHORS ChangeLog NEWS README*"
@@ -40,13 +36,6 @@ 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() {