From 373251a4cabf91b87ab78e6b2784d07c29a0b321 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 3 Mar 2015 19:36:33 +0200 Subject: relax deps to match with upstream, enable gtk3 support on xfce-panel, add xfce4-dev-tools --- dev-util/xfce4-dev-tools/Manifest | 1 + .../xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild | 23 ++++++++++++++++++++++ xfce-base/exo/exo-0.10.3.ebuild | 4 ++-- xfce-base/garcon/garcon-0.4.0.ebuild | 4 ++-- xfce-base/libxfce4ui/libxfce4ui-4.12.0.ebuild | 2 +- xfce-base/thunar/thunar-1.6.6.ebuild | 10 +++++----- .../xfce4-appfinder/xfce4-appfinder-4.12.0.ebuild | 8 ++++---- xfce-base/xfce4-panel/Manifest | 1 + xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild | 14 +++++++------ .../xfce4-session/xfce4-session-4.12.0.ebuild | 6 +++--- .../xfce4-settings/xfce4-settings-4.12.0.ebuild | 10 +++++----- xfce-base/xfconf/xfconf-4.12.0.ebuild | 2 +- xfce-base/xfdesktop/xfdesktop-4.12.0.ebuild | 10 +++++----- xfce-base/xfwm4/xfwm4-4.12.0.ebuild | 6 +++--- .../thunar-volman/thunar-volman-0.8.1.ebuild | 8 ++++---- .../xfce4-power-manager-1.4.3.ebuild | 8 ++++---- 16 files changed, 72 insertions(+), 45 deletions(-) create mode 100644 dev-util/xfce4-dev-tools/Manifest create mode 100644 dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild create mode 100644 xfce-base/xfce4-panel/Manifest diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest new file mode 100644 index 00000000..797e43fc --- /dev/null +++ b/dev-util/xfce4-dev-tools/Manifest @@ -0,0 +1 @@ +DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 SHA256 e2e3a654fe9110df81f8c2483c9cbfa6d656fed15d5e5e717d6ef10bd0f5b5cb SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31 WHIRLPOOL 27963f582fc568097c943133fbe7517cc27c526b795ca7813b4b91c2707ee82e55012044c6cedc1120b24614f988048fbeb2a0eb528c57d63cd016d3faa22d23 diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild new file mode 100644 index 00000000..315922cc --- /dev/null +++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.11.0.ebuild,v 1.1 2014/03/11 13:09:57 ssuominen Exp $ + +EAPI=5 +inherit xfconf + +DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance" +HOMEPAGE="http://www.xfce.org/ http://foo-projects.org/~benny/projects/xfce4-dev-tools/" +SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris" +IUSE="" + +RDEPEND=">=dev-libs/glib-2.24" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +pkg_setup() { + DOCS=( AUTHORS ChangeLog HACKING NEWS README ) +} diff --git a/xfce-base/exo/exo-0.10.3.ebuild b/xfce-base/exo/exo-0.10.3.ebuild index 44070a0d..61e63e35 100644 --- a/xfce-base/exo/exo-0.10.3.ebuild +++ b/xfce-base/exo/exo-0.10.3.ebuild @@ -17,8 +17,8 @@ RDEPEND=">=dev-lang/perl-5.6 >=dev-libs/glib-2.30 dev-perl/URI >=x11-libs/gtk+-2.24:2 - >=xfce-base/libxfce4ui-4.12 - >=xfce-base/libxfce4util-4.12" + >=xfce-base/libxfce4ui-4.10.0 + >=xfce-base/libxfce4util-4.10.0" DEPEND="${RDEPEND} dev-util/intltool sys-devel/gettext diff --git a/xfce-base/garcon/garcon-0.4.0.ebuild b/xfce-base/garcon/garcon-0.4.0.ebuild index 96a0a8f0..fb6dc7f1 100644 --- a/xfce-base/garcon/garcon-0.4.0.ebuild +++ b/xfce-base/garcon/garcon-0.4.0.ebuild @@ -15,8 +15,8 @@ IUSE="debug" RDEPEND=">=dev-libs/glib-2.30 >=x11-libs/gtk+-2.24:2 - >=xfce-base/libxfce4ui-4.12 - >=xfce-base/libxfce4util-4.12" + >=xfce-base/libxfce4ui-4.10.0 + >=xfce-base/libxfce4util-4.10.0" DEPEND="${RDEPEND} dev-util/intltool sys-devel/gettext diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.12.0.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.12.0.ebuild index 3a8a6fcb..96c4dd87 100644 --- a/xfce-base/libxfce4ui/libxfce4ui-4.12.0.ebuild +++ b/xfce-base/libxfce4ui/libxfce4ui-4.12.0.ebuild @@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/glib-2.28 x11-libs/libICE x11-libs/libSM >=xfce-base/libxfce4util-4.12.1 - >=xfce-base/xfconf-4.10 + >=xfce-base/xfconf-4.12.0 glade? ( dev-util/glade:3 ) startup-notification? ( x11-libs/startup-notification ) !xfce-base/xfce-utils" diff --git a/xfce-base/thunar/thunar-1.6.6.ebuild b/xfce-base/thunar/thunar-1.6.6.ebuild index ba2716f7..5f711dce 100644 --- a/xfce-base/thunar/thunar-1.6.6.ebuild +++ b/xfce-base/thunar/thunar-1.6.6.ebuild @@ -20,17 +20,17 @@ COMMON_DEPEND=">=dev-lang/perl-5.6 >=dev-libs/glib-2.30 >=x11-libs/gdk-pixbuf-2.14 >=x11-libs/gtk+-2.24:2 - >=xfce-base/exo-0.10.3 - >=xfce-base/libxfce4ui-4.12.0 - >=xfce-base/libxfce4util-4.12.1 - >=xfce-base/xfconf-4.12.0 + >=xfce-base/exo-0.10.0 + >=xfce-base/libxfce4ui-4.10.0 + >=xfce-base/libxfce4util-4.10.0 + >=xfce-base/xfconf-4.10.0 dbus? ( >=dev-libs/dbus-glib-0.100 ) exif? ( >=media-libs/libexif-0.6.19 ) libnotify? ( >=x11-libs/libnotify-0.7 ) pcre? ( >=dev-libs/libpcre-6 ) startup-notification? ( x11-libs/startup-notification ) udisks? ( virtual/libgudev:= ) - xfce_plugins_trash? ( >=xfce-base/xfce4-panel-4.12.0 )" + xfce_plugins_trash? ( >=xfce-base/xfce4-panel-4.10.0 )" RDEPEND="${COMMON_DEPEND} >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info diff --git a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0.ebuild b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0.ebuild index b0c8fe00..d8da6476 100644 --- a/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0.ebuild +++ b/xfce-base/xfce4-appfinder/xfce4-appfinder-4.12.0.ebuild @@ -16,10 +16,10 @@ IUSE="debug" RDEPEND=">=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.30 >=x11-libs/gtk+-3.2:3 - >=xfce-base/garcon-0.4.0 - >=xfce-base/libxfce4util-4.12.1 - >=xfce-base/libxfce4ui-4.12.0 - >=xfce-base/xfconf-4.12.0 + >=xfce-base/garcon-0.3.0 + >=xfce-base/libxfce4util-4.10.1 + >=xfce-base/libxfce4ui-4.10.0 + >=xfce-base/xfconf-4.10.0 !xfce-base/xfce-utils" DEPEND="${RDEPEND} dev-util/intltool diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest new file mode 100644 index 00000000..5f0b9753 --- /dev/null +++ b/xfce-base/xfce4-panel/Manifest @@ -0,0 +1 @@ +DIST xfce4-panel-4.12.0.tar.bz2 1107470 SHA256 30920fc2e2fc26279a82b5261a155c2cc15ab2aa1ced2275684a6ff8261b97b0 SHA512 9b5d0d51ac2c312d54e8daeea95bd861891e652faeee8b4a7dbf4b33507b70bf7b4fbca7cb8f2d3573699ae940a14d5a9a41da24f324db256146d8b7db8519a8 WHIRLPOOL 5468a67b2c4fe1fcf82d3f38a0a0a057f3dac714354f2b2e8ce0c2a8654ac92cf4d0c40b0a0ec00957da2db67db3cec2017673bfc0eeaac69a98e2f92d31c3f1 diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild index e2d2e44c..d7d61d7d 100644 --- a/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild +++ b/xfce-base/xfce4-panel/xfce4-panel-4.12.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="debug" +IUSE="debug gtk3" RDEPEND=">=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.24 @@ -19,11 +19,12 @@ RDEPEND=">=dev-libs/dbus-glib-0.100 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.31:1 - >=xfce-base/exo-0.10.3 - >=xfce-base/garcon-0.4.0 - >=xfce-base/libxfce4ui-4.12.0 - >=xfce-base/libxfce4util-4.12.1 - >=xfce-base/xfconf-4.12.0" + >=xfce-base/exo-0.10.0 + >=xfce-base/garcon-0.3.0 + >=xfce-base/libxfce4ui-4.11.0 + >=xfce-base/libxfce4util-4.10.0 + >=xfce-base/xfconf-4.10.0 + gtk3? ( >=x11-libs/gtk+-3.2:3 )" DEPEND="${RDEPEND} dev-lang/perl dev-util/intltool @@ -38,6 +39,7 @@ pkg_setup() { XFCONF=( --docdir="${EPREFIX}"/usr/share/doc/${PF} $(xfconf_use_debug) + $(use_enable gtk3) --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html ) diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.0.ebuild index 599a20b8..ea0044d8 100644 --- a/xfce-base/xfce4-session/xfce4-session-4.12.0.ebuild +++ b/xfce-base/xfce4-session/xfce4-session-4.12.0.ebuild @@ -19,9 +19,9 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100 x11-libs/libSM >=x11-libs/libwnck-2.30:1 x11-libs/libX11 - >=xfce-base/libxfce4util-4.12.1 - >=xfce-base/libxfce4ui-4.12.0 - >=xfce-base/xfconf-4.12.0 + >=xfce-base/libxfce4util-4.10.0 + >=xfce-base/libxfce4ui-4.10.0 + >=xfce-base/xfconf-4.10.0 !xfce-base/xfce-utils upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) polkit? ( >=sys-auth/polkit-0.100 )" diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild index cb0a4a1a..c342a0d0 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.0.ebuild @@ -21,11 +21,11 @@ RDEPEND=">=dev-libs/dbus-glib-0.100 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXrandr-1.2 - >=xfce-base/garcon-0.4.0 - >=xfce-base/exo-0.10.3 - >=xfce-base/libxfce4ui-4.12.0 - >=xfce-base/libxfce4util-4.12.1 - >=xfce-base/xfconf-4.12.0 + >=xfce-base/garcon-0.2.0 + >=xfce-base/exo-0.10.0 + >=xfce-base/libxfce4ui-4.11.0 + >=xfce-base/libxfce4util-4.10.0 + >=xfce-base/xfconf-4.10.0 libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) libnotify? ( >=x11-libs/libnotify-0.7 ) upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) diff --git a/xfce-base/xfconf/xfconf-4.12.0.ebuild b/xfce-base/xfconf/xfconf-4.12.0.ebuild index 548a1fdb..73e950b2 100644 --- a/xfce-base/xfconf/xfconf-4.12.0.ebuild +++ b/xfce-base/xfconf/xfconf-4.12.0.ebuild @@ -15,7 +15,7 @@ IUSE="debug perl" RDEPEND=">=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.24 - >=xfce-base/libxfce4util-4.12.1 + >=xfce-base/libxfce4util-4.10.0 perl? ( dev-perl/glib-perl )" DEPEND="${RDEPEND} dev-util/intltool diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.0.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.0.ebuild index 840d96dc..33a04db3 100644 --- a/xfce-base/xfdesktop/xfdesktop-4.12.0.ebuild +++ b/xfce-base/xfdesktop/xfdesktop-4.12.0.ebuild @@ -20,11 +20,11 @@ RDEPEND=">=dev-libs/dbus-glib-0.100 x11-libs/libSM >=x11-libs/libwnck-2.30:1 x11-libs/libX11 - >=xfce-base/exo-0.10.3 - >=xfce-base/garcon-0.4.0 - >=xfce-base/libxfce4ui-4.12.0 - >=xfce-base/libxfce4util-4.12.1 - >=xfce-base/xfconf-4.12.0 + >=xfce-base/exo-0.10.0 + >=xfce-base/garcon-0.3.0 + >=xfce-base/libxfce4ui-4.11.1 + >=xfce-base/libxfce4util-4.10.0 + >=xfce-base/xfconf-4.10.0 libnotify? ( >=x11-libs/libnotify-0.7 ) thunar? ( >=dev-libs/glib-2.38 diff --git a/xfce-base/xfwm4/xfwm4-4.12.0.ebuild b/xfce-base/xfwm4/xfwm4-4.12.0.ebuild index abc12f69..3cb9110f 100644 --- a/xfce-base/xfwm4/xfwm4-4.12.0.ebuild +++ b/xfce-base/xfwm4/xfwm4-4.12.0.ebuild @@ -23,9 +23,9 @@ RDEPEND=">=dev-libs/glib-2.20 x11-libs/libXrender x11-libs/pango >=x11-libs/libwnck-2.30:1 - >=xfce-base/libxfce4util-4.12.1 - >=xfce-base/libxfce4ui-4.12.0 - >=xfce-base/xfconf-4.12.0 + >=xfce-base/libxfce4util-4.10.0 + >=xfce-base/libxfce4ui-4.11.0 + >=xfce-base/xfconf-4.10.0 dri? ( >=x11-libs/libdrm-2.4 ) startup-notification? ( x11-libs/startup-notification ) xcomposite? ( diff --git a/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild index d08d6203..40e5b4be 100644 --- a/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild +++ b/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild @@ -16,10 +16,10 @@ IUSE="debug libnotify" COMMON_DEPEND=">=dev-libs/glib-2.20 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 - >=xfce-base/exo-0.10.3 - >=xfce-base/libxfce4ui-4.12.0 - >=xfce-base/libxfce4util-4.12.1 - >=xfce-base/xfconf-4.12.0 + >=xfce-base/exo-0.10.0 + >=xfce-base/libxfce4ui-4.10.0 + >=xfce-base/libxfce4util-4.10.1 + >=xfce-base/xfconf-4.10.0 libnotify? ( >=x11-libs/libnotify-0.7 )" RDEPEND="${COMMON_DEPEND} virtual/udev diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.3.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.3.ebuild index ebb4ba28..156fc2b2 100644 --- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.3.ebuild +++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.4.3.ebuild @@ -22,12 +22,12 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100.2 x11-libs/libX11 >=x11-libs/libXrandr-1.2 x11-libs/libXext - >=xfce-base/xfconf-4.12.0 - >=xfce-base/libxfce4ui-4.12.0 - >=xfce-base/libxfce4util-4.12.1 + >=xfce-base/xfconf-4.10.0 + >=xfce-base/libxfce4ui-4.10.0 + >=xfce-base/libxfce4util-4.10.0 lxpanel? ( lxde-base/lxpanel ) policykit? ( >=sys-auth/polkit-0.112 ) - xfce_plugins_power? ( >=xfce-base/xfce4-panel-4.12.0 )" + xfce_plugins_power? ( >=xfce-base/xfce4-panel-4.10.0 )" # USE="systemd" is for ensuring hibernate/suspend works by enforcing correct runtime -only dependencies RDEPEND="${COMMON_DEPEND} networkmanager? ( net-misc/networkmanager ) -- cgit v1.2.3