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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 94 insertions, 1 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/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
+}