Clean up vulnerable versions.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

3 files changed, 22 insertions, 217 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index 5bd3ba1339ed..60e46928cc4e 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.454 2015/05/27 12:26:01 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.455 2015/05/27 13:39:25 tetromino Exp $
+
+  27 May 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -libxml2-2.9.2.ebuild:
+  Clean up vulnerable versions.
 
   27 May 2015; Mikle Kolyada <zlogene@gentoo.org> libxml2-2.9.2-r1.ebuild:
   arm stable wrt bug #546720
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 3dc79a443c60..e362dafcfdac 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -15,15 +15,24 @@ DIST xmlts20080827.tar.gz 638940 SHA256 96151685cec997e1f9f3387e3626d61e6284d4d6
 DIST xsts-2002-01-16.tar.gz 6894439 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 WHIRLPOOL 84dd51959460a4f8aa582d57ad39229c546ca7fe155012c57c368b59f5d31400d8b940a343a7320058330ca611303139cacdffed514783f96406ac5366026b11
 DIST xsts-2004-01-14.tar.gz 2761085 SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe WHIRLPOOL c46a3bf7d6dd771757f4304995cc177cf51c6cdd0e9778851fc13d3809c7b984690b4f273b3e075abe018110968eb7fc78f5b83170d3e18bacf00a4ed64b213d
 EBUILD libxml2-2.9.2-r1.ebuild 6769 SHA256 0dbbc62bcda92d567bc92f20b0b500d802e6fed4f2f69747ae2332c932943271 SHA512 a7602218e55b590956573f4a5c55a1c116f8c29b51307e5e41963f23bfc0f525a00d333b320767e89a26df5d4a284fb4ec80f056e18dc7e502b45df211b6f600 WHIRLPOOL 1229ff63803a271c6f6033c6eccb14aaf0d5996ce7ce8ea29c5f3518cebbd716f3e50361cffea66e6d4ea6e803f79cde7049d7addc651ef17fe574f702ffb6e0
-EBUILD libxml2-2.9.2.ebuild 6500 SHA256 673b79f95dbe6ec1743240487585ca67ee0bb03ceb722b92e9313e8b3a3d0c25 SHA512 83da0196554d5b3af6be2d6c58ebc227f6aae8e03e7e7a0c6a1e6338dea0235c805ca07e497b58591a3f392761b743d4a88847f82fb50830c77e39dc4f756319 WHIRLPOOL 14452df05972fad2be967bec3fa2af7f5c8ee98545e51149189f86ea748d6aa7f32a4ad97435ec6fea5bdabc4b3a446d38b7f55510ff0f5c27e52fb957208d28
-MISC ChangeLog 65196 SHA256 b717fb268de84d541441048cc920c4e9bcad725721de3d22ce2351afa6d82211 SHA512 2a18a0714ffa4c060e47b0e5316addcdebd328d34f345d76123b07c723e82184566b25e458d8f90ee2c01d05ba5953a4c0c4a93330b8b63f767999ddc0072e2e WHIRLPOOL cd5f0534b64c30bc5ce01a6b949a83d5ee6d97d6303e45d6b1f83bdaf4e5dba6ca9c6c2a5ddda04932e750a8ce689a57dbb52d95de3c8a6223f3844b4c372993
+MISC ChangeLog 65315 SHA256 d04591b3b2b5b205fa04f164fec3c7fff029a47b7ae9f962f288db514d8e2687 SHA512 6ec4f7cf271ff7f0ccb0d079d9709dae5fd2546ab1d75f272d5c07cf08c76f0ad50be2188c6b8ad761f5d166289281682b8f5ede4a5dacdecc05b43edfbcb007 WHIRLPOOL 5dd3c53022e083af22d3c57c2bab1fa8d6586f47cc7bba6e924219c3bb562d9ba4a85034422b6cfdaf1688fea64fee2358cb2de9fe01b23eca0801b951c2afdf
 MISC metadata.xml 240 SHA256 5dcdc1a8fd86d82f00a60bb322fb4f8a579d75ec7be2398164435197ab3903df SHA512 d673fbe248c2fcdf401f91f8d0e15587fd9f94c604d62f7864931f379b35a3ffc20264ae9668661a0d09693cd42db30c7f74fcb606da812312e394272acfeec8 WHIRLPOOL 4d2cc2b44bc446377dc659162e9f638650e82564a3328b0b23c1e6f197e88b9ae545d8778c69829a6f268e8b5f7d0db1b0aee1e3d8aedd909d1d756dc4aa94c3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlVlt2AACgkQG9wOWsQutdY3HwQAoEpCkSrBLBC0O8riUTYnKGU0
-6vkOep3nagh+y2+05yje9HWuAt/JJuiFBhM+NbUcMs5DtHMXXoZLNa3GHy5YAs1H
-CixCgN9vDLhNF3VRWYXPe0qQaPFAA+VfXGtubzy2HF23wiFPxj4LTK6ghWJc3wDp
-js/qNkqevmHqem5ofBA=
-=+jWU
+iQJ8BAEBCABmBQJVZckPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNaYAP/AygDwR7WpvmAvuGIoUvzrBT
+uSEPydvp0K5Osp3Dv87ieuTgH6ijaBFzplP9qcSu+mPPKngyfqKEaZAH3cdqjduq
+0fxDjO5pmFBV9OwnyUNW/IkejW7nB3JgdUv2BXMxAc61EQSo863iLK8XPjqGW0Rg
+wLNgQc2Cy5AEIpjGP70pKfkV0nwAcYZSs7OJwGuOuGs51GITfYTU6BScr3RmDEd+
+N7Au0gKcBrwdNDgUxlQQkhD5SBlEy5OVd0T4n3eyZfLtPEyCcTZ5ZLfyENCqLHDl
++ukBmXzDvF7cCXBdFd254jLODqog/Ygyny6PQxTAOvTJNfxCuhz2vKq0Fw1VWRgN
+lWJ9jZZHvjBi97BreFzeya0dN14ocMhrKCCRQ8FgfzeGZJiIH554EwRJaek+OJdM
+M+K79QGw5BJQU7yNNsJ/S7bPZuyhrZzdGxkM8TUYXMqI4cNv1CZ4R4LXgRrEvqxq
+XfMhnqxXeaeJ98mxXECCWC6TaHodw8LgXqwIxEu1ZePvQkkRxbK18YVwaxvix72k
+GnOjG1oeGAgzV0osEvaE015E4UlcMSguJ6sCabr04hQdvd63qIpWCkodpnoPwTR0
+SuAqK98lsioe6YolXlQNIs4msqEaQUYV90TaQUgx1dw9FMJdkZUeZzMN/EtpyhBo
+oJy20DkRO1UMMh3EPLSS
+=lg+Z
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/libxml2-2.9.2.ebuild b/dev-libs/libxml2/libxml2-2.9.2.ebuild
deleted file mode 100644
index 26e33b21e4d9..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.2.ebuild,v 1.13 2015/04/08 17:51:56 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic eutils python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug examples icu ipv6 lzma python readline static-libs 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"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-COMMON_DEPEND="
-	>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-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/_rc/-rc}.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"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
-	# Patches needed for prefix support
-	epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
-	epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
-	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-#	epunt_cxx # if we don't eautoreconf
-
-	# Important patches from master
-	epatch \
-		"${FILESDIR}/${PN}-2.9.2-revert-missing-initialization.patch"
-
-	# Please do not remove, as else we get references to PORTAGE_TMPDIR
-	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
-	# We now need to run eautoreconf at the end to prevent maintainer mode.
-#	elibtoolize
-
-	# Use pkgconfig to find icu to properly support multilib, upstream bug #738751
-	epatch "${FILESDIR}/${PN}-2.9.2-icu-pkgconfig.patch"
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# 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).
-
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-subdir=${PF}/html \
-			--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable ipv6) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	libxml2_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure "--with-python=${PYTHON}" # odd build system
-	}
-
-	libxml2_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
-	fi
-}
-
-multilib_src_test() {
-	default
-	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" \
-		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxml2_py_emake DESTDIR="${D}" install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	# on windows, xmllint is installed by interix libxml2 in parent prefix.
-	# this is the version to use. the native winnt version does not support
-	# symlinks, which makes repoman fail if the portage tree is linked in
-	# from another location (which is my default). -- mduft
-	if [[ ${CHOST} == *-winnt* ]]; then
-		rm -rf "${ED}"/usr/bin/xmllint
-		rm -rf "${ED}"/usr/bin/xmlcatalog
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	einstalldocs
-
-	if ! use python; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/python
-		rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV}
-	fi
-
-	if ! use examples; then
-		rm -rf "${ED}/usr/share/doc/${PF}/examples"
-		rm -rf "${ED}/usr/share/doc/${PF}/python/examples"
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	# 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="${EROOT}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 "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}/python" > /dev/null || die
-	emake "$@"
-	popd > /dev/null
-}