* [gentoo-commits] gentoo-x86 commit in net-im/skype: ChangeLog skype-2.2.0.35-r1.ebuild
@ 2012-02-29 8:09 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2012-02-29 8:09 UTC (permalink / raw
To: gentoo-commits
jlec 12/02/29 08:09:50
Modified: ChangeLog skype-2.2.0.35-r1.ebuild
Log:
Correct installation with USE=qt-static, #405023; remove additional dies
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Revision Changes Path
1.119 net-im/skype/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.119&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.119&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?r1=1.118&r2=1.119
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- ChangeLog 28 Feb 2012 21:24:54 -0000 1.118
+++ ChangeLog 29 Feb 2012 08:09:50 -0000 1.119
@@ -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
1.3 net-im/skype/skype-2.2.0.35-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?rev=1.3&view=markup
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
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
Index: skype-2.2.0.35-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- skype-2.2.0.35-r1.ebuild 28 Feb 2012 21:24:54 -0000 1.2
+++ skype-2.2.0.35-r1.ebuild 29 Feb 2012 08:09:50 -0000 1.3
@@ -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 @@
:
}
-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 @@
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-im/skype: ChangeLog skype-2.2.0.35-r1.ebuild
@ 2012-02-29 9:07 Matt Thode (prometheanfire)
0 siblings, 0 replies; 3+ messages in thread
From: Matt Thode (prometheanfire) @ 2012-02-29 9:07 UTC (permalink / raw
To: gentoo-commits
prometheanfire 12/02/29 09:07:45
Modified: ChangeLog skype-2.2.0.35-r1.ebuild
Log:
fixed paxmark and sandbox errors
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Revision Changes Path
1.120 net-im/skype/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.120&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.120&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?r1=1.119&r2=1.120
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- ChangeLog 29 Feb 2012 08:09:50 -0000 1.119
+++ ChangeLog 29 Feb 2012 09:07:45 -0000 1.120
@@ -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.119 2012/02/29 08:09:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.120 2012/02/29 09:07:45 prometheanfire Exp $
+
+ 29 Feb 2012; mthode <mthode@gentoo.org> skype-2.2.0.35-r1.ebuild:
+ fix the paxmarking syntax
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
1.4 net-im/skype/skype-2.2.0.35-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?r1=1.3&r2=1.4
Index: skype-2.2.0.35-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- skype-2.2.0.35-r1.ebuild 29 Feb 2012 08:09:50 -0000 1.3
+++ skype-2.2.0.35-r1.ebuild 29 Feb 2012 09:07:45 -0000 1.4
@@ -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.3 2012/02/29 08:09:50 jlec Exp $
+# $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 $
EAPI=4
inherit gnome2-utils eutils qt4-r2 pax-utils
@@ -105,7 +105,7 @@
dosym /opt/skype /usr/share/skype #Fix for disabled sound notification
if use pax_kernel; then
- pax-mark m /opt/skype/skype || die
+ pax-mark Cm "${D}"/opt/skype/skype || die
eqawarn "You have set USE=pax_kernel meaning that you intend to run"
eqawarn "skype under a PaX enabled kernel. To do so, we must modify"
eqawarn "the skype binary itself and this *may* lead to breakage! If"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-im/skype: ChangeLog skype-2.2.0.35-r1.ebuild
@ 2012-02-29 13:07 Sebastian Pipping (sping)
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping (sping) @ 2012-02-29 13:07 UTC (permalink / raw
To: gentoo-commits
sping 12/02/29 13:07:46
Modified: ChangeLog skype-2.2.0.35-r1.ebuild
Log:
net-im/skype: Fix src_unpack
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Revision Changes Path
1.121 net-im/skype/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.121&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?rev=1.121&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/ChangeLog?r1=1.120&r2=1.121
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- ChangeLog 29 Feb 2012 09:07:45 -0000 1.120
+++ ChangeLog 29 Feb 2012 13:07:46 -0000 1.121
@@ -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
1.5 net-im/skype/skype-2.2.0.35-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild?r1=1.4&r2=1.5
Index: skype-2.2.0.35-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.2.0.35-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- skype-2.2.0.35-r1.ebuild 29 Feb 2012 09:07:45 -0000 1.4
+++ skype-2.2.0.35-r1.ebuild 29 Feb 2012 13:07:46 -0000 1.5
@@ -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 @@
}
src_unpack() {
- unpack ${A} && mv skype* "${S}" || die
+ unpack ${A} || die
+ [[ ! -d "${S}" ]] && {
+ mv skype* "${S}" || die
+ }
}
src_install() {
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-29 13:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-29 9:07 [gentoo-commits] gentoo-x86 commit in net-im/skype: ChangeLog skype-2.2.0.35-r1.ebuild Matt Thode (prometheanfire)
-- strict thread matches above, loose matches on Subject: below --
2012-02-29 13:07 Sebastian Pipping (sping)
2012-02-29 8:09 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox