summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2015-10-09 21:41:34 +0200
committerChristoph Mende <angelos@gentoo.org>2015-10-09 21:41:34 +0200
commit322a779f5a5bbe3ee7cd4b3d6c5534b485ca23ee (patch)
treef16097f9a4a44b758e67870d9f8da45bf11fbf2b
parentgarcon: Sync with gentoo-x86 (diff)
downloadxfce-322a779f5a5bbe3ee7cd4b3d6c5534b485ca23ee.tar.gz
xfce-322a779f5a5bbe3ee7cd4b3d6c5534b485ca23ee.tar.bz2
xfce-322a779f5a5bbe3ee7cd4b3d6c5534b485ca23ee.zip
libxfce4ui: Sync with gentoo-x86
Package-Manager: portage-2.2.23
-rw-r--r--xfce-base/libxfce4ui/libxfce4ui-9999.ebuild13
-rw-r--r--xfce-base/libxfce4ui/metadata.xml7
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>xfce@gentoo.org</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>