Restore stable 2.6.2 version for x86, intented removal was for 2.6.1, thanks Mr_Bones

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 28 insertions, 23 deletions

diff --git a/dev-libs/tinyxml/ChangeLog b/dev-libs/tinyxml/ChangeLog
index 72c10dfeed0f..b38734acddd5 100644
--- a/dev-libs/tinyxml/ChangeLog
+++ b/dev-libs/tinyxml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/tinyxml
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.20 2012/03/15 00:09:38 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.21 2012/03/15 16:05:10 voyageur Exp $
+
+  15 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  -tinyxml-2.6.1-r1.ebuild, +tinyxml-2.6.2-r1.ebuild:
+  Restore stable 2.6.2 version for x86, intented removal was for 2.6.1, thanks
+  Mr_Bones
 
   15 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org> tinyxml-2.6.2.ebuild,
   -tinyxml-2.6.2-r1.ebuild, tinyxml-2.6.2-r2.ebuild:
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index d29339a2e965..797a0fe64ad6 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -5,17 +5,16 @@ AUX Makefile-2 732 RMD160 9c39630188f0be3b05b785bd55f24e6b02b73fa3 SHA1 53745f72
 AUX Makefile-3 1054 RMD160 14f1603c4c4ac252e08161d75da9f1564a4d8fee SHA1 06c4a8b325be6501c2396c388f8c7b885be989ff SHA256 88fb55306acac573c00da8e03c5ac780f23313879b8952c8657905897a0caf88
 AUX tinyxml-2.6.1-entity.patch 1776 RMD160 495fa342f00616a96c0a5044d652aa94e34c4675 SHA1 402831d1fab0fe7cac7ad761b530a54c0cf9cb58 SHA256 ef493209b0a51160171fd834a7ecdddd02679463b85fb89a2ea254213e47f99b
 AUX tinyxml-2.6.2-defineSTL.patch 353 RMD160 6c560140d279d849feb719decfd55ee0fa4fd9b8 SHA1 9931730c98809bf61865d90b91a007fa172b9ce4 SHA256 3baf2c4dbc2c8f54a151dac8860113d2f549174f83ed85d552b094dfaebb52af
-DIST tinyxml_2_6_1.tar.gz 212399 RMD160 faff2c67d945dc22a43562324a84213f364e37ae SHA1 2ff9c177a6c0bef10cbd27700b71826801c12987 SHA256 c9b85047fb3f5b86a0e313a4f2a21bdf7bdada32ba2df580cffb170029b27214
 DIST tinyxml_2_6_2.tar.gz 210124 RMD160 e4f9072a76fb2fc2ced48d5ccd9b9f87ad94e53b SHA1 cba3f50dd657cb1434674a03b21394df9913d764 SHA256 15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593
-EBUILD tinyxml-2.6.1-r1.ebuild 1344 RMD160 05162601803d750e88ac7baac9af113bbfdd2660 SHA1 0a5a3ad8f0a02eebaeaf9f181823beb9a1cb850f SHA256 03fb91a88a07aa9eb02956560c9628b151535f29089c3507c73e657d3b5cc799
+EBUILD tinyxml-2.6.2-r1.ebuild 1408 RMD160 15afabd9fb797ef7b41b3af07dedc2e841e8afdd SHA1 1737137ac14555df6217eb9713fcd404de3890cf SHA256 1e98ec91074b5977cee9a47f6d1f0541ccf6782544d673d36be3e0853ae98e22
 EBUILD tinyxml-2.6.2-r2.ebuild 1419 RMD160 87a7e051b092ed0f76a569c4d0048b82c9fc99e5 SHA1 24104c4450bc893873fa7e65b7189cbabc914942 SHA256 75ef883b7368983a6f8f47cb652b33d3c31203c6f25276d2c963f4c2accbf8e9
 EBUILD tinyxml-2.6.2.ebuild 1285 RMD160 f2908eb038c8e04f1a3971ba643af541f1844e50 SHA1 9ef8d377ac9e13e647e33601e6c85c297a0eff87 SHA256 59f71cc72d92d2d16d050fe460b5ea7de00832369871da7b210f822ac50560b7
-MISC ChangeLog 3659 RMD160 13e07d4813cc7148fe488774815ba34e98d19d60 SHA1 ca1c0645df41e644373fee1278545adf12d3a3ba SHA256 7a328cdb891e6f9ea081a672c78df2cf7788d0f75c471196645866ebb8f99923
+MISC ChangeLog 3859 RMD160 033d84e8a22a5b4f25ef43cf763a2b2a52633876 SHA1 c0fd47bfdf6f139137fe1ba7ff3a3180603b6aad SHA256 9555eeea0693366ac6267979a0348d97e3bbe51e374758a2f9feb62b6eed583a
 MISC metadata.xml 322 RMD160 666bcf1df59ae405909de12bb26df511e3ecf791 SHA1 82d6d3a487d5e90f0620e727c8ddcfcc0bf258af SHA256 0059eb4221e369e18ed58dcbc3c4412b7123402f5e07a00ff1f5259a0af02850
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9hM08ACgkQFYEBGcdFJfJhcgD9E3NZ9lEeoSNtkJ0x+U3ozY5B
-OfVi3NMIuqeYuOEi3YMA/0EVxI3R7VUWi1qmwKdd+/uAdR7R7MaISTYs4aiA7ssb
-=Fh1e
+iF4EAREIAAYFAk9iE0EACgkQFYEBGcdFJfJCiwD+OCfLzMf29BeVj5feT5C9uP6O
+djOe8GtRVRmZvAJpA9wA/3fv4A3QLzbEK/o2/2uehytNdBYfzkMmmqL+xW5zIZsi
+=TCXa
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/tinyxml/tinyxml-2.6.1-r1.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r1.ebuild
index 9df5756ca202..23984e5fccd0 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.1-r1.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1-r1.ebuild,v 1.3 2011/10/09 16:43:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2-r1.ebuild,v 1.4 2012/03/15 16:05:10 voyageur Exp $
 
-EAPI=2
-inherit flag-o-matic toolchain-funcs
+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"
@@ -11,8 +11,8 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
-IUSE="debug doc stl"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86 ~x64-macos ~x86-macos"
+IUSE="debug doc static-libs +stl"
 
 RDEPEND=""
 DEPEND="doc? ( app-doc/doxygen )"
@@ -26,30 +26,31 @@ src_prepare() {
 
 	sed -e "s:@MAJOR_V@:$major_v:" \
 	    -e "s:@MINOR_V@:$minor_v:" \
-		"${FILESDIR}"/Makefile-2 > Makefile || die
+		"${FILESDIR}"/Makefile-3 > Makefile || die
 
-	epatch "${FILESDIR}"/${P}-entity.patch
-}
+	epatch "${FILESDIR}"/${PN}-2.6.1-entity.patch
 
-src_compile() {
 	use debug && append-cppflags -DDEBUG
 	use stl && append-cppflags -DTIXML_USE_STL
 
+	if ! use static-libs; then
+		sed -e "/^all:/s/\$(name).a //" -i Makefile || die
+	fi
+
 	tc-export AR CXX RANLIB
 
-	emake || die "emake failed"
+	[[ ${CHOST} == *-darwin* ]] && export LIBDIR="${EPREFIX}"/usr/$(get_libdir)
 }
 
 src_install() {
-	dolib.so *.so* || die "dolib.so failed"
-	dolib.a *.a || die "dolib.a failed"
+	dolib.so *$(get_libname)*
 
 	insinto /usr/include
-	doins *.h || die "doins failed"
+	doins *.h
 
-	dodoc {changes,readme}.txt || die "dodoc failed"
+	dodoc {changes,readme}.txt
 
 	if use doc; then
-		dohtml -r docs/* || die "dohtml failed"
+		dohtml -r docs/*
 	fi
 }