New version for GNOME 2.28. Clean up old revisions.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 32 insertions, 79 deletions

diff --git a/gnome-extra/gnome-user-share/ChangeLog b/gnome-extra/gnome-user-share/ChangeLog
index b72cce3a7b04..9008e06bfe70 100644
--- a/gnome-extra/gnome-user-share/ChangeLog
+++ b/gnome-extra/gnome-user-share/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-user-share
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.3 2009/05/03 22:07:41 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.4 2009/10/29 22:20:17 eva Exp $
+
+*gnome-user-share-2.28.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-user-share-0.40.ebuild, -gnome-user-share-0.41.ebuild,
+  +gnome-user-share-2.28.1.ebuild:
+  New version for GNOME 2.28. Clean up old revisions.
 
 *gnome-user-share-2.26.0 (03 May 2009)
 
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-0.40.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-0.40.ebuild
deleted file mode 100644
index 9be516a2adc9..000000000000
--- a/gnome-extra/gnome-user-share/gnome-user-share-0.40.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2008 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-0.40.ebuild,v 1.1 2008/10/12 20:14:39 eva Exp $
-
-inherit eutils autotools gnome2
-
-DESCRIPTION="Personal file sharing for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth"
-
-# FIXME: could libnotify be made optional ?
-#        is consolekit needed or not ?
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.12
-	>=gnome-base/gconf-2.10
-	>=sys-apps/dbus-1.1.1
-	>=dev-libs/dbus-glib-0.70
-	>=net-dns/avahi-0.6
-	>=www-servers/apache-2.2
-	x11-libs/libnotify
-	bluetooth? ( >=app-mobilephone/obex-data-server-0.3 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.17"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	if ! built_with_use www-servers/apache apache2_modules_dav \
-	apache2_modules_dav_fs apache2_modules_authn_file \
-	apache2_modules_auth_digest apache2_modules_authz_groupfile ; then
-		eerror "You need to build www-servers/apache with APACHE2_MODULES='dav dav_fs authn_file auth_digest authz_groupfile'"
-		die "re-emerge www-servers/apache with APACHE2_MODULES='dav dav_fs authn_file auth_digest authz_groupfile'"
-	fi
-
-	G2CONF="${G2CONF} --enable-avahi --disable-howl
-		--with-modules-path=/usr/lib/apache2/modules/"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# this file will be recreated with the correct module path
-	#rm data/dav_user_2.2.conf
-
-	# the configuration script looks for httpd, but we call it apache2
-	sed -i -e "s:\(AC_PATH_PROG(\[HTTPD\], \)\[httpd\]:\1[apache2]:" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-0.41.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-2.28.1.ebuild
index 74b5f885b7ff..dd3fb9384305 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-0.41.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-2.28.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 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-0.41.ebuild,v 1.2 2009/01/06 06:02:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.28.1.ebuild,v 1.1 2009/10/29 22:20:17 eva Exp $
 
-EAPI="1"
+EAPI="2"
+GCONF_DEBUG="no"
 
 inherit eutils gnome2
 
@@ -12,41 +13,43 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bluetooth +zeroconf"
+IUSE=""
 
 # FIXME: could libnotify be made optional ?
 #        is consolekit needed or not ?
+# FIXME: gnome-bluetooth is a hard-dep
 # bluetooth is pure runtime dep (dbus)
 RDEPEND=">=dev-libs/glib-2.16.0
 	>=x11-libs/gtk+-2.14
+	>=app-mobilephone/obex-data-server-0.4
+	>=dev-libs/dbus-glib-0.70
 	>=gnome-base/gconf-2.10
+	media-libs/libcanberra[gtk]
+	>=net-wireless/gnome-bluetooth-2.27.7.2:2
+	>=net-wireless/bluez-4.18
 	>=sys-apps/dbus-1.1.1
-	>=dev-libs/dbus-glib-0.70
-	zeroconf? ( >=net-dns/avahi-0.6 )
-	>=www-servers/apache-2.2
-	x11-libs/libnotify
-	bluetooth? (
-		>=net-wireless/bluez-4.18
-		>=app-mobilephone/obex-data-server-0.4 )"
-
+	>=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"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.17"
+	>=dev-util/pkgconfig-0.17
+	app-text/gnome-doc-utils
+	app-text/docbook-xml-dtd:4.1.2"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	if ! built_with_use www-servers/apache apache2_modules_dav \
-	apache2_modules_dav_fs apache2_modules_authn_file \
-	apache2_modules_auth_digest apache2_modules_authz_groupfile ; then
-		eerror "You need to build www-servers/apache with APACHE2_MODULES='dav dav_fs authn_file auth_digest authz_groupfile'"
-		die "re-emerge www-servers/apache with APACHE2_MODULES='dav dav_fs authn_file auth_digest authz_groupfile'"
-	fi
-
 	G2CONF="${G2CONF}
-		$(use_enable zeroconf avahi)
-		--disable-howl
 		--with-httpd=apache2
 		--with-modules-path=/usr/lib/apache2/modules/"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+}