commit: 322a779f5a5bbe3ee7cd4b3d6c5534b485ca23ee 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=322a779f
libxfce4ui: Sync with gentoo-x86 Package-Manager: portage-2.2.23 xfce-base/libxfce4ui/libxfce4ui-9999.ebuild | 13 ++++++------- xfce-base/libxfce4ui/metadata.xml | 7 +++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/xfce-base/libxfce4ui/libxfce4ui-9999.ebuild b/xfce-base/libxfce4ui/libxfce4ui-9999.ebuild index 21fcc9b..f32a7d2 100644 --- a/xfce-base/libxfce4ui/libxfce4ui-9999.ebuild +++ b/xfce-base/libxfce4ui/libxfce4ui-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/libxfce4ui/libxfce4ui-4.12.1.ebuild,v 1.1 2015/03/15 18:44:14 mgorny Exp $ +# $Id$ EAPI=5 inherit xfconf @@ -11,17 +11,16 @@ HOMEPAGE="http://www.xfce.org/projects/libxfce4"; LICENSE="LGPL-2" SLOT="0" KEYWORDS="" -IUSE="debug glade startup-notification" +IUSE="debug +gtk3 startup-notification" RDEPEND=">=dev-libs/glib-2.30:2= >=x11-libs/gtk+-2.24:2= - >=x11-libs/gtk+-3.2:3= x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= - glade? ( dev-util/glade:3= ) + gtk3? ( >=x11-libs/gtk+-3.2:3= ) startup-notification? ( x11-libs/startup-notification:= ) !xfce-base/xfce-utils" DEPEND="${RDEPEND} @@ -32,12 +31,12 @@ DEPEND="${RDEPEND} pkg_setup() { XFCONF=( - --enable-gtk3 $(use_enable startup-notification) - $(use_enable glade gladeui) + $(use_enable gtk3) $(xfconf_use_debug) + # requires deprecated glade:3 (gladeui-1.0), bug #551296 + --disable-gladeui --with-vendor-info=Gentoo - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html ) [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857 diff --git a/xfce-base/libxfce4ui/metadata.xml b/xfce-base/libxfce4ui/metadata.xml index 2391a70..c1ee9d4 100644 --- a/xfce-base/libxfce4ui/metadata.xml +++ b/xfce-base/libxfce4ui/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <herd>xfce</herd> + <maintainer> + <email>[email protected]</email> + <name>XFCE Team</name> + </maintainer> <use> - <flag name="glade">Build support for Glade 3's GtkBuilder implementation</flag> + <flag name='gtk3'>Enable gtk3 support</flag> </use> </pkgmetadata>
