Version bump and with ebuild updates thanks to radhermit, bug #379513. Also remove...

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/dev-libs/tinyxml/ChangeLog b/dev-libs/tinyxml/ChangeLog
index 69084f5ee580dbe927fe15327c42e30956ac6a3e..6e5fdc3711307b63b7d18d05cdbab7ca98e06989 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.10 2011/08/02 16:23:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.11 2011/08/19 12:58:31 voyageur Exp $
+
+*tinyxml-2.6.2 (19 Aug 2011)
+
+  19 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org> -tinyxml-2.6.1.ebuild,
+  +tinyxml-2.6.2.ebuild:
+  Version bump and with ebuild updates thanks to radhermit, bug #379513. Also
+  remove broken 2.6.1
 
   02 Aug 2011; Markos Chandras <hwoarang@gentoo.org> tinyxml-2.6.1-r1.ebuild:
   Stable on amd64 wrt bug #375503

diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index 0fff109414b23984bd7150190f999767365a5543..063eecfdb898f70d84f952eab01dc09f8ad27e72 100644 (file)
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -1,27 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX Makefile-2 732 RMD160 9c39630188f0be3b05b785bd55f24e6b02b73fa3 SHA1 53745f72b49194b0b8f0e677026af26a0594c271 SHA256 2e4afa3b11bc44612a9586c345a21ac19eb04ec877cd1267fbd07dc2f9180880
 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 1347 RMD160 fdd0e2c592a9e010c1a4382aad70c31003adee04 SHA1 72df0b55a807547dc9a049eb85faa38b5eaeea9e SHA256 63ddfe1a21283fb901cf7e6d951eeec0ec57766cff50f4e70acc213730d57c07
-EBUILD tinyxml-2.6.1.ebuild 1307 RMD160 67a92522a649764b6daab268e2e98985ff6a493b SHA1 098ec79902ae4f67584c9e3389e4d5c3c95063e8 SHA256 1c0a0349f0ff0705a7e3b0600bb1c4a1853452792060b8894c64570eaa1dd55a
-MISC ChangeLog 1842 RMD160 0c6433dba81b4577881c679b553cbceee9a0c7df SHA1 9c48385df4be1dfecc3db1fafe56963d7e09d66c SHA256 11b6b7ca98e95401a5ec6fa7cf2c830f28ebc39ebe68bdeb1b30da0d1e87828f
+EBUILD tinyxml-2.6.2.ebuild 1212 RMD160 5637aa2ea206c3f6bda83b9c1c3f09727222beaf SHA1 1455cab0731de242f1966ed7fbec1b595c2c1ade SHA256 bf55f41c87eb182d4dd3217b7b3be1ba0bc06e143bd779348311420f6d436ae1
+MISC ChangeLog 2076 RMD160 196030f1401dfa0172f4b1a0c97fbdd6fa442716 SHA1 8ee9c3265e0965d1d9dda27d24227408a5ea90b0 SHA256 163747b6b062685090d9fbe6c1634ae97671542c1ab0ab8489e34c03769be8ab
 MISC metadata.xml 345 RMD160 0865f4a9ba345d5c6e8fe3283243ee79e58e11c7 SHA1 ababc96e2c43928dc4ad1dc2fca8fdc53f17749c SHA256 45c04600572d2ed744d6de3f9d8ce142da264912027614ed82da25de0ac92900
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOOCReAAoJEPqDWhW0r/LCTsoQAKxNt5jnX3waxcmk0TOdPt8c
-r9spC+qGZcz8ZpFk+vmvsDIdfcO3BCjqCszpiobAzUD/ZKdE5eg03g8vFkWZSvwZ
-Fasedg4FsXNRviGpKxuxgPuJYujvxWIL883YXBJpxe1EWroSxzwFmfh6i+HI5n7h
-erKiYmx/V63Y19A+J21Ac27KiZCNFprlEeltF4MnlNPxS0EoC0DZkdwzVLvM+b4i
-2CbgRb9Bm6EqKMAE/PaSXLhkKALlOOl06omEGlzFoUczvCofejLYZHzmFMY2/5Zj
-Q6Tv7LtjwCfNF8TNqJb8fJ6VdIcr/HBL5DbC2pG1vCYPbNhKDpzc60xOmbC+1/at
-nfwMhy2ACIcHfA87Z7N15u8+phPeDKi/LPeMZBMS8CyrDTHPpxuj3lSCS9HeU7zF
-Gz14b+Nfmuth++zrcTsu4bCUpqDVaE7uwCS6b/g/0LBFwGuLc027Lk0d7frNRBI9
-WyudVfeIyCzKgvRdJJrE585HZNJ2sZRKYuxt2q9Jsdb1WEOgZGO9OlKETI42E4GR
-iMOoo3FWM7CobN8vUEcrMcSlpxwnVweCQcA7Y29ekfbHRwFViYaVbxxUeX53Qikz
-yeMwEEIJhY/aMdiPisHfphGPn+FmcvlKx9PLEw1aCymPLfnk908KgmGI2qmxXWEt
-BxdRnT9RZ00iAwLD1z4X
-=xo0r
+iF4EAREIAAYFAk5OXgQACgkQFYEBGcdFJfKSfwD7BpFFBwgyNWYeabuEOH3dZ0Vp
+RVW4JLKozrMcclgxB6QA/R2lncBrFZBQSxP3PptP41Xyus8cpftq06q8oJUKQBz9
+=nMLp
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/tinyxml/tinyxml-2.6.1.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2.ebuild
similarity index 74%
rename from dev-libs/tinyxml/tinyxml-2.6.1.ebuild
rename to dev-libs/tinyxml/tinyxml-2.6.2.ebuild
index 3ea5a8a1a89f01e34141d7362b891c8c48ed3a08..890927e45324008fe65fc1b197c6f13165eeb82d 100644 (file)
--- a/dev-libs/tinyxml/tinyxml-2.6.1.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2.ebuild
@@ -1,8 +1,8 @@
 # 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.1.ebuild,v 1.3 2011/02/11 18:43:31 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2.ebuild,v 1.1 2011/08/19 12:58:31 voyageur Exp $
 
-EAPI=2
+EAPI=4
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="a simple, small, C++ XML parser that can be easily integrating into other programs"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="debug doc +stl"
+IUSE="debug doc static-libs stl"
 
 RDEPEND=""
 DEPEND="doc? ( app-doc/doxygen )"
@@ -27,27 +27,25 @@ src_prepare() {
        sed -e "s:@MAJOR_V@:$major_v:" \
            -e "s:@MINOR_V@:$minor_v:" \
                "${FILESDIR}"/Makefile-2 > Makefile || die
-}
 
-src_compile() {
+       epatch "${FILESDIR}"/${P}-entity.patch
+
        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"
+       dolib.so *.so*
+       use static-libs && dolib.a *.a
 
        insinto /usr/include
-       doins *.h || die "doins failed"
+       doins *.h
 
-       dodoc {changes,readme}.txt || die "dodoc failed"
+       dodoc {changes,readme}.txt
 
        if use doc; then
-               dohtml -r docs/* || die "dohtml failed"
+               dohtml -r docs/*
        fi
 }