diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-02 12:24:15 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-02 12:24:15 +0000 |
commit | 799a14663ad1b223a93477b9ccd9a53e22e25cde (patch) | |
tree | c16b4f27bdc92cba0f932199315a176ba7ad32df /net-im/skype | |
parent | Transfer Prefix keywords (diff) | |
download | gentoo-2-799a14663ad1b223a93477b9ccd9a53e22e25cde.tar.gz gentoo-2-799a14663ad1b223a93477b9ccd9a53e22e25cde.tar.bz2 gentoo-2-799a14663ad1b223a93477b9ccd9a53e22e25cde.zip |
Use shipped skype.conf instead of one from FILESDIR.
(Portage version: 2.2_rc61/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.1.0.47.ebuild | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog index 75290b826b34..3013f8f0b1bd 100644 --- a/net-im/skype/ChangeLog +++ b/net-im/skype/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-im/skype # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.104 2010/01/02 00:29:37 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.105 2010/01/02 12:24:15 ssuominen Exp $ + + 02 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> skype-2.1.0.47.ebuild: + Use shipped skype.conf instead of one from FILESDIR. *skype-2.1.0.47 (02 Jan 2010) diff --git a/net-im/skype/skype-2.1.0.47.ebuild b/net-im/skype/skype-2.1.0.47.ebuild index 6a3aeda47950..0f22910601dc 100644 --- a/net-im/skype/skype-2.1.0.47.ebuild +++ b/net-im/skype/skype-2.1.0.47.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.1.0.47.ebuild,v 1.2 2010/01/02 00:32:55 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.1.0.47.ebuild,v 1.3 2010/01/02 12:24:15 ssuominen Exp $ EAPI=2 @@ -64,16 +64,16 @@ src_install() { # pax-mark m "${S}"/skype exeinto /opt/${PN} - doexe skype + doexe skype || die fowners root:audio /opt/skype/skype make_wrapper skype /opt/${PN}/skype /opt/${PN} /opt/${PN} /usr/bin insinto /opt/${PN}/sounds - doins sounds/*.wav + doins sounds/*.wav || die if ! use qt-static ; then insinto /etc/dbus-1/system.d - newins "${FILESDIR}"/skype.debus.config skype.conf + doins ${PN}.conf || die fi insinto /opt/${PN}/lang @@ -85,10 +85,10 @@ src_install() { lrelease lang/*.ts fi - doins lang/*.qm + doins lang/*.qm || die insinto /opt/${PN}/avatars - doins avatars/*.png + doins avatars/*.png || die insinto /opt/${PN} for X in 16 32 48 |