non-maintainer commit: version bump (bug #318665)

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

4 files changed, 98 insertions, 2 deletions

diff --git a/dev-libs/tinyxml/ChangeLog b/dev-libs/tinyxml/ChangeLog
index a9a96e1efcdd..b474b8da1494 100644
--- a/dev-libs/tinyxml/ChangeLog
+++ b/dev-libs/tinyxml/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2010/04/12 13:14:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.5 2010/05/22 12:55:52 polynomial-c Exp $
+
+*tinyxml-2.6.1 (22 May 2010)
+
+  22 May 2010; Lars Wendler <polynomial-c@gentoo.org> +files/Makefile-2,
+  +tinyxml-2.6.1.ebuild:
+  non-maintainer commit: version bump (bug #318665). Thanks to Jacek
+  Szafarkiewicz for new Makefile and bug report.
 
 *tinyxml-2.5.3_p20090813-r1 (12 Apr 2010)
 
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index c86521664bab..00cf7ce09c4c 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -1,5 +1,8 @@
 AUX Makefile 718 RMD160 3e137e1cb125672bfb97c218f258a3f648baceec SHA1 b17343ad328f4a3b4784cd0ae7bb2505ae29a221 SHA256 003727c63b53a8d140cf4bf930e05c6e18e3dbe570b7a046c6848d973622fddf
+AUX Makefile-2 732 RMD160 9c39630188f0be3b05b785bd55f24e6b02b73fa3 SHA1 53745f72b49194b0b8f0e677026af26a0594c271 SHA256 2e4afa3b11bc44612a9586c345a21ac19eb04ec877cd1267fbd07dc2f9180880
 DIST tinyxml-2.5.3_p20090813.tar.bz2 208824 RMD160 ffb38f881f22e5db3a902b4fef3946dbdcfca147 SHA1 eddfaf34febd381ef242a2c36a1edc60e5de47ab SHA256 681cf5f6111703f9999acfd1b3641d56162771a230526aba8d9da5dcb4db5e99
+DIST tinyxml_2_6_1.tar.gz 212399 RMD160 faff2c67d945dc22a43562324a84213f364e37ae SHA1 2ff9c177a6c0bef10cbd27700b71826801c12987 SHA256 c9b85047fb3f5b86a0e313a4f2a21bdf7bdada32ba2df580cffb170029b27214
 EBUILD tinyxml-2.5.3_p20090813-r1.ebuild 1195 RMD160 bc1d0305b626ec2f3e237fe2d5a4914ae12631ee SHA1 728e85bb246ad1d3802bd406cb109735f1f39d36 SHA256 95b41bf892e07ce133f215373db6406609fcf5d351120d1c057c65d57bf6f633
-MISC ChangeLog 842 RMD160 4e997bbdad65754871aa2a9e486e338ee7e89eb5 SHA1 c8fe6c81021fbbb9fc0410950ff46ad27a440155 SHA256 c3e30103e974ded79ab89c9b6a14c7dabba6483261233ee5e5d61708bece96dc
+EBUILD tinyxml-2.6.1.ebuild 1291 RMD160 2aee18b03112a0f8b6c19cd607e7a3a76b8f65ab SHA1 6be100eb28867add8a92d6a3d0d416bd5e56a0e8 SHA256 82ba1bdd21ed174dbdadb21b0166ecf12dfcbf9d9438f8c9198c06b1b0f4b1ab
+MISC ChangeLog 1092 RMD160 70290e2d0ea249246ea956df45d2777048fcb753 SHA1 d45249a6e48ffc2fe1724271f5747bab1ef18772 SHA256 6f3f1024780f44bfcea9f11ec55bdcad00df51f1a5cbcbb2c9261b668fc69a55
 MISC metadata.xml 321 RMD160 4785b085bec2af3e0173a50f0f17963a401293de SHA1 78d8fffbdfe0b5a8e628add0a6ab56caba75f53b SHA256 60582c5cdd7ea62ede5cf069dd04f34ffee3edeed38f2738dce075d268b3c0ee
diff --git a/dev-libs/tinyxml/files/Makefile-2 b/dev-libs/tinyxml/files/Makefile-2
new file mode 100644
index 000000000000..9e480922e9f0
--- /dev/null
+++ b/dev-libs/tinyxml/files/Makefile-2
@@ -0,0 +1,33 @@
+AR ?= ar
+CXX ?= g++
+CXXFLAGS += -Wall
+RANLIB ?= ranlib
+
+name = libtinyxml
+major = @MAJOR_V@
+minor = @MINOR_V@
+version = $(major).$(minor)
+
+src = tinyxml.cpp tinyxmlparser.cpp tinyxmlerror.cpp tinystr.cpp
+lo = $(addsuffix .lo,$(basename ${src}))
+o = $(addsuffix .o,$(basename ${src}))
+
+all: $(name).a $(name).so
+
+%.o: %.cpp
+	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $< -o $@
+
+$(name).a: $(o)
+	$(AR) rc $(name).a $(o)
+	$(RANLIB) $(name).a
+
+%.lo: %.cpp
+	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -fPIC $< -o $@
+
+$(name).so: $(lo)
+	$(CXX) $(LDFLAGS) -fPIC -shared $(lo) -Wl,-soname,$(name).so.$(major) -o $(name).so.$(version)
+	ln -s $(name).so.$(version) $(name).so.$(major)
+	ln -s $(name).so.$(version) $(name).so
+
+clean:
+	-rm -f *.o *.lo *.so* *.a
diff --git a/dev-libs/tinyxml/tinyxml-2.6.1.ebuild b/dev-libs/tinyxml/tinyxml-2.6.1.ebuild
new file mode 100644
index 000000000000..e618621ba389
--- /dev/null
+++ b/dev-libs/tinyxml/tinyxml-2.6.1.ebuild
@@ -0,0 +1,53 @@
+# 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.6.1.ebuild,v 1.1 2010/05/22 12:55:52 polynomial-c 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 ~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
+}