Patch suggested by both Ryan Hill & Pacho Ramos allows building on GCC 4.6; closes...

Package-Manager: portage-2.1.10.18/cvs/Linux x86_64

diff --git a/dev-libs/xqilla/ChangeLog b/dev-libs/xqilla/ChangeLog
index 51ab4ede75b2942566eb21624b929f45e78a1b8c..4d5bb999abc74726ac88ae37e81c83ef8cbbac10 100644 (file)
--- a/dev-libs/xqilla/ChangeLog
+++ b/dev-libs/xqilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/xqilla
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/ChangeLog,v 1.11 2010/08/29 11:47:00 dev-zero Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/ChangeLog,v 1.12 2011/09/24 12:36:27 chainsaw Exp $
+
+  24 Sep 2011; Tony Vroon <chainsaw@gentoo.org> xqilla-2.2.4.ebuild,
+  +files/xqilla-2.2.4-gcc46.patch:
+  Patch suggested by both Ryan Hill & Pacho Ramos allows building on GCC 4.6;
+  closes bug #362307.
 
 *xqilla-2.2.4 (29 Aug 2010)
 

diff --git a/dev-libs/xqilla/Manifest b/dev-libs/xqilla/Manifest
index 0a3c60f2db027c257b566a2baf7e8d81df038956..47f57f2c3924d0cf1638b965ee711436c3e1fcf1 100644 (file)
--- a/dev-libs/xqilla/Manifest
+++ b/dev-libs/xqilla/Manifest
@@ -1,11 +1,12 @@
 AUX 2.2.3-xerces-c-3.1.0.patch 979 RMD160 c810b86e8fb0154f237b9704d390067c649960df SHA1 6f60fed2ba5ba12f55c2033d6a004d4e53b72681 SHA256 7c7d9b1928d0b7ca8d5600ef6838dbd8e84e92858fdaa8d34342f8497b37f71e
 AUX 2.2.4-respect-ldflags-no-rpath.patch 561 RMD160 3682326b397caf4afec1f2853f7ce6f06b16d03c SHA1 faf97d6554b03a37d155d57a5d3a254de95a1ac1 SHA256 b05b7b14e1f23b51528c8b6da1dd47639496f4ed808da4c8fb83b700219ea111
 AUX xqilla-2.2.0-gcc44.patch 786 RMD160 4004b116bbf65b42f12b2d84153b632c87678ff5 SHA1 e47c4d147db7a8f7de8ec0b61a6070b09dc67c97 SHA256 5d798a2344adfab0501549eeec849ba0169a96c40b2616dca12bc1df0d9b64bd
+AUX xqilla-2.2.4-gcc46.patch 514 RMD160 505cc0809ec70a95fb9b295492f97198436d8a5a SHA1 6c23c8cc1fcd90777e8ba3b0d4bf2ae0cd7b345a SHA256 de7c144ad4ea2313840ee6e7cc2b00ec7fd7c9732b70821dbf5680f4a238a639
 DIST XQilla-2.2.0.tar.gz 4907127 RMD160 39598a7a8fbae30a392fe38d3bffa62b59fcdc8a SHA1 22b680afcb1fdc954ce9c34aec71f3add321dfbf SHA256 8d7e2916a922ecf75bf21069a18706cacdbbd413c49f6561537d00f592377c9d
 DIST XQilla-2.2.3.tar.gz 15642828 RMD160 62a190ff36d5157ef527717eaf8d47feedd4a7d9 SHA1 d859fe88efbec5c448621045d31112ba52a2c641 SHA256 6e25475111ab1ea5ec77e55dc8dedbdb77116cab7bf4fb9e4610cf0508d4af43
 DIST XQilla-2.2.4.tar.gz 15667750 RMD160 ec4268452c98d7c87e8bf7dccaf0ebc7ff19f167 SHA1 edd1681a6bb9d310b6aaca6af0584eb96df3b8eb SHA256 f39f8d11bca67ded2036d543bb6780ebeeee5b5723d75f067f256ae26516854b
 EBUILD xqilla-2.2.0.ebuild 1414 RMD160 0a62db7fa0700273d7df87685b677132fd9b415f SHA1 8f622a198e3e39aa4ef31f6cdaac54b70d230661 SHA256 afb852be5d25fa5b9a494bfbb592e20c3a3ffd7d4ae6cea8218aa3b034291f89
 EBUILD xqilla-2.2.3.ebuild 1428 RMD160 442975c44f57ac5f9c4001fa1d4a49bce439bc4b SHA1 98b9712e3c610428ddeedeabb4e10a94903dc9dc SHA256 3cc3280f4c036f3f8f332be6289729ffb1fc6cf6642f63fff6799eb9ccd397a2
-EBUILD xqilla-2.2.4.ebuild 1726 RMD160 4f2e31f0e585ac150260cfb674c7e204a4d7bef8 SHA1 506c17edff3b706fc9d35e32a368905c3044ff57 SHA256 813d0cd8f67955441a1b68bae2ce64bb7d3376df3933a76216376d1bda375cc2
-MISC ChangeLog 2707 RMD160 097a0a0ef1eefd439ab4c84e0db95129d2cb43d3 SHA1 8d5592b32df15d4e77d707f03eca527b250960a7 SHA256 d957d76106f915b34522e46a89c9ff57d5f7447782abe96cf1d1d9e46e179185
+EBUILD xqilla-2.2.4.ebuild 1554 RMD160 4c51755a780d8582c01b994a7f3d050f41f7fed0 SHA1 15ac1e52b27c49ba9834c6351b9c55cea057f804 SHA256 43e0440e4599458ad93f72dace4e5a37813461b3af446ec25c688a233f449deb
+MISC ChangeLog 2912 RMD160 92e677ee3140cd9c5ae4a239e47ee1bbea522ce9 SHA1 b085b57c9b53e897cf8d9b04f8db10dc6ff09e28 SHA256 d8e87f4a30f0625995baf58a7d2c3951aa30506cf74cb0e877561c98f4c9c277
 MISC metadata.xml 356 RMD160 87fa3f6ed33803039bdb19ecb566ba91858de68a SHA1 2f5ed3e9d93dc8af9e3d11aafd1eee11f23e202a SHA256 9e6928e22e3a021b76957f9787dcd10dbecfe2af936fca3b24efbc5122a0959b

diff --git a/dev-libs/xqilla/files/xqilla-2.2.4-gcc46.patch b/dev-libs/xqilla/files/xqilla-2.2.4-gcc46.patch
new file mode 100644 (file)
index 0000000..d64a28d
--- /dev/null
+++ b/dev-libs/xqilla/files/xqilla-2.2.4-gcc46.patch
@@ -0,0 +1,11 @@
+diff -uNr XQilla-2.2.4.ORIG/include/xqilla/framework/XPath2MemoryManager.hpp XQilla-2.2.4/include/xqilla/framework/XPath2MemoryManager.hpp
+--- XQilla-2.2.4.ORIG/include/xqilla/framework/XPath2MemoryManager.hpp 2011-09-24 13:31:20.666469427 +0100
++++ XQilla-2.2.4/include/xqilla/framework/XPath2MemoryManager.hpp      2011-09-24 13:32:01.175470668 +0100
+@@ -23,6 +23,7 @@
+ #define __XPATH2MEMORYMANAGER_HPP
+ 
+ #include <algorithm>
++#include <cstddef>
+ #include <assert.h>
+ 
+ #include <xqilla/framework/XQillaExport.hpp>

diff --git a/dev-libs/xqilla/xqilla-2.2.4.ebuild b/dev-libs/xqilla/xqilla-2.2.4.ebuild
index cf10fb921cfc93cc9358c23f65d0c0717375889c..54d6ad587c445153b4cc686375d0310ac645b010 100644 (file)
--- a/dev-libs/xqilla/xqilla-2.2.4.ebuild
+++ b/dev-libs/xqilla/xqilla-2.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.2.4.ebuild,v 1.1 2010/08/29 11:47:00 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.2.4.ebuild,v 1.2 2011/09/24 12:36:27 chainsaw Exp $
 
 EAPI="2"
-inherit autotools eutils
+inherit autotools base
 
 MY_P="XQilla-${PV}"
 
@@ -26,14 +26,15 @@ RDEPEND=">=dev-libs/xerces-c-3.1.0
 DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )"
 
+PATCHES=(
+       "${FILESDIR}/${PV}-respect-ldflags-no-rpath.patch"
+       "${FILESDIR}/${P}-gcc46.patch"
+)
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-       # respect our LDFLAGS and don't add an rpath for the xerces-c lib
-       # since that is in the default LDPATH anyway and the binaries
-       # may need relinking at install-time because they temporary use
-       # already installed libraries
-       epatch "${FILESDIR}/${PV}-respect-ldflags-no-rpath.patch"
+       base_src_prepare
        eautoreconf
 }