From: Yuta Satoh Date: Wed, 10 Jan 2018 13:56:02 +0000 (+0900) Subject: x11-wm/awesome: Fix dependency issue for Gentoo/FreeBSD. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7cc5885e6993af9eeb225171c0b439fb961bb124;p=gentoo.git x11-wm/awesome: Fix dependency issue for Gentoo/FreeBSD. Bug: https://bugs.gentoo.org/489984 Closes: https://github.com/gentoo/gentoo/pull/6817 Package-Manager: Portage-2.3.13, Repoman-2.3.3 --- diff --git a/x11-wm/awesome/awesome-3.5.6-r2.ebuild b/x11-wm/awesome/awesome-3.5.6-r2.ebuild index ada253ff8f8e..cd7b7ca16cae 100644 --- a/x11-wm/awesome/awesome-3.5.6-r2.ebuild +++ b/x11-wm/awesome/awesome-3.5.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -28,7 +28,7 @@ COMMON_DEPEND=" x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${COMMON_DEPEND} diff --git a/x11-wm/awesome/awesome-3.5.7.ebuild b/x11-wm/awesome/awesome-3.5.7.ebuild index c3473fd22bd5..839456e65e9c 100644 --- a/x11-wm/awesome/awesome-3.5.7.ebuild +++ b/x11-wm/awesome/awesome-3.5.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -28,7 +28,7 @@ COMMON_DEPEND=" x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${COMMON_DEPEND} diff --git a/x11-wm/awesome/awesome-3.5.8.ebuild b/x11-wm/awesome/awesome-3.5.8.ebuild index c3473fd22bd5..839456e65e9c 100644 --- a/x11-wm/awesome/awesome-3.5.8.ebuild +++ b/x11-wm/awesome/awesome-3.5.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -28,7 +28,7 @@ COMMON_DEPEND=" x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${COMMON_DEPEND} diff --git a/x11-wm/awesome/awesome-3.5.9.ebuild b/x11-wm/awesome/awesome-3.5.9-r1.ebuild similarity index 96% rename from x11-wm/awesome/awesome-3.5.9.ebuild rename to x11-wm/awesome/awesome-3.5.9-r1.ebuild index c3473fd22bd5..839456e65e9c 100644 --- a/x11-wm/awesome/awesome-3.5.9.ebuild +++ b/x11-wm/awesome/awesome-3.5.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -28,7 +28,7 @@ COMMON_DEPEND=" x11-libs/libXcursor >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${COMMON_DEPEND} diff --git a/x11-wm/awesome/awesome-4.0-r1.ebuild b/x11-wm/awesome/awesome-4.0-r1.ebuild index 3dddc28075a9..826268e38185 100644 --- a/x11-wm/awesome/awesome-4.0-r1.ebuild +++ b/x11-wm/awesome/awesome-4.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,7 +33,7 @@ RDEPEND=" x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${RDEPEND} diff --git a/x11-wm/awesome/awesome-4.0.ebuild b/x11-wm/awesome/awesome-4.0.ebuild index eed4554091af..ee9a7cf8b691 100644 --- a/x11-wm/awesome/awesome-4.0.ebuild +++ b/x11-wm/awesome/awesome-4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,7 +33,7 @@ RDEPEND=" x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${RDEPEND} diff --git a/x11-wm/awesome/awesome-4.1.ebuild b/x11-wm/awesome/awesome-4.1.ebuild index 65af18c4d489..2e8cefe90f62 100644 --- a/x11-wm/awesome/awesome-4.1.ebuild +++ b/x11-wm/awesome/awesome-4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,7 +33,7 @@ RDEPEND=" x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${RDEPEND} diff --git a/x11-wm/awesome/awesome-4.2.ebuild b/x11-wm/awesome/awesome-4.2.ebuild index 61644c037673..170a680ce24f 100644 --- a/x11-wm/awesome/awesome-4.2.ebuild +++ b/x11-wm/awesome/awesome-4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,7 +33,7 @@ RDEPEND=" x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${RDEPEND} diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild index 243752a5d4a3..d26ba4a2ba97 100644 --- a/x11-wm/awesome/awesome-9999.ebuild +++ b/x11-wm/awesome/awesome-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -32,7 +32,7 @@ RDEPEND=" x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo )" + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${RDEPEND}