summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-06-20 19:53:25 +0000
committerMichał Górny <mgorny@gentoo.org>2015-06-20 19:53:25 +0000
commita7f17a02d2769e79dfc3cf0821dd4a552b745878 (patch)
tree3f3b9ebb13222b0cfb6f7421d9b57feeb51269e3 /xfce-base/libxfce4ui
parentAdd 3.4.9 release. (diff)
downloadgentoo-2-a7f17a02d2769e79dfc3cf0821dd4a552b745878.tar.gz
gentoo-2-a7f17a02d2769e79dfc3cf0821dd4a552b745878.tar.bz2
gentoo-2-a7f17a02d2769e79dfc3cf0821dd4a552b745878.zip
Drop USE=glade as it uses deprecated glade:3, bug #551296.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'xfce-base/libxfce4ui')
-rw-r--r--xfce-base/libxfce4ui/ChangeLog8
-rw-r--r--xfce-base/libxfce4ui/libxfce4ui-4.12.1-r1.ebuild8
-rw-r--r--xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild (renamed from xfce-base/libxfce4ui/libxfce4ui-4.12.1.ebuild)12
3 files changed, 17 insertions, 11 deletions
diff --git a/xfce-base/libxfce4ui/ChangeLog b/xfce-base/libxfce4ui/ChangeLog
index 9de02955ea4c..2a83ffad17bc 100644
--- a/xfce-base/libxfce4ui/ChangeLog
+++ b/xfce-base/libxfce4ui/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for xfce-base/libxfce4ui
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/ChangeLog,v 1.57 2015/05/11 17:55:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/ChangeLog,v 1.58 2015/06/20 19:53:25 mgorny Exp $
+
+*libxfce4ui-4.12.1-r2 (20 Jun 2015)
+
+ 20 Jun 2015; Michał Górny <mgorny@gentoo.org> +libxfce4ui-4.12.1-r2.ebuild,
+ -libxfce4ui-4.12.1.ebuild, libxfce4ui-4.12.1-r1.ebuild:
+ Drop USE=glade as it uses deprecated glade:3, bug #551296.
*libxfce4ui-4.12.1-r1 (11 May 2015)
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r1.ebuild
index 793ac78beb3d..e9baf5fb69c1 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r1.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-r1.ebuild,v 1.1 2015/05/11 17:55:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r1.ebuild,v 1.2 2015/06/20 19:53:25 mgorny Exp $
EAPI=5
inherit xfconf
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade +gtk3 startup-notification"
+IUSE="debug +gtk3 startup-notification"
RDEPEND=">=dev-libs/glib-2.30:2=
>=x11-libs/gtk+-2.24:2=
@@ -21,7 +21,6 @@ RDEPEND=">=dev-libs/glib-2.30:2=
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"
@@ -34,9 +33,10 @@ DEPEND="${RDEPEND}
pkg_setup() {
XFCONF=(
$(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
)
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.12.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild
index 404e240c7dcf..43393c06e595 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.12.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.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 $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild,v 1.1 2015/06/20 19:53:25 mgorny Exp $
EAPI=5
inherit xfconf
@@ -12,17 +12,16 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-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}
@@ -33,10 +32,11 @@ 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
)