diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2012-02-29 13:07:46 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2012-02-29 13:07:46 +0000 |
| commit | 45d791e2a94cbd0c39ca157de4833d090b5d1510 (patch) | |
| tree | bba71668b3a40232d5b9ad13aded9209f7ed94ee /net-im/skype | |
| parent | Version bump, adds support for multiple storage areas (diff) | |
| download | gentoo-2-45d791e2a94cbd0c39ca157de4833d090b5d1510.tar.gz gentoo-2-45d791e2a94cbd0c39ca157de4833d090b5d1510.tar.bz2 gentoo-2-45d791e2a94cbd0c39ca157de4833d090b5d1510.zip | |
net-im/skype: Fix src_unpack
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'net-im/skype')
| -rw-r--r-- | net-im/skype/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/skype/skype-2.2.0.35-r1.ebuild | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index af030c835fae..b19bbbc20680 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/skype # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.120 2012/02/29 09:07:45 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.121 2012/02/29 13:07:46 sping Exp $ + + 29 Feb 2012; Sebastian Pipping <sping@gentoo.org> skype-2.2.0.35-r1.ebuild: + Fix "mv: cannot move `skype-2.2.0.35' to a subdirectory of itself" in an + update-proof manner 29 Feb 2012; mthode <mthode@gentoo.org> skype-2.2.0.35-r1.ebuild: fix the paxmarking syntax diff --git a/net-im/skype/skype-2.2.0.35-r1.ebuild b/net-im/skype/skype-2.2.0.35-r1.ebuild index 309bd964fcf5..34120077431d 100644 --- a/net-im/skype/skype-2.2.0.35-r1.ebuild +++ b/net-im/skype/skype-2.2.0.35-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI=4 inherit gnome2-utils eutils qt4-r2 pax-utils @@ -65,7 +65,10 @@ pkg_setup() { } src_unpack() { - unpack ${A} && mv skype* "${S}" || die + unpack ${A} || die + [[ ! -d "${S}" ]] && { + mv skype* "${S}" || die + } } src_install() { |