From 2ad011cd42b40aebf90105be4521fb1727266d1d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Sep 2022 15:08:09 +0100 Subject: gentoo auto-resync : 26:09:2022 - 15:08:08 --- app-admin/Manifest.gz | Bin 32883 -> 32877 bytes app-admin/ansible-lint/Manifest | 4 +- app-admin/ansible-lint/ansible-lint-6.6.1.ebuild | 78 --------------------- app-admin/ansible-lint/ansible-lint-6.7.0.ebuild | 78 +++++++++++++++++++++ app-admin/keepassxc/Manifest | 2 +- app-admin/keepassxc/keepassxc-9999.ebuild | 6 +- app-admin/watchfolder/Manifest | 4 +- .../watchfolder/files/0.3.3-implicit-decl.patch | 14 ++++ app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild | 45 ------------ app-admin/watchfolder/watchfolder-0.3.3-r2.ebuild | 45 ++++++++++++ app-admin/xtail/Manifest | 5 ++ .../xtail/files/xtail-2.1_p8-fix-limits-musl.patch | 28 ++++++++ .../xtail/files/xtail-2.1_p8-fix-prototype.patch | 20 ++++++ .../files/xtail-2.1_p8-rename-configure.patch | 23 ++++++ app-admin/xtail/xtail-2.1_p8.ebuild | 50 +++++++++++++ 15 files changed, 272 insertions(+), 130 deletions(-) delete mode 100644 app-admin/ansible-lint/ansible-lint-6.6.1.ebuild create mode 100644 app-admin/ansible-lint/ansible-lint-6.7.0.ebuild delete mode 100644 app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild create mode 100644 app-admin/watchfolder/watchfolder-0.3.3-r2.ebuild create mode 100644 app-admin/xtail/files/xtail-2.1_p8-fix-limits-musl.patch create mode 100644 app-admin/xtail/files/xtail-2.1_p8-fix-prototype.patch create mode 100644 app-admin/xtail/files/xtail-2.1_p8-rename-configure.patch create mode 100644 app-admin/xtail/xtail-2.1_p8.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index ab080e8a43d8..604410c8c1c2 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest index 0e083e453be4..51226990ec93 100644 --- a/app-admin/ansible-lint/Manifest +++ b/app-admin/ansible-lint/Manifest @@ -1,7 +1,7 @@ AUX ansible-lint-6.5.2_test-module-check.patch 1090 BLAKE2B 1fa06ac57a978c75744224f20e5dad1917a96c7716273daff72b025bd8696cb8ed960c1c7ef464278da0f8b2e99146d99e0194fdba3fdde8fff62b6bd86ff2f3 SHA512 8f6cc1a3b9522a1584fd7ae5b1f2d7b1d1295f4cd0fa286d3d917bdada355f06b5eb46cf3f7fb5f6e7410c489e1de56ac4b2f10553734a2e592bcc2594b60336 AUX ansible-lint-6.6.1_test-module-check.patch 1169 BLAKE2B e1dc222e82063ed1ade954d3557106d06a9bcba6642d102441b2a07e14a841f80709e0b50ce60e4e60dfda5ac31f1c5a2bf352b86d0cfbc14911c17051fc1ecd SHA512 227d225d2c444c1c6fae8529e44ba63692e94f019c2264c8b1b28af76f276214baa44390840ee326fec3bd5f644aa166c77ad0fdd1a7ed00005e12b5d36e08e8 DIST ansible-lint-6.5.2.gh.tar.gz 248425 BLAKE2B 02fe3f0cb410831ee7913c5f5ae434678ff183f9c60f0355988d69b516324513fd417439f9ceee4a38192c1e593d7bc00c8fd1aafdff6ba904cdb4ba56257657 SHA512 36a8d7b746bbb0c0f4d85a63180432b9165b1e59ff9da07f6b9477aa02d8998c5c682a317a04c4971a08f0691a10f420d9fd0e7d396d7d1b7f49979c7faf41f5 -DIST ansible-lint-6.6.1.gh.tar.gz 272235 BLAKE2B 50d014a919b7e915aff541b7be401f287ac990ec3dc435af2356143434fb27619e2e9ebad4a6b0ed57d9b0c1972137c34d08b603eda7f8dba49359d209da2e0a SHA512 bd6c2b695ba65e808f7773deef11bd51693b0343dc356788a87761810295fad32114bfb6f8df8eef69a13702b136f1c1d02b1a9f41c43c6e64174842ec67124f +DIST ansible-lint-6.7.0.gh.tar.gz 275573 BLAKE2B 56788efbd44f6c2d8f1dd946d26f4c784c5c9e077355823d143a7b95196a3b5ce672a987639da6f051832320585fe7106d92c293a0707c9886142eebdaa812f5 SHA512 39d5292c5d262a6ee6fe60b41d531d362c95b466fe28524d314c0f2554e50906db050df93c7dc6374b99e6ef283754844e08484d24570bbbaf637d08e0af4ae2 EBUILD ansible-lint-6.5.2.ebuild 2749 BLAKE2B eb63cfb774f451e410ad1c5ae5fa3be86f5d63a59fc7524262816150bfadd7378aa901a65d91b63cfc1f20f87acc9c1b537cb8bcbf4c7568541a4034d400c192 SHA512 2d33e1edb4d6c7bf69724689fb3787edcfe4d117a420dda3bdb187e91df3f0d32e522854b59f4ce3a5ef632b7d711ae0e13d8f1557d54c400455728536954364 -EBUILD ansible-lint-6.6.1.ebuild 2749 BLAKE2B 1376aa9a508034f257287c6395eb956290293ca3e0959ee36c3be6ff02568e90136dc6ffedcd2e645e3cbec7c9d343f05cfe3ef74edcbc84cd352287473c5882 SHA512 ad8d34d1afa854ec2cef5f00665babefbc8a3d92a2dbbb022f9b1575c2fb35112731e840ef6827d047b414d83cd091c4f20171510669f50655735333d8ab2dc9 +EBUILD ansible-lint-6.7.0.ebuild 2749 BLAKE2B 1376aa9a508034f257287c6395eb956290293ca3e0959ee36c3be6ff02568e90136dc6ffedcd2e645e3cbec7c9d343f05cfe3ef74edcbc84cd352287473c5882 SHA512 ad8d34d1afa854ec2cef5f00665babefbc8a3d92a2dbbb022f9b1575c2fb35112731e840ef6827d047b414d83cd091c4f20171510669f50655735333d8ab2dc9 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36 diff --git a/app-admin/ansible-lint/ansible-lint-6.6.1.ebuild b/app-admin/ansible-lint/ansible-lint-6.6.1.ebuild deleted file mode 100644 index a483735e3a30..000000000000 --- a/app-admin/ansible-lint/ansible-lint-6.6.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 - -DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved" -HOMEPAGE="https://github.com/ansible/ansible-lint" -# PyPI tarballs do not contain all the data files needed by the tests -SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~riscv" - -RDEPEND=" - >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}] - >=dev-python/ansible-compat-2.2.0[${PYTHON_USEDEP}] - dev-python/black[${PYTHON_USEDEP}] - >=dev-python/enrich-1.2.6[${PYTHON_USEDEP}] - dev-python/filelock[${PYTHON_USEDEP}] - >=dev-python/jsonschema-4.9.0[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - >=dev-python/rich-9.5.1[${PYTHON_USEDEP}] - >=dev-python/ruamel-yaml-0.15.37[${PYTHON_USEDEP}] - >=dev-python/wcmatch-7.0[${PYTHON_USEDEP}] - >=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]" -BDEPEND=" - >=dev-python/setuptools_scm-3.5.0[${PYTHON_USEDEP}] - >=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}] - test? ( - >=dev-python/flaky-3.7.0[${PYTHON_USEDEP}] - >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}] - >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}] - )" - -PATCHES=( - "${FILESDIR}"/${PN}-6.6.1_test-module-check.patch -) - -# Skip problematic tests: -# - test_call_from_outside_venv doesn't play nicely with the sandbox -# - all the others require Internet access, mostly in order to access Ansible Galaxy -EPYTEST_DESELECT=( - test/test_cli_role_paths.py::test_run_playbook_github - test/test_eco.py - test/test_examples.py::test_custom_kinds - test/test_import_playbook.py::test_task_hook_import_playbook - test/test_list_rules.py::test_list_rules_includes_opt_in_rules - test/test_list_rules.py::test_list_rules_with_format_option - test/test_list_rules.py::test_list_tags_includes_opt_in_rules - test/test_main.py::test_call_from_outside_venv - test/test_prerun.py::test_install_collection - test/test_prerun.py::test_prerun_reqs_v1 - test/test_prerun.py::test_prerun_reqs_v2 - test/test_prerun.py::test_require_collection_wrong_version - test/test_profiles.py::test_profile_listing - test/test_rules_collection.py::test_rich_rule_listing - test/test_skip_inside_yaml.py::test_role_meta - test/test_utils.py::test_cli_auto_detect - test/test_utils.py::test_template_lookup - test/test_verbosity.py::test_default_verbosity -) - -distutils_enable_tests pytest - -python_test() { - # Since 6.2.1, without this the test suite still gets confused by the presence of ansible-lint modules - # in both ${ED} and ${S}. - cd "${S}" || die - - epytest test -} diff --git a/app-admin/ansible-lint/ansible-lint-6.7.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.7.0.ebuild new file mode 100644 index 000000000000..a483735e3a30 --- /dev/null +++ b/app-admin/ansible-lint/ansible-lint-6.7.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_PEP517=setuptools + +inherit distutils-r1 + +DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved" +HOMEPAGE="https://github.com/ansible/ansible-lint" +# PyPI tarballs do not contain all the data files needed by the tests +SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~riscv" + +RDEPEND=" + >=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}] + >=dev-python/ansible-compat-2.2.0[${PYTHON_USEDEP}] + dev-python/black[${PYTHON_USEDEP}] + >=dev-python/enrich-1.2.6[${PYTHON_USEDEP}] + dev-python/filelock[${PYTHON_USEDEP}] + >=dev-python/jsonschema-4.9.0[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/rich-9.5.1[${PYTHON_USEDEP}] + >=dev-python/ruamel-yaml-0.15.37[${PYTHON_USEDEP}] + >=dev-python/wcmatch-7.0[${PYTHON_USEDEP}] + >=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]" +BDEPEND=" + >=dev-python/setuptools_scm-3.5.0[${PYTHON_USEDEP}] + >=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}] + test? ( + >=dev-python/flaky-3.7.0[${PYTHON_USEDEP}] + >=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}] + >=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}"/${PN}-6.6.1_test-module-check.patch +) + +# Skip problematic tests: +# - test_call_from_outside_venv doesn't play nicely with the sandbox +# - all the others require Internet access, mostly in order to access Ansible Galaxy +EPYTEST_DESELECT=( + test/test_cli_role_paths.py::test_run_playbook_github + test/test_eco.py + test/test_examples.py::test_custom_kinds + test/test_import_playbook.py::test_task_hook_import_playbook + test/test_list_rules.py::test_list_rules_includes_opt_in_rules + test/test_list_rules.py::test_list_rules_with_format_option + test/test_list_rules.py::test_list_tags_includes_opt_in_rules + test/test_main.py::test_call_from_outside_venv + test/test_prerun.py::test_install_collection + test/test_prerun.py::test_prerun_reqs_v1 + test/test_prerun.py::test_prerun_reqs_v2 + test/test_prerun.py::test_require_collection_wrong_version + test/test_profiles.py::test_profile_listing + test/test_rules_collection.py::test_rich_rule_listing + test/test_skip_inside_yaml.py::test_role_meta + test/test_utils.py::test_cli_auto_detect + test/test_utils.py::test_template_lookup + test/test_verbosity.py::test_default_verbosity +) + +distutils_enable_tests pytest + +python_test() { + # Since 6.2.1, without this the test suite still gets confused by the presence of ansible-lint modules + # in both ${ED} and ${S}. + cd "${S}" || die + + epytest test +} diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest index 7537a8968995..f1e8c4457350 100644 --- a/app-admin/keepassxc/Manifest +++ b/app-admin/keepassxc/Manifest @@ -1,4 +1,4 @@ DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9 EBUILD keepassxc-2.7.1-r1.ebuild 2368 BLAKE2B e1d3f23456beb2057c29f4040e9244ca2f2452a2dbd75ee8bb807b4921b2a0aa1519aecd31a21a6caa8c4c7b6295cd87bf66f9c01d50c4c98425728429287aeb SHA512 e90e777e8c8ea57551af72b11d82fa5e4fa6bcbe4bb424e0de39b99dddbd8d21b80e5cd1c49c12485da414e3670145144f31a6aa77b0ff163bcccbdb08e23207 -EBUILD keepassxc-9999.ebuild 2370 BLAKE2B d8c28490809d62eac02a2d5004561030d8e903268ab0e6387bed5963d6b22aac4522470e9f3a534d14878618d1b46ed678502cef86acb10b6a0bd05bc86b0a57 SHA512 8094d42d7eebe4e402b12b778a4b337a5c32a406ea997b19d5013bbc8acc61bef9462a7347e59af5b0217a2746e4825a4469fdcf9ab8a497000d93f725e2fdad +EBUILD keepassxc-9999.ebuild 2438 BLAKE2B 2bf06c3ed5101ca38de87175dc988ac374d94f7948971e1d363131d8b8517989d6620379ecf48b3edfc2c1d8ea6c1bf7ee413d34bdeb663be610bdd2bfb6f9b1 SHA512 1cc3f836db20dfbcbd4f7cabf45a93001a8ab4ca6bd86f0eca633172942cc76d744b5bcb2f691e6eae25a8f7c72d2744c07545e38d77f177d32ec41eb26d5c7f MISC metadata.xml 1028 BLAKE2B bc89e683ead8dfcedd9c1794c35df27ca535b69ce0036641d71c7df8a2db70060adc0d34a007c9da69765dea4fbfe5df5349d880197e2cbdb7f6c5347baed78f SHA512 abe1527cdd2c26b8f64d6b7e8651325146ffbbd53dc9cf273599901e9e9ac31bd43f2c85d8aad1067ccf807cbcad3d921d76df3666b8983eafe69589c7bd0647 diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild index 04056497dec9..985aebc0d678 100644 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ b/app-admin/keepassxc/keepassxc-9999.ebuild @@ -25,9 +25,10 @@ fi LICENSE="LGPL-2.1 GPL-2 GPL-3" SLOT="0" -IUSE="autotype browser doc keeshare +network test yubikey" +IUSE="X autotype browser doc keeshare +network test yubikey" RESTRICT="!test? ( test )" +REQUIRED_USE="autotype? ( X )" RDEPEND=" app-crypt/argon2:= @@ -39,10 +40,10 @@ RDEPEND=" dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= + X? ( dev-qt/qtx11extras:5 ) autotype? ( x11-libs/libX11 x11-libs/libXtst @@ -88,6 +89,7 @@ src_configure() { -DWITH_XC_SSHAGENT=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_YUBIKEY="$(usex yubikey)" + -DWITH_XC_X11="$(usex X)" ) if [[ "${PV}" == *_beta* ]] ; then mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) diff --git a/app-admin/watchfolder/Manifest b/app-admin/watchfolder/Manifest index 46109623369c..ab2f3d21f6c6 100644 --- a/app-admin/watchfolder/Manifest +++ b/app-admin/watchfolder/Manifest @@ -1,6 +1,6 @@ AUX 0.3.3-64bit.patch 378 BLAKE2B 5843192ec029f95163aabd7eaccfca794dc5d1eb1085a25c413ceea6ee86ab8fb7fed06cfd01643c20686f5e3846df3040b2fe4cdd6523d93188a9359436abcf SHA512 df3e6e83d93bbf9d1777186f521136ab1c3c80c68ecf206d9962539cf18b71a0581cfdddc22dc587ba538a8916c445f9a0feab4a123846c4aac61904b66360de AUX 0.3.3-fortify-sources.patch 338 BLAKE2B 5d8c0688411320ade5154e438800e25c48334093938813b8f3d5a2ce7e34251f960bde60c116ffb0a8290f4a075f110a65e14d39ea5430205c5e284438924ac9 SHA512 f5ace713b309f490761699e30a2250ab5e718bcf4b14fa4454e057a150d2961ff231721666556668594e47b37745ec6d0c951ede1d22221345afb13cee2fda66 -AUX 0.3.3-implicit-decl.patch 765 BLAKE2B 7d00a07f318b3599318831c70dc7808a00ed29814feb8ccc3f8649829f22cf183636e100ea6ed2b7314e11499e8c7e840dfebe92d109aa1798364cc32094d02c SHA512 65a006fb8272326eb693bb864346ee922f34a18db8d3f61c31e8e3212c2b96dbbd41cad66224de9dccbc8b18eea010c4304c4fb48febbf6b24d6655abfcad33b +AUX 0.3.3-implicit-decl.patch 1058 BLAKE2B 2f06a93dd433570b0ef2e0b8eb25e06cac58012f7b4a091ad8753bfa3e9196d4c671ea9627e656bc78464c8388ec1b4c71884e1ae9455da4aeb36093c8f6fd2e SHA512 4ce5e21474b9a0ea34025294517f3671225b8f02490556b647888130f4293bfdf8dc838af1ccd00c123aa3f6aaa6f0f1db13613d3043d4f82aecda057e28b8e5 DIST watchfolder-0.3.3.tar.gz 86741 BLAKE2B d834f8aade7e648e27f95ca896355ec07afb24bac0f0116280f374e763c6fca8e7e7ffca7850d54b11fdf1c1ccfe8d28bd52a527eeb7110d4783a55de28828fb SHA512 162a3535748d280d06db8b05ddc4c87b578ff4be08aeb7a08858c28fd4612f46c4b8ed866513283edcd6ad24207c94a02e562200ae102d1897b4b28be6717dc6 -EBUILD watchfolder-0.3.3-r1.ebuild 927 BLAKE2B 892ece87489683a1950f6f7d91c8f62724a68ab51da1abda6955f4032052361a3efd5badbd75b09ba72530f44a4dfd40ab6fe8b7ac8d79eacd23733421a7fbdb SHA512 66ef56727ab68951dca146395bcea3b6ff106a0b7fb9cd7c441f233fd2a2f2e3a6f0ac550e2077ffbe9d82eec8720962bab6c5664c641314060b2070536ce381 +EBUILD watchfolder-0.3.3-r2.ebuild 927 BLAKE2B 7742ed8965efb0763077dee5ae24f76f6ff84ed83655839e0b26aecf0dcb26c631ea11811be1edc0ce0c8c496b8afa220728b68ec683091d93167114ef8906e9 SHA512 b496631bc07a15008f700d4a3bc5a1cc12cee0ca7195cfab93fbeee6ba75e3e53299032725efef0c38b643448f0668aba5981d7749e1e6a0fa25959cd0e720f6 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/app-admin/watchfolder/files/0.3.3-implicit-decl.patch b/app-admin/watchfolder/files/0.3.3-implicit-decl.patch index 1b8e72d72bf8..f2fc0b367d48 100644 --- a/app-admin/watchfolder/files/0.3.3-implicit-decl.patch +++ b/app-admin/watchfolder/files/0.3.3-implicit-decl.patch @@ -38,3 +38,17 @@ #include #include #include +diff --git a/watchd.c b/watchd.c +index 842e186..49edb64 100644 +--- a/watchd.c ++++ b/watchd.c +@@ -52,6 +52,9 @@ Syntax : watchd + #define FL_LOG_MAIL 256 + #define FL_LOG_ALWAYS 512 + ++int isdir(char *name); ++void ini_close(inifile *i); ++ + typedef struct Twatchfolder + { + char* runprg; diff --git a/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild b/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild deleted file mode 100644 index 1622add191e4..000000000000 --- a/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Watches directories and processes files" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="mirror://gentoo/${P}.tar.gz" -S="${WORKDIR}/${P/folder/d}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~x86" - -PATCHES=( - # patch to remove warnings on 64 bit systems - "${FILESDIR}"/${PV}-64bit.patch - # and a gcc 4.3.3 / fortify_sources fix - "${FILESDIR}"/${PV}-fortify-sources.patch - # various implicit declarations - "${FILESDIR}"/${PV}-implicit-decl.patch -) - -src_prepare() { - default - - sed -i \ - -e '/-c -o/s:OPT:CFLAGS:' \ - -e 's:(\(LD\)\?OPT):(LDFLAGS) $(CFLAGS):' \ - -e 's:gcc:$(CC):' \ - Makefile || die "sed Makefile failed" -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - dobin watchd - insinto /etc - doins watchd.conf - dodoc README doc/* -} diff --git a/app-admin/watchfolder/watchfolder-0.3.3-r2.ebuild b/app-admin/watchfolder/watchfolder-0.3.3-r2.ebuild new file mode 100644 index 000000000000..9a93d1579f8a --- /dev/null +++ b/app-admin/watchfolder/watchfolder-0.3.3-r2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Watches directories and processes files" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${P}.tar.gz" +S="${WORKDIR}/${P/folder/d}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~ppc ~x86" + +PATCHES=( + # patch to remove warnings on 64 bit systems + "${FILESDIR}"/${PV}-64bit.patch + # and a gcc 4.3.3 / fortify_sources fix + "${FILESDIR}"/${PV}-fortify-sources.patch + # various implicit declarations + "${FILESDIR}"/${PV}-implicit-decl.patch +) + +src_prepare() { + default + + sed -i \ + -e '/-c -o/s:OPT:CFLAGS:' \ + -e 's:(\(LD\)\?OPT):(LDFLAGS) $(CFLAGS):' \ + -e 's:gcc:$(CC):' \ + Makefile || die "sed Makefile failed" +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dobin watchd + insinto /etc + doins watchd.conf + dodoc README doc/* +} diff --git a/app-admin/xtail/Manifest b/app-admin/xtail/Manifest index da0d90d78373..dea30f072e07 100644 --- a/app-admin/xtail/Manifest +++ b/app-admin/xtail/Manifest @@ -1,4 +1,9 @@ +AUX xtail-2.1_p8-fix-limits-musl.patch 688 BLAKE2B f3b2c0722fb170bc46ab920984f56083b8194c385e4b916a7c083aa1286c5f9a4fd392bbc97d78eed1e3aaf1ce27542c35bd5d60f48821964d228f8b4e95cde3 SHA512 047b7a812503f2070be11a1a1d7a656841bdd751f2d97ebb9b3bff3d3eba9b90c01fdd870e158d70a756186bcf6032786c793c9d148ae6fce931831c1e38879e +AUX xtail-2.1_p8-fix-prototype.patch 749 BLAKE2B c9c1fa301388b773296dbd0aac2318b1152027c0640a5ef88827372b6522855289da6fac6424514ba605978915e77535b8614169f3c3276c27710daf0b162e16 SHA512 2740c3c2e7791dc1e4fa82fe992d3aaf0c56f1be5c0ed880ddc7e9d62a3b871b3960d47880b94ee4951af1b34e8fe6d8e383b1a4f1dab851aaa9b82ba2c85b92 +AUX xtail-2.1_p8-rename-configure.patch 841 BLAKE2B 78a524fabd83ff46a1e2288bcd6493ce27951c46b68cbaa03cd3d1afae1d466bc2003bfaa833e6cdd943e79adb14034a4e931bc0f5c5ddd61968cc8e8506b829 SHA512 09b9e305b173ea2d94d5169360aa4ce1707f905e48b116fee97a5829ab1c0875b36a348f575df654139e148c4f281203686bd5ff0bb0e13e618e161e88d4de66 DIST 20120219-patch-aalto.zip 4991 BLAKE2B 6b3e228508bb12c1e18f3d2982c1bf23c996e1be231b4b08b640a310f9c5e9642b9f6ea25d45c717902cdf1024509fca6d804f8e64d3bb764eac8bc3e9bd0846 SHA512 ae20448944e25aa04879bdab8d61bd910b1aa6f85c3d8287e712c6d37b1154af480edc6569467e31b3b404d7f90f771ec3e4c20c58132d9125303b40a6f102f2 DIST xtail-2.1.tar.gz 26769 BLAKE2B 9a5c47810b2a8cd7aa4d8cc543ec9edce7a24ee446627f658063547276a43dfb72503f10c4d2d6a35f25415a32a2aa177dc5fde79e8ed834cf8ade5aaf9fb447 SHA512 a8519969ef960af97c4dcb75c679daa5687f553c909817ede1134dfa5d70ed71c5264f0e61c8c579cc253ccb7739a68c5213811169489a98e676ef8941d9446f +DIST xtail_2.1-8.debian.tar.xz 7168 BLAKE2B c04a239aabd307f36b983b83384ace6f7abbe7215f84921da159da57b338affb9840e3bfb9886121fd140e1a412f017cfdc1f22afe2ac8484fc1d8b641ef196e SHA512 6c00f87f905a94c579085e5f18e27fce94642d0a5a1376deb618f464a9ca6bb2f7ac0529ef7a2439b28c5314de7ee733f86dda0d7577d3575ce085e2a02c39fc EBUILD xtail-2.1-r1.ebuild 755 BLAKE2B 31ca3dd7ee5ebeb9fbcb28be16bf5d127b4ebe813b6988a1a0c4b5e752cadd2a3f8710640db0627d7d5cc33c82ace85191b1de32d8865fef0c737a92fe020e19 SHA512 190a8e7362c30ba5d1d53048859c64194db7e40d8a4fc1bab9e061ba8747524d9b1e9f0b07b80a63d0f6b0504e8666c89a28b53c07be884a0c67f76d88722c10 +EBUILD xtail-2.1_p8.ebuild 1029 BLAKE2B 553d0ea9b61428533b04a158227db5e77000175c54d70fe17a339b3c53bbff6aa00a0e7c22c8b175c51611e3dbed31d37e666554ae0a4898a6d647dd2db48e3c SHA512 2156df6b758594abc0922f798cd6212bb51dd98aa6d14b73987ea4897f160f509bc9282b9b774095f47973b61e75697677e3da5025ea005d964f5b9cd649c7e3 MISC metadata.xml 391 BLAKE2B 5e2a05efa60fb020077edf3a5c4dc026ab1ca6d3cea217c4252ae18b175a4ba5fcc7956ca079aeab704f187105839ea2f35e330567e8d47760cff23562f2466b SHA512 786871c7f378de616b4a0dfb8222fb1ec744886c2919e364f2bc4b783c46d4e6f394a463556dcae7d6bed678886c9aefb98d71682e38ab126b8f823e0d85f607 diff --git a/app-admin/xtail/files/xtail-2.1_p8-fix-limits-musl.patch b/app-admin/xtail/files/xtail-2.1_p8-fix-limits-musl.patch new file mode 100644 index 000000000000..c9a7ca3f2f5d --- /dev/null +++ b/app-admin/xtail/files/xtail-2.1_p8-fix-limits-musl.patch @@ -0,0 +1,28 @@ +From: Sam James +Subject: [PATCH] Fix build on musl + +Closes: https://bugs.gentoo.org/715876 +--- a/miscfuncs.c ++++ b/miscfuncs.c +@@ -8,6 +8,8 @@ + #include + #include + #include ++#include ++ + #ifdef HAVE_UNISTD_H + # include + #endif +@@ -65,7 +67,11 @@ int scan_directory(const char *dirname) + char *basename; + struct stat sbuf; + DIR *dirp; +- static char pathname[MAXNAMLEN]; ++ #ifdef NAME_MAX ++ static char pathname[NAME_MAX]; ++ #else ++ static char pathname[MAXNAMLEN] ++ #endif + + Dprintf(stderr, ">>> scanning directory '%s'\n", dirname); + if ((dirp = opendir(dirname)) == NULL) diff --git a/app-admin/xtail/files/xtail-2.1_p8-fix-prototype.patch b/app-admin/xtail/files/xtail-2.1_p8-fix-prototype.patch new file mode 100644 index 000000000000..29eff229772f --- /dev/null +++ b/app-admin/xtail/files/xtail-2.1_p8-fix-prototype.patch @@ -0,0 +1,20 @@ +From: Sam James +Subject: [PATCH] Fix -Wdeprecated-non-prototype + +xtail.c:365:22: warning: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a previous declaration [-Wdeprecated-non-prototype] + extern unsigned sleep(); + ^ +/usr/include/unistd.h:464:21: note: conflicting prototype is here +extern unsigned int sleep (unsigned int __seconds); + ^ +1 warning generated. +--- a/xtail.c ++++ b/xtail.c +@@ -362,7 +362,6 @@ int main(int argc, char *argv[]) + * End of checking loop. + */ + { +- extern unsigned sleep(); + (void) fflush(stdout); + (void) sleep(SLEEP_TIME); + } diff --git a/app-admin/xtail/files/xtail-2.1_p8-rename-configure.patch b/app-admin/xtail/files/xtail-2.1_p8-rename-configure.patch new file mode 100644 index 000000000000..56d3372aceda --- /dev/null +++ b/app-admin/xtail/files/xtail-2.1_p8-rename-configure.patch @@ -0,0 +1,23 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -25,7 +25,7 @@ CFLAGS = @CFLAGS@ $(DEFS) + TARBALL = xtail.tar + XTAIL_OBJECTS = xtail.o entryfuncs.o miscfuncs.o + DISTFILES = Makefile.in README acconfig.h config.h.in configure \ +- configure.in entryfuncs.c install-sh miscfuncs.c xtail.1 xtail.c \ ++ configure.ac entryfuncs.c install-sh miscfuncs.c xtail.1 xtail.c \ + xtail.h + + ### +@@ -70,9 +70,9 @@ Makefile : $(srcdir)/Makefile.in config.status + #config.h : $(srcdir)/config.h.in config.status + # CONFIG_FILES= CONFIG_HEADERS=$@ $(SHELL) ./config.status + +-$(srcdir)/configure : $(srcdir)/configure.in ++$(srcdir)/configure : $(srcdir)/configure.ac + cd $(srcdir) && autoconf + +-$(srcdir)/config.h.in : $(srcdir)/configure.in $(srcdir)/acconfig.h ++$(srcdir)/config.h.in : $(srcdir)/configure.ac $(srcdir)/acconfig.h + cd $(srcdir) && autoheader + diff --git a/app-admin/xtail/xtail-2.1_p8.ebuild b/app-admin/xtail/xtail-2.1_p8.ebuild new file mode 100644 index 000000000000..1ff57c0e443a --- /dev/null +++ b/app-admin/xtail/xtail-2.1_p8.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +MY_PV=$(ver_cut 1-2) +DESCRIPTION="Tail multiple logfiles at once, even if rotated" +HOMEPAGE="http://www.unicom.com/sw/xtail/" +SRC_URI=" + http://www.unicom.com/sw/xtail/${PN}-${MY_PV}.tar.gz + http://www.unicom.com/files/20120219-patch-aalto.zip + mirror://debian/pool/main/x/xtail/xtail_${MY_PV}-$(ver_cut 4).debian.tar.xz +" +S="${WORKDIR}"/${PN}-${MY_PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +BDEPEND="app-arch/unzip" + +PATCHES=( + "${FILESDIR}"/${P}-rename-configure.patch + "${FILESDIR}"/${P}-fix-prototype.patch + "${FILESDIR}"/${P}-fix-limits-musl.patch + + "${WORKDIR}"/0001-xtail.1-remove-SIGQUIT.patch + "${WORKDIR}"/debian/patches/ +) + +src_prepare() { + default + + # Needed for -Wimplicit-int in old configure + eautoreconf +} + +src_configure() { + tc-export CC + default +} + +src_install() { + dobin xtail + doman xtail.1 + dodoc README + newdoc ../README README.patches +} -- cgit v1.2.3