| 1 |
commit: 8db352582467fddce2faaaf9a623f9003f73e80e |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 27 13:41:39 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 27 15:03:10 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db35258 |
| 7 |
|
| 8 |
sys-boot/plymouth: Don't run eautoreconf in src_configure (QA fix). |
| 9 |
|
| 10 |
Converted myconf variable in an array. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/7299 |
| 14 |
|
| 15 |
sys-boot/plymouth/plymouth-0.9.3-r1.ebuild | 39 +++++++++++++++++------------- |
| 16 |
sys-boot/plymouth/plymouth-0.9.3.ebuild | 37 ++++++++++++++++------------ |
| 17 |
sys-boot/plymouth/plymouth-9999.ebuild | 37 ++++++++++++++++------------ |
| 18 |
3 files changed, 64 insertions(+), 49 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild |
| 21 |
index d73c2b13a9f..07707fbd471 100644 |
| 22 |
--- a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild |
| 23 |
+++ b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2017 Gentoo Foundation |
| 26 |
+# Copyright 1999-2018 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=6 |
| 30 |
@@ -52,23 +52,28 @@ PATCHES=( |
| 31 |
"${FILESDIR}"/0.9.3-glibc-sysmacros.patch |
| 32 |
) |
| 33 |
|
| 34 |
-src_configure() { |
| 35 |
- local myconf |
| 36 |
- myconf="--with-system-root-install=no |
| 37 |
- --localstatedir=/var |
| 38 |
- --without-rhgb-compat-link |
| 39 |
- --enable-documentation |
| 40 |
- --enable-systemd-integration |
| 41 |
- --with-systemdunitdir="$(systemd_get_systemunitdir)" |
| 42 |
- $(use_enable !static-libs shared) |
| 43 |
- $(use_enable static-libs static) |
| 44 |
- $(use_enable debug tracing) |
| 45 |
- $(use_enable gtk gtk) |
| 46 |
- $(use_enable libkms drm) |
| 47 |
- $(use_enable pango) |
| 48 |
- $(use_enable gdm gdm-transition)" |
| 49 |
+src_prepare() { |
| 50 |
+ default |
| 51 |
eautoreconf |
| 52 |
- econf ${myconf} |
| 53 |
+} |
| 54 |
+ |
| 55 |
+src_configure() { |
| 56 |
+ local myconf=( |
| 57 |
+ --with-system-root-install=no |
| 58 |
+ --localstatedir=/var |
| 59 |
+ --without-rhgb-compat-link |
| 60 |
+ --enable-documentation |
| 61 |
+ --enable-systemd-integration |
| 62 |
+ --with-systemdunitdir="$(systemd_get_systemunitdir)" |
| 63 |
+ $(use_enable !static-libs shared) |
| 64 |
+ $(use_enable static-libs static) |
| 65 |
+ $(use_enable debug tracing) |
| 66 |
+ $(use_enable gtk gtk) |
| 67 |
+ $(use_enable libkms drm) |
| 68 |
+ $(use_enable pango) |
| 69 |
+ $(use_enable gdm gdm-transition) |
| 70 |
+ ) |
| 71 |
+ econf "${myconf[@]}" |
| 72 |
} |
| 73 |
|
| 74 |
src_install() { |
| 75 |
|
| 76 |
diff --git a/sys-boot/plymouth/plymouth-0.9.3.ebuild b/sys-boot/plymouth/plymouth-0.9.3.ebuild |
| 77 |
index ea9aa1bd7d6..75326f75a37 100644 |
| 78 |
--- a/sys-boot/plymouth/plymouth-0.9.3.ebuild |
| 79 |
+++ b/sys-boot/plymouth/plymouth-0.9.3.ebuild |
| 80 |
@@ -1,4 +1,4 @@ |
| 81 |
-# Copyright 1999-2017 Gentoo Foundation |
| 82 |
+# Copyright 1999-2018 Gentoo Foundation |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
|
| 85 |
EAPI=6 |
| 86 |
@@ -49,22 +49,27 @@ DOC_CONTENTS=" |
| 87 |
PATCHES=( |
| 88 |
) |
| 89 |
|
| 90 |
-src_configure() { |
| 91 |
- local myconf |
| 92 |
- myconf="--with-system-root-install=no |
| 93 |
- --localstatedir=/var |
| 94 |
- --without-rhgb-compat-link |
| 95 |
- --enable-systemd-integration |
| 96 |
- --with-systemdunitdir="$(systemd_get_systemunitdir)" |
| 97 |
- $(use_enable !static-libs shared) |
| 98 |
- $(use_enable static-libs static) |
| 99 |
- $(use_enable debug tracing) |
| 100 |
- $(use_enable gtk gtk) |
| 101 |
- $(use_enable libkms drm) |
| 102 |
- $(use_enable pango) |
| 103 |
- $(use_enable gdm gdm-transition)" |
| 104 |
+src_prepare() { |
| 105 |
+ default |
| 106 |
eautoreconf |
| 107 |
- econf ${myconf} |
| 108 |
+} |
| 109 |
+ |
| 110 |
+src_configure() { |
| 111 |
+ local myconf=( |
| 112 |
+ --with-system-root-install=no |
| 113 |
+ --localstatedir=/var |
| 114 |
+ --without-rhgb-compat-link |
| 115 |
+ --enable-systemd-integration |
| 116 |
+ --with-systemdunitdir="$(systemd_get_systemunitdir)" |
| 117 |
+ $(use_enable !static-libs shared) |
| 118 |
+ $(use_enable static-libs static) |
| 119 |
+ $(use_enable debug tracing) |
| 120 |
+ $(use_enable gtk gtk) |
| 121 |
+ $(use_enable libkms drm) |
| 122 |
+ $(use_enable pango) |
| 123 |
+ $(use_enable gdm gdm-transition) |
| 124 |
+ ) |
| 125 |
+ econf "${myconf[@]}" |
| 126 |
} |
| 127 |
|
| 128 |
src_install() { |
| 129 |
|
| 130 |
diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild |
| 131 |
index 49ce1012fe8..375f98aabb3 100644 |
| 132 |
--- a/sys-boot/plymouth/plymouth-9999.ebuild |
| 133 |
+++ b/sys-boot/plymouth/plymouth-9999.ebuild |
| 134 |
@@ -1,4 +1,4 @@ |
| 135 |
-# Copyright 1999-2017 Gentoo Foundation |
| 136 |
+# Copyright 1999-2018 Gentoo Foundation |
| 137 |
# Distributed under the terms of the GNU General Public License v2 |
| 138 |
|
| 139 |
EAPI=6 |
| 140 |
@@ -50,22 +50,27 @@ PATCHES=( |
| 141 |
"${FILESDIR}"/0.9.3-glibc-sysmacros.patch |
| 142 |
) |
| 143 |
|
| 144 |
-src_configure() { |
| 145 |
- local myconf |
| 146 |
- myconf="--with-system-root-install=no |
| 147 |
- --localstatedir=/var |
| 148 |
- --without-rhgb-compat-link |
| 149 |
- --enable-systemd-integration |
| 150 |
- --with-systemdunitdir="$(systemd_get_systemunitdir)" |
| 151 |
- $(use_enable !static-libs shared) |
| 152 |
- $(use_enable static-libs static) |
| 153 |
- $(use_enable debug tracing) |
| 154 |
- $(use_enable gtk gtk) |
| 155 |
- $(use_enable libkms drm) |
| 156 |
- $(use_enable pango) |
| 157 |
- $(use_enable gdm gdm-transition)" |
| 158 |
+src_prepare() { |
| 159 |
+ default |
| 160 |
eautoreconf |
| 161 |
- econf ${myconf} |
| 162 |
+} |
| 163 |
+ |
| 164 |
+src_configure() { |
| 165 |
+ local myconf=( |
| 166 |
+ --with-system-root-install=no |
| 167 |
+ --localstatedir=/var |
| 168 |
+ --without-rhgb-compat-link |
| 169 |
+ --enable-systemd-integration |
| 170 |
+ --with-systemdunitdir="$(systemd_get_systemunitdir)" |
| 171 |
+ $(use_enable !static-libs shared) |
| 172 |
+ $(use_enable static-libs static) |
| 173 |
+ $(use_enable debug tracing) |
| 174 |
+ $(use_enable gtk gtk) |
| 175 |
+ $(use_enable libkms drm) |
| 176 |
+ $(use_enable pango) |
| 177 |
+ $(use_enable gdm gdm-transition) |
| 178 |
+ ) |
| 179 |
+ econf "${myconf[@]}" |
| 180 |
} |
| 181 |
|
| 182 |
src_install() { |
Archives