From 4604f59f5ba4bf865e02385c4cf65a2695e87636 Mon Sep 17 00:00:00 2001
From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Fri, 19 Aug 2011 12:58:31 +0000
Subject: 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)
---
 dev-libs/tinyxml/ChangeLog            |  9 +++++-
 dev-libs/tinyxml/tinyxml-2.6.1.ebuild | 53 -----------------------------------
 dev-libs/tinyxml/tinyxml-2.6.2.ebuild | 51 +++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 54 deletions(-)
 delete mode 100644 dev-libs/tinyxml/tinyxml-2.6.1.ebuild
 create mode 100644 dev-libs/tinyxml/tinyxml-2.6.2.ebuild

(limited to 'dev-libs/tinyxml')

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.1.ebuild
deleted file mode 100644
index 3ea5a8a1a89f..000000000000
--- a/dev-libs/tinyxml/tinyxml-2.6.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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 $
-
-EAPI=2
-inherit flag-o-matic toolchain-funcs
-
-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 ~ia64 ~ppc ~sparc ~x86"
-IUSE="debug doc +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-2 > Makefile || die
-}
-
-src_compile() {
-	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"
-
-	insinto /usr/include
-	doins *.h || die "doins failed"
-
-	dodoc {changes,readme}.txt || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r docs/* || die "dohtml failed"
-	fi
-}
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2.ebuild
new file mode 100644
index 000000000000..890927e45324
--- /dev/null
+++ b/dev-libs/tinyxml/tinyxml-2.6.2.ebuild
@@ -0,0 +1,51 @@
+# 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.2.ebuild,v 1.1 2011/08/19 12:58:31 voyageur Exp $
+
+EAPI=4
+inherit flag-o-matic toolchain-funcs
+
+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 ~ia64 ~ppc ~sparc ~x86"
+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-2 > Makefile || die
+
+	epatch "${FILESDIR}"/${P}-entity.patch
+
+	use debug && append-cppflags -DDEBUG
+	use stl && append-cppflags -DTIXML_USE_STL
+
+	tc-export AR CXX RANLIB
+}
+
+src_install() {
+	dolib.so *.so*
+	use static-libs && dolib.a *.a
+
+	insinto /usr/include
+	doins *.h
+
+	dodoc {changes,readme}.txt
+
+	if use doc; then
+		dohtml -r docs/*
+	fi
+}
-- 
cgit v1.2.3-65-gdbad