diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-02-29 08:09:50 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-02-29 08:09:50 +0000 |
| commit | 171d5947402ba62572a35a58a36ce4e7ca42f949 (patch) | |
| tree | 4d4c2f953819abeb7b8229528d0bd5e3cfb2499d /net-im/skype | |
| parent | Version bump, remove old. Fixes bug #404531. (diff) | |
| download | gentoo-2-171d5947402ba62572a35a58a36ce4e7ca42f949.tar.gz gentoo-2-171d5947402ba62572a35a58a36ce4e7ca42f949.tar.bz2 gentoo-2-171d5947402ba62572a35a58a36ce4e7ca42f949.zip | |
Correct installation with USE=qt-static, #405023; remove additional dies
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'net-im/skype')
| -rw-r--r-- | net-im/skype/ChangeLog | 5 | ||||
| -rw-r--r-- | net-im/skype/skype-2.2.0.35-r1.ebuild | 22 |
2 files changed, 15 insertions, 12 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index ad1c43c58beb..966168a35d69 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,9 @@ # 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.118 2012/02/28 21:24:54 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.119 2012/02/29 08:09:50 jlec Exp $ + + 29 Feb 2012; Justin Lecher <jlec@gentoo.org> skype-2.2.0.35-r1.ebuild: + Correct installation with USE=qt-static, #405023; remove additional dies 28 Feb 2012; mthode <mthode@gentoo.org> skype-2.2.0.35-r1.ebuild: paxmarked m skype to work on hardened 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 e3a8aa2088c2..1b1c3c99a6cf 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.2 2012/02/28 21:24:54 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v 1.3 2012/02/29 08:09:50 jlec Exp $ EAPI=4 inherit gnome2-utils eutils qt4-r2 pax-utils @@ -64,22 +64,22 @@ pkg_setup() { : } -src_install() { - local MY_S="${S}" - use qt-static && MY_S="${WORKDIR}/${PN}_static-${PV}" - cd "${MY_S}" +src_unpack() { + unpack ${A} && mv skype* "${S}" || die +} +src_install() { exeinto /opt/skype - doexe skype || die + doexe skype fowners root:audio /opt/skype/skype make_wrapper skype ./skype /opt/skype /opt/skype insinto /opt/skype/sounds - doins sounds/*.wav || die + doins sounds/*.wav if ! use qt-static; then insinto /etc/dbus-1/system.d - doins skype.conf || die + doins skype.conf fi if ! use qt-static; then @@ -87,15 +87,15 @@ src_install() { fi insinto /opt/skype/lang - doins lang/*.qm || die + doins lang/*.qm insinto /opt/skype/avatars - doins avatars/*.png || die + doins avatars/*.png local res for res in 16 32 48; do insinto /usr/share/icons/hicolor/${res}x${res}/apps - newins icons/SkypeBlue_${res}x${res}.png skype.png || die + newins icons/SkypeBlue_${res}x${res}.png skype.png done dodoc README |