www-servers/apache[apache2_mpms_prefork] needed (#551012 by Kobboi), stop messing with ITSTOOL value, drop old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 16 insertions, 72 deletions

diff --git a/gnome-extra/gnome-user-share/ChangeLog b/gnome-extra/gnome-user-share/ChangeLog
index 72577d87f4be..fbe93067fa6c 100644
--- a/gnome-extra/gnome-user-share/ChangeLog
+++ b/gnome-extra/gnome-user-share/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-user-share
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.44 2015/03/15 13:26:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.45 2015/06/02 19:07:16 pacho Exp $
+
+  02 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  -gnome-user-share-3.10.2-r1.ebuild, gnome-user-share-3.14.2.ebuild,
+  metadata.xml:
+  www-servers/apache[apache2_mpms_prefork] needed (#551012 by Kobboi), stop
+  messing with ITSTOOL value, drop old.
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> gnome-user-share-3.14.2.ebuild:
   x86 stable, bug 534012
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index 5dfa26445fa1..d5bd41cba0ef 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -2,16 +2,14 @@
 Hash: SHA256
 
 AUX gnome-user-share-3.10.2-launch-obexd.patch 1060 SHA256 5cfdae6771fd32a4968eeb7783d06cb63fee72581c37063e2e752be550d9f712 SHA512 6f1dea94b2dfc11635918c6302a114aa074edd48f9a7c6c2bd19c9d48da938b724015b3dba4dfd716b522130edcb8a08d68538c1aff9b9c01797a2b19a191af3 WHIRLPOOL 4700f3b3bd745b7881178b9ea0f604174f0267f7894aebb4ee1012b40daebd90e7812842112a0d9b1a53904b75de6fe69a2360545ef8c2405b540832be1f6a5d
-DIST gnome-user-share-3.10.2.tar.xz 383320 SHA256 1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f SHA512 792a7444475d6f02c53a9661192dc5550b2c7ca29975d5c9d33d9ef481440d9e4bca5f7f70861df4503e8331044a1db10fe6501cdaccc8f9d314c239c308078e WHIRLPOOL cf3c605ce1801797d5e915e266f7fa73aeb35b10efa07ca2b1a5b69cbb185910956b9342f7dc83ef4e5e3deb1ae0db3586b5e83566c48d4c1951fd6530a3abd1
 DIST gnome-user-share-3.14.2.tar.xz 391916 SHA256 6b05b3ef31af3bb39c903f94a0d163c0a9c4aa5266ae98e2281e0613f2972ee9 SHA512 d42587c0c64fda9d051f3d6c792358d02c32b95193df512016a04a0ee4861483f3060f1579de6fa229676795e420cf88732da334757471b79410d3be6ebe8bd1 WHIRLPOOL 14a191b8cbfa218e4dcde379212a00f0753d02726b55b16b9f67fbc2c5484038d9d18ababb5c2019624856041257a88cea6b00a3d4cf21a83c9369b9486452be
-EBUILD gnome-user-share-3.10.2-r1.ebuild 1546 SHA256 dc9dd18b2c45f1490618b228dbfdc164d790b4539829b09f30560cd99f71f69b SHA512 37f8bd9481d1754bb5366a461fdc3c80835d8beadab82c298f6cfd026f9394ed04b7d527fb08afb77f34e7cda3368072ff660cad944a59f9f19e1b6a640e29b3 WHIRLPOOL be0573adcabb8b2e5a1b4c142b8e06d8a88fe70bc10b09069ee33ef96999410be5cf5f66c80b848c5c4296c82555ce55e2ef3691018d1c4c89536be79f46599c
-EBUILD gnome-user-share-3.14.2.ebuild 1353 SHA256 57f38cf03b76eb54e8f746646c435e475d3a44616b038477509672a76d1ce309 SHA512 a084156a0a81e368f37d325c8579f2e8c523284d61bf2878bb263da7a4804c22a65919270cf7df224945d034f52fe29ed0bd5cf4fe966715aaa1c1e896467838 WHIRLPOOL 92ccb64e81a5fca561e534127ba19a65e62fa7f6dcc3c3093ed14c0b0ba78d74dead7b5276057dc8c8d429791292c753f1b3879c09b9d419e87090d29e9e4eec
-MISC ChangeLog 7281 SHA256 8c7b18eb167ad687b0104ee147f4158efc2eb01080ed7b1f6b918e1b503626a7 SHA512 2b8d096d29ff2b59d45d8ac395cf86abc27b721553f7a3e70ef3a6169d0ac1d32a8268ffa5aa1bae3fd83c8a1487108ddfe3a898952bbab4aa796801ddc4f7bd WHIRLPOOL 5f89cd2b77942cc280b13ddd5badfb9d1dad852b43a73a184c3a14a47b67387aa7cf93f69582b4a4d298a2ccf9bdbeeebaae880a5e5ad3c02841045cc786fbad
-MISC metadata.xml 306 SHA256 185c811ac4adbf390d2d997eaba05f7a5115bc35e1b1baa5e75165a9afe1cb18 SHA512 29dd6f73edaf9bc1cd3963758834c9b070b4781a5cc8e25be9ae236b8534d83d5b585a9f5e1a488e1605ac051af6793462d7e226318d228f460b0a77ae2c7915 WHIRLPOOL bc260875f60e4b96d4f2bcf6a976f6a4486be064bbaf26de72a37e3da79957b14ce04f5fd2214c5e9a4dd29a6a5e4c9b8dea4fe42acd4c8dadf6dd1b5e0c1534
+EBUILD gnome-user-share-3.14.2.ebuild 1346 SHA256 bcb7a8d392cd5895057c9c970a7bcfc3115e74544e35396e8fe563884b6bb46b SHA512 f2470e7d86f148205186a824327339e627797221e152b44024d71710acbd1ff4487e46826f5f189fec18568714f2841c1e26ce97cc3b295a6324e2cf06341fb8 WHIRLPOOL cc3b2e19388ab3574649581f709c5cfc499dbe34dfa4c5da159ade9b9c3a24c83fa951d671699a59734820a47d2c1027678ddd28a8405c1afc32fca3c17df41e
+MISC ChangeLog 7530 SHA256 409855d396cb98f54d9e9c207adb0787a2d26daeee362515764b3ab393fb0f9e SHA512 7e150c648f09796fbe89dea248b16e9620cd187fc6c3d4f57809a341414db2438d8c05b42f42cb9fbde679f920f7b2492ad309421eec1a09c617685288efcc6a WHIRLPOOL 210eea0567e2a43b465ec727bf5251ed2162c38105580ed6ba29032066a3bfc7aec3b196b081c5bbdfeebf10b9b249cac8ea37862b24a1ff3233962fc7e63780
+MISC metadata.xml 159 SHA256 d6e10a30ac9423eb5a9ba4e7b2a76322683f40b2fb428d2f310dcdbd1cfde235 SHA512 9918238e11ed07d72c15621419151cecc11daf46e1da36f7dc374c28c6925ec9e90bb8919861cf01a5328cec4a213ad859bda6a32616d461b90e01149b66b5b1 WHIRLPOOL 8a863208f99a864119345291d4862d906f2c6e9807010fb24246710601c4887f8e8715663891618eb1ae3166d27d7f7fcb1e4858e69e50a72a9a2b02a85dffab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUFiHoACgkQCaWpQKGI+9SI/gCdH+ENi0raaNg/zCFzxHO3i/eM
-hKEAniyJ8WFZIzYS/vS0A+EF0P0y9CUf
-=lKlp
+iEYEAREIAAYFAlVt/uUACgkQCaWpQKGI+9QCtQCfWGEIekEIR+9reDKO16zC/I+Y
+DUoAnjEw0kTAEwVP8IUvTgUyaUTcTLGv
+=Ayk4
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.10.2-r1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.10.2-r1.ebuild
deleted file mode 100644
index 635975ddc9cf..000000000000
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.10.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 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.10.2-r1.ebuild,v 1.3 2014/12/19 13:44:59 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="Personal file sharing for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bluetooth"
-
-# FIXME: could libnotify be made optional ?
-# FIXME: selinux automagic support
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3:3
-	>=gnome-base/nautilus-2.91.7
-	media-libs/libcanberra[gtk3]
-	>=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:=
-	bluetooth? (
-		>=net-wireless/gnome-bluetooth-3.9.3:2=
-		>=net-wireless/bluez-5[obex] )
-"
-DEPEND="${RDEPEND}
-	!<gnome-base/gnome-control-center-3.9
-	app-text/yelp-tools
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Make sure obexd daemon is launched if needed when starting to watch it (from 'master')
-	epatch "${FILESDIR}/${PN}-3.10.2-launch-obexd.patch"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable bluetooth) \
-		ITSTOOL=$(type -P true) \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/
-}
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.14.2.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.14.2.ebuild
index 1b6b39f4db55..05498077796c 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.14.2.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.14.2.ebuild,v 1.3 2015/03/15 13:26:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-3.14.2.ebuild,v 1.4 2015/06/02 19:07:16 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -24,7 +24,7 @@ RDEPEND="
 	>=gnome-base/nautilus-2.91.7
 	media-libs/libcanberra[gtk3]
 	>=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,apache2_mpms_prefork]
 	>=x11-libs/libnotify-0.7:=
 	bluetooth? (
 		>=net-wireless/gnome-bluetooth-3.9.3:2=
@@ -42,7 +42,6 @@ DEPEND="${RDEPEND}
 src_configure() {
 	gnome2_src_configure \
 		$(use_enable bluetooth) \
-		ITSTOOL=$(type -P true) \
 		--with-httpd=apache2 \
 		--with-modules-path=/usr/$(get_libdir)/apache2/modules/
 }
diff --git a/gnome-extra/gnome-user-share/metadata.xml b/gnome-extra/gnome-user-share/metadata.xml
index 59bbab5fafd9..e98dd9082dc1 100644
--- a/gnome-extra/gnome-user-share/metadata.xml
+++ b/gnome-extra/gnome-user-share/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<maintainer>
-		<email>eva@gentoo.org</email>
-		<name>Gilles Dartiguelongue</name>
-		<description>Primary maintainer</description>
-	</maintainer>
+<herd>gnome</herd>
 </pkgmetadata>