commit:     5a37c82fd3188758ae0b68f7347176fbdcf099a9
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  1 17:54:43 2024 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Apr  1 17:55:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a37c82f

sys-cluster/ceph: Don't remove egg-info files (bug #928389)

Closes: https://bugs.gentoo.org/928389
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 sys-cluster/ceph/{ceph-16.2.15.ebuild => ceph-16.2.15-r1.ebuild}  | 5 -----
 sys-cluster/ceph/{ceph-18.2.1-r1.ebuild => ceph-18.2.1-r2.ebuild} | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/sys-cluster/ceph/ceph-16.2.15.ebuild 
b/sys-cluster/ceph/ceph-16.2.15-r1.ebuild
similarity index 98%
rename from sys-cluster/ceph/ceph-16.2.15.ebuild
rename to sys-cluster/ceph/ceph-16.2.15-r1.ebuild
index b1cd72124475..02d333640c2e 100644
--- a/sys-cluster/ceph/ceph-16.2.15.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.15-r1.ebuild
@@ -406,9 +406,6 @@ src_install() {
        python_setup
        cmake_src_install
 
-       # the cmake_src_install here installs more egg-info files
-       rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die
-
        find "${ED}" -name '*.la' -type f -delete || die
 
        exeinto /usr/$(get_libdir)/ceph
@@ -466,8 +463,6 @@ python_install() {
        DESTDIR="${ED}" cmake_build VERBOSE=1 install
        popd >/dev/null || die
 
-       rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die
-
        python_scriptinto /usr/sbin
        python_doscript src/cephadm/cephadm
 

diff --git a/sys-cluster/ceph/ceph-18.2.1-r1.ebuild 
b/sys-cluster/ceph/ceph-18.2.1-r2.ebuild
similarity index 98%
rename from sys-cluster/ceph/ceph-18.2.1-r1.ebuild
rename to sys-cluster/ceph/ceph-18.2.1-r2.ebuild
index b753c82d138e..4e84916cc23c 100644
--- a/sys-cluster/ceph/ceph-18.2.1-r1.ebuild
+++ b/sys-cluster/ceph/ceph-18.2.1-r2.ebuild
@@ -418,8 +418,6 @@ src_install() {
        python_setup
        cmake_src_install
 
-       # the cmake_src_install here installs more egg-info files
-       rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die
        python_optimize
 
        find "${ED}" -name '*.la' -type f -delete || die
@@ -478,8 +476,6 @@ python_install() {
        DESTDIR="${ED}" cmake_build src/pybind/install
        DESTDIR="${ED}" cmake_build src/cephadm/install
 
-       rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die
-
        python_optimize
 }
 

Reply via email to