Use transmission and later deluge as default clients for torrent files and magnet links (#409637, thanks to tetromino for remembering transmission as first option). Remove old.

Package-Manager: portage-2.1.10.52/cvs/Linux x86_64

6 files changed, 22 insertions, 200 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 8df982cf20cf..63509c8dafe0 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.308 2012/01/25 03:53:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.309 2012/04/01 18:32:10 pacho Exp $
+
+  01 Apr 2012; Pacho Ramos <pacho@gentoo.org> -gnome-session-2.32.1-r2.ebuild,
+  -gnome-session-3.2.1.ebuild, files/defaults.list,
+  gnome-session-2.32.1-r3.ebuild:
+  Use transmission and later deluge as default clients for torrent files and
+  magnet links (#409637, thanks to tetromino for remembering transmission as
+  first option). Remove old.
 
 *gnome-session-3.2.1-r1 (25 Jan 2012)
 
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 17cb04687dd2..c85fc8377d50 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 10-user-dirs-update-gnome 264 RMD160 92eba5fafd59d6cf051138acd247127b7afcc32b SHA1 8a75d6f0cc0a2ab05ee0542cf0ed921c761c9fca SHA256 f060f401bf0e3f7dad91ce675666853de062d8523a3749f1040c4895bc3db931
 AUX 10-user-dirs-update-gnome-r1 299 RMD160 c76707fdce421431884beeabd60d5f0ce7716d26 SHA1 6adf982b43d2eeaa86622ecfd6b5f70eb772a9c2 SHA256 4baf3771a18f87db323580d868f232bf33830f72dcc54b4b3aa3d9bc9cce05e5
 AUX 15-xdg-data-gnome 227 RMD160 b42bf6342d18a00fe38b49264ef8a43c8ce87af9 SHA1 a365c288d94015e55c36bd25623b516ed27db352 SHA256 dca4022749bd9a7657dc077546ce0bc65312e87054e6f98761a7f1dd5f6a88cd
 AUX 15-xdg-data-gnome-r1 262 RMD160 6305f879183ecafae77d4cfd7bf035d44d801924 SHA1 99c5eb8187a608ab0b8cffe68eedb10e73dc1968 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f590069d0d9edf46ec0b24
 AUX Gnome 2391 RMD160 dee0875327352ae70f71b73257deb8ccc5bbc3ba SHA1 9d6f5c7c4f7aee36ea64b30c57b9cb9818664c42 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3
-AUX defaults.list 14535 RMD160 a3685d3d781fb517f49c6cf90bab68dc86ff1ea1 SHA1 248881f0bfa80e533acea3ccd6380750b7e14474 SHA256 d2d362a6f43ce9f36b8958f052657e884c92034e788420677977a279275702e7
+AUX defaults.list 14665 RMD160 4911cb92c2b4fb6a2cf0df760a6b8b69edb7633d SHA1 1954df452a625450cb3059f86774da83f02f40e7 SHA256 34af159eee20aa4f169fa0e368be33117d828b2db6daab7dc4826d9330719b21
 AUX gnome-session-2.32.0-session-saving-button.patch 21424 RMD160 11c4db9951859c2749473a7969693469c9d9e277 SHA1 f7c2f8d98c6deac63ca9448977bdcfa29ae80d52 SHA256 7a2dd8771180bc460fdc034ad95d61ed83b14952b16b17c3cb9a10aade8a1a97
 AUX gnome-session-2.32.1-dialog-size.patch 953 RMD160 436ac050715db19af87eb677e8a652e47f397ead SHA1 a4bf898f8c85b6870c61ddbd83816f7726e9fe5d SHA256 8f96daba40ae19223d54aa271f79e0a6541e4c936771815a4599077533c6948b
 AUX gnome-session-2.32.1-dialog-size2.patch 1114 RMD160 bd9587678b2bf4dffab7959b1377d5b9856cb22b SHA1 26702bba164b816dd34c53ad9669b6734c21c959 SHA256 fefa53adb80c531fecc4fa4e67f5faff7ee5cfd33a290c689dca9f2267525f6e
@@ -16,16 +16,14 @@ AUX gnome-session-2.32.1-idle-transition.patch 1802 RMD160 aec519f8b0bfff589c079
 AUX gnome-session-3.2.1-kernel-boot-line.patch 3611 RMD160 3b3b07935ea4428c17dc8ffdc73f5e394c76115a SHA1 099f2201ac34440067a02d69991933055ef0c8c7 SHA256 aea66b7bac863f2b334003e1eb5fa7a4cec97883df2632c0bf039d70541d09c6
 DIST gnome-session-2.32.1.tar.bz2 774842 RMD160 c579bf197b38c8df7df14c751c056be86695a287 SHA1 7d4c7652247606a972a2f1e50a6a6339809a5b9e SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a
 DIST gnome-session-3.2.1.tar.xz 700852 RMD160 ce31f04f2ced486f0bca59e7e64cf1194f401eff SHA1 a330cb69c3a1126ed57d36a58004987275e8982a SHA256 a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3
-EBUILD gnome-session-2.32.1-r2.ebuild 2181 RMD160 62ce137f70d6fabe0531cc10c8e5a66b884edafc SHA1 29e676cd69295adca01f209f7ed751a3690d1445 SHA256 1a0b4219a56f9e944d7badbc96769cc474058a7fc521b7a787060c72caf54c4f
-EBUILD gnome-session-2.32.1-r3.ebuild 2889 RMD160 ecd42181dde0ac33408a89d741f2696a22fea104 SHA1 e085b6fe13ee3a8b3034bc060f758b7c05fe2c30 SHA256 9c569247827b9a8126663841c34bb8cd21ca0a897360b00462a282d090eecd23
+EBUILD gnome-session-2.32.1-r3.ebuild 2886 RMD160 eacb94f55caebd716c31886d652bab28cb49acc2 SHA1 d547e548299aa207350416709eee3003472af442 SHA256 09eb3420f425981b2af28acde5659be243a6ccf3b925e85ba1572a0c8680fbab
 EBUILD gnome-session-3.2.1-r1.ebuild 3180 RMD160 24bf8e176deceda29b0c2610350372679c41977d SHA1 be46f9d8c806af5102542d825bd305bf531a72ce SHA256 d4ca0038f227049cf6afad930446eb11371c165a211e5364abb02781c2fb5457
-EBUILD gnome-session-3.2.1.ebuild 2963 RMD160 4f4b0d677a5893611899da19923d19ba95ded206 SHA1 274cc87053917b0110fbd37dcaaba69bc0e8c3c4 SHA256 05abed24d4bb7d070db0e6d434d2502e6d38ff30033935e95394ca1e7ee6571a
-MISC ChangeLog 45133 RMD160 8f37b57a0bf7ef60ed16d7e260e55cba451e8e8b SHA1 a8b97285e40e94dba2931d625fc4a47d4de89d61 SHA256 55c65a76105124be030c65bbb5400a2af00061a2f140cc45da3ec47de80ee94f
+MISC ChangeLog 45478 RMD160 24c689185e090d1aeebd45bf817e9e54e458e7d8 SHA1 0328a0d0bcf5a5f71ad4a2135f89ed8a9def28e2 SHA256 424e568ccf2a04571b580fc2fc67fdd9b89288dbb56fb59591a92ab9ac467d28
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8ffOkACgkQdjK8w9WeBnAjaQD8CWHqgBC2UDn/vkOKmQxNuXPp
-pWecLm0zHAMPjArC8poBAIlKMz1hML1x+KWXIoUdP9hpvwiXRI6F+Nf16wRmbRUJ
-=vL5q
+iEYEARECAAYFAk94ny8ACgkQCaWpQKGI+9S56gCfTs1U6mH5BzXJvGv9x5vj0ojS
++Y0An1h6TacT1DrR3h/MVuoygb3CapH9
+=I/le
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/files/defaults.list b/gnome-base/gnome-session/files/defaults.list
index b058622807a2..bac841cb5858 100644
--- a/gnome-base/gnome-session/files/defaults.list
+++ b/gnome-base/gnome-session/files/defaults.list
@@ -331,4 +331,6 @@ x-scheme-handler/ghelp=yelp.desktop;
 x-scheme-handler/help=yelp.desktop;
 x-scheme-handler/http=firefox.desktop;epiphany.desktop
 x-scheme-handler/https=firefox.desktop;epiphany.desktop
-x-scheme-handler/mailto=evolution.desktop
\ No newline at end of file
+x-scheme-handler/mailto=evolution.desktop
+application/x-bittorrent=transmission-gtk.desktop;deluge.desktop
+x-scheme-handler/magnet=transmission-gtk.desktop;deluge.desktop
diff --git a/gnome-base/gnome-session/gnome-session-2.32.1-r2.ebuild b/gnome-base/gnome-session/gnome-session-2.32.1-r2.ebuild
deleted file mode 100644
index e6d50dead8f6..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.32.1-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r2.ebuild,v 1.5 2011/04/30 17:39:38 armin76 Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="doc ipv6 elibc_FreeBSD"
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.22.0:2
-	>=dev-libs/dbus-glib-0.76
-	>=gnome-base/gconf-2:2
-	>=sys-power/upower-0.9.0
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXtst
-	x11-apps/xdpyinfo"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40
-	>=dev-util/pkgconfig-0.17
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!<gnome-base/gdm-2.20.4
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-pkg_setup() {
-	# TODO: convert libnotify to a configure option
-	G2CONF="${G2CONF}
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--with-default-wm=gnome-wm
-		--with-gtk=2.0
-		$(use_enable doc docbook-docs)
-		$(use_enable ipv6)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Add "session saving" button back, upstream bug #575544
-	epatch "${FILESDIR}/${PN}-2.32.0-session-saving-button.patch"
-
-	# Fix support for GNOME3 conditions, bug #XXXXXX
-	epatch "${FILESDIR}/${PN}-2.32.1-gnome3-conditions.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions || die "dodir failed"
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome" || die "doexe failed"
-
-	dodir /usr/share/gnome/applications/ || die
-	insinto /usr/share/gnome/applications/
-	doins "${FILESDIR}/defaults.list" || die
-
-	dodir /etc/X11/xinit/xinitrc.d/ || die
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/15-xdg-data-gnome" || die
-}
diff --git a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
index 310752ad000c..2f5fb99db9a4 100644
--- a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.7 2011/10/30 16:04:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.8 2012/04/01 18:32:10 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -61,8 +61,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Add "session saving" button back, upstream bug #575544
 	epatch "${FILESDIR}/${PN}-2.32.0-session-saving-button.patch"
 
@@ -81,6 +79,7 @@ src_prepare() {
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+	gnome2_src_prepare
 }
 
 src_install() {
diff --git a/gnome-base/gnome-session/gnome-session-3.2.1.ebuild b/gnome-base/gnome-session/gnome-session-3.2.1.ebuild
deleted file mode 100644
index 1895d5d0982b..000000000000
--- a/gnome-base/gnome-session/gnome-session-3.2.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.2.1.ebuild,v 1.3 2011/11/28 06:37:21 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc ipv6 elibc_FreeBSD"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.90.7:3
-	>=dev-libs/json-glib-0.10
-	>=dev-libs/dbus-glib-0.76
-	>=gnome-base/gconf-2:2
-	>=sys-power/upower-0.9.0
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-
-	virtual/opengl
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	x11-apps/xdpyinfo"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-settings-daemon
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=x11-themes/gnome-themes-standard-2.91.92
-	sys-apps/dbus[X]"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40
-	>=dev-util/pkgconfig-0.17
-	>=dev-util/intltool-0.40.6
-	!<gnome-base/gdm-2.20.4
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-pkg_setup() {
-	# TODO: convert libnotify to a configure option
-	G2CONF="${G2CONF}
-		--disable-deprecation-flags
-		--disable-schemas-compile
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable doc docbook-docs)
-		$(use_enable ipv6)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	dodir /usr/share/gnome/applications/
-	insinto /usr/share/gnome/applications/
-	doins "${FILESDIR}/defaults.list"
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/15-xdg-data-gnome"
-
-	# This should be done here as discussed in bug #270852
-	doexe "${FILESDIR}/10-user-dirs-update-gnome"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-}