Make sure to remove unneeded /usr/share/doc directory, bug #295762

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

4 files changed, 19 insertions, 143 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index 63dc6c0ef84e..dd9fb2892be7 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.274 2009/09/16 08:05:17 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.275 2009/12/08 00:02:40 eva Exp $
+
+  08 Dec 2009; Gilles Dartiguelongue <eva@gentoo.org> -libxml2-2.7.4.ebuild,
+  libxml2-2.7.4-r1.ebuild:
+  Make sure to remove unneeded /usr/share/doc directory, bug #295762
 
 *libxml2-2.7.4-r1 (16 Sep 2009)
 
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 766051f1e5af..3ae0e0c59f32 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libxml2-2.7.3-CVE-2009-2414-CVE-2009-2416.patch 6356 RMD160 a8c9086e5f0c1816ae1f8de8e27ae828c05c6a04 SHA1 28c2219b8e3b3a693d7e2553d239863ad21b41d5 SHA256 03f26db3f24e7fb91c489208f992f327c767135949e8e25d180df8b76065e7ef
 AUX libxml2-2.7.3-printf-rename.patch 17280 RMD160 920065d543127026c526f00856e9a2a8fb41e42d SHA1 9a9515a1ea7c7313aa8e6bb607f987560504aaed SHA256 a7206cbd8a675e2d944f330255d648502d143472a2d96daa4753e422614b8520
 AUX libxml2-2.7.4-parser-grow.patch 1309 RMD160 7364ec69b3929ed5976d8faf3c6cdb2359d2fce6 SHA1 6f703b7a3e32ad2728827a0ca976b93953719d27 SHA256 0003cf89dc6de0ea8be4e063745f4f585b329ab47bfdc71c81e4918dfd461584
@@ -6,7 +9,13 @@ DIST libxml2-2.7.4.tar.gz 4835073 RMD160 c1d29b6b869cb07cfd78a93ac9b8dd24c2b801b
 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-r2.ebuild 4453 RMD160 37ffaaee427f6eec4d8e683cd0c209dd11ee58b8 SHA1 22b2e24584a39d2f5d372aa15c335fb803bd5de2 SHA256 b9aa76091d1d31340fe8b5092f313ed4b1662b55ac25dfaa07984240c660b38e
-EBUILD libxml2-2.7.4-r1.ebuild 4132 RMD160 d313e81bf5b06954ac0e456794ea332e3158ae95 SHA1 3638a3a4975e81a678b140ed70e8401995537395 SHA256 82112586dfb40bfef83dbcf62d72ba9f0ace95c1a81a36348d50227b2cbdaf7d
-EBUILD libxml2-2.7.4.ebuild 3981 RMD160 427d2424c57712cbccf4b31857be48abb7517727 SHA1 49b0b6f3fd405cbe07188bac8aef8c8bb18a6dd4 SHA256 955cd843cfa579c47cb640fd0d0f439d497dc6962cf74ff77a493b9cd9fb9f41
-MISC ChangeLog 36820 RMD160 1e6ca9464ee29bc8acb65fb6fbce72baeb05e0c8 SHA1 32939b7135ef451402c31c71b1f6f393df799a66 SHA256 1feb975ad009d393ba4f597e4c62004d89944a0bc47e5e6ceb98d39b5803fdc3
+EBUILD libxml2-2.7.4-r1.ebuild 4083 RMD160 f1a2fa0b8220086ee1a69e9e17ea14aedadca7ff SHA1 5cbe3534b2a3a9c47a948b1b76becbeec647b67c SHA256 8fa0b9fcd0aa57cbb6a6881c465c5d8a7b1e34e7e04217b485659d970ef93d3f
+MISC ChangeLog 36990 RMD160 1f1beb1047963253b4f2152d9fa62259603d5187 SHA1 e47cf741b768e5777ef5be5b34142d4d463d3f4a SHA256 33ae1b4d8690f083431ed21b17116c0d6eafee5d6f085cef90fc1a64a66b28a5
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksdl6sACgkQ1fmVwcYIWAbgawCg67APPZ59vORWsIvBRSY4C3yx
+l8QAoLl108omyD2gv4fx9GZxEUZwRlbL
+=cpXn
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/libxml2-2.7.4-r1.ebuild b/dev-libs/libxml2/libxml2-2.7.4-r1.ebuild
index e3e46bbd0aed..5e66d43f4b3e 100644
--- a/dev-libs/libxml2/libxml2-2.7.4-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.7.4-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.4-r1.ebuild,v 1.1 2009/09/16 08:05:17 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.4-r1.ebuild,v 1.2 2009/12/08 00:02:40 eva Exp $
 
 EAPI="2"
 
@@ -91,7 +91,7 @@ src_install() {
 		exampledir=/usr/share/doc/${PF}/python/examples \
 		install || die "Installation failed"
 
-	rm "${D}"/usr/share/doc/${P}/{AUTHORS,ChangeLog,Copyright,NEWS,README*,TODO*}
+	rm -rf "${D}"/usr/share/doc/${P}
 	dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* || die "dodoc failed"
 
 	if ! use python; then
diff --git a/dev-libs/libxml2/libxml2-2.7.4.ebuild b/dev-libs/libxml2/libxml2-2.7.4.ebuild
deleted file mode 100644
index a5d8026f194a..000000000000
--- a/dev-libs/libxml2/libxml2-2.7.4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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.4.ebuild,v 1.1 2009/09/13 23:05:48 eva Exp $
-
-EAPI="2"
-
-inherit libtool flag-o-matic eutils python
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc examples ipv6 python readline test"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )"
-
-RDEPEND="sys-libs/zlib
-	python? ( dev-lang/python )
-	readline? ( sys-libs/readline )"
-
-DEPEND="${RDEPEND}
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )"
-
-src_unpack() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P}.tar.gz
-	cd "${S}"
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-	fi
-}
-
-src_prepare() {
-	epunt_cxx
-}
-
-src_configure() {
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-
-	# --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)         \
-		$(use_with readline history) \
-		$(use_enable ipv6) \
-		PYTHON_SITE_PACKAGES=$(python_get_sitedir)"
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	elibtoolize
-
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	econf $myconf
-}
-
-src_install() {
-	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"
-
-	rm "${D}"/usr/share/doc/${P}/{AUTHORS,ChangeLog,Copyright,NEWS,README*,TODO*}
-	dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* || die "dodoc failed"
-
-	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/${PF}/html
-	fi
-
-	if ! use examples; then
-		rm -rf "${D}/usr/share/doc/${PF}/examples"
-		rm -rf "${D}/usr/share/doc/${PF}/python/examples"
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize $(python_get_sitedir)
-	fi
-
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [ "${ROOT}" != "/" ]
-	then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${ROOT}etc/xml/catalog"
-
-		# we dont want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [ ! -e ${CATALOG} ]; then
-			[ -d "${ROOT}etc/xml" ] || mkdir -p "${ROOT}etc/xml"
-			/usr/bin/xmlcatalog --create > ${CATALOG}
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages
-}