diff options
author | 2012-06-01 08:06:26 +0000 | |
---|---|---|
committer | 2012-06-01 08:06:26 +0000 | |
commit | 0dea112e461346732009d388be7557b3c7fe3ec4 (patch) | |
tree | 9a0e51e8ebef26258d5bf91306cccd49ec7f440c /dev-libs/tinyxml | |
parent | Version bump. Drop old. (diff) | |
download | gentoo-2-0dea112e461346732009d388be7557b3c7fe3ec4.tar.gz gentoo-2-0dea112e461346732009d388be7557b3c7fe3ec4.tar.bz2 gentoo-2-0dea112e461346732009d388be7557b3c7fe3ec4.zip |
Stable on amd64 and x86 to match up ppc. Remove older stuff.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/tinyxml')
-rw-r--r-- | dev-libs/tinyxml/ChangeLog | 6 | ||||
-rw-r--r-- | dev-libs/tinyxml/files/Makefile-2 | 33 | ||||
-rw-r--r-- | dev-libs/tinyxml/tinyxml-2.6.2-r1.ebuild | 56 | ||||
-rw-r--r-- | dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild | 8 | ||||
-rw-r--r-- | dev-libs/tinyxml/tinyxml-2.6.2.ebuild | 54 |
5 files changed, 8 insertions, 149 deletions
diff --git a/dev-libs/tinyxml/ChangeLog b/dev-libs/tinyxml/ChangeLog index f2dfc957b7ad..5f42fbdc357d 100644 --- a/dev-libs/tinyxml/ChangeLog +++ b/dev-libs/tinyxml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/tinyxml # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.22 2012/04/16 19:20:21 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.23 2012/06/01 08:06:25 scarabeus Exp $ + + 01 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> -files/Makefile-2, + -tinyxml-2.6.2-r1.ebuild, -tinyxml-2.6.2.ebuild, tinyxml-2.6.2-r2.ebuild: + Stable on amd64 and x86 to match up ppc. Remove older stuff. 16 Apr 2012; Brent Baude <ranger@gentoo.org> tinyxml-2.6.2-r2.ebuild: Marking tinyxml-2.6.2-r2 ppc for bug 398285 diff --git a/dev-libs/tinyxml/files/Makefile-2 b/dev-libs/tinyxml/files/Makefile-2 deleted file mode 100644 index 9e480922e9f0..000000000000 --- a/dev-libs/tinyxml/files/Makefile-2 +++ /dev/null @@ -1,33 +0,0 @@ -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.2-r1.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r1.ebuild deleted file mode 100644 index 23984e5fccd0..000000000000 --- a/dev-libs/tinyxml/tinyxml-2.6.2-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2012 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.4 2012/03/15 16:05:10 voyageur 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 - - if ! use static-libs; then - sed -e "/^all:/s/\$(name).a //" -i Makefile || die - fi - - tc-export AR CXX RANLIB - - [[ ${CHOST} == *-darwin* ]] && export LIBDIR="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - dolib.so *$(get_libname)* - - insinto /usr/include - doins *.h - - dodoc {changes,readme}.txt - - if use doc; then - dohtml -r docs/* - fi -} diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild index cf8f36aff9b8..672566e8098c 100644 --- a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild +++ b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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-r2.ebuild,v 1.3 2012/04/16 19:20:21 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild,v 1.4 2012/06/01 08:06:25 scarabeus Exp $ EAPI=4 inherit flag-o-matic toolchain-funcs eutils multilib @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ppc ~sparc ~x86 ~x64-macos ~x86-macos" +KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86 ~x64-macos ~x86-macos" IUSE="debug doc static-libs +stl" RDEPEND="" @@ -50,7 +50,5 @@ src_install() { dodoc {changes,readme}.txt - if use doc; then - dohtml -r docs/* - fi + use doc && dohtml -r docs/* } diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2.ebuild deleted file mode 100644 index 60724e9ecc46..000000000000 --- a/dev-libs/tinyxml/tinyxml-2.6.2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2012 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.6 2012/03/15 00:09:38 voyageur Exp $ - -EAPI=4 -inherit flag-o-matic toolchain-funcs eutils - -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="~arm 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}"/${PN}-2.6.1-entity.patch - - use debug && append-cppflags -DDEBUG - use stl && append-cppflags -DTIXML_USE_STL - - if ! use static-libs; then - sed -e "/^all:/s/\$(name).a //" -i Makefile || die - fi - - tc-export AR CXX RANLIB -} - -src_install() { - dolib.so *.so* - - insinto /usr/include - doins *.h - - dodoc {changes,readme}.txt - - if use doc; then - dohtml -r docs/* - fi -} |