Fix README removals on reduced USE flag situations (thanks Francisco Vazquez for reporting bug 455098)

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 19 insertions, 11 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index cbfc5fa4c9b8..87b94f11b17a 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/xpra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.47 2013/02/04 07:29:42 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.48 2013/02/05 08:01:54 xmw Exp $
+
+*xpra-0.8.1-r1 (05 Feb 2013)
+*xpra-0.8.0-r1 (05 Feb 2013)
+
+  05 Feb 2013; Michael Weber <xmw@gentoo.org> -xpra-0.8.0.ebuild,
+  +xpra-0.8.0-r1.ebuild, -xpra-0.8.1.ebuild, +xpra-0.8.1-r1.ebuild:
+  Fix README removals on reduced USE flag situations (thanks Francisco Vazquez
+  for reporting bug 455098)
 
 *xpra-0.8.1 (04 Feb 2013)
 
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index d1d26ed21c8c..dbd9dd594d99 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -12,14 +12,14 @@ DIST xpra-0.8.1.tar.bz2 579525 SHA256 42a199ee4dfd4c7249feb2ae12d57329ad2797c6c8
 EBUILD xpra-0.7.5.ebuild 2445 SHA256 366c2a4ed58f2773292bac68ef656230d4022e4bcc5a4e70fdfa68303fda19c1 SHA512 edc6080c1df6cb7a7c6c81e1fa85a6a7d0f4d1f6c08a8a15befe8b085c96fecdd899ac869a849ae60bbf4ac77f7b954defaf4844d86db9643e4376c5160ffc2f WHIRLPOOL cd5cf557c8e705efa1ad87abebc751fc79a80c1ca7e0b00997a5bc3e8c234bf4b4209600ff283b8d348a1add6e435f2b8e34dd16e17322e9b448d7b23934efc5
 EBUILD xpra-0.7.6.ebuild 2522 SHA256 0bfa48c7ed85d3287987fc091683d34276a0e3332382f30c48d2f66d7a7b287f SHA512 dad52b49f14005f83cbeae372b370a6a8d74d45f34b499ee1a1bc0f692014ca986c99c9c9270d65e66db26673acc6b36548b070ca825d04ff4f78de7ef561a1e WHIRLPOOL 01095f5836ce1100367f43892367c2715e5da6ec3d69f5d2a96ab76210528bcd5b16f50a660b55c2fdf9f828b5467d1b8783eecb0b201b9776e153445c1828ef
 EBUILD xpra-0.7.8.ebuild 2522 SHA256 d3e8dc61c2d3a9af40744824a2ac4681456c470bdeca066021a0e26fb3dd27a6 SHA512 0e202e103627becc8726ce1bb8ac4a5b4ed7208b23e09b930249e3f768c9e42d08abbaa232a8c6766b44c66f28461ace15062253da9b91782d46c1a37d4e41bb WHIRLPOOL d374c996345171792dccb57992f31cbc5eb64f315966a20eafe6e330cd96f6ad9ac69a6080195c5279b4424af4ceb4eb2f126ff227e987cafacf957a8d5589b7
-EBUILD xpra-0.8.0.ebuild 2208 SHA256 887b3207bb6d29706f3ee047996f6c09bac2d53abf62ffe463444e57f998c16b SHA512 6944ce24dab1ca97ac2a642e0ec137b4622076a9923528599ab184ac6b474ec2d2a3e4cf93cac99c258d0b77aef84a781ed118a5c9cfa3264325519fbd29938b WHIRLPOOL 672aec78f14c8e04fc42884579e5f207e9d4ee15ca263e0114c4b496dd8e9052245acbfcb59d94bc74aabd56d9527c0e11a7f81f419f42a2f6796067ba9996e1
-EBUILD xpra-0.8.1.ebuild 2208 SHA256 68f6f1bf1b505cb5b3651d8c775f9bac99138be2c85d0de629bdc45f8f8172b7 SHA512 c0b437bef09058a294a521deb55ec0bfd1996d216616300e8760e2d0793f761d3fb7ad58ac39ed9e8521d36d6e5fd26000238f9499ccd05ee4e60ac7d9c9c1e7 WHIRLPOOL 34cd16545e236621c6c2e601f5b38f7829008e8adc16199df71d25c4d52a7d9f471ae970b260133169048462fddc372c06b476aee9a84babd93cc316dfb03350
-MISC ChangeLog 6703 SHA256 0dfb277ae00b76bfea3332647452655309fc18635207a4b5e2632f7e4c7d418f SHA512 7a7090a3b0caad7a3466c8880c4debe4995a00a4fe9b1055346f363bd3bf57651ae38485524b5c8af7c6e73d1a98de7fa99006124225f1875c56578c5da44aea WHIRLPOOL 064b2dc0962341485b99d5749b76ca6cc79a325119918fe36f9601795ac3eca2058053d151ffc7b1088b035df22ae56ec8664492fbeff7dee89ab79a3426b3a0
+EBUILD xpra-0.8.0-r1.ebuild 2212 SHA256 d690d59a1c3cd70ce90a31d65595d112fdab0b4a26566a2411e19a407252712d SHA512 042362199fc4abad2f767080597797887c465705c29209575ae9ad1b69812844acde65ff23949146359cb2348ad87a37604ec585122d44555a0872f94db1938b WHIRLPOOL e8d4fa167fbdcea4d860c188bb5527c3591c6721eb001dfdf3b58e63afe61176223fc032a276db587a25f5536847b5f94b192173b52ce938716894f15912ba34
+EBUILD xpra-0.8.1-r1.ebuild 2212 SHA256 47dc88107ca2fd6f84a255d27a85256b5ac130a510699423c98b9f8028640de8 SHA512 59a4648232466397365c8c25a481cc9cde61231bd0a77b79208a4c56c568ac7f54ab301245c709ea39d1cb4a92310ab180cd4895bf40bc669337686f46d568aa WHIRLPOOL 40f75f0a46410bdda6f7069a1cef7b04415c2802a245d35d9a8dcbaf3aeaaac0c49bf64364764590652a9e0f186bea8f87f66f1b70953a6f247d3afaea913859
+MISC ChangeLog 7004 SHA256 305b5df88d1a3509efec3634a61a1ca97729a5334fdc162107003362987e3796 SHA512 84ca8d0f622e58a89395b27db7d68490fd8e0c6f6b048218bd070a2cad89ff52670e66d9c375faa92dbfca5d9d26fdebbe07e32c87bbbea1b0ae58817b682c4b WHIRLPOOL b0ef17a2054276a0a3c430519be274fd6a2eb216962360c3569495fee43489bbf919eb401bcdf598c94abebb0e8854dfadb6d033df33c682ac45d36a889a2919
 MISC metadata.xml 513 SHA256 5ad186ef732faf537dc7a0ea56199d3ca1dda899b84f6752a45b2b606014146b SHA512 402f753c8cdcfaabbf07098cdfea66e50fa543f1545d65a34bd05acd86df678b56ec74d56fec1f105ee2a6f621fc399ba5f2a1a12b3c66905e4b9f8e0efbc640 WHIRLPOOL 110717d55313a3d6cf6b5326e9358c1f01cadafcb103c3f6cbbb098338cd8652ce317d5433bc315c4b5ee04fef946ffa480f54ac404403f422685afc93451f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEPY3AACgkQknrdDGLu8JASvAD/cc2v3E8ZNYftV0HRLXaQmAsd
-FPrYkKa6MuVFY6jPsl4A/38qSbjzvtahfmBzeCYrbhjPB1saxnUVQW8lp3vcDXBf
-=RKvI
+iF4EAREIAAYFAlEQvHgACgkQknrdDGLu8JA17QD/X0femdS1Sqa1S6b54+YO4xQE
+1xEQFaMXQTLZsGZ18pIBAJoqow1Psta0rISfRYRYXUu2VrfhDdbPly9pyPqKf9JH
+=buJX
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/xpra-0.8.0.ebuild b/x11-wm/xpra/xpra-0.8.0-r1.ebuild
index 25c0cd7ddf21..a15f20b57265 100644
--- a/x11-wm/xpra/xpra-0.8.0.ebuild
+++ b/x11-wm/xpra/xpra-0.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.8.0.ebuild,v 1.1 2013/02/01 11:37:47 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.8.0-r1.ebuild,v 1.1 2013/02/05 08:01:54 xmw Exp $
 
 EAPI=5
 
@@ -61,7 +61,7 @@ python_prepare_all() {
 src_install() {
 	distutils-r1_src_install
 
-	rm -v "${ED}"usr/share/parti/{parti.,}README \
+	rm -vf "${ED}"usr/share/parti/{parti.,}README \
 		"${ED}"usr/share/xpra/{webm/LICENSE,xpra.README} \
 		"${ED}"usr/share/wimpiggy/wimpiggy.README || die
 	dodoc {parti.,wimpiggy.,xpra.,}README
diff --git a/x11-wm/xpra/xpra-0.8.1.ebuild b/x11-wm/xpra/xpra-0.8.1-r1.ebuild
index 21a66b8b44db..869fae122128 100644
--- a/x11-wm/xpra/xpra-0.8.1.ebuild
+++ b/x11-wm/xpra/xpra-0.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.8.1.ebuild,v 1.1 2013/02/04 07:29:42 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.8.1-r1.ebuild,v 1.1 2013/02/05 08:01:54 xmw Exp $
 
 EAPI=5
 
@@ -61,7 +61,7 @@ python_prepare_all() {
 src_install() {
 	distutils-r1_src_install
 
-	rm -v "${ED}"usr/share/parti/{parti.,}README \
+	rm -vf "${ED}"usr/share/parti/{parti.,}README \
 		"${ED}"usr/share/xpra/{webm/LICENSE,xpra.README} \
 		"${ED}"usr/share/wimpiggy/wimpiggy.README || die
 	dodoc {parti.,wimpiggy.,xpra.,}README