Replace scons with custom Makefile wrt #281301.

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

3 files changed, 49 insertions, 11 deletions

diff --git a/dev-libs/tinyxml/ChangeLog b/dev-libs/tinyxml/ChangeLog
index 353cb4becc2d..f6a8480a1d48 100644
--- a/dev-libs/tinyxml/ChangeLog
+++ b/dev-libs/tinyxml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/tinyxml
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.1 2009/08/13 02:26:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.2 2009/08/13 13:22:13 ssuominen Exp $
+
+  13 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  tinyxml-2.5.3_p20090813.ebuild, +files/Makefile:
+  Replace scons with custom Makefile wrt #281301.
 
 *tinyxml-2.5.3_p20090813 (13 Aug 2009)
 
diff --git a/dev-libs/tinyxml/files/Makefile b/dev-libs/tinyxml/files/Makefile
new file mode 100644
index 000000000000..2a7bd6a5e00f
--- /dev/null
+++ b/dev-libs/tinyxml/files/Makefile
@@ -0,0 +1,34 @@
+AR ?= ar
+CPPFLAGS += -DTIXML_USE_STL
+CXX ?= g++
+CXXFLAGS += -Wall
+RANLIB ?= ranlib
+
+name = libtinyxml
+major = 0
+minor = 0.0
+version = $(major).$(minor)
+
+src = tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.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.5.3_p20090813.ebuild b/dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild
index 6889a04deeeb..218c07cc8d2b 100644
--- a/dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild,v 1.2 2009/08/13 07:10:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.5.3_p20090813.ebuild,v 1.3 2009/08/13 13:22:13 ssuominen Exp $
 
-EAPI="2"
+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"
@@ -14,19 +15,18 @@ KEYWORDS="~amd64"
 IUSE="debug doc"
 
 RDEPEND=""
-DEPEND="dev-util/scons
-	doc? ( app-doc/doxygen )"
+DEPEND="doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	sed -i -e 's:-O3::' SConstruct || die "sed failed"
+	cp -f "${FILESDIR}"/Makefile . || die
 }
 
 src_compile() {
-	local debug=0
-	use debug && debug=1
+	use debug && append-cppflags -DDEBUG
 
-	scons debug=${debug} program=0 sharedlibrary=1 staticlibrary=1 \
-		. || die "scons failed"
+	tc-export AR CXX RANLIB
+
+	emake || die "emake failed"
 
 	if use doc; then
 		doxygen dox || die "doxygen failed"
@@ -34,7 +34,7 @@ src_compile() {
 }
 
 src_install() {
-	dolib.so *.so || die "dolib.so failed"
+	dolib.so *.so* || die "dolib.so failed"
 	dolib.a *.a || die "dolib.a failed"
 
 	insinto /usr/include