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

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

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

garcon: Sync with gentoo-x86

Package-Manager: portage-2.2.23

 xfce-base/garcon/garcon-9999.ebuild | 6 +++---
 xfce-base/garcon/metadata.xml       | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/xfce-base/garcon/garcon-9999.ebuild b/xfce-base/garcon/garcon-9999.ebuild
index 8fa2d7b..01122ba 100644
--- a/xfce-base/garcon/garcon-9999.ebuild
+++ b/xfce-base/garcon/garcon-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/garcon/garcon-0.5.0.ebuild,v 1.1 2015/04/05 12:57:21 mgorny Exp $
+# $Id$
 
 EAPI=5
 inherit xfconf
@@ -16,9 +16,10 @@ IUSE="debug"
 RDEPEND=">=dev-libs/glib-2.30:=
 	>=x11-libs/gtk+-2.24:2=
 	>=x11-libs/gtk+-3.14:3=
-	>=xfce-base/libxfce4ui-4.11.1:=
+	>=xfce-base/libxfce4ui-4.11.1:=[gtk3(+)]
 	>=xfce-base/libxfce4util-4.11:="
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig"
@@ -26,7 +27,6 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	XFCONF=(
 		$(xfconf_use_debug)
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
 		)
 
 	DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )

diff --git a/xfce-base/garcon/metadata.xml b/xfce-base/garcon/metadata.xml
index d56729e..008cf47 100644
--- a/xfce-base/garcon/metadata.xml
+++ b/xfce-base/garcon/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>