Mercurial > hg > portage

changeset 340:9c4b58c14668

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ebuild for Skype 4.1.0.20
author Dirk Olmes <dirk@xanthippe.ping.de>
date Tue, 20 Nov 2012 08:44:20 +0100
parents 60459a8f4bd6
children 038e60afdaeb
files net-im/skype/Manifest net-im/skype/skype-2.1.0.47-r1.ebuild net-im/skype/skype-4.1.0.20.ebuild
diffstat 3 files changed, 103 insertions(+), 115 deletions(-) [+]
line wrap: on
line diff
--- a/net-im/skype/Manifest	Wed Jul 11 13:20:47 2012 +0200
+++ b/net-im/skype/Manifest	Tue Nov 20 08:44:20 2012 +0100
@@ -1,3 +1,2 @@
-DIST skype-2.1.0.47.tar.bz2 19748117 RMD160 7b5a3255b6a1db7c622355793ec3e582d9ff2777 SHA1 a0c7918767f01e79c37d4bd4dc085855c111994b SHA256 f4db42b21138ca9d424409f880dd311faa0f5e60003f5bbb82d6006dcfd61971
-DIST skype_static-2.1.0.47.tar.bz2 27323809 RMD160 6e63f345a40bf06d51a9d9d7698bf61992ac93c8 SHA1 aa9a2b6b8bc164ffbaa0141bc0ba7de470792921 SHA256 56b0fa6185661b187a409dc09b99ada3e01fa82aaae5f1048f8a698aa6f86e81
-EBUILD skype-2.1.0.47-r1.ebuild 2946 RMD160 9dd7c2f552fb993c41d90b77863dc90e04cb81b9 SHA1 f9f89a1789c0e4e0ad4214e10223f5b91e809fdd SHA256 9b83733c71538e1192a0665c75ca0e87a1e89217e4de7df6a34232845dd91a73
+DIST skype-4.1.0.20.tar.bz2 30500691 SHA256 c31e47cd5dcb14eead897f36bab80ee8d49c0e6dbf469c93bf745d5addec0ce2 SHA512 81cc8426d609735b6b86307300089365f43b5b492f6f99e7794b83a2b028f1e4031c0f045ec7a6e5ea4c34d618a6e1af56b21227f4b4049fb3e3430444228818 WHIRLPOOL 894fa9c8b97b02e88c23aa7a63edf49d3059e22c273220cd8cfc26cbe5e28e14a786b311b664208de1144153a7037f122d41830aeb1300a9646869a17387b406
+EBUILD skype-4.1.0.20.ebuild 2483 SHA256 2de1209091e828cd06a58f7fad046f7daf54559d5518a1c2eb0c26e72cb89fea SHA512 cefc821e4693832e0e8d4cea44a6e8e19346a3b857c6dfc0a68c60ef925e9f484b389dba17a4f7b2d36e84e618f59578d8b98f05b3df3f1ebb649e09c31cdfec WHIRLPOOL c31857f71854fd5f5a7b8510aad6f34a5f01690e889f21610c303a586ae1b606b935a396632b10cbce4a118f677e9dca22d306656a6df71b990e7d5371899528
--- a/net-im/skype/skype-2.1.0.47-r1.ebuild	Wed Jul 11 13:20:47 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-im/skype/Attic/skype-2.1.0.47-r1.ebuild,v 1.2 2010/01/23 17:17:01 ssuominen dead $
-
-EAPI=2
-
-inherit eutils qt4 pax-utils
-
-DESCRIPTION="A P2P-VoiceIP client."
-HOMEPAGE="http://www.skype.com/"
-
-SFILENAME=${PN}_static-${PV}.tar.bz2
-DFILENAME=${P}.tar.bz2
-SRC_URI="!qt-static? ( http://download.skype.com/linux/${DFILENAME} )
-	qt-static? ( http://download.skype.com/linux/${SFILENAME} )"
-
-LICENSE="skype-eula"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qt-static"
-
-# http://bugs.gentoo.org/show_bug.cgi?id=299368
-RESTRICT="mirror strip"
-
-EMUL_VER=20091231
-
-RDEPEND="amd64? ( >=app-emulation/emul-linux-x86-xlibs-${EMUL_VER}
-			>=app-emulation/emul-linux-x86-baselibs-${EMUL_VER}
-			>=app-emulation/emul-linux-x86-soundlibs-${EMUL_VER}
-			!qt-static? ( >=app-emulation/emul-linux-x86-qtlibs-${EMUL_VER} ) )
-	x86? ( >=media-libs/alsa-lib-1.0.11
-		x11-libs/libXScrnSaver
-		x11-libs/libXv
-		qt-static? ( media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXi
-			x11-libs/libXinerama
-			x11-libs/libXrandr
-			x11-libs/libXrender
-			x11-libs/libX11 )
-		!qt-static? ( x11-libs/qt-gui:4[accessibility,dbus]
-			x11-libs/qt-dbus:4
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdmcp ) )"
-
-# Required for lrelease command at buildtime
-DEPEND="!qt-static? ( x11-libs/qt-core:4 )"
-
-QA_EXECSTACK="opt/skype/skype"
-QA_WX_LOAD="opt/skype/skype"
-QA_DT_HASH="opt/skype/skype"
-QA_PRESTRIPPED="opt/skype/skype"
-
-use qt-static && S="${WORKDIR}/${PN}_static-${PV}"
-
-src_install() {
-	# remove mprotect() restrictions for PaX usage - see Bug 100507
-	# NOTE. Commented out because it's breaking Skype 2.1.0.47.
-	# pax-mark m "${S}"/skype
-
-	exeinto /opt/${PN}
-	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 || die
-
-	if ! use qt-static ; then
-		insinto /etc/dbus-1/system.d
-		doins ${PN}.conf || die
-	fi
-
-	insinto /opt/${PN}/lang
-	#
-	#There have been some issues were lang is not updated from the .ts files
-	#but if we have qt we can rebuild it
-	#
-	if ! use qt-static ; then
-		lrelease lang/*.ts
-	fi
-
-	doins lang/*.qm || die
-
-	insinto /opt/${PN}/avatars
-	doins avatars/*.png || die
-
-	insinto /opt/${PN}
-	for X in 16 32 48
-	do
-		insinto /usr/share/icons/hicolor/${X}x${X}/apps
-		newins "${S}"/icons/SkypeBlue_${X}x${X}.png ${PN}.png
-	done
-
-	dodoc README
-
-	# insinto /usr/share/applications/
-	# doins skype.desktop
-	make_desktop_entry ${PN} "Skype VoIP" ${PN} "Network;InstantMessaging;Telephony"
-
-	#Fix for no sound notifications
-	dosym /opt/${PN} /usr/share/${PN}
-
-	# TODO: Optional configuration of callto:// in KDE, Mozilla and friends
-	# doexe skype-callto-handler
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/skype/skype-4.1.0.20.ebuild	Tue Nov 20 08:44:20 2012 +0100
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+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="${SKYPE_URI}/${P}.tar.bz2"
+
+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=20120520
+
+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}
+		>=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
+		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
+		newicon -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
+}