| 1 |
On 12/23/15 10:44 AM, Michał Górny wrote: |
| 2 |
> --- |
| 3 |
> app-emulation/xen-tools/xen-tools-4.2.5-r10.ebuild | 2 +- |
| 4 |
> app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild | 2 +- |
| 5 |
> app-emulation/xen-tools/xen-tools-4.5.2-r2.ebuild | 4 ++-- |
| 6 |
> app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild | 4 ++-- |
| 7 |
> app-emulation/xen-tools/xen-tools-4.6.0-r4.ebuild | 2 +- |
| 8 |
> app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild | 2 +- |
| 9 |
> 6 files changed, 8 insertions(+), 8 deletions(-) |
| 10 |
> |
| 11 |
> diff --git a/app-emulation/xen-tools/xen-tools-4.2.5-r10.ebuild b/app-emulation/xen-tools/xen-tools-4.2.5-r10.ebuild |
| 12 |
> index 67e3d1c..d29aab3 100644 |
| 13 |
> --- a/app-emulation/xen-tools/xen-tools-4.2.5-r10.ebuild |
| 14 |
> +++ b/app-emulation/xen-tools/xen-tools-4.2.5-r10.ebuild |
| 15 |
> @@ -68,7 +68,7 @@ DEPEND="dev-libs/lzo:2 |
| 16 |
> api? ( dev-libs/libxml2 |
| 17 |
> net-misc/curl ) |
| 18 |
> ${PYTHON_DEPS} |
| 19 |
> - pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) |
| 20 |
> + pygrub? ( $(python_gen_impl_dep ncurses) ) |
| 21 |
> sys-devel/bin86 |
| 22 |
> sys-devel/dev86 |
| 23 |
> dev-lang/perl |
| 24 |
> diff --git a/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild b/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild |
| 25 |
> index ae93f4d..392be10 100644 |
| 26 |
> --- a/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild |
| 27 |
> +++ b/app-emulation/xen-tools/xen-tools-4.2.5-r11.ebuild |
| 28 |
> @@ -68,7 +68,7 @@ DEPEND="dev-libs/lzo:2 |
| 29 |
> api? ( dev-libs/libxml2 |
| 30 |
> net-misc/curl ) |
| 31 |
> ${PYTHON_DEPS} |
| 32 |
> - pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) |
| 33 |
> + pygrub? ( $(python_gen_impl_dep ncurses) ) |
| 34 |
> sys-devel/bin86 |
| 35 |
> sys-devel/dev86 |
| 36 |
> dev-lang/perl |
| 37 |
> diff --git a/app-emulation/xen-tools/xen-tools-4.5.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.5.2-r2.ebuild |
| 38 |
> index 8af652c..ba2f756 100644 |
| 39 |
> --- a/app-emulation/xen-tools/xen-tools-4.5.2-r2.ebuild |
| 40 |
> +++ b/app-emulation/xen-tools/xen-tools-4.5.2-r2.ebuild |
| 41 |
> @@ -87,8 +87,8 @@ DEPEND="${COMMON_DEPEND} |
| 42 |
> ${PYTHON_DEPS} |
| 43 |
> api? ( dev-libs/libxml2 |
| 44 |
> net-misc/curl ) |
| 45 |
> - pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) |
| 46 |
> - ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} ) |
| 47 |
> + pygrub? ( $(python_gen_impl_dep ncurses) ) |
| 48 |
> + ovmf? ( $(python_gen_impl_dep sqlite) ) |
| 49 |
> !amd64? ( >=sys-apps/dtc-1.4.0 ) |
| 50 |
> amd64? ( sys-devel/bin86 |
| 51 |
> system-seabios? ( sys-firmware/seabios ) |
| 52 |
> diff --git a/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild |
| 53 |
> index 59e9056..a147169 100644 |
| 54 |
> --- a/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild |
| 55 |
> +++ b/app-emulation/xen-tools/xen-tools-4.5.2-r3.ebuild |
| 56 |
> @@ -90,8 +90,8 @@ DEPEND="${COMMON_DEPEND} |
| 57 |
> ${PYTHON_DEPS} |
| 58 |
> api? ( dev-libs/libxml2 |
| 59 |
> net-misc/curl ) |
| 60 |
> - pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} ) |
| 61 |
> - ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} ) |
| 62 |
> + pygrub? ( $(python_gen_impl_dep ncurses) ) |
| 63 |
> + ovmf? ( $(python_gen_impl_dep sqlite) ) |
| 64 |
> !amd64? ( >=sys-apps/dtc-1.4.0 ) |
| 65 |
> amd64? ( sys-devel/bin86 |
| 66 |
> system-seabios? ( sys-firmware/seabios ) |
| 67 |
> diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r4.ebuild |
| 68 |
> index 57d618e..e9f84c0 100644 |
| 69 |
> --- a/app-emulation/xen-tools/xen-tools-4.6.0-r4.ebuild |
| 70 |
> +++ b/app-emulation/xen-tools/xen-tools-4.6.0-r4.ebuild |
| 71 |
> @@ -87,7 +87,7 @@ DEPEND="${COMMON_DEPEND} |
| 72 |
> ${PYTHON_DEPS} |
| 73 |
> api? ( dev-libs/libxml2 |
| 74 |
> net-misc/curl ) |
| 75 |
> - ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} ) |
| 76 |
> + ovmf? ( $(python_gen_impl_dep sqlite) ) |
| 77 |
> !amd64? ( >=sys-apps/dtc-1.4.0 ) |
| 78 |
> amd64? ( sys-devel/bin86 |
| 79 |
> system-seabios? ( sys-firmware/seabios ) |
| 80 |
> diff --git a/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild |
| 81 |
> index 104fac9..ceb1402 100644 |
| 82 |
> --- a/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild |
| 83 |
> +++ b/app-emulation/xen-tools/xen-tools-4.6.0-r5.ebuild |
| 84 |
> @@ -90,7 +90,7 @@ DEPEND="${COMMON_DEPEND} |
| 85 |
> ${PYTHON_DEPS} |
| 86 |
> api? ( dev-libs/libxml2 |
| 87 |
> net-misc/curl ) |
| 88 |
> - ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} ) |
| 89 |
> + ovmf? ( $(python_gen_impl_dep sqlite) ) |
| 90 |
> !amd64? ( >=sys-apps/dtc-1.4.0 ) |
| 91 |
> amd64? ( sys-devel/bin86 |
| 92 |
> system-seabios? ( sys-firmware/seabios ) |
| 93 |
> |
| 94 |
|
| 95 |
Acked-by: Doug Goldstein <cardoe@××××××.com> |
| 96 |
|
| 97 |
I actually made ncurses always required in recent versions to try and |
| 98 |
avoid this hack. I'm glad there's a nicer way to officially do this. |
| 99 |
|
| 100 |
-- |
| 101 |
Doug Goldstein |
Archives