old

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

4 files changed, 6 insertions, 260 deletions

diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index 24724818d22f..61e9f4af2f00 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,11 @@
 # 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.120 2012/03/15 02:29:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.121 2012/03/15 02:30:27 ssuominen Exp $
+
+  15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> -expat-2.0.1-r5.ebuild,
+  -expat-2.1.0_beta2.ebuild,
+  -files/expat-2.1.0_beta2-move_setContext_call.patch:
+  old
 
   15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> expat-2.0.1-r6.ebuild:
   alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #405915
diff --git a/dev-libs/expat/expat-2.0.1-r5.ebuild b/dev-libs/expat/expat-2.0.1-r5.ebuild
deleted file mode 100644
index dd8a956afd1b..000000000000
--- a/dev-libs/expat/expat-2.0.1-r5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 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-r5.ebuild,v 1.8 2011/12/22 16:43:20 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"
-
-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)"
-
-	local d
-	for d in build buildu buildw; do
-		pushd "${S}"-${d}
-		[[ ${d} == buildu ]] && export GENTOO_CPPFLAGS="-UXML_UNICODE"
-		[[ ${d} == buildw ]] && export GENTOO_CPPFLAGS="-UXML_UNICODE -DXML_UNICODE_WCHAR_T"
-		CPPFLAGS="${CPPFLAGS} ${GENTOO_CPPFLAGS}" ECONF_SOURCE="${S}" econf ${myconf}
-		popd
-	done
-}
-
-src_compile() {
-	cd "${S}"-build
-	emake
-	cd "${S}"-buildu
-	emake buildlib LIBRARY=libexpatu.la
-	cd "${S}"-buildw
-	emake buildlib LIBRARY=libexpatw.la
-}
-
-src_install() {
-	dodoc Changes README
-	dohtml doc/*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	cd "${S}"-build
-	emake install DESTDIR="${D}"
-	cd "${S}"-buildu
-	emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la
-	cd "${S}"-buildw
-	emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la
-
-	use static-libs || rm -f "${D}"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_beta2.ebuild b/dev-libs/expat/expat-2.1.0_beta2.ebuild
deleted file mode 100644
index a2b2a8bdea2e..000000000000
--- a/dev-libs/expat/expat-2.1.0_beta2.ebuild
+++ /dev/null
@@ -1,97 +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_beta2.ebuild,v 1.2 2012/03/10 17:51:46 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_unpack() {
-	if [[ ${PV} == *beta* ]]; then
-		unpack ${A}
-		mv ${PN}-* "${S}"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-move_setContext_call.patch #407555
-
-	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.1.0_beta2-move_setContext_call.patch b/dev-libs/expat/files/expat-2.1.0_beta2-move_setContext_call.patch
deleted file mode 100644
index ab0860a89ff2..000000000000
--- a/dev-libs/expat/files/expat-2.1.0_beta2-move_setContext_call.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-http://bugs.gentoo.org/407555
-http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmlparse.c?r1=1.168&r2=1.170
-http://sourceforge.net/tracker/?func=detail&atid=110127&aid=3500861&group_id=10127
-
---- lib/xmlparse.c
-+++ lib/xmlparse.c
-@@ -432,6 +432,9 @@
- getElementType(XML_Parser parser, const ENCODING *enc,
-                const char *ptr, const char *end);
- 
-+static unsigned long generate_hash_secret_salt(void);
-+static XML_Bool startParsing(XML_Parser parser);
-+
- static XML_Parser
- parserCreate(const XML_Char *encodingName,
-              const XML_Memory_Handling_Suite *memsuite,
-@@ -695,22 +698,27 @@
-   return rand();
- }
- 
-+static XML_Bool  /* only valid for root parser */
-+startParsing(XML_Parser parser)
-+{
-+    /* hash functions must be initialized before setContext() is called */
-+    if (hash_secret_salt == 0)
-+      hash_secret_salt = generate_hash_secret_salt();
-+    if (ns) {
-+      /* implicit context only set for root parser, since child
-+         parsers (i.e. external entity parsers) will inherit it
-+      */
-+      return setContext(parser, implicitContext);
-+    }
-+    return XML_TRUE;
-+}
-+
- XML_Parser XMLCALL
- XML_ParserCreate_MM(const XML_Char *encodingName,
-                     const XML_Memory_Handling_Suite *memsuite,
-                     const XML_Char *nameSep)
- {
--  XML_Parser parser = parserCreate(encodingName, memsuite, nameSep, NULL);
--  if (parser != NULL && ns) {
--    /* implicit context only set for root parser, since child
--       parsers (i.e. external entity parsers) will inherit it
--    */
--    if (!setContext(parser, implicitContext)) {
--      XML_ParserFree(parser);
--      return NULL;
--    }
--  }
--  return parser;
-+  return parserCreate(encodingName, memsuite, nameSep, NULL);
- }
- 
- static XML_Parser
-@@ -946,7 +954,7 @@
-   poolClear(&temp2Pool);
-   parserInit(parser, encodingName);
-   dtdReset(_dtd, &parser->m_mem);
--  return setContext(parser, implicitContext);
-+  return XML_TRUE;
- }
- 
- enum XML_Status XMLCALL
-@@ -1499,8 +1507,10 @@
-     errorCode = XML_ERROR_FINISHED;
-     return XML_STATUS_ERROR;
-   case XML_INITIALIZED:
--    if (hash_secret_salt == 0)
--      hash_secret_salt = generate_hash_secret_salt();
-+    if (parentParser == NULL && !startParsing(parser)) {
-+      errorCode = XML_ERROR_NO_MEMORY;
-+      return XML_STATUS_ERROR;
-+    }
-   default:
-     ps_parsing = XML_PARSING;
-   }
-@@ -1623,8 +1633,10 @@
-     errorCode = XML_ERROR_FINISHED;
-     return XML_STATUS_ERROR;
-   case XML_INITIALIZED:
--    if (hash_secret_salt == 0)
--      hash_secret_salt = generate_hash_secret_salt();
-+    if (parentParser == NULL && !startParsing(parser)) {
-+      errorCode = XML_ERROR_NO_MEMORY;
-+      return XML_STATUS_ERROR;
-+    }
-   default:
-     ps_parsing = XML_PARSING;
-   }