Switch from .deb to .tar.bz2 found from the upstream servers with direct link (no link from the upstream download page) and restore USE="qt-static" with it.

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

3 files changed, 135 insertions, 9 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index dea7f0eafb8b..69779a67f21e 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,13 @@
 # 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.131 2012/06/14 20:07:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.132 2012/06/14 22:04:29 ssuominen Exp $
+
+*skype-4.0.0.7-r2 (14 Jun 2012)
+
+  14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> +skype-4.0.0.7-r2.ebuild:
+  Switch from .deb to .tar.bz2 found from the upstream servers with direct link
+  (no link from the upstream download page) and restore USE="qt-static" with
+  it.
 
   14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> -skype-4.0.0.7.ebuild:
   old
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 8e55f188f3de..af945161da11 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -2,21 +2,24 @@
 Hash: SHA1
 
 DIST skype-2.2.0.35.tar.bz2 23079739 RMD160 70c9af95f2b41c0ab4bf4d50842f9845f4305bfe SHA1 c3a93e3fd0f5ff30e65afe4632e04b05e9f453b1 SHA256 b56b7170e218da1e2d52d63f8519d365c54296d294a32ab605788910d950eb94
+DIST skype-4.0.0.7.tar.bz2 28817742 RMD160 6af6db41afd5be634ef2bc64847d5bd0873442bd SHA1 d0667b1db373cff0a19106c8075b8787c9ee2d60 SHA256 d615fb48bb0535ab4fbf0630b08c825c3b09f05f41520c9faba36c8db9e23a57
 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
+DIST skype_static-4.0.0.7.tar.bz2 40957412 RMD160 23648d51320a3e5c77ab7c2df0f86d042f6514d4 SHA1 36e17ca52fa8df72196c792c879df51045be2630 SHA256 b9cbeed210788182da25c0048548009ccba8ae5f93f59e54fc481be6cbeb6139
 EBUILD skype-2.2.0.35-r99.ebuild 2997 RMD160 33cb939ee76e846eac0c389d7fac70dd1d98466c SHA1 88c9950af1538691cb438aa344c025e2b3a2a230 SHA256 35fe7d98c0c4d8620dee304cd3105fccb29b631486520e584b4ac810b769a817
 EBUILD skype-4.0.0.7-r1.ebuild 2910 RMD160 30e1fabf4d85f94fbd15b0cd6609f22b34359ff9 SHA1 8c901ba99104d5c9be0cc5b0bb1104935de60cd8 SHA256 500253f0a020bd18fb05aa20c92abb4f0f019e2f76b9e1f49b5d9aa4087c742b
-MISC ChangeLog 23397 RMD160 d5be9f3f5bc0c6498954469c0c1e5eb29ed2ac00 SHA1 670c5516111bf7b936d7131c9bd0fc96847c7c8b SHA256 2416e2fb732fc0ba90a2188635e41e658ecc59df23ece7a56938331c182c2c62
+EBUILD skype-4.0.0.7-r2.ebuild 3019 RMD160 e7d75f2e5a8068c14f2d3e40c6a60a5ab5cd9672 SHA1 e66cc8d76100f36c80dc0eaf29d01ccffabac57f SHA256 66483061874c6925c55b139fe5400e2e042c09560132e07a68d933834996fe6b
+MISC ChangeLog 23674 RMD160 ac23b995c89e332a13add00a84b2835cc87c3257 SHA1 5c82f160519a6b4ba8c5f7d08560cca6a377f003 SHA256 a3353e26af010467bd9bdcac11945cd7bbff0a457e173d7732b81dddb99322df
 MISC metadata.xml 738 RMD160 0ed439a565474528f4a7fd72bcb89bb82137fddd SHA1 41ad435a8e40169c4940cf33f44b9a3222777495 SHA256 b4da26338494bf44ebf212868c5d9a1422a1f6274b0c36a4616318fe91bddd3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP2lHSAAoJEEdUh39IaPFNbdMH/3tG69pYD1hY4zTzvfaW+zZJ
-kUUEJmfUPkZajg2ETX7zaZ4g27uIKfB60sgpaZvlqyR6YI7+Jr6XDyKqoxoH2J6v
-2xBlOaYyjNfhqAlkiutaWpUkOUNWoWotutYYVH8Kk5GLRsOBzo8TU3GVGCsiYqP2
-A5FR0ZCw6Z9noZLtxj9mGe34faAdaF0MaHFE7i75sisLmPPoklcn8kkpV0bod67j
-Ihwv5mvwvrMrUzuKYphGAbIxU81a8gsZJiNgmE+8rt32LVvKj9zqweRt+R4OgQXO
-EUctOc+t3X3cHrlhXQzVWb2pPZNpLy3XYObbpGADWu4hZgHMezCf8CbbETA03Wg=
-=I/lN
+iQEcBAEBAgAGBQJP2l70AAoJEEdUh39IaPFNAGcIAJroxeFj/OXyhfGU+ecm8/ME
+nCxQIKGKF3vKUzUWXbpTzAHpluVBzaKk4XNLaAT7hPxn47GXZeeJcn4/Jsj76sm2
+l5vQ1lwtDhjNyh4O3j+x3NEbSZ/ymH3b09qDgJwMoH62OOHC/xvudCuFty71fDwK
+z4tYealgIea9joIvtFGxABMIH6KENhMs04XaDMWSpj4Ub1d0HjJn+8tRWT4HgcYj
+iEIaTG5ltzCx4VjcbaJ7zJA5QZ8ado22McNNX3Ik3uLt6iMMF5yG3d6nccBwxsSY
+vYkVV6Km/06ygKaMH1E8fF4DHzg6QztjZOsGvIo8vRTwiLWHDb3UDmQqA2wMdXo=
+=ubwg
 -----END PGP SIGNATURE-----
diff --git a/net-im/skype/skype-4.0.0.7-r2.ebuild b/net-im/skype/skype-4.0.0.7-r2.ebuild
new file mode 100644
index 000000000000..7683f166218c
--- /dev/null
+++ b/net-im/skype/skype-4.0.0.7-r2.ebuild
@@ -0,0 +1,116 @@
+# 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-r2.ebuild,v 1.1 2012/06/14 22:04:29 ssuominen Exp $
+
+EAPI=4
+inherit eutils gnome2-utils pax-utils
+
+DESCRIPTION="An P2P Internet Telephony (VoiceIP) client"
+HOMEPAGE="http://www.skype.com/"
+SKYPE_URI="http://download.${PN}.com/linux"
+SRC_URI="!qt-static? ( ${SKYPE_URI}/${P}.tar.bz2 )
+	qt-static? ( ${SKYPE_URI}/${PN}_static-${PV}.tar.bz2 )"
+
+LICENSE="${P}-copyright ${P}-third-party_attributions.txt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel qt-static"
+
+QA_PREBUILT=opt/bin/${PN}
+RESTRICT="mirror strip" #299368
+
+EMUL_X86_VER=20120127
+
+RDEPEND="virtual/ttf-fonts
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-${EMUL_X86_VER}
+		>=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}
+		>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
+		!qt-static? ( >=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER} )
+	)
+	x86? (
+		media-libs/alsa-lib
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXScrnSaver
+		x11-libs/libXv
+		qt-static? (
+			>=dev-libs/glib-2.28
+			media-libs/fontconfig
+			>=media-libs/freetype-2
+			sys-libs/zlib
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXrender
+		)
+		!qt-static? (
+			x11-libs/qt-core:4
+			x11-libs/qt-dbus:4
+			x11-libs/qt-gui:4[accessibility,dbus]
+		)
+	)"
+
+src_unpack() {
+	unpack ${A}
+	[[ -d ${S} ]] || { mv skype* "${S}" || die; }
+}
+
+src_compile() {
+	type -P lrelease >/dev/null && lrelease lang/*.ts
+	rm -f lang/*.ts
+}
+
+src_install() {
+	into /opt
+	dobin ${PN}
+	fowners root:audio /opt/bin/${PN}
+
+	insinto /etc/dbus-1/system.d
+	doins ${PN}.conf
+
+	insinto /usr/share/skype
+	doins -r avatars lang sounds
+
+	dodoc README
+
+	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
+		# http://bugs.gentoo.org/421169
+		# doicon -s ${res} icons/SkypeBlue_${res}x${res}.png ${PN}.png
+	done
+
+	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
+
+	rm -rf "${EROOT}"/usr/share/${PN} #421165
+}
+
+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 package and \"README\" document of this package."
+	if use amd64; then
+		elog "You can install app-emulation/emul-linux-x86-medialibs package for the 32bit"
+		elog "libraries from the media-libs/libv4l package."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}