Correctly keep the indent patch in ebuild, catched by radhermit

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

diff --git a/dev-libs/tinyxml/ChangeLog b/dev-libs/tinyxml/ChangeLog
index 6e5fdc3711307b63b7d18d05cdbab7ca98e06989..e05911bcbb926b59a41ba54e9c99c00c32bbb44a 100644 (file)
--- a/dev-libs/tinyxml/ChangeLog
+++ b/dev-libs/tinyxml/ChangeLog
@@ -1,6 +1,9 @@
 # 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.11 2011/08/19 12:58:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.12 2011/08/19 16:35:30 voyageur Exp $
+
+  19 Aug 2011; Bernard Cafarelli <voyageur@gentoo.org> tinyxml-2.6.2.ebuild:
+  Correctly keep the indent patch in ebuild, catched by radhermit
 
 *tinyxml-2.6.2 (19 Aug 2011)
 

diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index 063eecfdb898f70d84f952eab01dc09f8ad27e72..859b390fa9d099df2615fec77943c07ff99d99a8 100644 (file)
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -6,13 +6,13 @@ AUX tinyxml-2.6.1-entity.patch 1776 RMD160 495fa342f00616a96c0a5044d652aa94e34c4
 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.2.ebuild 1212 RMD160 5637aa2ea206c3f6bda83b9c1c3f09727222beaf SHA1 1455cab0731de242f1966ed7fbec1b595c2c1ade SHA256 bf55f41c87eb182d4dd3217b7b3be1ba0bc06e143bd779348311420f6d436ae1
-MISC ChangeLog 2076 RMD160 196030f1401dfa0172f4b1a0c97fbdd6fa442716 SHA1 8ee9c3265e0965d1d9dda27d24227408a5ea90b0 SHA256 163747b6b062685090d9fbe6c1634ae97671542c1ab0ab8489e34c03769be8ab
+EBUILD tinyxml-2.6.2.ebuild 1226 RMD160 2887b4937184416c7051abcdcf5ce36c496489b9 SHA1 9278b6f16d7390e287d3395bd6b04fe71a36b1c6 SHA256 72e7ba22b17dea3ed1a1840d564327e3807d370536b4ea5e90f71e37ef375c00
+MISC ChangeLog 2220 RMD160 cc35ecd01b86f877a54ce5480c17430099a6c826 SHA1 b24f8822754249cd8d0b521356dc29a8c2f0a23b SHA256 f363f6548e0eff9e18eb59b5d647d4e839183ab6f2f26b5ff3550ffd63384c93
 MISC metadata.xml 345 RMD160 0865f4a9ba345d5c6e8fe3283243ee79e58e11c7 SHA1 ababc96e2c43928dc4ad1dc2fca8fdc53f17749c SHA256 45c04600572d2ed744d6de3f9d8ce142da264912027614ed82da25de0ac92900
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5OXgQACgkQFYEBGcdFJfKSfwD7BpFFBwgyNWYeabuEOH3dZ0Vp
-RVW4JLKozrMcclgxB6QA/R2lncBrFZBQSxP3PptP41Xyus8cpftq06q8oJUKQBz9
-=nMLp
+iF4EAREIAAYFAk5OkOIACgkQFYEBGcdFJfISLgEAjzAqOybS87Iu3iXN11ZkqL7a
++Zf/gdrh25UmOZVW4fABAJ1JGaBdWWRvYJaHs8BIQa1uGIw8Z8xH4yxws2fYMkxh
+=KguK
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2.ebuild
index 890927e45324008fe65fc1b197c6f13165eeb82d..7a7a4a219f60d16943dfd646e63e39969126bd14 100644 (file)
--- a/dev-libs/tinyxml/tinyxml-2.6.2.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2.ebuild
@@ -1,9 +1,9 @@
 # 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.ebuild,v 1.1 2011/08/19 12:58:31 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.2.ebuild,v 1.2 2011/08/19 16:35:30 voyageur Exp $
 
 EAPI=4
-inherit flag-o-matic toolchain-funcs
+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"
@@ -28,7 +28,7 @@ src_prepare() {
            -e "s:@MINOR_V@:$minor_v:" \
                "${FILESDIR}"/Makefile-2 > Makefile || die
 
-       epatch "${FILESDIR}"/${P}-entity.patch
+       epatch "${FILESDIR}"/${PN}-2.6.1-entity.patch
 
        use debug && append-cppflags -DDEBUG
        use stl && append-cppflags -DTIXML_USE_STL