Fix proble with applying patch (build issue).

Package-Manager: portage-2.1.10.27/cvs/Linux x86_64

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index f69e0397d7f3a1074de3e7b034774228e8bd8264..4d4c123a05001970888fd0194d4f7f77a4b03603 100644 (file)
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.220 2011/10/25 10:13:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.221 2011/10/25 16:45:22 pva Exp $
+
+  25 Oct 2011; Peter Volkov <pva@gentoo.org> psi-0.14-r4.ebuild:
+  Fix proble with applying patch (build issue).
 
   25 Oct 2011; Peter Volkov <pva@gentoo.org> psi-0.14-r4.ebuild,
   files/psi-0.14-minizip-detection.patch, psi-9999.ebuild:

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 3b096cab0e53ed768bb57b30bdd97a242df1c2e7..57d2453962cc04b6190b5dd2a1dd08f52e9ddca3 100644 (file)
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -11,14 +11,14 @@ DIST psi-extra-iconsets-r1428.tar.bz2 3214991 RMD160 5aba49e65ca39209a4791c6e5eb
 DIST psi-extra-patches-r1428.tar.bz2 131700 RMD160 071eadf3a174f392cfb7202a85d2082b3256c76e SHA1 78cfe1f6b8a15852b9ed72c0dd569c9b4e6d9fac SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48
 EBUILD psi-0.14-r1.ebuild 4668 RMD160 7e3aed2859dc2880471640af3a1c6296df848889 SHA1 37c58876124c1696b1111d8c11ee140ba93ee86d SHA256 7e7bf643317bc775d0e0e9d747e307edd6cba96a8f2a1162e62565fd383334bb
 EBUILD psi-0.14-r2.ebuild 4767 RMD160 8577968b92ca9e9c23222b2caaa8b70c86b41ce4 SHA1 4282e29358296d6f44e99d1fb88618dc107a82e9 SHA256 0933ae51870de2849f0b3543c1826a7784016ed40d21fd3e46db4a192f4c235b
-EBUILD psi-0.14-r4.ebuild 4825 RMD160 e08fc3c2c885d3bdd9dc990af84908812a4a2876 SHA1 d8658cf08bdf70facbf76735045568a715e5dbcc SHA256 1fa927acd441de298f31eeceb2476dea630a74c6c38f233113ee091306a64e16
+EBUILD psi-0.14-r4.ebuild 4851 RMD160 f79b2e67fe1c76bb56a1dd7b95c714e6894aee20 SHA1 68cfdb9144581bc55eb0be804b2b04b22bdb5aa3 SHA256 7e01b2cdf7bb2fff2d122a924610f7d64037bb08c2ef69fb9b6f7722893e7b8a
 EBUILD psi-9999.ebuild 6344 RMD160 0ac90b59fa1871002bfdd3cc434a7928d4352019 SHA1 e165d3b284e1b96a45c8ebff35f1d159efdb2d34 SHA256 215248637d2de3a1b3aa309ed4afa38765249b7425540e8b5aa74370b119efb8
-MISC ChangeLog 32721 RMD160 bf6230bc7196e19b13ee2b75e5c72c2bf1639a1c SHA1 f3386d8b157bdbe04fdd81d5b29d3bf19db6660d SHA256 4ac46844036b5132d78b614c480d5c6e1c306a8bd875ba909ae9bf51f08b81b6
+MISC ChangeLog 32835 RMD160 f0cdd010e48d2edac610c136dda279daea83aa1e SHA1 d2c46abd776669ab5fd3fbcbe667dc53b17ed4e7 SHA256 acc52f120411393e7e6e4ba90b53cdb490cd183b327340c5eec01089df1c3c1a
 MISC metadata.xml 1045 RMD160 41a67d4b456737917e90945bfd1ca1798603b7dd SHA1 38066b4c6e461321d33471202cc212d56aa8f463 SHA256 2d2db4b3989de29ab27080da8e7d4301b4b6a85a1f55a405a17de10d93a92be2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6mi2UACgkQGrk+8vGYmwcidAEA7ULfFVCbL+CPwh4OqfBgJTBE
-APsoI39Q/y1nNVvfhYEBAMyAUuZ0PKcuVBp7AEtYHgKlKXOpA3nzZQx1UqUxpEwV
-=WmIh
+iF0EAREIAAYFAk6m5zEACgkQGrk+8vGYmwe/QAD6AwP///373ApAOzWLJHJuwXup
+DLHkJgzBi8abZ796cI4A+OvJf7eGyWaAan7Oc6YHThIgmpU2BmvDNP8yRpimoXY=
+=+N9O
 -----END PGP SIGNATURE-----

diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild
index 890e17097900ec0c384b98ef065a806f7f57d6c4..ab8ec6767b1ef372c91b24a16261c9110cef0e62 100644 (file)
--- a/net-im/psi/psi-0.14-r4.ebuild
+++ b/net-im/psi/psi-0.14-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.6 2011/10/25 10:13:42 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.7 2011/10/25 16:45:22 pva Exp $
 
 EAPI=4
 
@@ -71,6 +71,7 @@ src_prepare() {
                ebeep
 
                EPATCH_EXCLUDE="${MY_EPATCH_EXCLUDE}
+                       005-less-includes.diff
                        755-psiplus-fix-application-info-defines.diff
                        9999-psiplus-application-info.diff" \
                EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch