Corrected dependencies. Added patches for unittests and freebsd (thanks to Timothy...

Package-Manager: portage-2.1.2_rc3

diff --git a/dev-libs/xmlwrapp/ChangeLog b/dev-libs/xmlwrapp/ChangeLog
index 603aef1402b397819ce08e74ef4535694b93059a..f60825e3017716d8354b4246086aa44d2c7f4913 100644 (file)
--- 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 <dev-zero@gentoo.org> 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 <weeve@gentoo.org> xmlwrapp-0.5.0-r1.ebuild:
   Stable on SPARC.

diff --git a/dev-libs/xmlwrapp/Manifest b/dev-libs/xmlwrapp/Manifest
index d0d744ff0bf306cb496b2c34fc44df7b9189de4d..c8efc11751a1d9b14c2a7f705cc8094c9eb5c5a8 100644 (file)
--- a/dev-libs/xmlwrapp/Manifest
+++ b/dev-libs/xmlwrapp/Manifest
@@ -1,21 +1,28 @@
+AUX xmlwrapp-0.5.0-fbsd.patch 371 RMD160 0dc90793978423b492edaed03a67766f9e192876 SHA1 7c40abf480585b226d75e2355e522633dc413803 SHA256 7e6e9879147ac3cda92f1e6a276cb522a881a5e302e6f72314273a61c7cc7fe0
+MD5 9859a46c0736a88ffb4ff41f5f53d27d files/xmlwrapp-0.5.0-fbsd.patch 371
+RMD160 0dc90793978423b492edaed03a67766f9e192876 files/xmlwrapp-0.5.0-fbsd.patch 371
+SHA256 7e6e9879147ac3cda92f1e6a276cb522a881a5e302e6f72314273a61c7cc7fe0 files/xmlwrapp-0.5.0-fbsd.patch 371
+AUX xmlwrapp-0.5.0-tests.patch 1603 RMD160 76537d1e3a3bb55e381f0048034e67143a501b72 SHA1 7674061489c6e902c4b844423d22a39cf4cd2feb SHA256 5ab20e2672cf1696a15e55f4e1444e1a4e03ee9b73e0270385bf8199751671d3
+MD5 beffa94a0ec1dd321d4342408f73ab01 files/xmlwrapp-0.5.0-tests.patch 1603
+RMD160 76537d1e3a3bb55e381f0048034e67143a501b72 files/xmlwrapp-0.5.0-tests.patch 1603
+SHA256 5ab20e2672cf1696a15e55f4e1444e1a4e03ee9b73e0270385bf8199751671d3 files/xmlwrapp-0.5.0-tests.patch 1603
 AUX xmlwrapp-gentoo.diff 469 RMD160 30c11edc2ff76e752b236a404fc02a466db27e9e SHA1 da64086fe17487187dc5834c9307e5a26dd0f984 SHA256 4f153d3ac057c918cebf27eaa79cddd3a49028641d315c1c4e295b3b530be332
 MD5 55066e7026cd8b9a9f6820015d0a986c files/xmlwrapp-gentoo.diff 469
 RMD160 30c11edc2ff76e752b236a404fc02a466db27e9e files/xmlwrapp-gentoo.diff 469
 SHA256 4f153d3ac057c918cebf27eaa79cddd3a49028641d315c1c4e295b3b530be332 files/xmlwrapp-gentoo.diff 469
-DIST xmlwrapp-0.5.0.tar.gz 110002 RMD160 e08c185e9d4f5b934f4e9f322bb70f4bfe1d3f58 SHA1 4b86a475676fc5a5a5659f413915fd526221323e SHA256 df66921453f68f3e05df59faea2930879230f06cae8b87e4bc313bea0e7495df
-DIST xmlwrapp-api.tar.gz 178488 RMD160 3318936d16e4d8352b1755292ee97566ea38c9b3 SHA1 6ddc32edb5cbbaa63e7abd9d876c62ce86350172 SHA256 949639556dd80651bda41fbf8161d947e28d3a5fd6e9380a98007ff659a2485e
-EBUILD xmlwrapp-0.5.0-r1.ebuild 1454 RMD160 c025053299153c301a017bf5fba5de6b013ecd2a SHA1 c5876e7341042f93296afd3f72368c0cfbf81c9a SHA256 f492c31a45f782f22b309b4db8380aa302baeb25fc47d8d4c7e539e0f01ff8c7
-MD5 7bb7099d3243ac19ec20663394c41e86 xmlwrapp-0.5.0-r1.ebuild 1454
-RMD160 c025053299153c301a017bf5fba5de6b013ecd2a xmlwrapp-0.5.0-r1.ebuild 1454
-SHA256 f492c31a45f782f22b309b4db8380aa302baeb25fc47d8d4c7e539e0f01ff8c7 xmlwrapp-0.5.0-r1.ebuild 1454
-MISC ChangeLog 3129 RMD160 2b2f54c86e0381e39ab5e897934236bb9767db85 SHA1 cd3196a1b1a50aa4f374ef325e12b1bde55b8951 SHA256 d20bf1738c37998d9170d9d6014ef2097a60df63054a54e86cd0141f57c27045
-MD5 2065f617db6bb35b2e987eb3f2633923 ChangeLog 3129
-RMD160 2b2f54c86e0381e39ab5e897934236bb9767db85 ChangeLog 3129
-SHA256 d20bf1738c37998d9170d9d6014ef2097a60df63054a54e86cd0141f57c27045 ChangeLog 3129
-MISC metadata.xml 250 RMD160 f09dbc5c28b68506941290eb88604bb34263f9b3 SHA1 2767ee6f12723fd137105fa223fa42da7aa654d3 SHA256 12297b46fbf69581b2b1994ae8f17d803614d0fd088e4b28a81788b1c73024e9
-MD5 baecda85db8f2f90e495be668d7108a8 metadata.xml 250
-RMD160 f09dbc5c28b68506941290eb88604bb34263f9b3 metadata.xml 250
-SHA256 12297b46fbf69581b2b1994ae8f17d803614d0fd088e4b28a81788b1c73024e9 metadata.xml 250
-MD5 1ff2102d55b573871268b09a542af6cc files/digest-xmlwrapp-0.5.0-r1 482
-RMD160 5ec557d5a4967c6e83670d71634a67da8ddd0b94 files/digest-xmlwrapp-0.5.0-r1 482
-SHA256 eb5ff752a5eecd15122d7dc5725ebd134d3beb901c9b739245a7ac23ea8cd140 files/digest-xmlwrapp-0.5.0-r1 482
+DIST xmlwrapp-0.5.0.tgz 442550 RMD160 2ecc840a910ea7231650f1cc6e3a071944ca696e SHA1 574f6b7c3715d351fb07a77dcd8bf42de07cfc1f SHA256 af3b71a6983c5c08e00096f5bb9f8ce61de3147f020aef327624043736d5ac73
+EBUILD xmlwrapp-0.5.0-r1.ebuild 1414 RMD160 ad4462616fbc2be74cbea41654b7e300fa0e97a9 SHA1 e4e3ce17978e565005537a09aaac82b74f5fb857 SHA256 05428403fa74bb6e58b80f358e3953eb21847f68a087b1a6420e576cf4983c46
+MD5 5711d0aa746bb793bee8d520e3574a7b xmlwrapp-0.5.0-r1.ebuild 1414
+RMD160 ad4462616fbc2be74cbea41654b7e300fa0e97a9 xmlwrapp-0.5.0-r1.ebuild 1414
+SHA256 05428403fa74bb6e58b80f358e3953eb21847f68a087b1a6420e576cf4983c46 xmlwrapp-0.5.0-r1.ebuild 1414
+MISC ChangeLog 3336 RMD160 495ef94afdaa3035f26c0775d17fe2c414f02061 SHA1 9ab78613a374dab3a88916371026edd1fa420b9a SHA256 4260288a0314124c8494a1e3efe7e8d0408baaece6b0ea1f4a16ad16a2752e33
+MD5 88b37fab0cf6ea7efbe58708f9b1a2df ChangeLog 3336
+RMD160 495ef94afdaa3035f26c0775d17fe2c414f02061 ChangeLog 3336
+SHA256 4260288a0314124c8494a1e3efe7e8d0408baaece6b0ea1f4a16ad16a2752e33 ChangeLog 3336
+MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f
+MD5 694f01269d0e6ca70d0d588a68181808 metadata.xml 157
+RMD160 1a16d7c8813911ff609857e1d437b678c924114c metadata.xml 157
+SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f metadata.xml 157
+MD5 033d30cc1ba154ce3dc051a22f4b3303 files/digest-xmlwrapp-0.5.0-r1 235
+RMD160 1439b56f5a3c3c759f2e6afb2fac5df53a46e8dd files/digest-xmlwrapp-0.5.0-r1 235
+SHA256 1a1699e2c0306cd1cdc94eea86d347b1dce0e0f34d13fe4561d2c85c30fb7d85 files/digest-xmlwrapp-0.5.0-r1 235

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 d9a4849ff3e77fbae49f8ae964be34a5196f4b57..35016ac60e414ba4a4681534aae3782148b643fb 100644 (file)
--- 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 (file)
index 0000000..813a431
--- /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 (file)
index 0000000..7de7745
--- /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 @@
+-<!DOCTYPE root SYSTEM "data/09.dtd">
++<!DOCTYPE root SYSTEM "09.dtd">
+ <root one="1"/>
+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 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE example SYSTEM "data/10.dtd">
++<!DOCTYPE example SYSTEM "10.dtd">
+ <example>See?</example>
+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 @@
+-<subchild><innerchild self="yes"/></subchild>
++<subchild xml:base="data/14inc.xml"><innerchild self="yes"/></subchild>
+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 a862cd9b8d17f673b6a83bc959b21b36c43489a4..bc97bb6ee2077d497e8d699a5d9890a8d405b070 100644 (file)
--- a/dev-libs/xmlwrapp/metadata.xml
+++ b/dev-libs/xmlwrapp/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
        <herd>cpp</herd>
-       <maintainer>
-               <email>ka0ttic@gentoo.org</email>
-               <name>Aaron Walker</name>
-       </maintainer>
 </pkgmetadata>

diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild
index 124d3a4e5802b957eeb19f9f410d046501601e2c..d4d3a9b3e200d0d42eaa912349c54b01a0d0f481 100644 (file)
--- 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}