[gentoo-commits] proj/xfce:master commit in: xfce-base/xfconf/

["Christoph Mende" <angelos@gentoo.org>]

commit:     d4f5e322a9917233c1bb3fb25e479d68d3aff7fe
Author:     Christoph Mende <angelos <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  9 19:41:38 2015 +0000
Commit:     Christoph Mende <angelos <AT> gentoo <DOT> org>
CommitDate: Fri Oct  9 19:41:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/xfce.git/commit/?id=d4f5e322

xfconf: Sync with gentoo-x86

Package-Manager: portage-2.2.23

 xfce-base/xfconf/metadata.xml       |  5 ++++-
 xfce-base/xfconf/xfconf-9999.ebuild | 14 ++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/xfce-base/xfconf/metadata.xml b/xfce-base/xfconf/metadata.xml
index 826e2ca..008cf47 100644
--- a/xfce-base/xfconf/metadata.xml
+++ b/xfce-base/xfconf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xfce</herd>
+  <maintainer>
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
 </pkgmetadata>

diff --git a/xfce-base/xfconf/xfconf-9999.ebuild b/xfce-base/xfconf/xfconf-9999.ebuild
index 7b50f7b..b2d0bdb 100644
--- a/xfce-base/xfconf/xfconf-9999.ebuild
+++ b/xfce-base/xfconf/xfconf-9999.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/xfce-base/xfconf/xfconf-4.12.0.ebuild,v 1.1 2015/03/08 15:06:39 mgorny Exp $
+# $Id$
 
 EAPI=5
 inherit xfconf
@@ -16,15 +16,18 @@ IUSE="debug perl"
 RDEPEND=">=dev-libs/dbus-glib-0.98
 	>=dev-libs/glib-2.30
 	>=xfce-base/libxfce4util-4.10
-	perl? ( dev-perl/glib-perl )"
+	perl? (
+		dev-lang/perl:=[-build(-)]
+		dev-perl/glib-perl
+	)"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
 	sys-devel/gettext
 	perl? (
-		dev-perl/extutils-depends
+		dev-perl/ExtUtils-Depends
 		dev-perl/extutils-pkgconfig
-		)"
+	)"
 
 pkg_setup() {
 	XFCONF=(
@@ -32,7 +35,6 @@ pkg_setup() {
 		$(xfconf_use_debug)
 		$(use_enable debug checks)
 		--with-perl-options=INSTALLDIRS=vendor
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
 		)
 
 	[[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
@@ -41,7 +43,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# http://bugzilla.xfce.org/show_bug.cgi?id=9556
+	# https://bugzilla.xfce.org/show_bug.cgi?id=9556
 	cat <<-EOF >> po/POTFILES.skip
 	xfconf-perl/xs/Xfconf.c
 	xfconf-perl/xs/XfconfBinding.c