| 1 |
jlec 12/02/29 08:09:50 |
| 2 |
|
| 3 |
Modified: ChangeLog skype-2.2.0.35-r1.ebuild |
| 4 |
Log: |
| 5 |
Correct installation with USE=qt-static, #405023; remove additional dies |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.119 net-im/skype/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.119&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.119&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?r1=1.118&r2=1.119 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v |
| 19 |
retrieving revision 1.118 |
| 20 |
retrieving revision 1.119 |
| 21 |
diff -u -r1.118 -r1.119 |
| 22 |
--- ChangeLog 28 Feb 2012 21:24:54 -0000 1.118 |
| 23 |
+++ ChangeLog 29 Feb 2012 08:09:50 -0000 1.119 |
| 24 |
@@ -1,6 +1,9 @@ |
| 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.118 2012/02/28 21:24:54 prometheanfire Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.119 2012/02/29 08:09:50 jlec Exp $ |
| 29 |
+ |
| 30 |
+ 29 Feb 2012; Justin Lecher <jlec@g.o> skype-2.2.0.35-r1.ebuild: |
| 31 |
+ Correct installation with USE=qt-static, #405023; remove additional dies |
| 32 |
|
| 33 |
28 Feb 2012; mthode <mthode@g.o> skype-2.2.0.35-r1.ebuild: |
| 34 |
paxmarked m skype to work on hardened |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 net-im/skype/skype-2.2.0.35-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: skype-2.2.0.35-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- skype-2.2.0.35-r1.ebuild 28 Feb 2012 21:24:54 -0000 1.2 |
| 51 |
+++ skype-2.2.0.35-r1.ebuild 29 Feb 2012 08:09:50 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2012 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $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 $ |
| 56 |
+# $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 $ |
| 57 |
|
| 58 |
EAPI=4 |
| 59 |
inherit gnome2-utils eutils qt4-r2 pax-utils |
| 60 |
@@ -64,22 +64,22 @@ |
| 61 |
: |
| 62 |
} |
| 63 |
|
| 64 |
-src_install() { |
| 65 |
- local MY_S="${S}" |
| 66 |
- use qt-static && MY_S="${WORKDIR}/${PN}_static-${PV}" |
| 67 |
- cd "${MY_S}" |
| 68 |
+src_unpack() { |
| 69 |
+ unpack ${A} && mv skype* "${S}" || die |
| 70 |
+} |
| 71 |
|
| 72 |
+src_install() { |
| 73 |
exeinto /opt/skype |
| 74 |
- doexe skype || die |
| 75 |
+ doexe skype |
| 76 |
fowners root:audio /opt/skype/skype |
| 77 |
make_wrapper skype ./skype /opt/skype /opt/skype |
| 78 |
|
| 79 |
insinto /opt/skype/sounds |
| 80 |
- doins sounds/*.wav || die |
| 81 |
+ doins sounds/*.wav |
| 82 |
|
| 83 |
if ! use qt-static; then |
| 84 |
insinto /etc/dbus-1/system.d |
| 85 |
- doins skype.conf || die |
| 86 |
+ doins skype.conf |
| 87 |
fi |
| 88 |
|
| 89 |
if ! use qt-static; then |
| 90 |
@@ -87,15 +87,15 @@ |
| 91 |
fi |
| 92 |
|
| 93 |
insinto /opt/skype/lang |
| 94 |
- doins lang/*.qm || die |
| 95 |
+ doins lang/*.qm |
| 96 |
|
| 97 |
insinto /opt/skype/avatars |
| 98 |
- doins avatars/*.png || die |
| 99 |
+ doins avatars/*.png |
| 100 |
|
| 101 |
local res |
| 102 |
for res in 16 32 48; do |
| 103 |
insinto /usr/share/icons/hicolor/${res}x${res}/apps |
| 104 |
- newins icons/SkypeBlue_${res}x${res}.png skype.png || die |
| 105 |
+ newins icons/SkypeBlue_${res}x${res}.png skype.png |
| 106 |
done |
| 107 |
|
| 108 |
dodoc README |
Archives