diff options
| -rw-r--r-- | xfce-base/xfce4-settings/ChangeLog | 7 | ||||
| -rw-r--r-- | xfce-base/xfce4-settings/metadata.xml | 10 | ||||
| -rw-r--r-- | xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild | 9 | ||||
| -rw-r--r-- | xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild | 11 | ||||
| -rw-r--r-- | xfce-base/xfce4-settings/xfce4-settings-4.8.1.ebuild | 10 |
5 files changed, 25 insertions, 22 deletions
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog index 1fcacb028f53..6e09808d1385 100644 --- a/xfce-base/xfce4-settings/ChangeLog +++ b/xfce-base/xfce4-settings/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for xfce-base/xfce4-settings # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.67 2011/02/05 18:45:40 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.68 2011/02/12 09:53:18 ssuominen Exp $ + + 12 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> + xfce4-settings-4.6.5.ebuild, xfce4-settings-4.8.0.ebuild, + xfce4-settings-4.8.1.ebuild, metadata.xml: + Rename USE="sound" to USE="libcanberra" wrt #354585 by Ulrich Müller. 05 Feb 2011; Markus Meier <maekke@gentoo.org> xfce4-settings-4.8.0.ebuild: arm stable, bug #349053 diff --git a/xfce-base/xfce4-settings/metadata.xml b/xfce-base/xfce4-settings/metadata.xml index 84d44f1dec11..21bbdbdae78b 100644 --- a/xfce-base/xfce4-settings/metadata.xml +++ b/xfce-base/xfce4-settings/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>xfce</herd> -<use> - <flag name='sound'>Enable sound event support with <pkg>media-libs/libcanberra</pkg></flag> - <flag name='keyboard'>Enable Keyboard layout selection with <pkg>x11-libs/libxklavier</pkg></flag> -</use> + <herd>xfce</herd> + <use> + <flag name='libcanberra'>Enable sound event support with <pkg>media-libs/libcanberra</pkg></flag> + <flag name='keyboard'>Enable Keyboard layout selection with <pkg>x11-libs/libxklavier</pkg></flag> + </use> </pkgmetadata> diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild index 36ecd2e7699f..128975774b37 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild,v 1.10 2011/01/29 20:23:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.5.ebuild,v 1.11 2011/02/12 09:53:18 ssuominen Exp $ EAPI=3 EAUTORECONF=yes @@ -13,7 +13,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.6/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="debug +keyboard libnotify sound" +IUSE="debug +keyboard libcanberra libnotify" RDEPEND=">=dev-libs/glib-2.12:2 >=dev-libs/dbus-glib-0.34 @@ -30,8 +30,7 @@ RDEPEND=">=dev-libs/glib-2.12:2 >=xfce-base/exo-0.3.100 libnotify? ( <x11-libs/libnotify-0.7 ) keyboard? ( >=x11-libs/libxklavier-0.3 ) - sound? ( media-libs/libcanberra ) - !<x11-base/xorg-server-1.5.3" + libcanberra? ( media-libs/libcanberra )" DEPEND="${RDEPEND} dev-util/intltool sys-devel/gettext @@ -43,7 +42,7 @@ pkg_setup() { XFCONF="--disable-dependency-tracking $(use_enable libnotify) $(use_enable keyboard libxklavier) - $(use_enable sound sound-settings) + $(use_enable libcanberra sound-settings) $(xfconf_use_debug)" DOCS="AUTHORS ChangeLog NEWS TODO" PATCHES=( "${FILESDIR}/${PN}-4.6.3-exo.patch" ) diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild index 2f1fc2f2e373..0aaac9482857 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild,v 1.5 2011/02/05 18:45:40 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.8.0.ebuild,v 1.6 2011/02/12 09:53:18 ssuominen Exp $ EAPI=3 inherit xfconf @@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.8/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="debug +keyboard libnotify sound" +IUSE="debug +keyboard libcanberra libnotify" RDEPEND=">=dev-libs/glib-2.16:2 >=dev-libs/dbus-glib-0.88 @@ -26,10 +26,9 @@ RDEPEND=">=dev-libs/glib-2.16:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfconf-4.8 >=xfce-base/exo-0.6 + libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) libnotify? ( >=x11-libs/libnotify-0.1.3 ) - keyboard? ( >=x11-libs/libxklavier-0.3 ) - sound? ( >=media-libs/libcanberra-0.25[sound] ) - !<x11-base/xorg-server-1.5.3" + keyboard? ( >=x11-libs/libxklavier-0.3 )" DEPEND="${RDEPEND} dev-util/intltool sys-devel/gettext @@ -43,7 +42,7 @@ pkg_setup() { --disable-static $(use_enable libnotify) $(use_enable keyboard libxklavier) - $(use_enable sound sound-settings) + $(use_enable libcanberra sound-settings) $(xfconf_use_debug) ) diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.8.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.8.1.ebuild index 91d7d1faa252..6ec7ca19d7d4 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.8.1.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.8.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.8.1.ebuild,v 1.1 2011/01/30 17:00:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.8.1.ebuild,v 1.2 2011/02/12 09:53:18 ssuominen Exp $ EAPI=3 inherit xfconf @@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/4.8/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="debug +keyboard libnotify sound" +IUSE="debug +keyboard libcanberra libnotify" RDEPEND=">=dev-libs/glib-2.16:2 >=dev-libs/dbus-glib-0.88 @@ -26,9 +26,9 @@ RDEPEND=">=dev-libs/glib-2.16:2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfconf-4.8 >=xfce-base/exo-0.6 + libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) libnotify? ( >=x11-libs/libnotify-0.1.3 ) - keyboard? ( >=x11-libs/libxklavier-0.3 ) - sound? ( >=media-libs/libcanberra-0.25[sound] )" + keyboard? ( >=x11-libs/libxklavier-0.3 )" DEPEND="${RDEPEND} dev-util/intltool dev-util/pkgconfig @@ -42,7 +42,7 @@ pkg_setup() { --disable-static $(use_enable libnotify) $(use_enable keyboard libxklavier) - $(use_enable sound sound-settings) + $(use_enable libcanberra sound-settings) $(xfconf_use_debug) ) |