[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/, pym/gentoolkit/merge_driver_ekeyword/, ...

[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/, pym/gentoolkit/merge_driver_ekeyword/, ...

[Matt Turner]

commit:     b194cf357d9cb2ee6a9f3587e2309f01edce9723
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 17:02:49 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 17:04:01 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=b194cf35

merge_driver_ekeyword: Add build system

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 pym/gentoolkit/merge_driver_ekeyword/meson.build   | 24 ++++++++++++++++++++++
 pym/gentoolkit/merge_driver_ekeyword/pytest.ini    |  3 +++
 .../merge_driver_ekeyword/tests/meson.build        | 21 +++++++++++++++++++
 pym/gentoolkit/meson.build                         |  1 +
 4 files changed, 49 insertions(+)

diff --git a/pym/gentoolkit/merge_driver_ekeyword/meson.build b/pym/gentoolkit/merge_driver_ekeyword/meson.build
new file mode 100644
index 0000000..9c157b9
--- /dev/null
+++ b/pym/gentoolkit/merge_driver_ekeyword/meson.build
@@ -0,0 +1,24 @@
+
+merge_driver_ekeyword_py = configure_file(
+    input : 'merge_driver_ekeyword.py',
+    output : 'merge_driver_ekeyword.py',
+    configuration : conf_data
+)
+
+py.install_sources(
+    [
+        '__init__.py',
+        merge_driver_ekeyword_py,
+        'test_merge_driver_ekeyword.py',
+    ],
+    subdir : 'gentoolkit/merge_driver_ekeyword'
+)
+
+install_data(
+    [
+        'pytest.ini',
+    ],
+    install_dir : py.get_install_dir() / 'gentoolkit' / 'merge_driver_ekeyword'
+)
+
+subdir('tests')

diff --git a/pym/gentoolkit/merge_driver_ekeyword/pytest.ini b/pym/gentoolkit/merge_driver_ekeyword/pytest.ini
new file mode 100644
index 0000000..7e21bec
--- /dev/null
+++ b/pym/gentoolkit/merge_driver_ekeyword/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+addopts = --cov
+python_files = test_*.py

diff --git a/pym/gentoolkit/merge_driver_ekeyword/tests/meson.build b/pym/gentoolkit/merge_driver_ekeyword/tests/meson.build
new file mode 100644
index 0000000..cb7a9d5
--- /dev/null
+++ b/pym/gentoolkit/merge_driver_ekeyword/tests/meson.build
@@ -0,0 +1,21 @@
+install_data(
+    [
+		'conflict-near-KEYWORDS/A.ebuild',
+		'conflict-near-KEYWORDS/B.ebuild',
+		'conflict-near-KEYWORDS/common-ancestor.ebuild',
+		'conflict-near-KEYWORDS/expected.ebuild',
+		'multiple-KEYWORDS-conflict/A.ebuild',
+		'multiple-KEYWORDS-conflict/B.ebuild',
+		'multiple-KEYWORDS-conflict/common-ancestor.ebuild',
+		'multiple-KEYWORDS-conflict/expected.ebuild',
+		'non-KEYWORDS-conflict/A.ebuild',
+		'non-KEYWORDS-conflict/B.ebuild',
+		'non-KEYWORDS-conflict/common-ancestor.ebuild',
+		'single-KEYWORDS-conflict/A.ebuild',
+		'single-KEYWORDS-conflict/B.ebuild',
+		'single-KEYWORDS-conflict/common-ancestor.ebuild',
+		'single-KEYWORDS-conflict/expected.ebuild',
+    ],
+    preserve_path: true,
+    install_dir : py.get_install_dir() / 'gentoolkit' / 'merge_driver_ekeyword' / 'tests'
+)

diff --git a/pym/gentoolkit/meson.build b/pym/gentoolkit/meson.build
index 7908d94..7fd5f99 100644
--- a/pym/gentoolkit/meson.build
+++ b/pym/gentoolkit/meson.build
@@ -31,5 +31,6 @@ subdir('enalyze')
 subdir('equery')
 subdir('eshowkw')
 subdir('imlate')
+subdir('merge_driver_ekeyword')
 subdir('revdep_rebuild')
 subdir('test')