| 1 |
commit: e268e3aca20a867b8ed350d3e5b1679bc8222a15 |
| 2 |
Author: Michal Privoznik <mprivozn <AT> redhat <DOT> com> |
| 3 |
AuthorDate: Mon Feb 10 12:49:23 2020 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 10 15:59:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e268e3ac |
| 7 |
|
| 8 |
app-emulation/libvirt-9999: Drop gnulib dance |
| 9 |
|
| 10 |
Libvirt just dropped gnulib submodule and therefore all steps the |
| 11 |
live ebuild took to make gnulib happy are no longer necessary. |
| 12 |
|
| 13 |
Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com> |
| 14 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 15 |
|
| 16 |
app-emulation/libvirt/libvirt-9999.ebuild | 20 -------------------- |
| 17 |
1 file changed, 20 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild |
| 20 |
index e8d19df4415..648922f96f2 100644 |
| 21 |
--- a/app-emulation/libvirt/libvirt-9999.ebuild |
| 22 |
+++ b/app-emulation/libvirt/libvirt-9999.ebuild |
| 23 |
@@ -217,20 +217,6 @@ src_prepare() { |
| 24 |
|
| 25 |
default |
| 26 |
|
| 27 |
- if [[ ${PV} = *9999* ]]; then |
| 28 |
- # Reinitialize submodules as this is required for gnulib's bootstrap |
| 29 |
- git submodule init |
| 30 |
- # git checkouts require bootstrapping to create the configure script. |
| 31 |
- # Additionally the submodules must be cloned to the right locations |
| 32 |
- # bug #377279 |
| 33 |
- ./bootstrap || die "bootstrap failed" |
| 34 |
- ( |
| 35 |
- git submodule status .gnulib | awk '{ print $1 }' |
| 36 |
- git hash-object bootstrap.conf |
| 37 |
- git ls-tree -d HEAD gnulib/local | awk '{ print $3 }' |
| 38 |
- ) >.git-module-status |
| 39 |
- fi |
| 40 |
- |
| 41 |
# Tweak the init script: |
| 42 |
cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die |
| 43 |
sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ |
| 44 |
@@ -304,12 +290,6 @@ my_src_configure() { |
| 45 |
fi |
| 46 |
|
| 47 |
econf "${myeconfargs[@]}" |
| 48 |
- |
| 49 |
- if [[ ${PV} = *9999* ]]; then |
| 50 |
- # Restore gnulib's config.sub and config.guess |
| 51 |
- # bug #377279 |
| 52 |
- (cd "${S}"/.gnulib && git reset --hard > /dev/null) |
| 53 |
- fi |
| 54 |
} |
| 55 |
|
| 56 |
my_src_test() { |
Archives