old

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

8 files changed, 17 insertions, 337 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/Manifest b/dev-libs/expat/Manifest
index 0ec15ac49851..b23c6867cf7b 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX expat-2.0.1-CVE-2009-3560-revised.patch 532 RMD160 dea59f98ce296e64cde88910e130f2dda0eab70c SHA1 539bb11a6ae11d83c703c52636fa35d32e7711dc SHA256 1909160d5745b47e54e3db525b94c5992320ddd8ef28a0aaf52c081669cef368
-AUX expat-2.0.1-check_stopped_parser.patch 410 RMD160 10fa46c2844aeffd31c43f23ba08367f87aa2ac0 SHA1 dc457839ba07ff661f5ed424841af9ea0bbdf605 SHA256 555f1c652c983f60010e1d88af96c672520245034a9aa846aec048d258726d44
-AUX expat-2.0.1-fix_bug_1990430.patch 428 RMD160 7b566a7db9036238a7e781a20157f9b4c13fa0d9 SHA1 5d1c09acaa7d73cae98cda327d79a2d64f3b6926 SHA256 1e491172e983878ca7974c1a40a7327a630b728cc33eb9183f8050b536dcb692
-DIST expat-2.0.1.tar.gz 446456 RMD160 d31bcb152adaff9e358968be1ea901e1b4ed3b2f SHA1 663548c37b996082db1f2f2c32af060d7aa15c2d SHA256 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
-DIST expat-2.1.0-beta3.tar.gz 562612 RMD160 2a03f16494c61fe7eb0e5e3081a4f68f78f3610d SHA1 956e05916d4840c46ca9f5377a01b13cafc4b510 SHA256 69d2ec90d46b1308ffd2f4e8f2f269124951f9c12314d422df8f47fe315f2aa6
 DIST expat-2.1.0.tar.gz 562616 RMD160 bffca083d29fe7688f106a902ef9b909c3321c5d SHA1 b08197d146930a5543a7b99e871cba3da614f6f0 SHA256 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
-EBUILD expat-2.0.1-r6.ebuild 2271 RMD160 3328a7a2af7d28e4dd4b96094fa1be55744e2a4f SHA1 163b37b7b83fb32f64a347f6a94828c90e3cf4fa SHA256 0c477a2016491abf555c9cd64c5da42a7f3350abbf6dd5180ae7e65c36530a7f
-EBUILD expat-2.1.0-r1.ebuild 2355 RMD160 88ee5d953233fbf10d1b86d47f7f76fe66c7da56 SHA1 874523eefc69b0c5c4eb753e89575fe4dab6d64b SHA256 a3b9080b910d9dfca493654c238e8fdd4c8f12bb1154d9eb0321a5f50ad67345
 EBUILD expat-2.1.0-r2.ebuild 2322 RMD160 b6ab3d7ab27ca83a89833e1866fcea329d593424 SHA1 6c1fea1fb1a136345553f41bce5ad8409f9147a1 SHA256 92ceefbab3de48c050635e797c6cde487fdd2f700d198e54be7096f0cd989c0b
 EBUILD expat-2.1.0.ebuild 2092 RMD160 3b383653533e55a78694da3036af13e0ebf03d40 SHA1 1442bb318ee5a5b03c52e50b356a57a58c042fea SHA256 fe2d698ec29141401a22e1d0b0df45c489369bf8ca7a277f1cf97c1064ec6820
-EBUILD expat-2.1.0_beta3.ebuild 2206 RMD160 36659c30a6b065893c12e6edf5970f820464fd81 SHA1 ab8105587274d0dc87c0a373ff5b8d641e8dac20 SHA256 aee818e8aac73a92e29bf332247049debeec7f7219b69cf1dbc91e14493f8646
-MISC ChangeLog 18200 RMD160 9cf3fac682af7f5f0f97e4fcea97c2a1a5af76c9 SHA1 d3535151d24d1df284f798e5afaf09f17691fde0 SHA256 9a02ab091f1638421b0a7cf77da1d31210d2be84267eca463def77e82eb0b3ad
+MISC ChangeLog 18483 RMD160 efef7a6fc98fc42ccd7a1cc598933e750a664418 SHA1 131e692306f91244a578a9247c348e67b38b84bd SHA256 b08b5d686006dbd8dd68c22b302ddb1c0f0fc0dcdf04bcaf8b6a06982b5fa3f4
 MISC metadata.xml 166 RMD160 70f6dcdab1516411ac581b270671fb776401f7b3 SHA1 79f7c7e01fdc4b59d924371b4ec75b000948fecc SHA256 a4f7a9f8f89d2da4f8d0c2d6acdacc96c38d4c076d23d8b2081f2a149ff15a56
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/DnngACgkQuQc30/atMkArcACgg/RWSYAuT4oihKHNTANtwaoO
-WvkAn2puebqTY5Nm3+57i6AQGe4Cp7SN
-=VbNr
+iQEcBAEBAgAGBQJPw6GzAAoJEEdUh39IaPFNm6YH/Rv8Rnlt+xwKc+I/Gg4PURWn
+AarXu2jSo1FXQMOOkjK416JgZtiE1nXBBdQInqV4smZVkV8G7y0gx2sW7NWaqgy3
+CsOJEkWCxar2Ol9M9o6lwDgGw9CgMZ93T9Sm+StrqzxI0FPfkyANi8FfRlUNn/Jc
+QHT627DDctjDZtDPVv7Cn2lVoseVZUWV8zcIDL8uTRpauFNOE2McQsPUkLi00adB
+MCsWBYG1NwGHDJQstxSWflFYQOKqzlSX3mhBA+NLyjs4UDatZtoVJf1hlGTwE+wb
+W11gj+qza1ctpoPf0lopThwSV4NvqcrSHLil2cSgNOQ9XyIZBzjLMh2Cgl63pdA=
+=y/6H
 -----END PGP SIGNATURE-----
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: \