Version bump and with ebuild updates thanks to radhermit, bug #379513. Also remove broken 2.6.1

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

2 files changed, 18 insertions, 13 deletions

diff --git a/dev-libs/tinyxml/ChangeLog b/dev-libs/tinyxml/ChangeLog
index 69084f5ee580..6e5fdc371130 100644
--- a/dev-libs/tinyxml/ChangeLog
+++ b/dev-libs/tinyxml/ChangeLog
@@ -1,6 +1,13 @@
 # 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.10 2011/08/02 16:23:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.11 2011/08/19 12:58:31 voyageur Exp $
+
+*tinyxml-2.6.2 (19 Aug 2011)
+
+  19 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org> -tinyxml-2.6.1.ebuild,
+  +tinyxml-2.6.2.ebuild:
+  Version bump and with ebuild updates thanks to radhermit, bug #379513. Also
+  remove broken 2.6.1
 
   02 Aug 2011; Markos Chandras <hwoarang@gentoo.org> tinyxml-2.6.1-r1.ebuild:
   Stable on amd64 wrt bug #375503
diff --git a/dev-libs/tinyxml/tinyxml-2.6.1.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2.ebuild
index 3ea5a8a1a89f..890927e45324 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.1.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.ebuild,v 1.3 2011/02/11 18:43:31 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2.ebuild,v 1.1 2011/08/19 12:58:31 voyageur Exp $
 
-EAPI=2
+EAPI=4
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="a simple, small, C++ XML parser that can be easily integrating into other programs"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="debug doc +stl"
+IUSE="debug doc static-libs stl"
 
 RDEPEND=""
 DEPEND="doc? ( app-doc/doxygen )"
@@ -27,27 +27,25 @@ src_prepare() {
 	sed -e "s:@MAJOR_V@:$major_v:" \
 	    -e "s:@MINOR_V@:$minor_v:" \
 		"${FILESDIR}"/Makefile-2 > Makefile || die
-}
 
-src_compile() {
+	epatch "${FILESDIR}"/${P}-entity.patch
+
 	use debug && append-cppflags -DDEBUG
 	use stl && append-cppflags -DTIXML_USE_STL
 
 	tc-export AR CXX RANLIB
-
-	emake || die "emake failed"
 }
 
 src_install() {
-	dolib.so *.so* || die "dolib.so failed"
-	dolib.a *.a || die "dolib.a failed"
+	dolib.so *.so*
+	use static-libs && dolib.a *.a
 
 	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
 }