Clean up old revision.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 14 insertions, 113 deletions

diff --git a/gnome-extra/gnome-user-share/ChangeLog b/gnome-extra/gnome-user-share/ChangeLog
index 18a15fba63ac..bd6dd1232319 100644
--- a/gnome-extra/gnome-user-share/ChangeLog
+++ b/gnome-extra/gnome-user-share/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-user-share
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.23 2013/03/28 17:24:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.24 2013/03/29 22:43:21 eva Exp $
+
+  29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-user-share-3.0.2.ebuild, -gnome-user-share-3.0.3.ebuild,
+  gnome-user-share-3.8.0.ebuild:
+  Clean up old revision.
 
 *gnome-user-share-3.8.0 (28 Mar 2013)
 
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.0.2.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.0.2.ebuild
deleted file mode 100644
index 240235e4119f..000000000000
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.0.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 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-3.0.2.ebuild,v 1.1 2012/05/06 05:39:00 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit 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.28:2
-	>=x11-libs/gtk+-3:3
-	>=app-mobilephone/obex-data-server-0.4
-	>=dev-libs/dbus-glib-0.70
-	>=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}
-	app-text/gnome-doc-utils
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--with-httpd=apache2
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/"
-}
-
-src_prepare() {
-	# Rebuild marshalers for <glib-2.31 compatibility
-	rm -v src/marshal.{c,h} || die
-	gnome2_src_prepare
-}
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.0.3.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.0.3.ebuild
deleted file mode 100644
index 4bb102728d4c..000000000000
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.0.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 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-3.0.3.ebuild,v 1.1 2012/10/21 13:28:19 eva Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit 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)
-# FIXME selinux automagic support
-RDEPEND=">=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3:3
-	>=app-mobilephone/obex-data-server-0.4
-	>=dev-libs/dbus-glib-0.70
-	>=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}
-	app-text/yelp-tools
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--with-httpd=apache2
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/"
-
-	# Rebuild marshalers for <glib-2.31 compatibility
-	rm -v src/marshal.{c,h} || die
-	gnome2_src_prepare
-}
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.8.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.8.0.ebuild
index 3f9ed647be31..e63209d0a9dc 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.8.0.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-3.8.0.ebuild,v 1.1 2013/03/28 17:24:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-3.8.0.ebuild,v 1.2 2013/03/29 22:43:21 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -41,12 +41,14 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	G2CONF="${G2CONF}
-		ITSTOOL=$(type -P true)
-		--with-httpd=apache2
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/"
-
 	# Rebuild marshalers for <glib-2.31 compatibility
 	rm -v src/marshal.{c,h} || die
 	gnome2_src_prepare
 }
+
+src_configure() {
+	gnome2_src_configure \
+		ITSTOOL=$(type -P true) \
+		--with-httpd=apache2 \
+		--with-modules-path=/usr/$(get_libdir)/apache2/modules/
+}