summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2015-10-09 21:41:39 +0200
committerChristoph Mende <angelos@gentoo.org>2015-10-09 21:41:39 +0200
commitdd4442f0c58780c1b432e8ab12b19f64abd7ec2d (patch)
tree84f419c33a39925e26dea5650afbf90b1fcaf58f
parentxfdesktop: Sync with gentoo-x86 (diff)
downloadxfce-dd4442f0c58780c1b432e8ab12b19f64abd7ec2d.tar.gz
xfce-dd4442f0c58780c1b432e8ab12b19f64abd7ec2d.tar.bz2
xfce-dd4442f0c58780c1b432e8ab12b19f64abd7ec2d.zip
xfwm4: Sync with gentoo-x86
Package-Manager: portage-2.2.23
-rw-r--r--xfce-base/xfwm4/metadata.xml5
-rw-r--r--xfce-base/xfwm4/xfwm4-9999.ebuild42
2 files changed, 26 insertions, 21 deletions
diff --git a/xfce-base/xfwm4/metadata.xml b/xfce-base/xfwm4/metadata.xml
index 826e2ca..008cf47 100644
--- a/xfce-base/xfwm4/metadata.xml
+++ b/xfce-base/xfwm4/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/xfwm4/xfwm4-9999.ebuild b/xfce-base/xfwm4/xfwm4-9999.ebuild
index 127a7fb..fb1e87e 100644
--- a/xfce-base/xfwm4/xfwm4-9999.ebuild
+++ b/xfce-base/xfwm4/xfwm4-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/xfwm4/xfwm4-4.12.2.ebuild,v 1.1 2015/03/15 21:43:33 mgorny Exp $
+# $Id$
EAPI=5
inherit xfconf
@@ -13,35 +13,37 @@ SLOT="0"
KEYWORDS=""
IUSE="debug dri startup-notification +xcomposite"
-RDEPEND=">=dev-libs/glib-2.20
- >=x11-libs/gtk+-2.24:2
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/pango
- >=x11-libs/libwnck-2.30:1
- >=xfce-base/libxfce4util-4.10
- >=xfce-base/libxfce4ui-4.10
- >=xfce-base/xfconf-4.10
- dri? ( >=x11-libs/libdrm-2.4 )
- startup-notification? ( x11-libs/startup-notification )
+RDEPEND="dev-libs/dbus-glib:=
+ >=dev-libs/glib-2.20:=
+ >=x11-libs/gtk+-2.24:2=
+ x11-libs/libX11:=
+ x11-libs/libXext:=
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/pango:=
+ >=x11-libs/libwnck-2.30:1=
+ >=xfce-base/libxfce4util-4.10:=
+ >=xfce-base/libxfce4ui-4.11:=
+ >=xfce-base/xfconf-4.10:=
+ startup-notification? ( x11-libs/startup-notification:= )
xcomposite? (
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
+ x11-libs/libXcomposite:=
+ x11-libs/libXdamage:=
+ x11-libs/libXfixes:=
)"
+# libICE/liBSM: not really used anywhere but checked by configure
+# https://bugzilla.xfce.org/show_bug.cgi?id=11914
DEPEND="${RDEPEND}
dev-util/intltool
sys-devel/gettext
+ x11-libs/libICE
+ x11-libs/libSM
+ xfce-base/exo
virtual/pkgconfig"
pkg_setup() {
XFCONF=(
--docdir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable dri libdrm)
$(use_enable startup-notification)
--enable-xsync
--enable-render