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

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 10 insertions, 64 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/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>