Set TIXML_USE_STL in header when USE=stl, idea from Arch and bug #407825. Packages depending on USE=stl should not have to append TIXML_USE_STL to CXXFLAGS anymore

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

3 files changed, 75 insertions, 2 deletions

diff --git a/dev-libs/tinyxml/ChangeLog b/dev-libs/tinyxml/ChangeLog
index ab396894a636..893f3b367d39 100644
--- a/dev-libs/tinyxml/ChangeLog
+++ b/dev-libs/tinyxml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/tinyxml
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.18 2011/11/13 14:52:43 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.19 2012/03/14 23:07:32 voyageur Exp $
+
+*tinyxml-2.6.2-r2 (14 Mar 2012)
+
+  14 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/tinyxml-2.6.2-defineSTL.patch, +tinyxml-2.6.2-r2.ebuild:
+  Set TIXML_USE_STL in header when USE=stl, idea from Arch and bug #407825.
+  Packages depending on USE=stl should not have to append TIXML_USE_STL to
+  CXXFLAGS anymore
 
   13 Nov 2011; Markus Meier <maekke@gentoo.org> tinyxml-2.6.2-r1.ebuild:
   x86 stable, bug #388619
diff --git a/dev-libs/tinyxml/files/tinyxml-2.6.2-defineSTL.patch b/dev-libs/tinyxml/files/tinyxml-2.6.2-defineSTL.patch
new file mode 100644
index 000000000000..7bcde59ff946
--- /dev/null
+++ b/dev-libs/tinyxml/files/tinyxml-2.6.2-defineSTL.patch
@@ -0,0 +1,12 @@
+diff -up tinyxml/tinyxml.h~ tinyxml/tinyxml.h
+--- tinyxml/tinyxml.h~	2007-11-30 22:39:36.000000000 +0100
++++ tinyxml/tinyxml.h	2007-11-30 22:39:36.000000000 +0100
+@@ -26,6 +26,8 @@ distribution.
+ #ifndef TINYXML_INCLUDED
+ #define TINYXML_INCLUDED
+ 
++#define TIXML_USE_STL 1
++
+ #ifdef _MSC_VER
+ #pragma warning( push )
+ #pragma warning( disable : 4530 )
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
new file mode 100644
index 000000000000..a9e037a7bcc0
--- /dev/null
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild,v 1.1 2012/03/14 23:07:32 voyageur Exp $
+
+EAPI=4
+inherit flag-o-matic toolchain-funcs eutils multilib
+
+DESCRIPTION="a simple, small, C++ XML parser that can be easily integrating into other programs"
+HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="debug doc static-libs +stl"
+
+RDEPEND=""
+DEPEND="doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	local major_v minor_v
+	major_v=$(echo ${PV} | cut -d \. -f 1)
+	minor_v=$(echo ${PV} | cut -d \. -f 2-3)
+
+	sed -e "s:@MAJOR_V@:$major_v:" \
+	    -e "s:@MINOR_V@:$minor_v:" \
+		"${FILESDIR}"/Makefile-3 > Makefile || die
+
+	epatch "${FILESDIR}"/${PN}-2.6.1-entity.patch
+
+	use debug && append-cppflags -DDEBUG
+	use stl && epatch "${FILESDIR}"/${P}-defineSTL.patch
+
+	tc-export AR CXX RANLIB
+
+	[[ ${CHOST} == *-darwin* ]] && export LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	dolib.so *$(get_libname)*
+	use static-libs && dolib.a *.a
+
+	insinto /usr/include
+	doins *.h
+
+	dodoc {changes,readme}.txt
+
+	if use doc; then
+		dohtml -r docs/*
+	fi
+}