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.

(Portage version: 2.1.10.52/cvs/Linux x86_64)

5 files changed, 14 insertions, 190 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/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
-}