[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-user-share/files/, gnome-extra/gnome-user-share/

[Alexandre Restovtsev]

commit:     2f8c3108ab5a9460638d8dc522fbc3e134bfde70
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 20:17:42 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Oct 28 20:17:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2f8c3108

gnome-extra/gnome-user-share: 3.0.1 is in gx86

---
 .../files/gnome-user-share-3.0.0-AF_INET.patch     |   14 -----
 .../gnome-user-share-3.0.0-r1.ebuild               |   57 --------------------
 2 files changed, 0 insertions(+), 71 deletions(-)

diff --git a/gnome-extra/gnome-user-share/files/gnome-user-share-3.0.0-AF_INET.patch b/gnome-extra/gnome-user-share/files/gnome-user-share-3.0.0-AF_INET.patch
deleted file mode 100644
index 7a8e55b..0000000
--- a/gnome-extra/gnome-user-share/files/gnome-user-share-3.0.0-AF_INET.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-## Description: Specify an address family in http.c:get_port()
-## Origin/Author: Adam Glasgall <adam@××××××××××××.net>
-Index: gnome-user-share-3.0.0/src/http.c
-===================================================================
---- gnome-user-share-3.0.0.orig/src/http.c	2011-09-22 15:00:09.086505068 -0400
-+++ gnome-user-share-3.0.0/src/http.c	2011-09-22 15:00:00.766504944 -0400
-@@ -77,6 +77,7 @@
- 	memset (&addr, 0, sizeof (addr));
- 	addr.sin_port = 0;
- 	addr.sin_addr.s_addr = INADDR_ANY;
-+	addr.sin_family = AF_INET;
- 
- 	reuse = 1;
- 	setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof (reuse));

diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.0.0-r1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.0.0-r1.ebuild
deleted file mode 100644
index 87e3c60..0000000
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild,v 1.1 2010/09/28 19:05:16 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="Personal file sharing for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# FIXME: could libnotify be made optional ?
-# FIXME: gnome-bluetooth is a hard-dep
-# bluetooth is pure runtime dep (dbus)
-RDEPEND=">=dev-libs/glib-2.16.0:2
-	>=x11-libs/gtk+-3.0.0:3
-	>=app-mobilephone/obex-data-server-0.4
-	>=dev-libs/dbus-glib-0.70
-	dev-libs/libunique:3
-	>=gnome-base/gconf-2.10:2
-	>=gnome-base/nautilus-2.91.7
-	media-libs/libcanberra[gtk3]
-	>=net-wireless/gnome-bluetooth-2.91.5:2
-	>=net-wireless/bluez-4.18
-	>=sys-apps/dbus-1.1.1
-	>=www-apache/mod_dnssd-0.6
-	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-	>=x11-libs/libnotify-0.7"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.17
-	app-text/gnome-doc-utils
-	app-text/docbook-xml-dtd:4.1.2"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--with-httpd=apache2
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Ubuntu patch to work around kernel 3.x's inability to bind to AF_UNSPEC
-	# sockets. See https://bugzilla.gnome.org/show_bug.cgi?id=660658 and
-	# https://bugs.launchpad.net/ubuntu/+source/gnome-user-share/+bug/856732
-	epatch "${FILESDIR}/${PN}-3.0.0-AF_INET.patch"
-}