Version bump. Require apache-2.2.x (gnome-user-share will not start with apache-2.4).

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

4 files changed, 66 insertions, 5 deletions

diff --git a/gnome-extra/gnome-user-share/ChangeLog b/gnome-extra/gnome-user-share/ChangeLog
index 2fd3335633da..965e14a07de7 100644
--- a/gnome-extra/gnome-user-share/ChangeLog
+++ b/gnome-extra/gnome-user-share/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-user-share
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.19 2012/05/05 06:25:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.20 2012/05/06 05:39:00 tetromino Exp $
+
+*gnome-user-share-3.0.2 (06 May 2012)
+
+  06 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-user-share-2.30.1.ebuild, gnome-user-share-3.0.1.ebuild,
+  +gnome-user-share-3.0.2.ebuild:
+  Version bump. Require apache-2.2.x (gnome-user-share will not start with
+  apache-2.4).
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org>
   gnome-user-share-2.30.1.ebuild, gnome-user-share-3.0.1.ebuild:
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild
index fc29b6646c96..2b5c99ebf763 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild
@@ -1,6 +1,6 @@
 # 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-2.30.1.ebuild,v 1.9 2012/05/05 06:25:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild,v 1.10 2012/05/06 05:39:00 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.16.0
 	>=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]
+	=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
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.0.1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.0.1.ebuild
index b671f424d959..ffe5c6df625b 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.0.1.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.2 2012/05/05 06:25:22 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-3.0.1.ebuild,v 1.3 2012/05/06 05:39:00 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.16.0: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]
+	=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
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
new file mode 100644
index 000000000000..240235e4119f
--- /dev/null
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.0.2.ebuild
@@ -0,0 +1,53 @@
+# 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
+}