summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-01-02 12:24:15 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-01-02 12:24:15 +0000
commit3ec2ed9ff7f144c7ad6ce3ac80817c0fd477f87d (patch)
treef7e412b9025428865487d057139b1af2fbb0bf70 /net-im
parentTransfer Prefix keywords (diff)
downloadhistorical-3ec2ed9ff7f144c7ad6ce3ac80817c0fd477f87d.tar.gz
historical-3ec2ed9ff7f144c7ad6ce3ac80817c0fd477f87d.tar.bz2
historical-3ec2ed9ff7f144c7ad6ce3ac80817c0fd477f87d.zip
Use shipped skype.conf instead of one from FILESDIR.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'net-im')
-rw-r--r--net-im/skype/ChangeLog5
-rw-r--r--net-im/skype/Manifest4
-rw-r--r--net-im/skype/skype-2.1.0.47.ebuild12
3 files changed, 12 insertions, 9 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/Manifest b/net-im/skype/Manifest
index 9632ba4cd174..605b62a6de9a 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -5,6 +5,6 @@ DIST skype-2.1.0.47.tar.bz2 19748117 RMD160 7b5a3255b6a1db7c622355793ec3e582d9ff
DIST skype_static-2.0.0.72.tar.bz2 21613953 RMD160 fcadcbb30eeea2e548771984b38884d23d461f7f SHA1 bc69854b5cc83e2e92c91f9a5b7688a00dc7ce7e SHA256 2f37963e8f19c0ec5efd8631abe9633b6551f09dee024460c40fad10728bc580
DIST skype_static-2.1.0.47.tar.bz2 27323809 RMD160 6e63f345a40bf06d51a9d9d7698bf61992ac93c8 SHA1 aa9a2b6b8bc164ffbaa0141bc0ba7de470792921 SHA256 56b0fa6185661b187a409dc09b99ada3e01fa82aaae5f1048f8a698aa6f86e81
EBUILD skype-2.0.0.72.ebuild 2635 RMD160 047bf50be407d3ddc9b0af51569e080925d42bb7 SHA1 14f1d20cd8b16517487da1aaf45c9fd8116d1e41 SHA256 e67d531d87dfab6028ea64d010f4ef2fb6e1cb39eb21a0b661cec09db7dc4438
-EBUILD skype-2.1.0.47.ebuild 2890 RMD160 a65b6ada96a55c22bc6379cef189e9a6ac8ba6c6 SHA1 b08ee7053255ed11163b976d5b9378be93e49bf4 SHA256 57b6d792a8ffc7fabec8e9ad677cfa473d8a3b6da383639680fa9ca6e225c2ae
-MISC ChangeLog 19115 RMD160 a0b646942f0787eba9ce33543cea3079c4113802 SHA1 8d7d517aab84268ca462fcf3a214b0c87c9540cb SHA256 09786793de2b25cde0c2417eff6fd4c5bb08056603023e8b215689483c3c24fc
+EBUILD skype-2.1.0.47.ebuild 2891 RMD160 000f0c4e872398efdec90ff30c89938689d16094 SHA1 f3049dd4b7bfe2ea7f16a79cb1e0a2c0fa3c7063 SHA256 ca65f345d382eb5b1229bf6e10f66c53df6c5501945f8482bb1c82dac2e5df7f
+MISC ChangeLog 19249 RMD160 f743bca16e02572031061715c02e61337c550ca8 SHA1 524fcafc05aa57b1a1d1fb0a3aab447f1394c2ee SHA256 81b262b1605f6626c99b2da7fd92447135b13a9de3385851d5119066bed09508
MISC metadata.xml 574 RMD160 8b4dbbc23a0cdff6e73ace07c8aaff5ac6bb1e49 SHA1 474a65946ca1d57f50b123d4f6f6518ab6106553 SHA256 ba7224ee8e985051a464944ba62227ff7e9364df9be83270ac0075b2e95b2ef0
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