| 1 |
sping 12/02/29 13:07:46 |
| 2 |
|
| 3 |
Modified: ChangeLog skype-2.2.0.35-r1.ebuild |
| 4 |
Log: |
| 5 |
net-im/skype: Fix src_unpack |
| 6 |
|
| 7 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.121 net-im/skype/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.121&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.121&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?r1=1.120&r2=1.121 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v |
| 19 |
retrieving revision 1.120 |
| 20 |
retrieving revision 1.121 |
| 21 |
diff -u -r1.120 -r1.121 |
| 22 |
--- ChangeLog 29 Feb 2012 09:07:45 -0000 1.120 |
| 23 |
+++ ChangeLog 29 Feb 2012 13:07:46 -0000 1.121 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for net-im/skype |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.120 2012/02/29 09:07:45 prometheanfire Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.121 2012/02/29 13:07:46 sping Exp $ |
| 29 |
+ |
| 30 |
+ 29 Feb 2012; Sebastian Pipping <sping@g.o> skype-2.2.0.35-r1.ebuild: |
| 31 |
+ Fix "mv: cannot move `skype-2.2.0.35' to a subdirectory of itself" in an |
| 32 |
+ update-proof manner |
| 33 |
|
| 34 |
29 Feb 2012; mthode <mthode@g.o> skype-2.2.0.35-r1.ebuild: |
| 35 |
fix the paxmarking syntax |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.5 net-im/skype/skype-2.2.0.35-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?rev=1.5&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?rev=1.5&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?r1=1.4&r2=1.5 |
| 44 |
|
| 45 |
Index: skype-2.2.0.35-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v |
| 48 |
retrieving revision 1.4 |
| 49 |
retrieving revision 1.5 |
| 50 |
diff -u -r1.4 -r1.5 |
| 51 |
--- skype-2.2.0.35-r1.ebuild 29 Feb 2012 09:07:45 -0000 1.4 |
| 52 |
+++ skype-2.2.0.35-r1.ebuild 29 Feb 2012 13:07:46 -0000 1.5 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2012 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v 1.4 2012/02/29 09:07:45 prometheanfire Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v 1.5 2012/02/29 13:07:46 sping Exp $ |
| 58 |
|
| 59 |
EAPI=4 |
| 60 |
inherit gnome2-utils eutils qt4-r2 pax-utils |
| 61 |
@@ -65,7 +65,10 @@ |
| 62 |
} |
| 63 |
|
| 64 |
src_unpack() { |
| 65 |
- unpack ${A} && mv skype* "${S}" || die |
| 66 |
+ unpack ${A} || die |
| 67 |
+ [[ ! -d "${S}" ]] && { |
| 68 |
+ mv skype* "${S}" || die |
| 69 |
+ } |
| 70 |
} |
| 71 |
|
| 72 |
src_install() { |
Archives