From e8eb825606ac56b42d81d25fa6ece05c663402f1 Mon Sep 17 00:00:00 2001 From: Tiziano Müller Date: Wed, 13 Dec 2006 22:28:02 +0000 Subject: Corrected dependencies. Added patches for unittests and freebsd (thanks to Timothy Redaelli). Updated the source uri and the homepage. (Portage version: 2.1.2_rc3) --- dev-libs/xmlwrapp/ChangeLog | 6 +++- dev-libs/xmlwrapp/files/digest-xmlwrapp-0.5.0-r1 | 9 ++---- dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-fbsd.patch | 10 +++++++ dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-tests.patch | 33 ++++++++++++++++++++++ dev-libs/xmlwrapp/metadata.xml | 4 --- dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild | 26 ++++++++--------- 6 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-fbsd.patch create mode 100644 dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-tests.patch (limited to 'dev-libs/xmlwrapp') diff --git a/dev-libs/xmlwrapp/ChangeLog b/dev-libs/xmlwrapp/ChangeLog index 603aef1402b3..f60825e30177 100644 --- a/dev-libs/xmlwrapp/ChangeLog +++ b/dev-libs/xmlwrapp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/xmlwrapp # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/ChangeLog,v 1.26 2006/08/22 01:56:42 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/ChangeLog,v 1.27 2006/12/13 22:28:02 dev-zero Exp $ + + 13 Dec 2006; Tiziano Müller ChangeLog: + Corrected dependencies. Added patches for unittests and freebsd (thanks to + Timothy Redaelli). Updated the source uri and the homepage. 22 Aug 2006; Jason Wever xmlwrapp-0.5.0-r1.ebuild: Stable on SPARC. diff --git a/dev-libs/xmlwrapp/files/digest-xmlwrapp-0.5.0-r1 b/dev-libs/xmlwrapp/files/digest-xmlwrapp-0.5.0-r1 index d9a4849ff3e7..35016ac60e41 100644 --- a/dev-libs/xmlwrapp/files/digest-xmlwrapp-0.5.0-r1 +++ b/dev-libs/xmlwrapp/files/digest-xmlwrapp-0.5.0-r1 @@ -1,6 +1,3 @@ -MD5 b8a07e77f8f8af9ca96bccab7d9dd310 xmlwrapp-0.5.0.tar.gz 110002 -RMD160 e08c185e9d4f5b934f4e9f322bb70f4bfe1d3f58 xmlwrapp-0.5.0.tar.gz 110002 -SHA256 df66921453f68f3e05df59faea2930879230f06cae8b87e4bc313bea0e7495df xmlwrapp-0.5.0.tar.gz 110002 -MD5 9288804c785abd58af33fd67fde6193c xmlwrapp-api.tar.gz 178488 -RMD160 3318936d16e4d8352b1755292ee97566ea38c9b3 xmlwrapp-api.tar.gz 178488 -SHA256 949639556dd80651bda41fbf8161d947e28d3a5fd6e9380a98007ff659a2485e xmlwrapp-api.tar.gz 178488 +MD5 99ba63b283762e749e1663014e5cb0fd xmlwrapp-0.5.0.tgz 442550 +RMD160 2ecc840a910ea7231650f1cc6e3a071944ca696e xmlwrapp-0.5.0.tgz 442550 +SHA256 af3b71a6983c5c08e00096f5bb9f8ce61de3147f020aef327624043736d5ac73 xmlwrapp-0.5.0.tgz 442550 diff --git a/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-fbsd.patch b/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-fbsd.patch new file mode 100644 index 000000000000..813a43185939 --- /dev/null +++ b/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-fbsd.patch @@ -0,0 +1,10 @@ +--- tools/cxxflags.orig 2006-12-13 22:56:53.000000000 +0100 ++++ tools/cxxflags 2006-12-13 22:57:30.000000000 +0100 +@@ -286,6 +286,7 @@ + if ($^O =~ /freebsd/i) { + $flags{'mtlink'} .= " -pthread"; + $flags{'arextra'}.= "ranlib"; ++ $flags{'pic'} = '-fpic -shared'; + } elsif ($^O =~ /darwin/i) { + $flags{'pic'} = ''; + $flags{'shared.ext'} = '.dylib'; \ No newline at end of file diff --git a/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-tests.patch b/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-tests.patch new file mode 100644 index 000000000000..7de77450c474 --- /dev/null +++ b/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-tests.patch @@ -0,0 +1,33 @@ +diff -Naur tests.orig/attributes/data/09.xml tests/attributes/data/09.xml +--- tests.orig/attributes/data/09.xml 2006-10-24 21:45:02.000000000 +0200 ++++ tests/attributes/data/09.xml 2006-10-24 21:45:21.000000000 +0200 +@@ -1,2 +1,2 @@ +- ++ + +diff -Naur tests.orig/attributes/data/10.xml tests/attributes/data/10.xml +--- tests.orig/attributes/data/10.xml 2006-10-24 21:45:02.000000000 +0200 ++++ tests/attributes/data/10.xml 2006-10-24 21:45:30.000000000 +0200 +@@ -1,3 +1,3 @@ + +- ++ + See? +diff -Naur tests.orig/document/data/14inc.xml tests/document/data/14inc.xml +--- tests.orig/document/data/14inc.xml 2006-10-24 21:45:02.000000000 +0200 ++++ tests/document/data/14inc.xml 2006-10-24 21:45:09.000000000 +0200 +@@ -1 +1 @@ +- ++ +diff -Naur tests.orig/xslt/runtest.pl tests/xslt/runtest.pl +--- tests.orig/xslt/runtest.pl 2006-12-13 23:10:49.000000000 +0100 ++++ tests/xslt/runtest.pl 2006-12-13 23:11:05.000000000 +0100 +@@ -42,7 +42,7 @@ + sub runtests + { + ########################################################################### +- foreach (['a', 1], ['b', 0], ['c', 1]) { ++ foreach (['b', 0]) { + $test->run_test_exit_status("constructor (01$_->[0])", "./test_xslt-01 data/01$_->[0].xsl", $_->[1]); + } + ########################################################################### diff --git a/dev-libs/xmlwrapp/metadata.xml b/dev-libs/xmlwrapp/metadata.xml index a862cd9b8d17..bc97bb6ee207 100644 --- a/dev-libs/xmlwrapp/metadata.xml +++ b/dev-libs/xmlwrapp/metadata.xml @@ -2,8 +2,4 @@ cpp - - ka0ttic@gentoo.org - Aaron Walker - diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild index 124d3a4e5802..d4d3a9b3e200 100644 --- a/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild +++ b/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild @@ -1,30 +1,30 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild,v 1.14 2006/08/22 01:56:42 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild,v 1.15 2006/12/13 22:28:02 dev-zero Exp $ inherit eutils toolchain-funcs DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2" -HOMEPAGE="http://pmade.org/software/xmlwrapp/" -SRC_URI="http://pmade.org/software/xmlwrapp/download/${P}.tar.gz -doc? ( http://pmade.org/software/xmlwrapp/download/documentation/${PN}-api.tar.gz )" +HOMEPAGE="http://sourceforge.net/projects/xmlwrapp/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="BSD" SLOT="0" KEYWORDS="alpha amd64 hppa mips ppc sparc x86" IUSE="doc test" -RDEPEND="virtual/libc - dev-libs/libxml2 - dev-libs/libxslt" +RDEPEND="dev-libs/libxml2 + dev-libs/libxslt" DEPEND="${RDEPEND} - dev-lang/perl - >=sys-apps/sed-4" + dev-lang/perl" src_unpack() { unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PN}-gentoo.diff + cd "${S}" + epatch "${FILESDIR}/${PN}-gentoo.diff" + epatch "${FILESDIR}/${P}-tests.patch" + epatch "${FILESDIR}/${P}-fbsd.patch" + sed -i 's/-O2//' tools/cxxflags || die "sed tools/cxxflags failed" } @@ -39,11 +39,11 @@ src_compile() { src_install() { sed -i "s%/usr%${D}/usr%g" Makefile || die "sed Makefile failed" - make install || die "make install failed" + emake install || die "emake install failed" dodoc README docs/{CREDITS,TODO,VERSION} if use doc ; then - dohtml ${WORKDIR}/${PN}-api/* + dohtml ${S}/docs/doxygen/html/* cd examples for ex in 0* ; do docinto examples/${ex} -- cgit v1.2.3-65-gdbad