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

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 85 insertions, 8 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/Manifest b/gnome-extra/gnome-user-share/Manifest
index 80391be07814..071699a20fcf 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -1,7 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-user-share-2.30.1-libnotify-0.7.patch 1340 RMD160 b184eb99c4d595c8c28693d92174adfa1faa15a4 SHA1 98e1cb208d54ba5a8e837695493dbc25e83468f5 SHA256 60fcfe4a7120b7a917e2aec227f3a40fe4993bc9c80f2722f856fbe4e6e4994e
 DIST gnome-user-share-2.30.1.tar.bz2 959747 RMD160 f54ba99544bbf3f8a71486462837f99afb24de97 SHA1 1051de28334991f270b4abb67a2e7ddb01bc80ea SHA256 30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe
 DIST gnome-user-share-3.0.1.tar.xz 1000640 RMD160 6c416802a642d2ebb78ef37cd7cc9e5852cd8fb7 SHA1 af097b99e4a12f680118699c804eca19c0341ba0 SHA256 9d1188c316e536ad6f84b595f118040474f8b9017acd492e80bce30d0c5d54ea
-EBUILD gnome-user-share-2.30.1.ebuild 1633 RMD160 c21e11f34407ec6259cbcbdd39f84293c3e2cd42 SHA1 01d2533b3a7300f37ad5e6cac1ecdd8aa78647b5 SHA256 83c47055c689746bf601fd704721cb951228f69176716ebda8932db849801647
-EBUILD gnome-user-share-3.0.1.ebuild 1421 RMD160 89132399f1b1d35d74f9a5ca37230a945e68cdf6 SHA1 92401484021418d1880dc5a553df674e6c5c72c1 SHA256 816dad4fcf35d256841e0c41d3da84e26d1ae1922c63b495647d014d130b1518
-MISC ChangeLog 3547 RMD160 cad4c1b6040a44e3987edf698ac81798c25785da SHA1 deff0c1885ea7d068d9c5ab18b8a6cece7e9e7d6 SHA256 c43390b7637d87cac10887cd4d2342651159d2085b7f8fbf86dbc5c8ebca42e5
+DIST gnome-user-share-3.0.2.tar.xz 1008128 RMD160 69ee7f1138488dd94d69fe0b18e7c9f27ee2cacb SHA1 c554c40e24db36abc983a92a19e7216bad62f8f4 SHA256 34a5b6e340025e8466233f374898a6e293839f6785c0abf14eed86d1f3d22ffd
+EBUILD gnome-user-share-2.30.1.ebuild 1637 RMD160 9c1e5a16b66b6a2382cf08f395218c53547ce286 SHA1 b433fc4b273906658204cdc41c5fbe76c029616a SHA256 456a713dc4ae2f8d4e52d28db857fc4ca9b11660dc72e25a01e2b82d5c40086b
+EBUILD gnome-user-share-3.0.1.ebuild 1424 RMD160 b32d24b561fc09bbe10cdcc3e035ae7f986d1e93 SHA1 3494432399f2659dfbe96ba3c80ed26ed24494a4 SHA256 588996116e00d272b79f081a3ffdee7dca726089b7687d25b56d8075c7b228df
+EBUILD gnome-user-share-3.0.2.ebuild 1518 RMD160 a5ec728a7f0328146c63b309e159123a455dd0a4 SHA1 363f90856c6f88e0eca24e3c414f3a6349274c2c SHA256 27524ce525e1d8a2f2f165757e4d5d654a810574f8015bac5f752058488a5290
+MISC ChangeLog 3838 RMD160 b563478733087fe5c765948f47d9acee85db51bc SHA1 28f2aa74c1237eaf0b56950636d648fc10c10b86 SHA256 5a0ad8f6676de31a93ebea5716a3967620559bd7ee267b3fb1fd2489eec6bab4
 MISC metadata.xml 306 RMD160 1b5f520dd385288193c3cfa5f2977f5c8cd36246 SHA1 b7b6d50b01bbe9ab5d9159239b89332186063335 SHA256 185c811ac4adbf390d2d997eaba05f7a5115bc35e1b1baa5e75165a9afe1cb18
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPpg56AAoJEJ0WA1zPCt1h1LsH/jygXvKZSTZBxD+ljI5gupSJ
+o/0Ut+nx/bcwhW+pbNNYqO440ZovoI1KVnlm1ELs9Ywq0nJiFK7qX0T/KTqxZvjG
+ksotKvxMOkgPOpV2FEJ64cactgypWmdcLdukeBpRmzMHqlaocMLKxCHrata55hKY
+KwmeFeldou8VhZfQETFSROCKjqkUabNL2FeNxk892tROp5uHoc405KcTFO6sv/FG
+jlKLcbxYKH98U6UTat2HHBcgNrqDkTyVqjfZRwtXMqoh+LZOoakmT3/T8tTERPcn
+E1giPGDS6YxISRiFack5QULoBPpXRv1KfcDcNkG34DynZb75Vv7CioJWXM2x4Po=
+=C7km
+-----END PGP SIGNATURE-----
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
+}