Patch Makefile and ebuild for Mach-O (dylib) support and keyword ~x86-macos and ...

Package-Manager: portage-2.2.01.19572-prefix/cvs/Darwin i386

diff --git a/dev-libs/tinyxml/ChangeLog b/dev-libs/tinyxml/ChangeLog
index 03eef1da25eaecf7d802c4d40d7bbc85c761610e..d3d732ea54f258786e69fd57f103e5ea13f4b64c 100644 (file)
--- 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.16 2011/10/28 08:48:30 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.17 2011/11/07 18:57:09 grobian Exp $
+
+*tinyxml-2.6.2-r1 (07 Nov 2011)
+
+  07 Nov 2011; Fabian Groffen <grobian@gentoo.org> +tinyxml-2.6.2-r1.ebuild,
+  +files/Makefile-3:
+  Patch Makefile and ebuild for Mach-O (dylib) support and keyword ~x86-macos
+  and ~x64-macos
 
   28 Oct 2011; Tony Vroon <chainsaw@gentoo.org> tinyxml-2.6.2.ebuild:
   Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian

diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index 8055a2a7d79949725d8eb676beecaa69218b4e10..82afc4affdf0086d22bda7d58cee72f3196d6ad4 100644 (file)
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA1
 
 AUX Makefile-2 732 RMD160 9c39630188f0be3b05b785bd55f24e6b02b73fa3 SHA1 53745f72b49194b0b8f0e677026af26a0594c271 SHA256 2e4afa3b11bc44612a9586c345a21ac19eb04ec877cd1267fbd07dc2f9180880
+AUX Makefile-3 1054 RMD160 14f1603c4c4ac252e08161d75da9f1564a4d8fee SHA1 06c4a8b325be6501c2396c388f8c7b885be989ff SHA256 88fb55306acac573c00da8e03c5ac780f23313879b8952c8657905897a0caf88
 AUX tinyxml-2.6.1-entity.patch 1776 RMD160 495fa342f00616a96c0a5044d652aa94e34c4675 SHA1 402831d1fab0fe7cac7ad761b530a54c0cf9cb58 SHA256 ef493209b0a51160171fd834a7ecdddd02679463b85fb89a2ea254213e47f99b
 DIST tinyxml_2_6_1.tar.gz 212399 RMD160 faff2c67d945dc22a43562324a84213f364e37ae SHA1 2ff9c177a6c0bef10cbd27700b71826801c12987 SHA256 c9b85047fb3f5b86a0e313a4f2a21bdf7bdada32ba2df580cffb170029b27214
 DIST tinyxml_2_6_2.tar.gz 210124 RMD160 e4f9072a76fb2fc2ced48d5ccd9b9f87ad94e53b SHA1 cba3f50dd657cb1434674a03b21394df9913d764 SHA256 15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593
 EBUILD tinyxml-2.6.1-r1.ebuild 1344 RMD160 05162601803d750e88ac7baac9af113bbfdd2660 SHA1 0a5a3ad8f0a02eebaeaf9f181823beb9a1cb850f SHA256 03fb91a88a07aa9eb02956560c9628b151535f29089c3507c73e657d3b5cc799
+EBUILD tinyxml-2.6.2-r1.ebuild 1354 RMD160 696a1d7e71e1ba17ca0399fdc96b5d11df9ea439 SHA1 412e368fc0d89c9008722e6a903fc8aa9ecb4dda SHA256 88ce5925012e426bc18a7a73be92e71f858c1d87925eaa00bfd16bec34f5a917
 EBUILD tinyxml-2.6.2.ebuild 1231 RMD160 5efaaab23221a1e31be82c55ee01373caa66ad29 SHA1 2b97645966d95dfbbcef05e3958c74178ab92783 SHA256 e58ba51e00fe16ed34e574dd9f0ad015d7ed0cb18a56428e7ad7bdc2cb03d858
-MISC ChangeLog 2762 RMD160 2145baa7e6b58ab0103f929e6ef7d39063d32d58 SHA1 c8d16f9e6173e215d4758fccb37cdcd43d13c72b SHA256 f057934dc4c649d7f319c83c9001072ce4d91f5d9b3a3d76c867b6ad3b25d5d1
+MISC ChangeLog 2988 RMD160 ef1eecfac3e92ee57ea6b076d8a16c41ff29c707 SHA1 f93ac88551a6bfe65b9b88c32b0d1f9dff32b99a SHA256 3b217125ffbd3faca3295e844220273769f44c08f370fba7b20042446c11d5a2
 MISC metadata.xml 322 RMD160 666bcf1df59ae405909de12bb26df511e3ecf791 SHA1 82d6d3a487d5e90f0620e727c8ddcfcc0bf258af SHA256 0059eb4221e369e18ed58dcbc3c4412b7123402f5e07a00ff1f5259a0af02850
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk6qbHAACgkQp5vW4rUFj5pFsQCghAtIH45AFWG2jaVWCLeElWgX
-vNwAoJveJoIQo9iGA+118Pvs5u35CXPB
-=+Yxl
+iEYEARECAAYFAk64KgsACgkQX3X2B8XHTon8KwCeMCso0Sth8J/Bg4wGmboYBxV/
+ZFYAnj2L0v/Rr1Kb576BRW37VGSyED14
+=FECI
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/tinyxml/files/Makefile-3 b/dev-libs/tinyxml/files/Makefile-3
new file mode 100644 (file)
index 0000000..40ad4fe
--- /dev/null
+++ b/dev-libs/tinyxml/files/Makefile-3
@@ -0,0 +1,44 @@
+AR ?= ar
+CXX ?= g++
+CXXFLAGS += -Wall
+RANLIB ?= ranlib
+LIBDIR ?= /usr/lib
+
+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}))
+
+lib = so
+ifeq ($(shell uname),Darwin)
+       lib = dylib
+endif
+
+all: $(name).a $(name).$(lib)
+
+%.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
+
+$(name).dylib: $(lo)
+       $(CXX) $(LDFLAGS) -fPIC -dynamiclib $(lo) -install_name $(LIBDIR)/$(name).$(major).dylib -o $(name).$(version).dylib
+       ln -s $(name).$(version).dylib $(name).$(major).dylib
+       ln -s $(name).$(version).dylib $(name).dylib
+
+clean:
+       -rm -f *.o *.lo *.so* *.a

diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r1.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r1.ebuild
new file mode 100644 (file)
index 0000000..d7a079b
--- /dev/null
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r1.ebuild
@@ -0,0 +1,53 @@
+# 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-r1.ebuild,v 1.1 2011/11/07 18:57:09 grobian Exp $
+
+EAPI=4
+inherit flag-o-matic toolchain-funcs eutils multilib
+
+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 ~arm ~ia64 ~ppc ~sparc ~x86 ~x64-macos ~x86-macos"
+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-3 > Makefile || die
+
+       epatch "${FILESDIR}"/${PN}-2.6.1-entity.patch
+
+       use debug && append-cppflags -DDEBUG
+       use stl && append-cppflags -DTIXML_USE_STL
+
+       tc-export AR CXX RANLIB
+
+       [[ ${CHOST} == *-darwin* ]] && export LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+       dolib.so *$(get_libname)*
+       use static-libs && dolib.a *.a
+
+       insinto /usr/include
+       doins *.h
+
+       dodoc {changes,readme}.txt
+
+       if use doc; then
+               dohtml -r docs/*
+       fi
+}