Do not install 3 different documentation directories, bug #248127.

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

3 files changed, 28 insertions, 11 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index 7263bd3e9dd0..e8d4af694c52 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.264 2009/04/27 21:28:46 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.265 2009/05/31 17:37:14 eva Exp $
+
+  31 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  libxml2-2.7.3-r1.ebuild:
+  Do not install 3 different documentation directories, bug #248127.
 
 *libxml2-2.7.3-r1 (27 Apr 2009)
 
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index ec7b6fd4eda9..02974931154c 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -5,14 +5,14 @@ AUX libxml2-2.7.3-printf-rename.patch 17280 RMD160 920065d543127026c526f00856e9a
 DIST libxml2-2.7.3.tar.gz 4789450 RMD160 14018347531fd135366cee9fd9d760a1988546e2 SHA1 fd4e427fb55c977876bc74c0e552ef7d3d794a07 SHA256 432464d8c9bd8060d9c1fdef1cfa75803c1a363ceac20b21f8c7e34e056e5a98
 DIST xsts-2002-01-16.tar.gz 6894439 RMD160 e8905fe1451a1c367b0104af24edca73bad1db08 SHA1 ca6344e6c47f8c28231f5b213d0c8deb0311a409 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914
 DIST xsts-2004-01-14.tar.gz 2761085 RMD160 faff2d7826e47ae9968564bc83dab1b54c5e4bf6 SHA1 5896c2aa2cda464246306c5cf0577ed506eefaab SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17
-EBUILD libxml2-2.7.3-r1.ebuild 3955 RMD160 b83ea471fd0cfbec34cafc188652fea8cd491803 SHA1 9d901c65c6301d2f6d665e41c50952ef2ff19248 SHA256 01799d800f1a7cc7f86d5bbe6ee5787c164233279fddb934ba2a08915963e429
+EBUILD libxml2-2.7.3-r1.ebuild 4356 RMD160 434ec9f6ef838ac4776c46c12699bdceaf82b1d3 SHA1 bd313440b932a6ea0fbc6492829e38416a721678 SHA256 62bcb63eeae44defca7808a13dfed70fe83380c868c69f2267073817dc401645
 EBUILD libxml2-2.7.3.ebuild 3899 RMD160 1ee7fc807c673de46c107aca9df437439e9783ad SHA1 07b708b6f3222f7e849195d199a5d6001ea0cbed SHA256 9f53004724783f7e19a37c34fec4513e276b09e002afbbba4c08b09c3f08547d
-MISC ChangeLog 35254 RMD160 5aca14beb5af335780aa62882e94501303c21316 SHA1 ac6acbe23dfb43f1013ec2d7d51c35edd1da47df SHA256 fdf47fbfbd885d92e3dbd03d8983230462ef6d2aab9263b031967191463338d5
+MISC ChangeLog 35405 RMD160 b41830426e45beb75ea8f5e4d81d1994e8e1180e SHA1 127c68ca233243e212f9e24dd3418c79194d8d5b SHA256 737a397b8418f8d12a70f77719a6f6c4460a550b216ec0b5d351f47a20664376
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkn2P7cACgkQ1fmVwcYIWAYrnACfRFZK17xTkOXAs9LULE8xH2TL
-RaAAoIlJ+nm5y3SC/gdNVXroxYxDWGQk
-=t10s
+iEYEARECAAYFAkoiwFAACgkQ1fmVwcYIWAaSrwCZAdTDDtAgk91kdRSHiGeUCPvt
+FTwAn0eOoM7uDqgH+5p7RGquI2Q6x2jU
+=SYcJ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild b/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild
index f8411cb38878..69f09f804233 100644
--- a/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild,v 1.1 2009/04/27 21:28:46 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild,v 1.2 2009/05/31 17:37:14 eva Exp $
 
 inherit libtool flag-o-matic eutils python
 
@@ -60,6 +60,8 @@ src_compile() {
 	# --with-mem-debug causes unusual segmentation faults (bug #105120).
 
 	local myconf="--with-zlib \
+		--with-html-subdir=${PF}/html \
+		--docdir=/usr/share/doc/${PF} \
 		$(use_with debug run-debug)  \
 		$(use_with python)           \
 		$(use_with readline)         \
@@ -89,18 +91,29 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" \
+		EXAMPLES_DIR=/usr/share/doc/${PF}/examples \
+		docsdir=/usr/share/doc/${PF}/python \
+		exampledir=/usr/share/doc/${PF}/python/examples \
+		install || die "Installation failed"
 
 	dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* || die "dodoc failed"
+	rm "${D}"/usr/share/doc/${P}/Copyright
+	rm -rf "${D}"/usr/share/doc/${P}
+
+	if ! use python; then
+		rm -rf "${D}"/usr/share/doc/${PF}/python
+		rm -rf "${D}"/usr/share/doc/${PN}-python-${PV}
+	fi
 
 	if ! use doc; then
 		rm -rf "${D}"/usr/share/gtk-doc
-		rm -rf "${D}"/usr/share/doc/${P}/html
+		rm -rf "${D}"/usr/share/doc/${PF}/html
 	fi
 
 	if ! use examples; then
-		rm -rf "${D}/usr/share/doc/${P}/examples"
-		rm -rf "${D}/usr/share/doc/${PN}-python-${PV}/examples"
+		rm -rf "${D}/usr/share/doc/${PF}/examples"
+		rm -rf "${D}/usr/share/doc/${PF}/python/examples"
 	fi
 }