Patch for --as-needed

(Portage version: 2.2_rc23/svn/Linux x86_64)

svn path=/; revision=158

10 files changed, 256 insertions, 0 deletions

diff --git a/dev-libs/xmlwrapp/ChangeLog b/dev-libs/xmlwrapp/ChangeLog
new file mode 100644
index 0000000..9b89d70
--- /dev/null
+++ b/dev-libs/xmlwrapp/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for dev-libs/xmlwrapp
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  06 Feb 2009; Timothy Redaelli <drizzt@gentoo.org>
+  +files/xmlwrapp-0.5.0-fbsd.patch, +files/xmlwrapp-0.5.0-gcc-4.3.patch,
+  +files/xmlwrapp-0.5.0-gcc42_namespace.patch,
+  +files/xmlwrapp-0.5.0-tests.patch, +files/xmlwrapp-0.5.0-undefined.patch,
+  +files/xmlwrapp-gentoo.diff, +metadata.xml, +xmlwrapp-0.5.0-r2.ebuild:
+  Patch for --as-needed
+
diff --git a/dev-libs/xmlwrapp/Manifest b/dev-libs/xmlwrapp/Manifest
new file mode 100644
index 0000000..418e807
--- /dev/null
+++ b/dev-libs/xmlwrapp/Manifest
@@ -0,0 +1,10 @@
+AUX xmlwrapp-0.5.0-fbsd.patch 371 RMD160 0dc90793978423b492edaed03a67766f9e192876 SHA1 7c40abf480585b226d75e2355e522633dc413803 SHA256 7e6e9879147ac3cda92f1e6a276cb522a881a5e302e6f72314273a61c7cc7fe0
+AUX xmlwrapp-0.5.0-gcc-4.3.patch 278 RMD160 8155ccb5bf81ba3d7f66f963944de9f94c40e9fc SHA1 b31af41a1e237bb4c1673a508a52b7369c9cd28d SHA256 ec35cb5c08d056df5dc33369bb8eadd961e071a60d00fa99f2c254a83dcc523e
+AUX xmlwrapp-0.5.0-gcc42_namespace.patch 729 RMD160 e46409d6bba004c2af9d14682f93b8dc38edf0ed SHA1 2ee00bea583728a77571e4c995bbb3c29a96db69 SHA256 80d6823ca40f2c2521662acbee0425a749b9b5c409e82348dbc46cfc44a82492
+AUX xmlwrapp-0.5.0-tests.patch 1603 RMD160 76537d1e3a3bb55e381f0048034e67143a501b72 SHA1 7674061489c6e902c4b844423d22a39cf4cd2feb SHA256 5ab20e2672cf1696a15e55f4e1444e1a4e03ee9b73e0270385bf8199751671d3
+AUX xmlwrapp-0.5.0-undefined.patch 4654 RMD160 e5e2f83262f3a38cf6eb05e26c09a1b6ffb9d26f SHA1 23eb6ca7ad3674d4362c8e8ed3487d1ac9ccfde3 SHA256 d52a7b62a07eeccb47e2ec5dab54fb3019922ccc4096c62e72b46fdd47b6d87c
+AUX xmlwrapp-gentoo.diff 469 RMD160 30c11edc2ff76e752b236a404fc02a466db27e9e SHA1 da64086fe17487187dc5834c9307e5a26dd0f984 SHA256 4f153d3ac057c918cebf27eaa79cddd3a49028641d315c1c4e295b3b530be332
+DIST xmlwrapp-0.5.0.tgz 442550 RMD160 2ecc840a910ea7231650f1cc6e3a071944ca696e SHA1 574f6b7c3715d351fb07a77dcd8bf42de07cfc1f SHA256 af3b71a6983c5c08e00096f5bb9f8ce61de3147f020aef327624043736d5ac73
+EBUILD xmlwrapp-0.5.0-r2.ebuild 1573 RMD160 7f42723722563ffdbab908cfb364a2646e1121b7 SHA1 1099446e807570b50ad85017f99b8ae015cdcc29 SHA256 d55a7ac1b1d5ff28b3e67ba2f245ae35bfacc66ed0a8bf2ee1c2d18099e5923a
+MISC ChangeLog 464 RMD160 892cfbb0acf6d5d9b91c4ed38f6fd55aa3c31f19 SHA1 7d6a0345673792299eb9e4931549039db1ce0461 SHA256 e3dc7465797f03e71c4beb3d0f7f1090f7d2c9d482143be748dade75cbc765f0
+MISC metadata.xml 246 RMD160 7b3a212531bf410456573eaab88dbacb8310ac26 SHA1 51f32cc963d5679809bd574a72cf597d23a7f8be SHA256 d9936672523955a3d01af3d37e99da31780f35cc1433fadcea2c3a9601cb6d9e
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 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-gcc-4.3.patch b/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-gcc-4.3.patch
new file mode 100644
index 0000000..dba843f
--- /dev/null
+++ b/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-gcc-4.3.patch
@@ -0,0 +1,10 @@
+--- src/libxml/node.cxx.orig	2008-04-05 02:55:35.804091000 +0200
++++ src/libxml/node.cxx	2008-04-05 03:09:21.170667965 +0200
+@@ -51,6 +51,7 @@
+ #include <algorithm>
+ #include <stdexcept>
+ #include <functional>
++#include <cstring>
+ 
+ // libxml includes
+ #include <libxml/tree.h>
diff --git a/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-gcc42_namespace.patch b/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-gcc42_namespace.patch
new file mode 100644
index 0000000..6b61bcb
--- /dev/null
+++ b/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-gcc42_namespace.patch
@@ -0,0 +1,20 @@
+--- xmlwrapp-0.5.0/src/libxml/node.cxx.orig	2007-07-06 08:13:31.000000000 +0200
++++ xmlwrapp-0.5.0/src/libxml/node.cxx	2007-07-06 08:13:05.000000000 +0200
+@@ -512,10 +512,12 @@
+     }
+ }
+ //####################################################################
+-std::ostream& xml::operator<< (std::ostream &stream, const xml::node &n) {
+-    std::string xmldata;
+-    n.node_to_string(xmldata);
+-    stream << xmldata;
+-    return stream;
++namespace xml {
++    std::ostream& operator<< (std::ostream &stream, const xml::node &n) {
++        std::string xmldata;
++        n.node_to_string(xmldata);
++        stream << xmldata;
++        return stream;
++    }
+ }
+ //####################################################################
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 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/files/xmlwrapp-0.5.0-undefined.patch b/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-undefined.patch
new file mode 100644
index 0000000..3c35a57
--- /dev/null
+++ b/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-undefined.patch
@@ -0,0 +1,85 @@
+diff -ur --exclude Makefile xmlwrapp-0.5.0.orig/configure.pl xmlwrapp-0.5.0/configure.pl
+--- xmlwrapp-0.5.0.orig/configure.pl	2009-02-06 18:06:37.000000000 +0100
++++ xmlwrapp-0.5.0/configure.pl	2009-02-06 18:57:43.000000000 +0100
+@@ -125,6 +125,7 @@
+   --contrib            Configure for being bundled inside another project
+   --disable-shared     Don't build a shared library
+   --disable-examples   Don't build the example programs
++  --disable-xslt       Don't build with xslt
+   --enable-tests       Enable the building of test programs
+ 
+   --xml2-config file   Run file to get info about libxml2 [xml2-config]
+@@ -405,12 +406,12 @@
+ 	print STDERR "\n**** hey, I can't cd into my src/$src_sub_dir directory: $!\n";
+ 	exit 1;
+     }
+-
+     my $extra_flags = "--shared-lib $libname --major $xmlwrapp_mjr" unless $clo{'disable-shared'};
++    $extra_flags = "$extra_flags --linkwith xslt" unless $clo{'disable-xslt'};
+     foreach my $dir (@external_incs) { $extra_flags .= " --include $dir"; }
+ 
+     print "Creating src/$src_sub_dir/Makefile ...\n";
+-    system("$^X $mkmf $mkmf_flags --static-lib $libname $extra_flags *.cxx");
++    system("$^X $mkmf $mkmf_flags --static-lib $libname --linkwith xml2 $extra_flags *.cxx");
+     chdir($cwd);
+ 
+     ##
+@@ -420,11 +421,11 @@
+ 	exit 1;
+     }
+ 
+-    my $extra_flags = "--shared-lib $xslt_libname --major $xsltwrapp_mjr" unless $clo{'disable-shared'};
++    my $extra_flags = "--shared-lib $xslt_libname --major $xsltwrapp_mjr --linkwith $cwd${dirsep}src${dirsep}$xslt_sub_dir,$libname" unless $clo{'disable-shared'};
+     foreach my $dir (@external_incs) { $extra_flags .= " --include $dir"; }
+ 
+     print "Creating src/$xslt_sub_dir/Makefile ...\n";
+-    system("$^X $mkmf $mkmf_flags --static-lib $xslt_libname $extra_flags *.cxx");
++    system("$^X $mkmf $mkmf_flags --static-lib $xslt_libname --linkwith xslt --linkwith exslt $extra_flags *.cxx");
+     chdir($cwd);
+ }
+ ################################################################################
+Only in xmlwrapp-0.5.0/examples/01-tree_parsing: example
+Only in xmlwrapp-0.5.0/examples/01-tree_parsing: example.o
+Only in xmlwrapp-0.5.0/examples/02-event_parsing: example
+Only in xmlwrapp-0.5.0/examples/02-event_parsing: example.o
+Only in xmlwrapp-0.5.0/examples/03-xml_generation: example
+Only in xmlwrapp-0.5.0/examples/03-xml_generation: example.o
+Only in xmlwrapp-0.5.0/examples/04-xslt: example
+Only in xmlwrapp-0.5.0/examples/04-xslt: example.o
+Files xmlwrapp-0.5.0.orig/src/libxml/ait_impl.o and xmlwrapp-0.5.0/src/libxml/ait_impl.o differ
+Files xmlwrapp-0.5.0.orig/src/libxml/attributes.o and xmlwrapp-0.5.0/src/libxml/attributes.o differ
+Files xmlwrapp-0.5.0.orig/src/libxml/document.o and xmlwrapp-0.5.0/src/libxml/document.o differ
+Files xmlwrapp-0.5.0.orig/src/libxml/dtd_impl.o and xmlwrapp-0.5.0/src/libxml/dtd_impl.o differ
+Files xmlwrapp-0.5.0.orig/src/libxml/event_parser.o and xmlwrapp-0.5.0/src/libxml/event_parser.o differ
+Files xmlwrapp-0.5.0.orig/src/libxml/init.o and xmlwrapp-0.5.0/src/libxml/init.o differ
+Files xmlwrapp-0.5.0.orig/src/libxml/libxmlwrapp.a and xmlwrapp-0.5.0/src/libxml/libxmlwrapp.a differ
+Only in xmlwrapp-0.5.0/src/libxml: libxmlwrapp.so
+Files xmlwrapp-0.5.0.orig/src/libxml/node.o and xmlwrapp-0.5.0/src/libxml/node.o differ
+Files xmlwrapp-0.5.0.orig/src/libxml/node_iterator.o and xmlwrapp-0.5.0/src/libxml/node_iterator.o differ
+Files xmlwrapp-0.5.0.orig/src/libxml/node_manip.o and xmlwrapp-0.5.0/src/libxml/node_manip.o differ
+Files xmlwrapp-0.5.0.orig/src/libxml/tree_parser.o and xmlwrapp-0.5.0/src/libxml/tree_parser.o differ
+Files xmlwrapp-0.5.0.orig/src/libxml/utility.o and xmlwrapp-0.5.0/src/libxml/utility.o differ
+Only in xmlwrapp-0.5.0/src/libxslt: init.o
+Only in xmlwrapp-0.5.0/src/libxslt: libxsltwrapp.a
+Only in xmlwrapp-0.5.0/src/libxslt: libxsltwrapp.so
+Only in xmlwrapp-0.5.0/src/libxslt: stylesheet.o
+Only in xmlwrapp-0.5.0.orig/src: xmlwrapp_config.h
+diff -ur --exclude Makefile xmlwrapp-0.5.0.orig/tools/mkmf xmlwrapp-0.5.0/tools/mkmf
+--- xmlwrapp-0.5.0.orig/tools/mkmf	2009-02-06 18:06:37.000000000 +0100
++++ xmlwrapp-0.5.0/tools/mkmf	2009-02-06 18:33:06.000000000 +0100
+@@ -234,11 +234,11 @@
+     }
+ 
+     $lib = $static_lib_prefix . $lib . $static_lib_extension;
+-    addflags($ENV{'LDFLAGS'}, "'$path$lib'");
++    addflags($ENV{'POST_LDFLAGS'}, "'$path$lib'");
+ }
+ 
+ foreach (@{$clo{'linkwith'}}) {
+-    addflags($ENV{'LDFLAGS'}, `$^X $clo{'cxxflags'} --linkwith "$_"`);
++    addflags($ENV{'POST_LDFLAGS'}, `$^X $clo{'cxxflags'} --linkwith "$_"`);
+ }
+ 
+ foreach (@{$clo{'include'}}) {
+Only in xmlwrapp-0.5.0.orig: xmlwrapp-config
+Only in xmlwrapp-0.5.0.orig: xmlwrapp.pc
diff --git a/dev-libs/xmlwrapp/files/xmlwrapp-gentoo.diff b/dev-libs/xmlwrapp/files/xmlwrapp-gentoo.diff
new file mode 100644
index 0000000..31f0315
--- /dev/null
+++ b/dev-libs/xmlwrapp/files/xmlwrapp-gentoo.diff
@@ -0,0 +1,12 @@
+diff -urN ori/configure.pl xmlwrapp-0.4.0/configure.pl
+--- ori/configure.pl	2003-02-03 23:47:54.000000000 +0100
++++ xmlwrapp-0.4.0/configure.pl	2003-03-24 12:21:07.000000000 +0100
+@@ -277,7 +277,7 @@
+     $output =~ s/-I//g;
+     my @include_dirs = split(/\s+/, $output);
+     my $main_include_dir = undef;
+-    my $xslt_include_dir = undef;
++    my $xslt_include_dir = "/usr/include/libxml2";
+ 
+     foreach my $dir (@include_dirs) {
+ 	if (-d "$dir${dirsep}libxml") {
diff --git a/dev-libs/xmlwrapp/metadata.xml b/dev-libs/xmlwrapp/metadata.xml
new file mode 100644
index 0000000..5aec0d2
--- /dev/null
+++ b/dev-libs/xmlwrapp/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>bsd</herd>
+<maintainer>
+<email>drizzt@gentoo.org</email>
+<name>Timothy Redaelli</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r2.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r2.ebuild
new file mode 100644
index 0000000..94bf69d
--- /dev/null
+++ b/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 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.21 2008/05/01 00:45:43 dev-zero Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
+HOMEPAGE="http://sourceforge.net/projects/xmlwrapp/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc test"
+
+RDEPEND="dev-libs/libxml2
+	dev-libs/libxslt"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-gentoo.diff" \
+		"${FILESDIR}/${P}-tests.patch" \
+		"${FILESDIR}/${P}-fbsd.patch" \
+		"${FILESDIR}/${P}-gcc42_namespace.patch" \
+		"${FILESDIR}/${P}-gcc-4.3.patch" \
+		"${FILESDIR}/${P}-undefined.patch"
+
+	sed -i 's/-O2//' tools/cxxflags || die "sed tools/cxxflags failed"
+}
+
+src_compile() {
+	local myconf="--prefix /usr --libdir /usr/$(get_libdir) --disable-examples"
+	use test && myconf="${myconf} --enable-tests"
+
+	export CXX="$(tc-getCXX)"
+	./configure.pl ${myconf} || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	sed -i "s%/usr%${D}/usr%g" Makefile || die "sed Makefile failed"
+	emake install || die "emake install failed"
+
+	dodoc README docs/{CREDITS,TODO,VERSION}
+	if use doc ; then
+		dohtml "${S}"/docs/doxygen/html/*
+		cd examples
+		for ex in 0* ; do
+			docinto examples/${ex}
+			dodoc ${ex}/*
+		done
+	fi
+}