thanks jakub

Package-Manager: portage-2.1.2.7

5 files changed, 141 insertions, 166 deletions

diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 30af4d6ae6f2..a1583f73d77a 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/skype
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.73 2007/06/16 15:31:20 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.74 2007/06/17 16:31:35 humpback Exp $
+
+*skype-1.4.0.74-r1 (17 Jun 2007)
+
+  17 Jun 2007; <humpback@gentoo.org> -skype-1.4.0.74.ebuild,
+  +skype-1.4.0.74-r1.ebuild:
+  Added ebuild with heavy fixes from Jakub in bug 182248. Thanks M8.
 
 *skype-1.4.0.74 (16 Jun 2007)
 
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 7b02c0d27853..62367a580ca4 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -35,14 +35,14 @@ EBUILD skype-1.3.0.53-r1.ebuild 3497 RMD160 ad50edbff0421bfd1144ae3eef65051ab9d1
 MD5 addb8442d0fa446604e6ea8d8814594f skype-1.3.0.53-r1.ebuild 3497
 RMD160 ad50edbff0421bfd1144ae3eef65051ab9d1e7ad skype-1.3.0.53-r1.ebuild 3497
 SHA256 c73a297ab35110f8d61fc6e52a27fa2ef425f7dd0e6d9e896717429d108d3def skype-1.3.0.53-r1.ebuild 3497
-EBUILD skype-1.4.0.74.ebuild 4148 RMD160 308372edbb0633a062428460549c6747034d43d0 SHA1 657f9351d8fec26dab8e7cf998afc1752cddb85c SHA256 20b1a9b751599f6052a24f1cfb97e4ce9f3896397ad05ee32e8c0ce589f61577
-MD5 f96dca01703db274da05844970e11d7e skype-1.4.0.74.ebuild 4148
-RMD160 308372edbb0633a062428460549c6747034d43d0 skype-1.4.0.74.ebuild 4148
-SHA256 20b1a9b751599f6052a24f1cfb97e4ce9f3896397ad05ee32e8c0ce589f61577 skype-1.4.0.74.ebuild 4148
-MISC ChangeLog 14017 RMD160 0ed87eb09929587ec34ddb848977725fd60cf70a SHA1 d092241b5b4be003c749f4abe58398c66f3a8511 SHA256 b3680ba6392a91c081c5bd7ab6bdc0c363900a8b6f88c71cf4728f2d3c2be1d9
-MD5 7c84ced1ede30aa8ba7088e1f6ad9542 ChangeLog 14017
-RMD160 0ed87eb09929587ec34ddb848977725fd60cf70a ChangeLog 14017
-SHA256 b3680ba6392a91c081c5bd7ab6bdc0c363900a8b6f88c71cf4728f2d3c2be1d9 ChangeLog 14017
+EBUILD skype-1.4.0.74-r1.ebuild 3379 RMD160 ee4c642e3d3739154f0ff8f0f1b2f5afd43517ee SHA1 d8f6b5d53c7fead890dcef00d1ad78b0a717d086 SHA256 ecb01e2227b4104cb4472846eb6e5c69cc0165dfffc254a6e93f866941e55dc4
+MD5 0af59aa57fdce42d270fa8f40b56c8c4 skype-1.4.0.74-r1.ebuild 3379
+RMD160 ee4c642e3d3739154f0ff8f0f1b2f5afd43517ee skype-1.4.0.74-r1.ebuild 3379
+SHA256 ecb01e2227b4104cb4472846eb6e5c69cc0165dfffc254a6e93f866941e55dc4 skype-1.4.0.74-r1.ebuild 3379
+MISC ChangeLog 14211 RMD160 81d624487e8d6f6eda5485ad6721bc4409970fb2 SHA1 754c5ca37e800f4c8a7570ce68f236f431aa0a89 SHA256 897b850f1259bc963236a305a18a860eb3757f5bcc26e2435216635356524609
+MD5 724b00b5d029488a102be8e2a0076d01 ChangeLog 14211
+RMD160 81d624487e8d6f6eda5485ad6721bc4409970fb2 ChangeLog 14211
+SHA256 897b850f1259bc963236a305a18a860eb3757f5bcc26e2435216635356524609 ChangeLog 14211
 MISC metadata.xml 488 RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 SHA1 8e376a6a24f831850ee87a8538c5b3336f6986e2 SHA256 964cb103f057a79a194dea8ef8cd183400daa2d8f7041a57f95f3544b0b0a7a9
 MD5 dbaa6f09202bfea8c248e1f7c222d40f metadata.xml 488
 RMD160 0dc53516bb6b9f04aad7625aaf8e81f94f288117 metadata.xml 488
@@ -56,6 +56,6 @@ SHA256 4b42f1a7bddcb3e6e5983b00f4586a56e33980ae9ccd64d9f1f2970ba21aad2e files/di
 MD5 ab5b36105b359eb1767d8744cdab9ea0 files/digest-skype-1.3.0.53-r1 822
 RMD160 52043ad46fb7bb6f36c29e765ae24b1cfc471656 files/digest-skype-1.3.0.53-r1 822
 SHA256 2bbcbf2f1b9029baf2c5227bb14f07d47c84c901f506b4625a418190424c4f73 files/digest-skype-1.3.0.53-r1 822
-MD5 10f2445538e1baaad5bdc00f269de7fd files/digest-skype-1.4.0.74 822
-RMD160 8d62bee17e397dbd0f14aec4dccca76a8360cc66 files/digest-skype-1.4.0.74 822
-SHA256 d2e532cc145e43a2e11e1bd1e6b2e4e8e1923dd42453ccc925bb0c6bee93c9ac files/digest-skype-1.4.0.74 822
+MD5 10f2445538e1baaad5bdc00f269de7fd files/digest-skype-1.4.0.74-r1 822
+RMD160 8d62bee17e397dbd0f14aec4dccca76a8360cc66 files/digest-skype-1.4.0.74-r1 822
+SHA256 d2e532cc145e43a2e11e1bd1e6b2e4e8e1923dd42453ccc925bb0c6bee93c9ac files/digest-skype-1.4.0.74-r1 822
diff --git a/net-im/skype/files/digest-skype-1.4.0.74 b/net-im/skype/files/digest-skype-1.4.0.74-r1
index 46c8861062ef..46c8861062ef 100644
--- a/net-im/skype/files/digest-skype-1.4.0.74
+++ b/net-im/skype/files/digest-skype-1.4.0.74-r1
diff --git a/net-im/skype/skype-1.4.0.74-r1.ebuild b/net-im/skype/skype-1.4.0.74-r1.ebuild
new file mode 100644
index 000000000000..956f563bb0d2
--- /dev/null
+++ b/net-im/skype/skype-1.4.0.74-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.4.0.74-r1.ebuild,v 1.1 2007/06/17 16:31:35 humpback Exp $
+
+inherit eutils qt4 pax-utils
+
+DESCRIPTION="A P2P-VoiceIP client."
+HOMEPAGE="http://www.skype.com/"
+
+SFILENAME=${P}-static.tar.bz2
+DFILENAME=${P}.bz2
+SRC_URI="!qt-static? ( http://download.skype.com/linux/${DFILENAME} )
+	qt-static? ( http://download.skype.com/linux/${SFILENAME} )
+	amd64? ( http://felisberto.net/~humpback/libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz )"
+
+LICENSE="skype-eula"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+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
+		>=dev-libs/libsigc++-2
+		>=media-libs/alsa-lib-1.0.11
+		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? ( $(qt4_min_version 4.2.3)
+				x11-libs/libX11
+				x11-libs/libXau
+				x11-libs/libXdmcp ) )"
+RDEPEND="${DEPEND}"
+
+QA_EXECSTACK="opt/skype/skype"
+
+use qt-static && S="${WORKDIR}/${PN}_static-${PV}"
+
+pkg_setup() {
+	if ! use qt-static && ! built_with_use ">=x11-libs/qt-4.0" accessibility dbus ; then
+		eerror "Rebuild qt-4 with USE=\"accessibility dbus\" or set USE=qt-static"
+		die "USE=\"-qt-static\" only works with qt-4 built with USE=\"accessibility dbus\"."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# Hack around bug in filename
+	if ! use qt-static ; then
+		tar xf ${P} || die "unpack failed"
+	fi
+}
+
+src_install() {
+	# remove mprotect() restrictions for PaX usage - see Bug 100507
+	pax-mark m "${S}"/skype
+
+	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}
+	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}.png "Network;InstantMessaging;Telephony"
+
+	# AMD64 team does not provide this so we add it:
+	if use amd64; then
+		exeinto /opt/${PN}
+		dosym libsigc-2.0.so.0.0.0 /opt/${PN}/libsigc-2.0.so.0
+		doexe "${WORKDIR}"/libsigc-2.0.so.0.0.0
+	fi
+
+	# TODO: avatars
+	# insinto /opt/${PN}/avatars
+	# doins avatars/*.jpg
+
+	# TODO: Optional configuration of callto:// in KDE, Mozilla and friends
+	# doexe skype-callto-handler
+}
+
+pkg_postinst() {
+	elog "If you have sound problems please visit: "
+	elog "http://forum.skype.com/bb/viewtopic.php?t=4489"
+	elog "These kernel options are reported to help"
+	elog
+	elog "Processor type and features --->"
+	elog "-- Preemption Model (Preemptible Kernel (Low-Latency Desktop))"
+	elog "-- Timer frequency (250 HZ)"
+	elog
+	ewarn "This release no longer uses the old wrapper because ${PN} now uses ALSA"
+	ewarn
+
+}
diff --git a/net-im/skype/skype-1.4.0.74.ebuild b/net-im/skype/skype-1.4.0.74.ebuild
deleted file mode 100644
index 22b9c869277e..000000000000
--- a/net-im/skype/skype-1.4.0.74.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-1.4.0.74.ebuild,v 1.1 2007/06/16 15:31:20 humpback Exp $
-
-inherit eutils qt4
-
-#If you want to know when this package will be marked stable please see the Changelog
-RESTRICT="mirror strip"
-AVATARV="1.0"
-DESCRIPTION="${PN} is a P2P-VoiceIP client."
-MY_PN=${PN}
-MY_PV=${PV}
-HOMEPAGE="http://www.skype.com/"
-
-SFILENAME=${MY_PN}-${MY_PV}-static.tar.bz2
-DFILENAME=${MY_PN}-${MY_PV}.bz2
-SRC_URI="
-		!static? ( http://download.skype.com/linux/${DFILENAME} )
-		static? (
-		http://download.skype.com/linux/${SFILENAME} )
-		amd64? ( http://felisberto.net/~humpback/libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz )"
-
-LICENSE="skype-eula"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="static"
-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
-		>=dev-libs/libsigc++-2
-		!static? ( $(qt4_min_version 4.2.3) ) )"
-RDEPEND="${DEPEND}
-	>=sys-apps/dbus-1.0.0"
-
-QA_EXECSTACK_x86="opt/skype/skype"
-QA_EXECSTACK_amd64="opt/skype/skype"
-
-S="${WORKDIR}"/${MY_PN}-${MY_PV}
-
-pkg_setup() {
-	if use amd64 && ! use static;
-	then
-		die "There is no pre-built qt4 for amd64. Please turn the static flag on"
-	fi
-
-#	if ! use static && ! built_with_use ">=x11-libs/qt-4.0" accessibility;
-#	then
-#		eerror "Rebuild qt-4 with USE=accessibility or try again with USE=static"
-#		die "USE=-static only works with qt-4 built with USE=accessibility."
-#	fi
-}
-
-src_unpack() {
-	if use static;
-	then
-		unpack ${SFILENAME}
-	else
-		unpack ${DFILENAME}
-		#Hack around bug in filename
-		tar xf skype-1.4.0.74
-	fi
-	if use amd64;
-	then
-		unpack libsigc++20-2.0.17-1-from-fc5.rf.i386.tar.gz
-	fi
-}
-
-src_install() {
-	## Install the wrapper script
-	#mv skype skype
-	#cp ${FILESDIR}/sDaemonWrapper-r1 skype
-
-	# remove mprotect() restrictions for PaX usage - see Bug 100507
-	[[ -x /sbin/chpax ]] && /sbin/chpax -m skype
-
-	dodir /opt/${PN}
-	exeopts -m0755
-	exeinto /opt/${PN}
-	doexe skype
-	make_wrapper skype /opt/${PN}/skype /opt/${PN} /opt/${PN} /usr/bin
-
-	#doexe skype-callto-handler
-	insinto /opt/${PN}/sounds
-	doins sounds/*.wav
-
-	#insinto /opt/${PN}/lang
-	#doins lang/*.qm
-	#Skype still shows ALL languagues no matter what were installed
-	#for i in ${LINGUAS}; do
-	#	if [ -f lang/${PN}_${i}.qm ]; then
-	#		doins lang/${PN}_${i}.qm
-	#	fi;
-	#done;
-	insinto /etc/dbus-1/system.d
-	newins ${FILESDIR}/skype.debus.config skype.conf
-
-	#insinto /opt/${PN}/avatars
-	#doins avatars/*.jpg
-
-	#insinto /opt/${PN}
-	#for SIZE in 16 32 48
-	#do
-	#	insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
-	#	newins ${S}/icons/${PN}_${SIZE}_32.png ${PN}.png
-	#done
-
-	# The skype icon doesn't show up in gnome for some reason
-	# Putting the icon in /usr/share/pixmaps seems to solve it
-	#insinto /usr/share/pixmaps
-	#newins ${S}/icons/${PN}_48_32.png ${PN}.png
-
-	fowners root:audio /opt/skype/skype
-	#fowners root:audio /opt/skype/skype-callto-handler
-
-	#insinto /usr/share/applications/
-	#doins skype.desktop
-
-	#dodir /usr/bin/
-	# Install the Documentation
-	#dodoc README LICENSE
-
-	make_desktop_entry skype "Skype VoIP" skype
-
-	#AMD64 team does not provide this so we add it:
-	if use amd64; then
-		exeinto /opt/${PN}
-		dosym libsigc-2.0.so.0.0.0 /opt/${PN}/libsigc-2.0.so.0
-		doexe "${WORKDIR}"/libsigc-2.0.so.0.0.0
-	fi
-
-	#Ugly hack for bug #179568
-	use amd64 && multilib_toolchain_setup x86
-	dosym /usr/$(get_libdir)/libdbus-1.so /opt/${PN}/libdbus-1.so.2
-
-	# TODO: Optional configuration of callto:// in KDE, Mozilla and friends
-}
-
-pkg_postinst() {
-	einfo "If you have sound problems please visit: "
-	einfo "http://forum.skype.com/bb/viewtopic.php?t=4489"
-	einfo "These kernel options are reported to help"
-	einfo "Processor type and features --->"
-	einfo "-- Preemption Model (Preemptible Kernel (Low-Latency Desktop))"
-	einfo "-- Timer frequency (250 HZ)"
-	ewarn ""
-	ewarn "This release no longer uses the old wrapper because skype now uses
-	ALSA"
-	ewarn ""
-
-}