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 ada253ff8f8efe65f5151887bb4432956e2ab9a2..cd7b7ca16cae90416815c3d9028f24347cc4bfc7 100644 (file)
--- 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 c3473fd22bd58b70f0ebcf102d887841770564c5..839456e65e9c2f41af2e2af4fbb58bad3714ec6e 100644 (file)
--- 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 c3473fd22bd58b70f0ebcf102d887841770564c5..839456e65e9c2f41af2e2af4fbb58bad3714ec6e 100644 (file)
--- 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 c3473fd22bd58b70f0ebcf102d887841770564c5..839456e65e9c2f41af2e2af4fbb58bad3714ec6e 100644 (file)
--- 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 3dddc28075a9ce0105b76368c105bf4d9483346c..826268e38185204e71964f5c9caed70a4e9de77e 100644 (file)
--- 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 eed4554091af2829d8fa6a1d9aacd52808a46998..ee9a7cf8b691e8399f7887bbe6ab5f16ec7374e5 100644 (file)
--- 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 65af18c4d4897d7eac206dd4accd10ab33cfec86..2e8cefe90f6203792a7e68a2be5a88fcc8293977 100644 (file)
--- 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 61644c03767349be50d0a4a1d1987d7aa54a10b8..170a680ce24f2c4fe7fce52f83a6ce115d904dc6 100644 (file)
--- 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 243752a5d4a305ffc35fc02f0741e7481773d488..d26ba4a2ba97f83b5fede1aed854f2434b4c6b97 100644 (file)
--- 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}