old

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

7 files changed, 8 insertions, 324 deletions

diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index 482075616c55..131665b9ade5 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/expat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.138 2012/05/28 15:49:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.139 2012/05/28 16:06:25 ssuominen Exp $
+
+  28 May 2012; Samuli Suominen <ssuominen@gentoo.org> -expat-2.0.1-r6.ebuild,
+  -files/expat-2.0.1-CVE-2009-3560-revised.patch,
+  -files/expat-2.0.1-check_stopped_parser.patch,
+  -files/expat-2.0.1-fix_bug_1990430.patch, -expat-2.1.0_beta3.ebuild,
+  -expat-2.1.0-r1.ebuild:
+  old
 
   28 May 2012; Raúl Porcel <armin76@gentoo.org> expat-2.1.0.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #412089
diff --git a/dev-libs/expat/expat-2.0.1-r6.ebuild b/dev-libs/expat/expat-2.0.1-r6.ebuild
deleted file mode 100644
index 526ed1c9dda1..000000000000
--- a/dev-libs/expat/expat-2.0.1-r6.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.0.1-r6.ebuild,v 1.8 2012/03/15 02:29:18 ssuominen Exp $
-
-EAPI=4
-inherit eutils libtool toolchain-funcs
-
-DESCRIPTION="XML parsing libraries"
-HOMEPAGE="http://expat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/expat/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="elibc_FreeBSD examples static-libs unicode"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-check_stopped_parser.patch \
-		"${FILESDIR}"/${P}-fix_bug_1990430.patch \
-		"${FILESDIR}"/${P}-CVE-2009-3560-revised.patch
-
-	elibtoolize
-	epunt_cxx
-
-	mkdir "${S}"-build{,u,w} || die
-}
-
-src_configure() {
-	local myconf="$(use_enable static-libs static)"
-
-	pushd "${S}"-build >/dev/null
-	ECONF_SOURCE="${S}" econf ${myconf}
-	popd >/dev/null
-
-	if use unicode; then
-		pushd "${S}"-buildu >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
-		popd >/dev/null
-
-		pushd "${S}"-buildw >/dev/null
-		CFLAGS="${CFLAGS} -fshort-wchar" CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf}
-		popd >/dev/null
-	fi
-}
-
-src_compile() {
-	pushd "${S}"-build >/dev/null
-	emake
-	popd >/dev/null
-
-	if use unicode; then
-		pushd "${S}"-buildu >/dev/null
-		emake buildlib LIBRARY=libexpatu.la
-		popd >/dev/null
-
-		pushd "${S}"-buildw >/dev/null
-		emake buildlib LIBRARY=libexpatw.la
-		popd >/dev/null
-	fi
-}
-
-src_install() {
-	dodoc Changes README
-	dohtml doc/*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	pushd "${S}"-build >/dev/null
-	emake install DESTDIR="${D}"
-	popd >/dev/null
-
-	if use unicode; then
-		pushd "${S}"-buildu >/dev/null
-		emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la
-		popd >/dev/null
-
-		pushd "${S}"-buildw >/dev/null
-		emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
-		popd >/dev/null
-	fi
-
-	use static-libs || rm -f "${ED}"usr/lib*/libexpat{,u,w}.la
-
-	# libgeom in /lib and ifconfig in /sbin require it on FreeBSD since we
-	# stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
-	use elibc_FreeBSD && gen_usr_ldscript -a expat{,u,w}
-}
diff --git a/dev-libs/expat/expat-2.1.0-r1.ebuild b/dev-libs/expat/expat-2.1.0-r1.ebuild
deleted file mode 100644
index bb1451fc47ff..000000000000
--- a/dev-libs/expat/expat-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r1.ebuild,v 1.2 2012/04/26 12:16:04 aballier Exp $
-
-EAPI=4
-inherit eutils libtool multilib toolchain-funcs
-
-DESCRIPTION="XML parsing libraries"
-HOMEPAGE="http://expat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/expat/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="elibc_FreeBSD examples static-libs unicode"
-
-src_prepare() {
-	elibtoolize
-	epunt_cxx
-
-	mkdir "${S}"-build{,u,w} || die
-}
-
-src_configure() {
-	local myconf="$(use_enable static-libs static)"
-
-	pushd "${S}"-build >/dev/null
-	ECONF_SOURCE="${S}" econf ${myconf}
-	popd >/dev/null
-
-	if use unicode; then
-		pushd "${S}"-buildu >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
-		popd >/dev/null
-
-		pushd "${S}"-buildw >/dev/null
-		CFLAGS="${CFLAGS} -fshort-wchar" CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf}
-		popd >/dev/null
-	fi
-}
-
-src_compile() {
-	pushd "${S}"-build >/dev/null
-	emake
-	popd >/dev/null
-
-	if use unicode; then
-		pushd "${S}"-buildu >/dev/null
-		emake buildlib LIBRARY=libexpatu.la
-		popd >/dev/null
-
-		pushd "${S}"-buildw >/dev/null
-		emake buildlib LIBRARY=libexpatw.la
-		popd >/dev/null
-	fi
-}
-
-src_install() {
-	dodoc Changes README
-	dohtml doc/*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	pushd "${S}"-build >/dev/null
-	emake install DESTDIR="${D}"
-	popd >/dev/null
-
-	if use unicode; then
-		pushd "${S}"-buildu >/dev/null
-		emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la
-		popd >/dev/null
-
-		pushd "${S}"-buildw >/dev/null
-		emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
-		popd >/dev/null
-
-		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
-		cp expat.pc expatu.pc
-		sed -i -e '/^Libs/s:-lexpat:&u:' expatu.pc || die
-		cp expat.pc expatw.pc
-		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
-		popd >/dev/null
-	fi
-
-	rm -f "${ED}"usr/lib*/libexpat{,u,w}.la
-
-	# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
-	# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
-	use elibc_FreeBSD && gen_usr_ldscript -a expat
-}
diff --git a/dev-libs/expat/expat-2.1.0_beta3.ebuild b/dev-libs/expat/expat-2.1.0_beta3.ebuild
deleted file mode 100644
index 9b2f04c3eed1..000000000000
--- a/dev-libs/expat/expat-2.1.0_beta3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0_beta3.ebuild,v 1.9 2012/04/08 14:55:11 armin76 Exp $
-
-EAPI=4
-inherit eutils libtool toolchain-funcs
-
-DESCRIPTION="XML parsing libraries"
-HOMEPAGE="http://expat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/expat/${P/_/-}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="elibc_FreeBSD examples static-libs unicode"
-
-src_unpack() {
-	if [[ ${PV} == *beta* ]]; then
-		unpack ${A}
-		mv ${PN}-* "${S}"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	elibtoolize
-	epunt_cxx
-
-	mkdir "${S}"-build{,u,w} || die
-}
-
-src_configure() {
-	local myconf="$(use_enable static-libs static)"
-
-	pushd "${S}"-build >/dev/null
-	ECONF_SOURCE="${S}" econf ${myconf}
-	popd >/dev/null
-
-	if use unicode; then
-		pushd "${S}"-buildu >/dev/null
-		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf}
-		popd >/dev/null
-
-		pushd "${S}"-buildw >/dev/null
-		CFLAGS="${CFLAGS} -fshort-wchar" CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf}
-		popd >/dev/null
-	fi
-}
-
-src_compile() {
-	pushd "${S}"-build >/dev/null
-	emake
-	popd >/dev/null
-
-	if use unicode; then
-		pushd "${S}"-buildu >/dev/null
-		emake buildlib LIBRARY=libexpatu.la
-		popd >/dev/null
-
-		pushd "${S}"-buildw >/dev/null
-		emake buildlib LIBRARY=libexpatw.la
-		popd >/dev/null
-	fi
-}
-
-src_install() {
-	dodoc Changes README
-	dohtml doc/*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	pushd "${S}"-build >/dev/null
-	emake install DESTDIR="${D}"
-	popd >/dev/null
-
-	if use unicode; then
-		pushd "${S}"-buildu >/dev/null
-		emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la
-		popd >/dev/null
-
-		pushd "${S}"-buildw >/dev/null
-		emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
-		popd >/dev/null
-	fi
-
-	rm -f "${ED}"usr/lib*/libexpat{,u,w}.la
-
-	# libgeom in /lib and ifconfig in /sbin require it on FreeBSD since we
-	# stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
-	use elibc_FreeBSD && gen_usr_ldscript -a expat{,u,w}
-}
diff --git a/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch b/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch
deleted file mode 100644
index 301831f0dd69..000000000000
--- a/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560
-http://bugs.gentoo.org/show_bug.cgi?id=303727
-http://cvs.fedoraproject.org/viewvc/rpms/expat/devel/
-
---- lib/xmlparse.c
-+++ lib/xmlparse.c
-@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser,
-         return XML_ERROR_UNCLOSED_TOKEN;
-       case XML_TOK_PARTIAL_CHAR:
-         return XML_ERROR_PARTIAL_CHAR;
-+      case -XML_TOK_PROLOG_S:
-+        tok = -tok;
-+        break;
-       case XML_TOK_NONE:
- #ifdef XML_DTD
-         /* for internal PE NOT referenced between declarations */
diff --git a/dev-libs/expat/files/expat-2.0.1-check_stopped_parser.patch b/dev-libs/expat/files/expat-2.0.1-check_stopped_parser.patch
deleted file mode 100644
index a51e6baa3351..000000000000
--- a/dev-libs/expat/files/expat-2.0.1-check_stopped_parser.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix segmentation fault in python tests
-http://bugs.gentoo.org/197043
-
---- lib/xmlparse.c
-+++ lib/xmlparse.c
-@@ -2563,6 +2563,8 @@
-                               (int)(dataPtr - (ICHAR *)dataBuf));
-               if (s == next)
-                 break;
-+              if (ps_parsing == XML_FINISHED || ps_parsing == XML_SUSPENDED)
-+                break;
-               *eventPP = s;
-             }
-           }
diff --git a/dev-libs/expat/files/expat-2.0.1-fix_bug_1990430.patch b/dev-libs/expat/files/expat-2.0.1-fix_bug_1990430.patch
deleted file mode 100644
index 17dc166a6956..000000000000
--- a/dev-libs/expat/files/expat-2.0.1-fix_bug_1990430.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmltok_impl.c?view=log (1.13 -> 1.15)
-http://svn.python.org/view?view=rev&revision=74429
-
---- lib/xmltok_impl.c
-+++ lib/xmltok_impl.c
-@@ -1744,7 +1744,7 @@
-                        const char *end,
-                        POSITION *pos)
- {
--  while (ptr != end) {
-+  while (ptr < end) {
-     switch (BYTE_TYPE(enc, ptr)) {
- #define LEAD_CASE(n) \
-     case BT_LEAD ## n: \