Mercurial > hg > portage

changeset 188:53e0b4793285

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Skype 2.1.0.47 aus der Portage reaktiviert
author Dirk Olmes <dirk@xanthippe.ping.de>
date Tue, 23 Feb 2010 09:11:07 +0100
parents b2a0a67c29a5
children 81a205c65822
files net-im/skype/Manifest net-im/skype/skype-2.1.0.47-r1.ebuild net-im/skype/skype-2.1.0.47.ebuild
diffstat 3 files changed, 113 insertions(+), 102 deletions(-) [+]
line wrap: on
line diff
--- a/net-im/skype/Manifest	Fri Feb 19 19:57:26 2010 +0100
+++ b/net-im/skype/Manifest	Tue Feb 23 09:11:07 2010 +0100
@@ -1,3 +1,3 @@
 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.ebuild 2544 RMD160 2147e6aaabaeb815d8421c200ff1e935e40573f8 SHA1 23342f107302dbc8e9c9ae41fe058ca5d2289f2a SHA256 96ebf4360badf5cdd15bb4c56629778b5a0b97b9743771c008540e18b8971ec6
+EBUILD skype-2.1.0.47-r1.ebuild 2946 RMD160 9dd7c2f552fb993c41d90b77863dc90e04cb81b9 SHA1 f9f89a1789c0e4e0ad4214e10223f5b91e809fdd SHA256 9b83733c71538e1192a0665c75ca0e87a1e89217e4de7df6a34232845dd91a73
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-im/skype/skype-2.1.0.47-r1.ebuild	Tue Feb 23 09:11:07 2010 +0100
@@ -0,0 +1,112 @@
+# 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
+}
--- a/net-im/skype/skype-2.1.0.47.ebuild	Fri Feb 19 19:57:26 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-2.0.0.72.ebuild,v 1.3 2009/04/14 09:38:40 armin76 Exp $
-
-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"
-RESTRICT="mirror strip"
-
-DEPEND="amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.2
-		>=app-emulation/emul-linux-x86-baselibs-2.1.1
-		>=app-emulation/emul-linux-x86-soundlibs-2.4
-		app-emulation/emul-linux-x86-compat )
-	x86? ( >=sys-libs/glibc-2.4
-		>=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-core:4
-		                x11-libs/qt-gui:4[accessibility,dbus]
-				x11-libs/qt-dbus:4
-				x11-libs/libX11
-				x11-libs/libXau
-				x11-libs/libXdmcp ) )"
-RDEPEND="${DEPEND}"
-
-QA_EXECSTACK="opt/skype/skype"
-
-use qt-static && S="${WORKDIR}/${PN}_static-${PV}"
-
-src_install() {
-	exeinto /opt/${PN}
-	doexe skype
-	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
-
-	if ! use qt-static ; then
-		insinto /etc/dbus-1/system.d
-		newins "${FILESDIR}"/skype.debus.config skype.conf
-	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
-
-	insinto /opt/${PN}/avatars
-	doins avatars/*.png
-
-	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
-}