summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiziano Müller <dev-zero@gentoo.org>2010-02-07 11:21:09 +0000
committerTiziano Müller <dev-zero@gentoo.org>2010-02-07 11:21:09 +0000
commite292d954f6d7f96c15802ba36670d5defe2745ed (patch)
treee582b1b66db8a89324a9d10784f90b74e470cf4b /dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild
parentStable on amd64 wrt bug #302944 (diff)
downloadgentoo-2-e292d954f6d7f96c15802ba36670d5defe2745ed.tar.gz
gentoo-2-e292d954f6d7f96c15802ba36670d5defe2745ed.tar.bz2
gentoo-2-e292d954f6d7f96c15802ba36670d5defe2745ed.zip
Added thread-test-disabling patch (thanks to Andreas Schürch, bug #280613). Version bump (which solves bug #277703 as well).
(Portage version: 2.2_rc61/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild')
-rw-r--r--dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild20
1 files changed, 14 insertions, 6 deletions
diff --git a/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild
index e8a9b700fe73..4b70d9987333 100644
--- a/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild,v 1.4 2009/12/07 18:20:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild,v 1.5 2010/02/07 11:21:08 dev-zero Exp $
EAPI="2"
@@ -12,9 +12,9 @@ SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 hppa ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="curl debug doc iconv icu libwww threads elibc_Darwin elibc_FreeBSD"
+IUSE="curl debug doc iconv icu libwww test threads elibc_Darwin elibc_FreeBSD"
-RDEPEND="icu? ( dev-libs/icu )
+RDEPEND="icu? ( >=dev-libs/icu-4.2 )
curl? ( net-misc/curl )
libwww? ( net-libs/libwww )
virtual/libiconv"
@@ -35,8 +35,16 @@ src_prepare() {
-e 's|$(prefix)/msg|$(DESTDIR)/$(prefix)/share/xerces-c/msg|' \
src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in || die "sed failed"
- epatch "${FILESDIR}/${P}-CVE-2009-2625.patch"
- epatch "${FILESDIR}/${P}-libicu.patch"
+ epatch \
+ "${FILESDIR}/${P}-CVE-2009-2625.patch" \
+ "${FILESDIR}/${P}-libicu.patch"
+
+ if use test && ! use threads ; then
+ epatch "${FILESDIR}/${PV}-disable-thread-tests.patch"
+ sed -i \
+ -e 's|ThreadTest$(EXEEXT) XSerializerTest$(EXEEXT)|XSerializerTest$(EXEEXT)|g' \
+ tests/Makefile.in || die "sed failed"
+ fi
}
src_configure() {