commit: 52a3d668722bedda48baaa054ed12e82335dcb42
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 1 07:46:27 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 1 16:49:10 2022 +0000
URL:
https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=52a3d668
setup.py: reorder data files
Store all data files (files that should be installed into `/usr` outside
python lib location) in one main "data" directory, with direct subdirs
matching the once installed on system. This is preparation for moving to
flit backend.
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.gitignore | 3 +-
MANIFEST.in | 2 --
{ebd => data/lib/pkgcore/ebd}/eapi/0/global.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/0/phase.bash | 0
.../lib/pkgcore/ebd}/eapi/0/src_compile.bash | 0
.../lib/pkgcore/ebd}/eapi/0/src_install.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/1/global.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/2/global.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/2/phase.bash | 0
.../lib/pkgcore/ebd}/eapi/2/pkg_nofetch.bash | 0
.../lib/pkgcore/ebd}/eapi/2/src_compile.bash | 0
.../lib/pkgcore/ebd}/eapi/2/src_configure.bash | 0
.../lib/pkgcore/ebd}/eapi/2/src_prepare.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/2/src_test.bash | 0
.../lib/pkgcore/ebd}/eapi/2/src_unpack.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/4/global.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/4/phase.bash | 0
.../lib/pkgcore/ebd}/eapi/4/src_configure.bash | 0
.../lib/pkgcore/ebd}/eapi/4/src_install.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/5/global.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/5/phase.bash | 0
.../lib/pkgcore/ebd}/eapi/5/src_configure.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/6/global.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/6/phase.bash | 0
.../lib/pkgcore/ebd}/eapi/6/src_configure.bash | 0
.../lib/pkgcore/ebd}/eapi/6/src_install.bash | 0
.../lib/pkgcore/ebd}/eapi/6/src_prepare.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/7/global.bash | 0
.../lib/pkgcore/ebd}/eapi/7/src_configure.bash | 0
.../lib/pkgcore/ebd}/eapi/7/src_install.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/8/global.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/8/phase.bash | 0
.../lib/pkgcore/ebd}/eapi/8/src_configure.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/common.bash | 0
{ebd => data/lib/pkgcore/ebd}/eapi/depend.bash | 0
.../lib/pkgcore/ebd}/ebuild-daemon-lib.bash | 0
{ebd => data/lib/pkgcore/ebd}/ebuild-daemon.bash | 0
.../lib/pkgcore/ebd}/ebuild-default-functions.bash | 0
.../lib/pkgcore/ebd}/ebuild-env-utils.bash | 0
{ebd => data/lib/pkgcore/ebd}/ebuild.bash | 0
{ebd => data/lib/pkgcore/ebd}/exit-handling.bash | 0
.../lib/pkgcore/ebd}/generate_eapi_cmd_list | 0
.../lib/pkgcore/ebd}/generate_eapi_func_list | 0
{ebd => data/lib/pkgcore/ebd}/generate_eapi_lib | 0
.../lib/pkgcore/ebd}/generate_global_func_list | 0
{ebd => data/lib/pkgcore/ebd}/helpers/0/dosed | 0
{ebd => data/lib/pkgcore/ebd}/helpers/0/emake | 0
.../pkgcore/ebd}/helpers/0/pkg_postinst/fowners | 0
.../lib/pkgcore/ebd}/helpers/0/pkg_postinst/fperms | 0
.../pkgcore/ebd}/helpers/0/pkg_postinst/keepdir | 0
.../lib/pkgcore/ebd}/helpers/0/pkg_preinst/dodir | 0
.../lib/pkgcore/ebd}/helpers/0/pkg_preinst/fowners | 0
.../lib/pkgcore/ebd}/helpers/0/pkg_preinst/fperms | 0
.../lib/pkgcore/ebd}/helpers/0/pkg_preinst/keepdir | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/dobin | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/doconfd | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/dodir | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/dodoc | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/doenvd | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/doexe | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/dohard | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/dohtml | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/doinfo | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/doinitd | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/doins | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/dolib | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/dolib.a | 0
.../pkgcore/ebd}/helpers/0/src_install/dolib.so | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/doman | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/domo | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/dosbin | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/dosym | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/fowners | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/fperms | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/keepdir | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/newbin | 0
.../pkgcore/ebd}/helpers/0/src_install/newconfd | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/newdoc | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/newenvd | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/newexe | 0
.../pkgcore/ebd}/helpers/0/src_install/newinitd | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/newins | 0
.../pkgcore/ebd}/helpers/0/src_install/newlib.a | 0
.../pkgcore/ebd}/helpers/0/src_install/newlib.so | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/newman | 0
.../lib/pkgcore/ebd}/helpers/0/src_install/newsbin | 0
{ebd => data/lib/pkgcore/ebd}/helpers/4/dosed | 0
.../lib/pkgcore/ebd}/helpers/4/src_install/dohard | 0
.../pkgcore/ebd}/helpers/5/src_install/doheader | 0
.../pkgcore/ebd}/helpers/5/src_install/newheader | 0
.../lib/pkgcore/ebd}/helpers/6/src_install/dohtml | 0
{ebd => data/lib/pkgcore/ebd}/helpers/7/nonfatal | 0
.../lib/pkgcore/ebd}/helpers/7/src_install/dohtml | 0
.../lib/pkgcore/ebd}/helpers/7/src_install/dolib | 0
.../lib/pkgcore/ebd}/helpers/8/src_install/doconfd | 0
.../lib/pkgcore/ebd}/helpers/8/src_install/doenvd | 0
.../pkgcore/ebd}/helpers/8/src_install/doheader | 0
.../lib/pkgcore/ebd}/helpers/8/src_install/doinitd | 0
.../ebd}/helpers/common/pkgcore-ebuild-helper | 0
.../pkgcore/ebd}/helpers/common/pkgcore-ipc-helper | 0
.../lib/pkgcore/ebd}/helpers/common/prepalldocs | 0
.../lib/pkgcore/ebd}/helpers/common/prepallstrip | 0
.../lib/pkgcore/ebd}/helpers/common/prepinfo | 0
.../lib/pkgcore/ebd}/helpers/common/prepman | 0
.../lib/pkgcore/ebd}/helpers/common/prepstrip | 0
.../pkgcore/ebd}/helpers/internals/_generic_new | 0
.../lib/pkgcore/ebd}/helpers/internals/banned | 0
.../lib/pkgcore/ebd}/helpers/internals/deprecated | 0
.../pkgcore/ebd}/helpers/internals/helper-lib.bash | 0
.../lib/pkgcore/ebd}/helpers/internals/prepall | 0
.../lib/pkgcore/ebd}/isolated-functions.bash | 0
.../lib/pkgcore/shell}/bash/pkgcore.bash | 0
.../lib/pkgcore/shell}/bin/pkgcore-sh-helper | 0
{shell => data/lib/pkgcore/shell}/bin/psite | 0
{shell => data/lib/pkgcore/shell}/pkgcore.sh | 0
{shell => data/lib/pkgcore/shell}/zsh/pkgcore.zsh | 0
.../share/bash-completion/completions}/pquery | 0
data/{ => share/pkgcore}/config/make.globals | 0
data/{ => share/pkgcore}/config/repos.conf | 0
data/{ => share/pkgcore}/stubconfig/repos.conf | 0
.../pkgcore}/stubrepo/metadata/layout.conf | 0
.../pkgcore}/stubrepo/profiles/arch.list | 0
.../stubrepo/profiles/default/make.defaults | 0
.../pkgcore}/stubrepo/profiles/profiles.desc | 0
.../pkgcore}/stubrepo/profiles/repo_name | 0
data/{ => share/pkgcore}/xml-schema/metadata.xsd | 0
.../share/zsh/site-functions}/_pkgcore | 0
setup.py | 37 ++++++++--------------
src/pkgcore/const.py | 4 +--
src/pkgcore/ebuild/const.py | 2 +-
130 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/.gitignore b/.gitignore
index 349b8bdae..09a222c41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ src/**/*.so
# generated function lists
ebd/.generated
+data/lib/pkgcore/ebd/.generated
src/pkgcore/plugins/plugincache
/build
@@ -13,7 +14,7 @@ src/pkgcore/plugins/plugincache
/dist
/.tox
/.coverage
-/*.egg-info
+*.egg-info
_trial_temp
/doc/dev-notes/index.rst
/doc/dev-notes/*/index.rst
diff --git a/MANIFEST.in b/MANIFEST.in
index 5a6be6ab3..27ad49216 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,9 +3,7 @@ include pytest.ini tox.ini pyproject.toml .coveragerc
recursive-include bin *
recursive-include data *
recursive-include doc *
-recursive-include ebd *
recursive-include examples *
recursive-include requirements *
-recursive-include shell *
recursive-include tests *
global-exclude *.pyc *.pyo __pycache__
diff --git a/ebd/eapi/0/global.bash b/data/lib/pkgcore/ebd/eapi/0/global.bash
similarity index 100%
rename from ebd/eapi/0/global.bash
rename to data/lib/pkgcore/ebd/eapi/0/global.bash
diff --git a/ebd/eapi/0/phase.bash b/data/lib/pkgcore/ebd/eapi/0/phase.bash
similarity index 100%
rename from ebd/eapi/0/phase.bash
rename to data/lib/pkgcore/ebd/eapi/0/phase.bash
diff --git a/ebd/eapi/0/src_compile.bash
b/data/lib/pkgcore/ebd/eapi/0/src_compile.bash
similarity index 100%
rename from ebd/eapi/0/src_compile.bash
rename to data/lib/pkgcore/ebd/eapi/0/src_compile.bash
diff --git a/ebd/eapi/0/src_install.bash
b/data/lib/pkgcore/ebd/eapi/0/src_install.bash
similarity index 100%
rename from ebd/eapi/0/src_install.bash
rename to data/lib/pkgcore/ebd/eapi/0/src_install.bash
diff --git a/ebd/eapi/1/global.bash b/data/lib/pkgcore/ebd/eapi/1/global.bash
similarity index 100%
rename from ebd/eapi/1/global.bash
rename to data/lib/pkgcore/ebd/eapi/1/global.bash
diff --git a/ebd/eapi/2/global.bash b/data/lib/pkgcore/ebd/eapi/2/global.bash
similarity index 100%
rename from ebd/eapi/2/global.bash
rename to data/lib/pkgcore/ebd/eapi/2/global.bash
diff --git a/ebd/eapi/2/phase.bash b/data/lib/pkgcore/ebd/eapi/2/phase.bash
similarity index 100%
rename from ebd/eapi/2/phase.bash
rename to data/lib/pkgcore/ebd/eapi/2/phase.bash
diff --git a/ebd/eapi/2/pkg_nofetch.bash
b/data/lib/pkgcore/ebd/eapi/2/pkg_nofetch.bash
similarity index 100%
rename from ebd/eapi/2/pkg_nofetch.bash
rename to data/lib/pkgcore/ebd/eapi/2/pkg_nofetch.bash
diff --git a/ebd/eapi/2/src_compile.bash
b/data/lib/pkgcore/ebd/eapi/2/src_compile.bash
similarity index 100%
rename from ebd/eapi/2/src_compile.bash
rename to data/lib/pkgcore/ebd/eapi/2/src_compile.bash
diff --git a/ebd/eapi/2/src_configure.bash
b/data/lib/pkgcore/ebd/eapi/2/src_configure.bash
similarity index 100%
rename from ebd/eapi/2/src_configure.bash
rename to data/lib/pkgcore/ebd/eapi/2/src_configure.bash
diff --git a/ebd/eapi/2/src_prepare.bash
b/data/lib/pkgcore/ebd/eapi/2/src_prepare.bash
similarity index 100%
rename from ebd/eapi/2/src_prepare.bash
rename to data/lib/pkgcore/ebd/eapi/2/src_prepare.bash
diff --git a/ebd/eapi/2/src_test.bash
b/data/lib/pkgcore/ebd/eapi/2/src_test.bash
similarity index 100%
rename from ebd/eapi/2/src_test.bash
rename to data/lib/pkgcore/ebd/eapi/2/src_test.bash
diff --git a/ebd/eapi/2/src_unpack.bash
b/data/lib/pkgcore/ebd/eapi/2/src_unpack.bash
similarity index 100%
rename from ebd/eapi/2/src_unpack.bash
rename to data/lib/pkgcore/ebd/eapi/2/src_unpack.bash
diff --git a/ebd/eapi/4/global.bash b/data/lib/pkgcore/ebd/eapi/4/global.bash
similarity index 100%
rename from ebd/eapi/4/global.bash
rename to data/lib/pkgcore/ebd/eapi/4/global.bash
diff --git a/ebd/eapi/4/phase.bash b/data/lib/pkgcore/ebd/eapi/4/phase.bash
similarity index 100%
rename from ebd/eapi/4/phase.bash
rename to data/lib/pkgcore/ebd/eapi/4/phase.bash
diff --git a/ebd/eapi/4/src_configure.bash
b/data/lib/pkgcore/ebd/eapi/4/src_configure.bash
similarity index 100%
rename from ebd/eapi/4/src_configure.bash
rename to data/lib/pkgcore/ebd/eapi/4/src_configure.bash
diff --git a/ebd/eapi/4/src_install.bash
b/data/lib/pkgcore/ebd/eapi/4/src_install.bash
similarity index 100%
rename from ebd/eapi/4/src_install.bash
rename to data/lib/pkgcore/ebd/eapi/4/src_install.bash
diff --git a/ebd/eapi/5/global.bash b/data/lib/pkgcore/ebd/eapi/5/global.bash
similarity index 100%
rename from ebd/eapi/5/global.bash
rename to data/lib/pkgcore/ebd/eapi/5/global.bash
diff --git a/ebd/eapi/5/phase.bash b/data/lib/pkgcore/ebd/eapi/5/phase.bash
similarity index 100%
rename from ebd/eapi/5/phase.bash
rename to data/lib/pkgcore/ebd/eapi/5/phase.bash
diff --git a/ebd/eapi/5/src_configure.bash
b/data/lib/pkgcore/ebd/eapi/5/src_configure.bash
similarity index 100%
rename from ebd/eapi/5/src_configure.bash
rename to data/lib/pkgcore/ebd/eapi/5/src_configure.bash
diff --git a/ebd/eapi/6/global.bash b/data/lib/pkgcore/ebd/eapi/6/global.bash
similarity index 100%
rename from ebd/eapi/6/global.bash
rename to data/lib/pkgcore/ebd/eapi/6/global.bash
diff --git a/ebd/eapi/6/phase.bash b/data/lib/pkgcore/ebd/eapi/6/phase.bash
similarity index 100%
rename from ebd/eapi/6/phase.bash
rename to data/lib/pkgcore/ebd/eapi/6/phase.bash
diff --git a/ebd/eapi/6/src_configure.bash
b/data/lib/pkgcore/ebd/eapi/6/src_configure.bash
similarity index 100%
rename from ebd/eapi/6/src_configure.bash
rename to data/lib/pkgcore/ebd/eapi/6/src_configure.bash
diff --git a/ebd/eapi/6/src_install.bash
b/data/lib/pkgcore/ebd/eapi/6/src_install.bash
similarity index 100%
rename from ebd/eapi/6/src_install.bash
rename to data/lib/pkgcore/ebd/eapi/6/src_install.bash
diff --git a/ebd/eapi/6/src_prepare.bash
b/data/lib/pkgcore/ebd/eapi/6/src_prepare.bash
similarity index 100%
rename from ebd/eapi/6/src_prepare.bash
rename to data/lib/pkgcore/ebd/eapi/6/src_prepare.bash
diff --git a/ebd/eapi/7/global.bash b/data/lib/pkgcore/ebd/eapi/7/global.bash
similarity index 100%
rename from ebd/eapi/7/global.bash
rename to data/lib/pkgcore/ebd/eapi/7/global.bash
diff --git a/ebd/eapi/7/src_configure.bash
b/data/lib/pkgcore/ebd/eapi/7/src_configure.bash
similarity index 100%
rename from ebd/eapi/7/src_configure.bash
rename to data/lib/pkgcore/ebd/eapi/7/src_configure.bash
diff --git a/ebd/eapi/7/src_install.bash
b/data/lib/pkgcore/ebd/eapi/7/src_install.bash
similarity index 100%
rename from ebd/eapi/7/src_install.bash
rename to data/lib/pkgcore/ebd/eapi/7/src_install.bash
diff --git a/ebd/eapi/8/global.bash b/data/lib/pkgcore/ebd/eapi/8/global.bash
similarity index 100%
rename from ebd/eapi/8/global.bash
rename to data/lib/pkgcore/ebd/eapi/8/global.bash
diff --git a/ebd/eapi/8/phase.bash b/data/lib/pkgcore/ebd/eapi/8/phase.bash
similarity index 100%
rename from ebd/eapi/8/phase.bash
rename to data/lib/pkgcore/ebd/eapi/8/phase.bash
diff --git a/ebd/eapi/8/src_configure.bash
b/data/lib/pkgcore/ebd/eapi/8/src_configure.bash
similarity index 100%
rename from ebd/eapi/8/src_configure.bash
rename to data/lib/pkgcore/ebd/eapi/8/src_configure.bash
diff --git a/ebd/eapi/common.bash b/data/lib/pkgcore/ebd/eapi/common.bash
similarity index 100%
rename from ebd/eapi/common.bash
rename to data/lib/pkgcore/ebd/eapi/common.bash
diff --git a/ebd/eapi/depend.bash b/data/lib/pkgcore/ebd/eapi/depend.bash
similarity index 100%
rename from ebd/eapi/depend.bash
rename to data/lib/pkgcore/ebd/eapi/depend.bash
diff --git a/ebd/ebuild-daemon-lib.bash
b/data/lib/pkgcore/ebd/ebuild-daemon-lib.bash
similarity index 100%
rename from ebd/ebuild-daemon-lib.bash
rename to data/lib/pkgcore/ebd/ebuild-daemon-lib.bash
diff --git a/ebd/ebuild-daemon.bash b/data/lib/pkgcore/ebd/ebuild-daemon.bash
similarity index 100%
rename from ebd/ebuild-daemon.bash
rename to data/lib/pkgcore/ebd/ebuild-daemon.bash
diff --git a/ebd/ebuild-default-functions.bash
b/data/lib/pkgcore/ebd/ebuild-default-functions.bash
similarity index 100%
rename from ebd/ebuild-default-functions.bash
rename to data/lib/pkgcore/ebd/ebuild-default-functions.bash
diff --git a/ebd/ebuild-env-utils.bash
b/data/lib/pkgcore/ebd/ebuild-env-utils.bash
similarity index 100%
rename from ebd/ebuild-env-utils.bash
rename to data/lib/pkgcore/ebd/ebuild-env-utils.bash
diff --git a/ebd/ebuild.bash b/data/lib/pkgcore/ebd/ebuild.bash
similarity index 100%
rename from ebd/ebuild.bash
rename to data/lib/pkgcore/ebd/ebuild.bash
diff --git a/ebd/exit-handling.bash b/data/lib/pkgcore/ebd/exit-handling.bash
similarity index 100%
rename from ebd/exit-handling.bash
rename to data/lib/pkgcore/ebd/exit-handling.bash
diff --git a/ebd/generate_eapi_cmd_list
b/data/lib/pkgcore/ebd/generate_eapi_cmd_list
similarity index 100%
rename from ebd/generate_eapi_cmd_list
rename to data/lib/pkgcore/ebd/generate_eapi_cmd_list
diff --git a/ebd/generate_eapi_func_list
b/data/lib/pkgcore/ebd/generate_eapi_func_list
similarity index 100%
rename from ebd/generate_eapi_func_list
rename to data/lib/pkgcore/ebd/generate_eapi_func_list
diff --git a/ebd/generate_eapi_lib b/data/lib/pkgcore/ebd/generate_eapi_lib
similarity index 100%
rename from ebd/generate_eapi_lib
rename to data/lib/pkgcore/ebd/generate_eapi_lib
diff --git a/ebd/generate_global_func_list
b/data/lib/pkgcore/ebd/generate_global_func_list
similarity index 100%
rename from ebd/generate_global_func_list
rename to data/lib/pkgcore/ebd/generate_global_func_list
diff --git a/ebd/helpers/0/dosed b/data/lib/pkgcore/ebd/helpers/0/dosed
similarity index 100%
rename from ebd/helpers/0/dosed
rename to data/lib/pkgcore/ebd/helpers/0/dosed
diff --git a/ebd/helpers/0/emake b/data/lib/pkgcore/ebd/helpers/0/emake
similarity index 100%
rename from ebd/helpers/0/emake
rename to data/lib/pkgcore/ebd/helpers/0/emake
diff --git a/ebd/helpers/0/pkg_postinst/fowners
b/data/lib/pkgcore/ebd/helpers/0/pkg_postinst/fowners
similarity index 100%
rename from ebd/helpers/0/pkg_postinst/fowners
rename to data/lib/pkgcore/ebd/helpers/0/pkg_postinst/fowners
diff --git a/ebd/helpers/0/pkg_postinst/fperms
b/data/lib/pkgcore/ebd/helpers/0/pkg_postinst/fperms
similarity index 100%
rename from ebd/helpers/0/pkg_postinst/fperms
rename to data/lib/pkgcore/ebd/helpers/0/pkg_postinst/fperms
diff --git a/ebd/helpers/0/pkg_postinst/keepdir
b/data/lib/pkgcore/ebd/helpers/0/pkg_postinst/keepdir
similarity index 100%
rename from ebd/helpers/0/pkg_postinst/keepdir
rename to data/lib/pkgcore/ebd/helpers/0/pkg_postinst/keepdir
diff --git a/ebd/helpers/0/pkg_preinst/dodir
b/data/lib/pkgcore/ebd/helpers/0/pkg_preinst/dodir
similarity index 100%
rename from ebd/helpers/0/pkg_preinst/dodir
rename to data/lib/pkgcore/ebd/helpers/0/pkg_preinst/dodir
diff --git a/ebd/helpers/0/pkg_preinst/fowners
b/data/lib/pkgcore/ebd/helpers/0/pkg_preinst/fowners
similarity index 100%
rename from ebd/helpers/0/pkg_preinst/fowners
rename to data/lib/pkgcore/ebd/helpers/0/pkg_preinst/fowners
diff --git a/ebd/helpers/0/pkg_preinst/fperms
b/data/lib/pkgcore/ebd/helpers/0/pkg_preinst/fperms
similarity index 100%
rename from ebd/helpers/0/pkg_preinst/fperms
rename to data/lib/pkgcore/ebd/helpers/0/pkg_preinst/fperms
diff --git a/ebd/helpers/0/pkg_preinst/keepdir
b/data/lib/pkgcore/ebd/helpers/0/pkg_preinst/keepdir
similarity index 100%
rename from ebd/helpers/0/pkg_preinst/keepdir
rename to data/lib/pkgcore/ebd/helpers/0/pkg_preinst/keepdir
diff --git a/ebd/helpers/0/src_install/dobin
b/data/lib/pkgcore/ebd/helpers/0/src_install/dobin
similarity index 100%
rename from ebd/helpers/0/src_install/dobin
rename to data/lib/pkgcore/ebd/helpers/0/src_install/dobin
diff --git a/ebd/helpers/0/src_install/doconfd
b/data/lib/pkgcore/ebd/helpers/0/src_install/doconfd
similarity index 100%
rename from ebd/helpers/0/src_install/doconfd
rename to data/lib/pkgcore/ebd/helpers/0/src_install/doconfd
diff --git a/ebd/helpers/0/src_install/dodir
b/data/lib/pkgcore/ebd/helpers/0/src_install/dodir
similarity index 100%
rename from ebd/helpers/0/src_install/dodir
rename to data/lib/pkgcore/ebd/helpers/0/src_install/dodir
diff --git a/ebd/helpers/0/src_install/dodoc
b/data/lib/pkgcore/ebd/helpers/0/src_install/dodoc
similarity index 100%
rename from ebd/helpers/0/src_install/dodoc
rename to data/lib/pkgcore/ebd/helpers/0/src_install/dodoc
diff --git a/ebd/helpers/0/src_install/doenvd
b/data/lib/pkgcore/ebd/helpers/0/src_install/doenvd
similarity index 100%
rename from ebd/helpers/0/src_install/doenvd
rename to data/lib/pkgcore/ebd/helpers/0/src_install/doenvd
diff --git a/ebd/helpers/0/src_install/doexe
b/data/lib/pkgcore/ebd/helpers/0/src_install/doexe
similarity index 100%
rename from ebd/helpers/0/src_install/doexe
rename to data/lib/pkgcore/ebd/helpers/0/src_install/doexe
diff --git a/ebd/helpers/0/src_install/dohard
b/data/lib/pkgcore/ebd/helpers/0/src_install/dohard
similarity index 100%
rename from ebd/helpers/0/src_install/dohard
rename to data/lib/pkgcore/ebd/helpers/0/src_install/dohard
diff --git a/ebd/helpers/0/src_install/dohtml
b/data/lib/pkgcore/ebd/helpers/0/src_install/dohtml
similarity index 100%
rename from ebd/helpers/0/src_install/dohtml
rename to data/lib/pkgcore/ebd/helpers/0/src_install/dohtml
diff --git a/ebd/helpers/0/src_install/doinfo
b/data/lib/pkgcore/ebd/helpers/0/src_install/doinfo
similarity index 100%
rename from ebd/helpers/0/src_install/doinfo
rename to data/lib/pkgcore/ebd/helpers/0/src_install/doinfo
diff --git a/ebd/helpers/0/src_install/doinitd
b/data/lib/pkgcore/ebd/helpers/0/src_install/doinitd
similarity index 100%
rename from ebd/helpers/0/src_install/doinitd
rename to data/lib/pkgcore/ebd/helpers/0/src_install/doinitd
diff --git a/ebd/helpers/0/src_install/doins
b/data/lib/pkgcore/ebd/helpers/0/src_install/doins
similarity index 100%
rename from ebd/helpers/0/src_install/doins
rename to data/lib/pkgcore/ebd/helpers/0/src_install/doins
diff --git a/ebd/helpers/0/src_install/dolib
b/data/lib/pkgcore/ebd/helpers/0/src_install/dolib
similarity index 100%
rename from ebd/helpers/0/src_install/dolib
rename to data/lib/pkgcore/ebd/helpers/0/src_install/dolib
diff --git a/ebd/helpers/0/src_install/dolib.a
b/data/lib/pkgcore/ebd/helpers/0/src_install/dolib.a
similarity index 100%
rename from ebd/helpers/0/src_install/dolib.a
rename to data/lib/pkgcore/ebd/helpers/0/src_install/dolib.a
diff --git a/ebd/helpers/0/src_install/dolib.so
b/data/lib/pkgcore/ebd/helpers/0/src_install/dolib.so
similarity index 100%
rename from ebd/helpers/0/src_install/dolib.so
rename to data/lib/pkgcore/ebd/helpers/0/src_install/dolib.so
diff --git a/ebd/helpers/0/src_install/doman
b/data/lib/pkgcore/ebd/helpers/0/src_install/doman
similarity index 100%
rename from ebd/helpers/0/src_install/doman
rename to data/lib/pkgcore/ebd/helpers/0/src_install/doman
diff --git a/ebd/helpers/0/src_install/domo
b/data/lib/pkgcore/ebd/helpers/0/src_install/domo
similarity index 100%
rename from ebd/helpers/0/src_install/domo
rename to data/lib/pkgcore/ebd/helpers/0/src_install/domo
diff --git a/ebd/helpers/0/src_install/dosbin
b/data/lib/pkgcore/ebd/helpers/0/src_install/dosbin
similarity index 100%
rename from ebd/helpers/0/src_install/dosbin
rename to data/lib/pkgcore/ebd/helpers/0/src_install/dosbin
diff --git a/ebd/helpers/0/src_install/dosym
b/data/lib/pkgcore/ebd/helpers/0/src_install/dosym
similarity index 100%
rename from ebd/helpers/0/src_install/dosym
rename to data/lib/pkgcore/ebd/helpers/0/src_install/dosym
diff --git a/ebd/helpers/0/src_install/fowners
b/data/lib/pkgcore/ebd/helpers/0/src_install/fowners
similarity index 100%
rename from ebd/helpers/0/src_install/fowners
rename to data/lib/pkgcore/ebd/helpers/0/src_install/fowners
diff --git a/ebd/helpers/0/src_install/fperms
b/data/lib/pkgcore/ebd/helpers/0/src_install/fperms
similarity index 100%
rename from ebd/helpers/0/src_install/fperms
rename to data/lib/pkgcore/ebd/helpers/0/src_install/fperms
diff --git a/ebd/helpers/0/src_install/keepdir
b/data/lib/pkgcore/ebd/helpers/0/src_install/keepdir
similarity index 100%
rename from ebd/helpers/0/src_install/keepdir
rename to data/lib/pkgcore/ebd/helpers/0/src_install/keepdir
diff --git a/ebd/helpers/0/src_install/newbin
b/data/lib/pkgcore/ebd/helpers/0/src_install/newbin
similarity index 100%
rename from ebd/helpers/0/src_install/newbin
rename to data/lib/pkgcore/ebd/helpers/0/src_install/newbin
diff --git a/ebd/helpers/0/src_install/newconfd
b/data/lib/pkgcore/ebd/helpers/0/src_install/newconfd
similarity index 100%
rename from ebd/helpers/0/src_install/newconfd
rename to data/lib/pkgcore/ebd/helpers/0/src_install/newconfd
diff --git a/ebd/helpers/0/src_install/newdoc
b/data/lib/pkgcore/ebd/helpers/0/src_install/newdoc
similarity index 100%
rename from ebd/helpers/0/src_install/newdoc
rename to data/lib/pkgcore/ebd/helpers/0/src_install/newdoc
diff --git a/ebd/helpers/0/src_install/newenvd
b/data/lib/pkgcore/ebd/helpers/0/src_install/newenvd
similarity index 100%
rename from ebd/helpers/0/src_install/newenvd
rename to data/lib/pkgcore/ebd/helpers/0/src_install/newenvd
diff --git a/ebd/helpers/0/src_install/newexe
b/data/lib/pkgcore/ebd/helpers/0/src_install/newexe
similarity index 100%
rename from ebd/helpers/0/src_install/newexe
rename to data/lib/pkgcore/ebd/helpers/0/src_install/newexe
diff --git a/ebd/helpers/0/src_install/newinitd
b/data/lib/pkgcore/ebd/helpers/0/src_install/newinitd
similarity index 100%
rename from ebd/helpers/0/src_install/newinitd
rename to data/lib/pkgcore/ebd/helpers/0/src_install/newinitd
diff --git a/ebd/helpers/0/src_install/newins
b/data/lib/pkgcore/ebd/helpers/0/src_install/newins
similarity index 100%
rename from ebd/helpers/0/src_install/newins
rename to data/lib/pkgcore/ebd/helpers/0/src_install/newins
diff --git a/ebd/helpers/0/src_install/newlib.a
b/data/lib/pkgcore/ebd/helpers/0/src_install/newlib.a
similarity index 100%
rename from ebd/helpers/0/src_install/newlib.a
rename to data/lib/pkgcore/ebd/helpers/0/src_install/newlib.a
diff --git a/ebd/helpers/0/src_install/newlib.so
b/data/lib/pkgcore/ebd/helpers/0/src_install/newlib.so
similarity index 100%
rename from ebd/helpers/0/src_install/newlib.so
rename to data/lib/pkgcore/ebd/helpers/0/src_install/newlib.so
diff --git a/ebd/helpers/0/src_install/newman
b/data/lib/pkgcore/ebd/helpers/0/src_install/newman
similarity index 100%
rename from ebd/helpers/0/src_install/newman
rename to data/lib/pkgcore/ebd/helpers/0/src_install/newman
diff --git a/ebd/helpers/0/src_install/newsbin
b/data/lib/pkgcore/ebd/helpers/0/src_install/newsbin
similarity index 100%
rename from ebd/helpers/0/src_install/newsbin
rename to data/lib/pkgcore/ebd/helpers/0/src_install/newsbin
diff --git a/ebd/helpers/4/dosed b/data/lib/pkgcore/ebd/helpers/4/dosed
similarity index 100%
rename from ebd/helpers/4/dosed
rename to data/lib/pkgcore/ebd/helpers/4/dosed
diff --git a/ebd/helpers/4/src_install/dohard
b/data/lib/pkgcore/ebd/helpers/4/src_install/dohard
similarity index 100%
rename from ebd/helpers/4/src_install/dohard
rename to data/lib/pkgcore/ebd/helpers/4/src_install/dohard
diff --git a/ebd/helpers/5/src_install/doheader
b/data/lib/pkgcore/ebd/helpers/5/src_install/doheader
similarity index 100%
rename from ebd/helpers/5/src_install/doheader
rename to data/lib/pkgcore/ebd/helpers/5/src_install/doheader
diff --git a/ebd/helpers/5/src_install/newheader
b/data/lib/pkgcore/ebd/helpers/5/src_install/newheader
similarity index 100%
rename from ebd/helpers/5/src_install/newheader
rename to data/lib/pkgcore/ebd/helpers/5/src_install/newheader
diff --git a/ebd/helpers/6/src_install/dohtml
b/data/lib/pkgcore/ebd/helpers/6/src_install/dohtml
similarity index 100%
rename from ebd/helpers/6/src_install/dohtml
rename to data/lib/pkgcore/ebd/helpers/6/src_install/dohtml
diff --git a/ebd/helpers/7/nonfatal b/data/lib/pkgcore/ebd/helpers/7/nonfatal
similarity index 100%
rename from ebd/helpers/7/nonfatal
rename to data/lib/pkgcore/ebd/helpers/7/nonfatal
diff --git a/ebd/helpers/7/src_install/dohtml
b/data/lib/pkgcore/ebd/helpers/7/src_install/dohtml
similarity index 100%
rename from ebd/helpers/7/src_install/dohtml
rename to data/lib/pkgcore/ebd/helpers/7/src_install/dohtml
diff --git a/ebd/helpers/7/src_install/dolib
b/data/lib/pkgcore/ebd/helpers/7/src_install/dolib
similarity index 100%
rename from ebd/helpers/7/src_install/dolib
rename to data/lib/pkgcore/ebd/helpers/7/src_install/dolib
diff --git a/ebd/helpers/8/src_install/doconfd
b/data/lib/pkgcore/ebd/helpers/8/src_install/doconfd
similarity index 100%
rename from ebd/helpers/8/src_install/doconfd
rename to data/lib/pkgcore/ebd/helpers/8/src_install/doconfd
diff --git a/ebd/helpers/8/src_install/doenvd
b/data/lib/pkgcore/ebd/helpers/8/src_install/doenvd
similarity index 100%
rename from ebd/helpers/8/src_install/doenvd
rename to data/lib/pkgcore/ebd/helpers/8/src_install/doenvd
diff --git a/ebd/helpers/8/src_install/doheader
b/data/lib/pkgcore/ebd/helpers/8/src_install/doheader
similarity index 100%
rename from ebd/helpers/8/src_install/doheader
rename to data/lib/pkgcore/ebd/helpers/8/src_install/doheader
diff --git a/ebd/helpers/8/src_install/doinitd
b/data/lib/pkgcore/ebd/helpers/8/src_install/doinitd
similarity index 100%
rename from ebd/helpers/8/src_install/doinitd
rename to data/lib/pkgcore/ebd/helpers/8/src_install/doinitd
diff --git a/ebd/helpers/common/pkgcore-ebuild-helper
b/data/lib/pkgcore/ebd/helpers/common/pkgcore-ebuild-helper
similarity index 100%
rename from ebd/helpers/common/pkgcore-ebuild-helper
rename to data/lib/pkgcore/ebd/helpers/common/pkgcore-ebuild-helper
diff --git a/ebd/helpers/common/pkgcore-ipc-helper
b/data/lib/pkgcore/ebd/helpers/common/pkgcore-ipc-helper
similarity index 100%
rename from ebd/helpers/common/pkgcore-ipc-helper
rename to data/lib/pkgcore/ebd/helpers/common/pkgcore-ipc-helper
diff --git a/ebd/helpers/common/prepalldocs
b/data/lib/pkgcore/ebd/helpers/common/prepalldocs
similarity index 100%
rename from ebd/helpers/common/prepalldocs
rename to data/lib/pkgcore/ebd/helpers/common/prepalldocs
diff --git a/ebd/helpers/common/prepallstrip
b/data/lib/pkgcore/ebd/helpers/common/prepallstrip
similarity index 100%
rename from ebd/helpers/common/prepallstrip
rename to data/lib/pkgcore/ebd/helpers/common/prepallstrip
diff --git a/ebd/helpers/common/prepinfo
b/data/lib/pkgcore/ebd/helpers/common/prepinfo
similarity index 100%
rename from ebd/helpers/common/prepinfo
rename to data/lib/pkgcore/ebd/helpers/common/prepinfo
diff --git a/ebd/helpers/common/prepman
b/data/lib/pkgcore/ebd/helpers/common/prepman
similarity index 100%
rename from ebd/helpers/common/prepman
rename to data/lib/pkgcore/ebd/helpers/common/prepman
diff --git a/ebd/helpers/common/prepstrip
b/data/lib/pkgcore/ebd/helpers/common/prepstrip
similarity index 100%
rename from ebd/helpers/common/prepstrip
rename to data/lib/pkgcore/ebd/helpers/common/prepstrip
diff --git a/ebd/helpers/internals/_generic_new
b/data/lib/pkgcore/ebd/helpers/internals/_generic_new
similarity index 100%
rename from ebd/helpers/internals/_generic_new
rename to data/lib/pkgcore/ebd/helpers/internals/_generic_new
diff --git a/ebd/helpers/internals/banned
b/data/lib/pkgcore/ebd/helpers/internals/banned
similarity index 100%
rename from ebd/helpers/internals/banned
rename to data/lib/pkgcore/ebd/helpers/internals/banned
diff --git a/ebd/helpers/internals/deprecated
b/data/lib/pkgcore/ebd/helpers/internals/deprecated
similarity index 100%
rename from ebd/helpers/internals/deprecated
rename to data/lib/pkgcore/ebd/helpers/internals/deprecated
diff --git a/ebd/helpers/internals/helper-lib.bash
b/data/lib/pkgcore/ebd/helpers/internals/helper-lib.bash
similarity index 100%
rename from ebd/helpers/internals/helper-lib.bash
rename to data/lib/pkgcore/ebd/helpers/internals/helper-lib.bash
diff --git a/ebd/helpers/internals/prepall
b/data/lib/pkgcore/ebd/helpers/internals/prepall
similarity index 100%
rename from ebd/helpers/internals/prepall
rename to data/lib/pkgcore/ebd/helpers/internals/prepall
diff --git a/ebd/isolated-functions.bash
b/data/lib/pkgcore/ebd/isolated-functions.bash
similarity index 100%
rename from ebd/isolated-functions.bash
rename to data/lib/pkgcore/ebd/isolated-functions.bash
diff --git a/shell/bash/pkgcore.bash b/data/lib/pkgcore/shell/bash/pkgcore.bash
similarity index 100%
rename from shell/bash/pkgcore.bash
rename to data/lib/pkgcore/shell/bash/pkgcore.bash
diff --git a/shell/bin/pkgcore-sh-helper
b/data/lib/pkgcore/shell/bin/pkgcore-sh-helper
similarity index 100%
rename from shell/bin/pkgcore-sh-helper
rename to data/lib/pkgcore/shell/bin/pkgcore-sh-helper
diff --git a/shell/bin/psite b/data/lib/pkgcore/shell/bin/psite
similarity index 100%
rename from shell/bin/psite
rename to data/lib/pkgcore/shell/bin/psite
diff --git a/shell/pkgcore.sh b/data/lib/pkgcore/shell/pkgcore.sh
similarity index 100%
rename from shell/pkgcore.sh
rename to data/lib/pkgcore/shell/pkgcore.sh
diff --git a/shell/zsh/pkgcore.zsh b/data/lib/pkgcore/shell/zsh/pkgcore.zsh
similarity index 100%
rename from shell/zsh/pkgcore.zsh
rename to data/lib/pkgcore/shell/zsh/pkgcore.zsh
diff --git a/shell/bash/completion/pquery
b/data/share/bash-completion/completions/pquery
similarity index 100%
rename from shell/bash/completion/pquery
rename to data/share/bash-completion/completions/pquery
diff --git a/data/config/make.globals b/data/share/pkgcore/config/make.globals
similarity index 100%
rename from data/config/make.globals
rename to data/share/pkgcore/config/make.globals
diff --git a/data/config/repos.conf b/data/share/pkgcore/config/repos.conf
similarity index 100%
rename from data/config/repos.conf
rename to data/share/pkgcore/config/repos.conf
diff --git a/data/stubconfig/repos.conf
b/data/share/pkgcore/stubconfig/repos.conf
similarity index 100%
rename from data/stubconfig/repos.conf
rename to data/share/pkgcore/stubconfig/repos.conf
diff --git a/data/stubrepo/metadata/layout.conf
b/data/share/pkgcore/stubrepo/metadata/layout.conf
similarity index 100%
rename from data/stubrepo/metadata/layout.conf
rename to data/share/pkgcore/stubrepo/metadata/layout.conf
diff --git a/data/stubrepo/profiles/arch.list
b/data/share/pkgcore/stubrepo/profiles/arch.list
similarity index 100%
rename from data/stubrepo/profiles/arch.list
rename to data/share/pkgcore/stubrepo/profiles/arch.list
diff --git a/data/stubrepo/profiles/default/make.defaults
b/data/share/pkgcore/stubrepo/profiles/default/make.defaults
similarity index 100%
rename from data/stubrepo/profiles/default/make.defaults
rename to data/share/pkgcore/stubrepo/profiles/default/make.defaults
diff --git a/data/stubrepo/profiles/profiles.desc
b/data/share/pkgcore/stubrepo/profiles/profiles.desc
similarity index 100%
rename from data/stubrepo/profiles/profiles.desc
rename to data/share/pkgcore/stubrepo/profiles/profiles.desc
diff --git a/data/stubrepo/profiles/repo_name
b/data/share/pkgcore/stubrepo/profiles/repo_name
similarity index 100%
rename from data/stubrepo/profiles/repo_name
rename to data/share/pkgcore/stubrepo/profiles/repo_name
diff --git a/data/xml-schema/metadata.xsd
b/data/share/pkgcore/xml-schema/metadata.xsd
similarity index 100%
rename from data/xml-schema/metadata.xsd
rename to data/share/pkgcore/xml-schema/metadata.xsd
diff --git a/shell/zsh/completion/_pkgcore
b/data/share/zsh/site-functions/_pkgcore
similarity index 100%
rename from shell/zsh/completion/_pkgcore
rename to data/share/zsh/site-functions/_pkgcore
diff --git a/setup.py b/setup.py
index 38cb7bb85..58d65dbe1 100755
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,8 @@
#!/usr/bin/env python3
-import glob
import os
import subprocess
import sys
-from itertools import chain
from setuptools import setup
from setuptools._distutils import log
@@ -21,6 +19,7 @@ CONFIG_INSTALL_OFFSET = os.path.join(DATA_INSTALL_OFFSET,
'config')
LIBDIR_INSTALL_OFFSET = 'lib/pkgcore'
EBD_INSTALL_OFFSET = os.path.join(LIBDIR_INSTALL_OFFSET, 'ebd')
+EBD_SCRIPTS_DIR = os.path.join(pkgdist.REPODIR, 'data/lib/pkgcore/ebd')
class sdist(pkgdist.sdist):
"""sdist wrapper to bundle generated files for release."""
@@ -30,12 +29,12 @@ class sdist(pkgdist.sdist):
import shutil
# generate function lists so they don't need to be created on install
- write_pkgcore_ebd_funclists(root='/', target='ebd/.generated')
- write_pkgcore_ebd_cmdlists(root='/', target='ebd/.generated')
- write_pkgcore_ebd_eapi_libs(root='/', target='ebd/.generated')
+ write_pkgcore_ebd_funclists(root='/',
target='data/lib/pkgcore/ebd/.generated')
+ write_pkgcore_ebd_cmdlists(root='/',
target='data/lib/pkgcore/ebd/.generated')
+ write_pkgcore_ebd_eapi_libs(root='/',
target='data/lib/pkgcore/ebd/.generated')
shutil.copytree(
- os.path.join(pkgdist.REPODIR, 'ebd', '.generated'),
- os.path.join(base_dir, 'ebd', '.generated'))
+ os.path.join(pkgdist.REPODIR, 'data/lib/pkgcore/ebd/.generated'),
+ os.path.join(base_dir, 'data/lib/pkgcore/ebd/.generated'))
pkgdist.sdist.make_release_tree(self, base_dir, files)
@@ -84,7 +83,7 @@ def write_pkgcore_ebd_funclists(root, target):
log.info(f'writing ebd global function list: {path!r}')
with open(path, 'w') as f:
if subprocess.call(
- [os.path.join(pkgdist.REPODIR, 'ebd',
'generate_global_func_list')],
+ [os.path.join(EBD_SCRIPTS_DIR, 'generate_global_func_list')],
cwd=ebd_dir, stdout=f):
raise DistutilsExecError("generating global function list failed")
@@ -97,7 +96,7 @@ def write_pkgcore_ebd_funclists(root, target):
log.info(f'writing EAPI {eapi} function list: {path!r}')
with open(path, 'w') as f:
if subprocess.call(
- [os.path.join(pkgdist.REPODIR, 'ebd',
'generate_eapi_func_list'), eapi],
+ [os.path.join(EBD_SCRIPTS_DIR,
'generate_eapi_func_list'), eapi],
cwd=ebd_dir, stdout=f):
raise DistutilsExecError(f"generating EAPI {eapi} function
list failed")
@@ -110,6 +109,7 @@ def write_pkgcore_ebd_cmdlists(root, target):
os.makedirs(os.path.join(ebd_dir, 'cmds'), exist_ok=True)
# generate EAPI specific command lists
+ script = os.path.join(EBD_SCRIPTS_DIR, 'generate_eapi_cmd_list')
with pkgdist.syspath(pkgdist.PACKAGEDIR):
from pkgcore.ebuild.eapi import EAPI
for eapi_obj in EAPI.known_eapis.values():
@@ -120,7 +120,7 @@ def write_pkgcore_ebd_cmdlists(root, target):
log.info(f'writing EAPI {eapi} banned command list: {path!r}')
with open(path, 'w') as f:
if subprocess.call(
- [os.path.join(pkgdist.REPODIR, 'ebd',
'generate_eapi_cmd_list'), '-b', eapi],
+ [script, '-b', eapi],
cwd=ebd_dir, stdout=f):
raise DistutilsExecError(f'generating EAPI {eapi} banned
command list failed')
@@ -128,7 +128,7 @@ def write_pkgcore_ebd_cmdlists(root, target):
log.info(f'writing EAPI {eapi} deprecated command list: {path!r}')
with open(path, 'w') as f:
if subprocess.call(
- [os.path.join(pkgdist.REPODIR, 'ebd',
'generate_eapi_cmd_list'), '-d', eapi],
+ [script, '-d', eapi],
cwd=ebd_dir, stdout=f):
raise DistutilsExecError(f'generating EAPI {eapi}
deprecated command list failed')
@@ -136,7 +136,7 @@ def write_pkgcore_ebd_cmdlists(root, target):
log.info(f'writing EAPI {eapi} internal command list: {path!r}')
with open(path, 'w') as f:
if subprocess.call(
- [os.path.join(pkgdist.REPODIR, 'ebd',
'generate_eapi_cmd_list'), '-i', eapi],
+ [script, '-i', eapi],
cwd=ebd_dir, stdout=f):
raise DistutilsExecError(f'generating EAPI {eapi} internal
command list failed')
@@ -147,7 +147,7 @@ def write_pkgcore_ebd_eapi_libs(root, target):
if root != '/':
ebd_dir = os.path.join(root, target.lstrip('/'))
- script = os.path.join(pkgdist.REPODIR, 'ebd', 'generate_eapi_lib')
+ script = os.path.join(EBD_SCRIPTS_DIR, 'generate_eapi_lib')
with pkgdist.syspath(pkgdist.PACKAGEDIR):
from pkgcore.ebuild.eapi import EAPI
for eapi_obj in EAPI.known_eapis.values():
@@ -238,16 +238,7 @@ setup(**dict(
author='Tim Harder',
author_email='[email protected]',
entry_points={'pytest11': ['pkgcore = pkgcore.pytest.plugin']},
- data_files=list(chain(
- pkgdist.data_mapping(EBD_INSTALL_OFFSET, 'ebd'),
- pkgdist.data_mapping(DATA_INSTALL_OFFSET, 'data'),
- pkgdist.data_mapping('share/bash-completion/completions',
'shell/bash/completion'),
- pkgdist.data_mapping('share/zsh/site-functions',
'shell/zsh/completion'),
- pkgdist.data_mapping(
- os.path.join(LIBDIR_INSTALL_OFFSET, 'shell'), 'shell',
- skip=glob.glob('shell/*/completion'),
- ),
- )),
+ data_files=list(pkgdist.data_mapping('.', 'data')),
cmdclass=dict(
pkgdist_cmds,
sdist=sdist,
diff --git a/src/pkgcore/const.py b/src/pkgcore/const.py
index 023508408..f5dde16a3 100644
--- a/src/pkgcore/const.py
+++ b/src/pkgcore/const.py
@@ -49,8 +49,8 @@ SYSTEM_CONF_FILE = '/etc/pkgcore/pkgcore.conf'
SYSTEM_CACHE_PATH = '/var/cache/pkgcore'
REPO_PATH = _GET_CONST('REPO_PATH', _reporoot)
-DATA_PATH = _GET_CONST('DATA_PATH', '%(REPO_PATH)s/data')
+DATA_PATH = _GET_CONST('DATA_PATH', '%(REPO_PATH)s/data/share/pkgcore')
LIBDIR_PATH = _GET_CONST('LIBDIR_PATH', '%(REPO_PATH)s')
-CONFIG_PATH = _GET_CONST('CONFIG_PATH', '%(REPO_PATH)s/data/config')
+CONFIG_PATH = _GET_CONST('CONFIG_PATH', '%(DATA_PATH)s/config')
PATH_FORCED_PREPEND = _GET_CONST('INJECTED_BIN_PATH', ('%(REPO_PATH)s/bin',))
CP_BINARY = _GET_CONST('CP_BINARY', '/bin/cp')
diff --git a/src/pkgcore/ebuild/const.py b/src/pkgcore/ebuild/const.py
index 78b0256b8..c32fa9ba7 100644
--- a/src/pkgcore/ebuild/const.py
+++ b/src/pkgcore/ebuild/const.py
@@ -25,7 +25,7 @@ metadata_keys = (
WORLD_FILE = '/var/lib/portage/world'
-EBD_PATH = const._GET_CONST('EBD_PATH', '%(REPO_PATH)s/ebd')
+EBD_PATH = const._GET_CONST('EBD_PATH', '%(REPO_PATH)s/data/lib/pkgcore/ebd')
EBUILD_DAEMON_PATH = pjoin(EBD_PATH, "ebuild-daemon.bash")
EBUILD_HELPERS_PATH = pjoin(EBD_PATH, "helpers")
