Support for USE="stl" wrt #314669

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-libs/tinyxml/ChangeLog b/dev-libs/tinyxml/ChangeLog
index 211970014917f5269c06f730c1ddf09f9d217fd4..a9a96e1efcdd38b19f6217f9db5373bf78371ea8 100644 (file)
--- a/dev-libs/tinyxml/ChangeLog
+++ b/dev-libs/tinyxml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/tinyxml
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.3 2010/03/07 10:00:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.4 2010/04/12 13:14:24 ssuominen Exp $
+
+*tinyxml-2.5.3_p20090813-r1 (12 Apr 2010)
+
+  12 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +tinyxml-2.5.3_p20090813-r1.ebuild, files/Makefile, metadata.xml:
+  Support for USE="stl" wrt #314669
 
   07 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   tinyxml-2.5.3_p20090813.ebuild:

diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index e1524a66163115b17112eb3e47a1dedd351eb1a6..9511283cfae42145c386ad56c20730c9112c39ce 100644 (file)
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -1,5 +1,5 @@
-AUX Makefile 746 RMD160 bab39e41643ed6172a7a89cb4e9bb22c68ff29f3 SHA1 0c32001f3019a9cdaaa30e30798ad491681c69d8 SHA256 bfde65cc3184ef171fb9c3b6f4032522746b61b7c743e88d60926a65628b1b93
+AUX Makefile 718 RMD160 3e137e1cb125672bfb97c218f258a3f648baceec SHA1 b17343ad328f4a3b4784cd0ae7bb2505ae29a221 SHA256 003727c63b53a8d140cf4bf930e05c6e18e3dbe570b7a046c6848d973622fddf
 DIST tinyxml-2.5.3_p20090813.tar.bz2 208824 RMD160 ffb38f881f22e5db3a902b4fef3946dbdcfca147 SHA1 eddfaf34febd381ef242a2c36a1edc60e5de47ab SHA256 681cf5f6111703f9999acfd1b3641d56162771a230526aba8d9da5dcb4db5e99
-EBUILD tinyxml-2.5.3_p20090813.ebuild 1144 RMD160 2095ee78e7fec3532a4a9024daa681c6cced0812 SHA1 0f3a99d0843d4d00c42fe318487fef4b54d95739 SHA256 75d250eb35e7863fc08f47205f37f69684d04daf37497bab53ed2c81a0ae4699
-MISC ChangeLog 640 RMD160 12f8c93c481dabbd73b252394f9c13c909aa23f8 SHA1 480982a6ed164d194ff98011f2059244b57d6a30 SHA256 51bd489665334dfded4c9ef8683e0145665bde957175963e1804fd391359f112
-MISC metadata.xml 266 RMD160 b4480e6518739202d8543a84b01b53940907f016 SHA1 3a5b0bff8b6ad1614a1e8fcbecddf54b800c80a2 SHA256 7aba9af99c2de45240978680e160a1bc959795d16c7eeeae6f2822ba59da9af2
+EBUILD tinyxml-2.5.3_p20090813-r1.ebuild 1195 RMD160 bc1d0305b626ec2f3e237fe2d5a4914ae12631ee SHA1 728e85bb246ad1d3802bd406cb109735f1f39d36 SHA256 95b41bf892e07ce133f215373db6406609fcf5d351120d1c057c65d57bf6f633
+MISC ChangeLog 842 RMD160 4e997bbdad65754871aa2a9e486e338ee7e89eb5 SHA1 c8fe6c81021fbbb9fc0410950ff46ad27a440155 SHA256 c3e30103e974ded79ab89c9b6a14c7dabba6483261233ee5e5d61708bece96dc
+MISC metadata.xml 346 RMD160 58f5ed2151ef8ce9f9a2d695f2e2623f467b12dd SHA1 8702650a6df0defcb4e6bc35ec5e95d7d6e871ff SHA256 aa75c28bc6ae1dbb84d86bfb55072ddf6440a7a608bbeb130f7914efd2576f36

diff --git a/dev-libs/tinyxml/files/Makefile b/dev-libs/tinyxml/files/Makefile
index 2a7bd6a5e00f6f1d25f54cb019b1ef07ccd7c63b..1db0244525cbc3619165958330caf8f0fd43933e 100644 (file)
--- a/dev-libs/tinyxml/files/Makefile
+++ b/dev-libs/tinyxml/files/Makefile
@@ -1,5 +1,4 @@
 AR ?= ar
-CPPFLAGS += -DTIXML_USE_STL
 CXX ?= g++
 CXXFLAGS += -Wall
 RANLIB ?= ranlib

diff --git a/dev-libs/tinyxml/metadata.xml b/dev-libs/tinyxml/metadata.xml
index 7cc5007c5d7904e3337c8dac5599f2e8ed420da5..361dd823f6e6a48a7643f1f9cd272014ced87d64 100644 (file)
--- a/dev-libs/tinyxml/metadata.xml
+++ b/dev-libs/tinyxml/metadata.xml
@@ -6,4 +6,7 @@
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+  <use>
+    <flag name='stl'>Compile with TIXML_USE_STL support</flag>
+  </use>
 </pkgmetadata>

diff --git a/dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild b/dev-libs/tinyxml/tinyxml-2.5.3_p20090813-r1.ebuild
similarity index 89%
rename from dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild
rename to dev-libs/tinyxml/tinyxml-2.5.3_p20090813-r1.ebuild
index 1703c3aef745e589741260df67ac69aa761711c9..d94d86af7781c662362cc28914a5a99d9a437927 100644 (file)
--- a/dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.5.3_p20090813-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild,v 1.5 2010/03/07 10:00:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.5.3_p20090813-r1.ebuild,v 1.1 2010/04/12 13:14:24 ssuominen Exp $
 
 EAPI=2
 inherit flag-o-matic toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc"
+IUSE="debug doc stl"
 
 RDEPEND=""
 DEPEND="doc? ( app-doc/doxygen )"
@@ -23,6 +23,7 @@ src_prepare() {
 
 src_compile() {
        use debug && append-cppflags -DDEBUG
+       use stl && append-cppflags -DTIXML_USE_STL
 
        tc-export AR CXX RANLIB