From 3f8717e3db4a3e6d8bfb23e2a2b75fc919d2db21 Mon Sep 17 00:00:00 2001
From: Ben de Groot <yngwin@gentoo.org>
Date: Sat, 7 Mar 2015 15:55:00 +0000
Subject: [PATCH] Change block on older libfm into hard block, to force users
 to uninstall libfm first.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!
---
 x11-libs/libfm-extra/ChangeLog                |  6 +++-
 x11-libs/libfm-extra/Manifest                 | 32 +++++++++----------
 x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild |  4 +--
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/x11-libs/libfm-extra/ChangeLog b/x11-libs/libfm-extra/ChangeLog
index 6c2c837240bd..f19560d0baad 100644
--- a/x11-libs/libfm-extra/ChangeLog
+++ b/x11-libs/libfm-extra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libfm-extra
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm-extra/ChangeLog,v 1.2 2015/03/07 05:09:58 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm-extra/ChangeLog,v 1.3 2015/03/07 15:54:56 yngwin Exp $
+
+  07 Mar 2015; Ben de Groot <yngwin@gentoo.org> libfm-extra-1.2.3.ebuild:
+  Change block on older libfm into hard block, to force users to uninstall libfm
+  first.
 
   07 Mar 2015; Ben de Groot <yngwin@gentoo.org> libfm-extra-1.2.3.ebuild:
   Block <=x11-libs/libfm-1.2.3 to prevent file collisions
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index f7af0d6b1429..6a4a84e424f7 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST libfm-1.2.3.tar.xz 898256 SHA256 c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9 SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443 WHIRLPOOL ae5354c5ef5154ebce8a9124b47e0a645171d50d4034fd1e6000ff084acc15261398029c58b067b9027d4ba68d36d8addf91a28678c91a3fbd9ce0806e9b6046
-EBUILD libfm-extra-1.2.3.ebuild 2677 SHA256 755660fbaada04046b776c7752a3c6f3fc95423be22422f6a1faa8fca8ff73d5 SHA512 a95aff37cfb74f90503e1f5ea571b7aeca0b9812b58483b2dda4eafd6f54a3c969c86fed65f08d31c9f3e5a27bbdc002e958a82bed2dd10f6505e6d1ba9db755 WHIRLPOOL 0f80eb4952d23c3815b1c481ccfaa5c75643aff375bb14d198fbfc621fe3f0db057b69fec28821d4b4928356a744f106c692376666a0d6ad33827a29c2bcc412
-MISC ChangeLog 552 SHA256 42987242ca0183493fb74232f3cd8f52ad8e8b2ab6940a87a17d0fc6c9dcb05d SHA512 a27733572f78dbb4c874cc1631302d6b82d31c46e1aac24a6ee8f8c20ec3afb9fedcacbc7483bcb338426228fc721303152bdc557440e9c7080a250efbce34e3 WHIRLPOOL d80f839f5ca57ff0b33e1c60716457a94acc169a56f1d96560cceae05b16ab4feb0613b41dd1f6ceb43817a65cd93bee7df7d4d3717b450ac01442ec41a26f0b
+EBUILD libfm-extra-1.2.3.ebuild 2678 SHA256 4966fa726c06a9a8a0699ee7f721cae72c3b2d2acf0d39d60bc6c8ee22bdf4e5 SHA512 bd5e448fa4eb9806b19176f962e46d47b7e92f734c6e4fd9e8460095195c02d8cb8235649537055854f80c4f79b17b797e22edfd4429c418eb6b5afeb2c651c2 WHIRLPOOL 96ac7271d6fbeef1463fdff5323fffbde5582080e37a992de52716ff588527e450928b750c40d7af218137d96912b6e1a63730cc954b1d7d458fe8f787e58e8a
+MISC ChangeLog 717 SHA256 8f887679cc86aaa5a09d756050cce56b1941884d984bbd0e0d51a90d1e384e8c SHA512 f2ff36c2a6dca880dd1f54387a6bd80d7556f4d9c7ed07db4292be8ecb65bb450aa9ce136b60cb003effdd5745009bd6435ca11ff917686b72cfe7cccf25fae7 WHIRLPOOL ac27fd5316ee005d315d46592192649bc92a861976276e3d273b58dd76b7f25d13e124ed7e721beba37338becdfcf4ac2fb92eb0f76498d99e52c44fdee4713e
 MISC metadata.xml 179 SHA256 f2fb09f29eb86b99a43176e7c3e23a9050944bc16d3c8a24de81d68769f7972c SHA512 3e4198ffd569b62911dc8625912ebbf9935ba8fed89b89d8fc9365fc5ae8820e0c191a0eb6bfb1e7945b8ed598004f3b1d945314bb7b9dfcc366174598084ee0 WHIRLPOOL af31d78fddcc9f5642aae3fb6ee6ba593c1c3f8e5fa4b16636b23c363418c1bb10d3b82ada595403ec2099d5edf69a31f8080af6015bdf68b1de4a6f423f4842
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU+ogrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU+x9SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOHcAQAMjuqHWYVJzJXIdyYbd5LqpI
-jOqB+Io+EHfNWMgMusyYy8EZEb7VDP6kUFHRejOBtUtHdERH1slW4bhO+a2mQF2G
-rfaNvpYw2N2jrl4HHqdxniBzZPVLyXtKnpF7urnvIRqf/zYnAL89Qd8OQI+BuVy7
-4PuHQDdkKgtmldVKI/e/FzV1j6IVDkuHabKWf1aBVVbTrFcT3rF+SucviRaweCu3
-y5YtDWv2o1jGBROafaDm86GFqIwxqa0UcqyMgidO5YmmqGpTYr4CA1PVDodBvjye
-Gjgveclbp6q5bteDdq2lVqat4NVM8LdOFCysT+JMM6I+idpz5bfYGgt5IGXBDoAu
-Qw2Nr944MC+eDcEwOislfInPr0NvR7W7PAqDUHWKy3LOxEd2mj3MvW3nw73lFIVz
-X4IIpNikzm1rICrT8h41VkTuE3cYIKFUPUhmAqWxR/x4IKy3yvT2V0Jdsf9itY1B
-tgvJP1xgfGD3cS8amBigA2I4ffP7fXSSJ5zdYnAjmoeKQdF7ELzvF/xwVa0iqc8j
-2sLaiYl65MlQictmxV3qHhER2AVGgR9NZ5gBscCvu0D/tpGP/IYqaoJiSN0LijAo
-Hd9gfZVgo7zhoFlzpje72thhbhh74tFbjyOuUxZtrNpe8Z3MLlYmvpIR2RlJJMJn
-Pc12hV12E8caqZo+xANS
-=0yn3
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO8ykP/1SMyDuQk7ub2szOCZGCRxNa
+X4PObRNc3YsCjkBIHZvqWauWuJrzmesJakXzwzNuXZXJct8ShmeuOSm9vxu4Axpx
+1RAbC1IpTw0SWj31SOcnPX9Hp5pL/eH9V5bqNLFMulFVvXIJVXLXKPWD9qEFbCzl
+4xVm1ZzVDkbaPy60ukV3qjrp8DhUMye7lTjGFpXu27X4RO3BKPm2sqAyk6lGuxiO
+vVdSVnT+7uMVj+z3SrSi4oKZ1xEchL6Nv71CMXPN/mzjAeTTGv0l2UMJYkq03l+N
+u+zJ8RZzTNuHdl2Ft3Z8h6o028NP8Qn3W6ZHr4lItWnqKS4G4Uxul8XM2Ad5Skiz
+fDBq9LXVv4xv2XixeKKAfLUoTqdWX01sDecDvGae6Bt88MPwL0oFndTtoLvnPxAB
+LWdZxU9Ci96vFKXy69XQ/7sAgJJxePOfnYTgTBT/dcS18A27IsR1Ct9Mdj1Md3KH
+h4omQ67HN7jIVljxIGIgktxKAkmPaORAICLBUrEf7ca/3oGhY2fHMyyQWfBGiAxc
+66xU94nQwPthgaZlPiOS3assPSHrCve9iDmMgTDyasBp8JbGljUpbi0hKL8kEnEF
+cz/lon9hREW58QetZdpiWBFzungyrLF7BsTx1Ek95ZdeUKIGpUDnFnJN1IcIhTpA
++P9av+nx5/qZgB1qUTOr
+=lZrv
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
index 3a4250a8383b..0179fa9d08d0 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild,v 1.2 2015/03/07 05:09:58 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild,v 1.3 2015/03/07 15:54:56 yngwin Exp $
 
 EAPI=5
 inherit autotools fdo-mime
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
 	sys-devel/gettext
-	!<=x11-libs/libfm-1.2.3"
+	!!<=x11-libs/libfm-1.2.3"
 
 S="${WORKDIR}"/${MY_P}
 
-- 
2.26.2