Version bump wrt #421115 by Justin Lecher. Print pkg_postinst() warning for media-libs/libv4l and LD_PRELOAD usage wrt #360815.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 108 insertions, 9 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index b6ce2ed8b1cf..ef2e063019c2 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,12 @@
 # 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.127 2012/05/21 21:11:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.128 2012/06/14 17:19:31 ssuominen Exp $
+
+*skype-4.0.0.7 (14 Jun 2012)
+
+  14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> +skype-4.0.0.7.ebuild:
+  Version bump wrt #421115 by Justin Lecher. Print pkg_postinst() message for
+  media-libs/libv4l and LD_PRELOAD usage wrt #360815.
 
   21 May 2012; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Maintain this package.
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index d0bd083917e4..f056f2b7face 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA1
 
 DIST skype-2.2.0.35.tar.bz2 23079739 RMD160 70c9af95f2b41c0ab4bf4d50842f9845f4305bfe SHA1 c3a93e3fd0f5ff30e65afe4632e04b05e9f453b1 SHA256 b56b7170e218da1e2d52d63f8519d365c54296d294a32ab605788910d950eb94
+DIST skype-debian_4.0.0.7-1_amd64.deb 29341976 RMD160 7c9b38d84af5f47ca1e4697eb2558826bbfbc8ac SHA1 b318d2fea0491ef120012225258e6beb86c8e402 SHA256 556c8dd83ff4ccdd0a5942b2d14bc512db858afad047d12dbd70bcc1ee61a881
+DIST skype-debian_4.0.0.7-1_i386.deb 29342008 RMD160 a93ce779097cfbd450184c363ead2353e0610073 SHA1 2e52f137a0bd1f6e4a696f5896d7fb52a22f1fed SHA256 c051b58e72f7577307fca618bb6acca3661d0cb199e98c5eb9bd0a4eb20dada2
 DIST skype_static-2.2.0.99.tar.bz2 34592774 RMD160 2f9e2e75ff26ebde5d0852b8bebbd42c5b1531ed SHA1 0277b886d722e64480a9bc65befa432bcb571625 SHA256 a9fa7744cb86060397597013a0ec44d21f72d30e42c5a6a28cd3ec33c0b5d955
 EBUILD skype-2.2.0.35-r99.ebuild 2997 RMD160 33cb939ee76e846eac0c389d7fac70dd1d98466c SHA1 88c9950af1538691cb438aa344c025e2b3a2a230 SHA256 35fe7d98c0c4d8620dee304cd3105fccb29b631486520e584b4ac810b769a817
-MISC ChangeLog 22664 RMD160 c50af016a1029923a8de533ec9cecfc758c563b2 SHA1 f1c719d16ba16b962d30c0a1aea74055294eae0d SHA256 e4700d6f25b32fd66b4295704452443c308663f41f34a6879b274222953145c9
+EBUILD skype-4.0.0.7.ebuild 2422 RMD160 9d0464834f8df11e37dd5c8802a28801257c24da SHA1 667898f37171bbe9597e11fecbbb27ae216c6911 SHA256 5b96ba4369cd90fba2d75bf54eb733d6ba7554f286033a35f68104dc11d56fa2
+MISC ChangeLog 22904 RMD160 b1a07c077e08e4ffe069e38dccd4c340a4d5c9d0 SHA1 34c92ef2159d4f6d39e341d68b654da581d3141f SHA256 6cc30a22a97da0f2d307bc70b6722d8f376777b81eb1f65c9f20d950c025d8f9
 MISC metadata.xml 738 RMD160 0ed439a565474528f4a7fd72bcb89bb82137fddd SHA1 41ad435a8e40169c4940cf33f44b9a3222777495 SHA256 b4da26338494bf44ebf212868c5d9a1422a1f6274b0c36a4616318fe91bddd3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPuq7gAAoJEEdUh39IaPFNTzIH/AmEnJxPnVWbT5FoycIYEHRl
-eOn+jJNvPx62cbxzfU/CW75vFZKuudfy0S2nxVNUaTqQol/dmtn4P+uufzhik6/w
-F3jNtkLUH/n/eafeQcAcNFz6ngRwo9xPewaLRa9EXSOjU1KQj5IdU5DfO7Gx2AhH
-9iDoZBfJHO0frWa1GakY21SIi2VYJ0rRgFZVj+lEdADwS4JFPKXhzYKGDF7ob1rk
-zyZAvTDtmGR2A6/RJ/EDaC7BSR67aRYuFaKqgOV6NVZ3dF3CyupTzMJzz8aH2RfW
-pN2ywJjC7Fb0lcJZeFUeq9c8MNzVSBsujQKyXIwOjRy+1MdYrqLUqrAUqBLunCk=
-=kfFe
+iQEcBAEBAgAGBQJP2hwtAAoJEEdUh39IaPFN0SoH+QEA/EtjQZwK/7im5UcGODJa
+pecxE0IAsZ8uJy/I81QwnWmiivkR/XTw5S0nAlhtgKu8Sa3fcbQnxb5uUdr7a308
+We5Ta4rIeQVV2u5neQFw++TCwhOnPTMujXyEySgT5UxGvcb+nJCYClUy9OfAUVZA
+Ec85O1O0sk9Q6UtQIsIF500Yi3eCCMvXhZzWshWwSpsm9ExJ20nbfAzvcm/n/5o7
+Q/ftjfeP22tz50ZVN0OJ0M0kYjanpDRWwXExmVUGakXxbjWDWgRlNbpaqkR8iUi+
+E25MDYI/oIr+kztANnF/GVDGNXXZbx4XVfJ+wRFBjSsx8cnlpzTVmEv6EcwdJ6I=
+=Juz2
 -----END PGP SIGNATURE-----
diff --git a/net-im/skype/skype-4.0.0.7.ebuild b/net-im/skype/skype-4.0.0.7.ebuild
new file mode 100644
index 000000000000..e56a99ce3e4b
--- /dev/null
+++ b/net-im/skype/skype-4.0.0.7.ebuild
@@ -0,0 +1,90 @@
+# 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-4.0.0.7.ebuild,v 1.1 2012/06/14 17:19:31 ssuominen Exp $
+
+EAPI=4
+inherit eutils gnome2-utils qt4-r2 pax-utils unpacker
+
+DESCRIPTION="An P2P Internet Telephony (VoiceIP) client"
+HOMEPAGE="http://www.skype.com/"
+SKYPE_URI="http://download.${PN}.com/linux"
+SRC_URI="amd64? ( ${SKYPE_URI}/${PN}-debian_${PV}-1_amd64.deb )
+	x86? ( ${SKYPE_URI}/${PN}-debian_${PV}-1_i386.deb )"
+
+LICENSE="${P}-copyright ${P}-third-party_attributions.txt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+QA_PREBUILT=opt/bin/${PN}
+RESTRICT="mirror strip" #299368
+
+EMUL_X86_VER=20120127
+
+RDEPEND="virtual/ttf-fonts
+	amd64? (
+		>=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}
+		>=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}
+		>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
+	)
+	x86? (
+		media-libs/alsa-lib
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXScrnSaver
+		x11-libs/libXv
+		x11-libs/qt-core:4
+		x11-libs/qt-dbus:4
+		x11-libs/qt-gui:4[accessibility,dbus]
+	)"
+
+S=${WORKDIR}
+
+src_compile() {
+	local langdir=usr/share/${PN}/lang
+	type -P lrelease >/dev/null && lrelease ${langdir}/*.ts
+	rm -f ${langdir}/*.ts
+}
+
+src_install() {
+	into /opt
+	dobin usr/bin/${PN}
+	fowners root:audio /opt/bin/${PN}
+
+	insinto /etc/dbus-1/system.d
+	doins etc/dbus-1/system.d/${PN}.conf
+
+	insinto /usr/share
+	doins -r usr/share/${PN}
+
+	dodoc usr/share/doc/${PN}/README
+
+	doicon -s 48 usr/share/icons/${PN}.png
+	make_desktop_entry ${PN} 'Skype VoIP' ${PN} 'Network;InstantMessaging;Telephony'
+
+	if use pax_kernel; then
+		pax-mark Cm "${ED}"/opt/bin/${PN} || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	# http://bugs.gentoo.org/360815
+	elog "For webcam support, see \"LD_PRELOAD\" section of \"README.lib\" document provided by"
+	elog "media-libs/libv4l"
+	use amd64 && elog "You can install app-emulation/emul-linux-x86-medialibs for 32bit media-libs/libv4l"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}