From 3371c7b14a02fa327ccfb7be6ae2de3269db3e31 Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Wed, 6 Jan 2021 22:30:45 +0100 Subject: [PATCH] gitweb tarballs without hash in subdir The old SRC_URI produces tarballs from gitweb that contained the commit hash in a short form in the top level directory name. Fix this. --- app-backup/sitarba/Manifest | 5 +++-- app-backup/sitarba/sitarba-2.2.ebuild | 4 ++-- games-util/joydevmap/Manifest | 5 +++-- games-util/joydevmap/joydevmap-1.0.1.ebuild | 5 ++--- mail-mta/smailq/Manifest | 14 ++++++-------- mail-mta/smailq/smailq-1.0.ebuild | 17 +++++++++++------ mail-mta/smailq/smailq-1.1.ebuild | 17 +++++++++++------ mail-mta/smailq/smailq-1.2.ebuild | 17 +++++++++++------ 8 files changed, 49 insertions(+), 35 deletions(-) diff --git a/app-backup/sitarba/Manifest b/app-backup/sitarba/Manifest index 1a1fd5f..cbf9615 100644 --- a/app-backup/sitarba/Manifest +++ b/app-backup/sitarba/Manifest @@ -1,2 +1,3 @@ -DIST sitarba-2.2.tar.gz 9744 BLAKE2B 0154fd71e49b9131ca08aea6a952ded507a0982d614e3c6111a2048f128ee934eb49cc3df561378e7273b833d53606156ab30a7fda212dbea2a52931eb232135 SHA512 68d05f880815a16260f73a528615a784b0d31dcf726570e82a00b546cb8a56b65cf0a8cd2d599b8b1a69646fb2a7f53ed0ca5185d21dd2d66ff03e224b4b320c -EBUILD sitarba-2.2.ebuild 538 BLAKE2B c44c3c63646a288baab967300887b62bf79afa1435a8a6b389b8511c5d4662d900ececfcfc28202f920b59bf2413bda8c07af7ceec9d6abedd641d995f206e62 SHA512 f5a415567a34464b85d1fc617e56ce371bc59119d72dbd4819aefcbe78c2eae95d1125ad9b99521858dbfea3aab0b3dbdc07c906b308a70674a0f9f43c827c2f +DIST sitarba-2.2.tar.gz 9748 BLAKE2B d623318f22c7eb1819750f16e187b215b725b7c31c8935824771122cd83b388844cde212fee868b21315e57d7befc702a96e28554569811e016ad035836cbb13 SHA512 8e4b61d769521ac5f57a6fe8ca1270ff498b3bf0a832a4bd4d2efdfeb00bef4a9e947103e5ac4e01a898547f5f28e20eaa0bfded984cbca375a550d579fd41ba +EBUILD sitarba-2.2.ebuild 540 BLAKE2B 54faffc47c1364f552f303923b1ee342280dff33461c4a5043ffae4d1aa7c5d8b629a981d06060acc25755c1e1ba2383a0f168b26ca5c2e5889359e1b3df04ce SHA512 d70c339e5e4cc08f72616396f3023188104b1f35b88de7da86e8c042005d00ea8c3a95d428c9a1ce125bc6881fb1d32f90718896996d63c593a64a2495745a91 +MISC metadata.xml 243 BLAKE2B 889d08efb220a9fb8457500f5f3c33c8c737616995e19fa8b621ced4bc9d380d016413d098d4d09925c679cd23f7fbd75e495424fe6ed809a9e873014caae682 SHA512 f9051a65d7e11d7abd1b9568dbbf8be84a6ae68eb994b0c22d57dff5620047d5ad5a324057a5cf4cec10837d16024e5f21a8cf5f1a6247807f62931839eb73bc diff --git a/app-backup/sitarba/sitarba-2.2.ebuild b/app-backup/sitarba/sitarba-2.2.ebuild index 1733ea4..7bbd4b6 100644 --- a/app-backup/sitarba/sitarba-2.2.ebuild +++ b/app-backup/sitarba/sitarba-2.2.ebuild @@ -5,7 +5,8 @@ EAPI=7 DESCRIPTION="A simple tar-based backup tool" HOMEPAGE="https://www.sthu.org/code/sitarba.html" -SRC_URI="http://git.sthu.org/?p=${PN}.git;a=snapshot;h=v${PV};sf=tgz -> ${P}.tar.gz" +SRC_URI="http://git.sthu.org/?p=${PN}.git;a=snapshot;h=refs/tags/v${PV};sf=tgz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-v${PV}" LICENSE="LGPL-3" SLOT="0" @@ -17,7 +18,6 @@ DEPEND=" app-arch/tar " RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-v${PV}-09e6373" src_install() { dobin sitarba diff --git a/games-util/joydevmap/Manifest b/games-util/joydevmap/Manifest index 20843ea..1dd57f3 100644 --- a/games-util/joydevmap/Manifest +++ b/games-util/joydevmap/Manifest @@ -1,2 +1,3 @@ -DIST joydevmap-1.0.1.tar.gz 5444 SHA256 1f30c0a47817a1ede0f5850eb78c33a16c813912341dd555cc1190cd3ee698da SHA512 6db9ffa8ac591e7f759505936620790f09ae883bb47d4bfedf9dfdc7b05c4b5d90af062d04a111f8aefaba44c392ac181f174f7836b6ecdd915666b70d4e9c20 WHIRLPOOL a49f639e7aaa38c70f2cbd4443ca8134d694f21dd9bb701642e0bf80508f52d74f4e87f191901cec53b861e6c82ae854665a5efdc6868ba7d4c0acc63fe29617 -EBUILD joydevmap-1.0.1.ebuild 504 SHA256 3fe8de079a061a1c37663b9369a1b7fe8066d925767d781adcefb8e943788d85 SHA512 9733c76692fb0fbd40d7ce89f947416bdcbb68994643040ea2aabdb45c6ef566e5aa8c7f8222f1d1f526122348c922508152c68af1fe222ac9b606c6f9b707d0 WHIRLPOOL 82640b14276c2a646a42819b74f2cc8bc638df01b86a4ab0221ffa45dc8b17ddfc506858594fa9bed169540190055a765f0f3ae026289f9db9962c21ab648170 +DIST joydevmap-1.0.1.tar.gz 5438 BLAKE2B a94b9501212ebc4614a24bfa4dc765022a56ccf6f1b8e614b5cfca7b89055675a22fe06e4a0ae4c103f0f5ee1f6237e7d6a48ea3a56b80b074e6425842c9216d SHA512 5ce9639227198d04ef7ecf97178e553890a062f37a008465a2719bc45e7436a9bfc2e66f2c562ed7b97f7446122782aa45e194e844396dae22c49b3a7d4e1523 +EBUILD joydevmap-1.0.1.ebuild 501 BLAKE2B 86d9fcb30a320d20bcf1f76416b6962487418081ac3a758796ac74e3aa8d7b33316c5568a3e1a7d6fc30de988caacf8dfc0b2d0c779254c7471037f3377251ab SHA512 c8c70160fd2e4736424a3534b34bc4ab0775c2e571613c4f8bf557202458ebc2fdfaa529fb7d3d456ead8c2a36b3863283d61db7ad31d139a604e181f756fcb6 +MISC metadata.xml 243 BLAKE2B 889d08efb220a9fb8457500f5f3c33c8c737616995e19fa8b621ced4bc9d380d016413d098d4d09925c679cd23f7fbd75e495424fe6ed809a9e873014caae682 SHA512 f9051a65d7e11d7abd1b9568dbbf8be84a6ae68eb994b0c22d57dff5620047d5ad5a324057a5cf4cec10837d16024e5f21a8cf5f1a6247807f62931839eb73bc diff --git a/games-util/joydevmap/joydevmap-1.0.1.ebuild b/games-util/joydevmap/joydevmap-1.0.1.ebuild index 1e02144..30a757d 100644 --- a/games-util/joydevmap/joydevmap-1.0.1.ebuild +++ b/games-util/joydevmap/joydevmap-1.0.1.ebuild @@ -8,8 +8,8 @@ inherit cmake-utils DESCRIPTION="A simple tool to set axis and button maps of joysticks" HOMEPAGE="http://www.sthu.org/code/joydevmap.html" -SRC_URI="http://git.sthu.org/?p=joydevmap.git;a=snapshot;h=v1.0.1;sf=tgz - -> ${P}.tar.gz" +SRC_URI="http://git.sthu.org/?p=${PN}.git;a=snapshot;h=refs/tags/v${PV};sf=tgz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-v${PV}" LICENSE="LGPL-3" SLOT="0" @@ -19,5 +19,4 @@ IUSE="" DEPEND="" RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-v1.0.1-0fa6015" diff --git a/mail-mta/smailq/Manifest b/mail-mta/smailq/Manifest index cbeb09e..4e7f567 100644 --- a/mail-mta/smailq/Manifest +++ b/mail-mta/smailq/Manifest @@ -1,9 +1,7 @@ -DIST smailq-1.0.tar.gz 8684 BLAKE2B d7cd4fa2ca12c35cfd5b3b4cda0525aef6f9861095bba1d0700a2b34e7f3b8f001f5178780e4dd27895bb9d86cf457d79b8d3e114d8dc1132e392178359e4db4 SHA512 9e98282616995541b4c8f5d8f3f6e32de8e109e3b8d270a91bb0f8831dc1f241bab6c1ba5a6911ca777e0b941d9faf7d892fbf7633ca505b3d4e70c96fb8cd07 -DIST smailq-1.1.tar.gz 8703 BLAKE2B 020e48172cb3c5830619e7cb7df53a73a01bfe9f4d77eb974dcf51b06cf97b335e346348e88e1050c6af5e60b80566da83ed728f231756f990d05f37d0e6f84a SHA512 49dc96d19298a8625d6c4934d542afb7706bb3eeba1193743576fe9376f97581416e7eb0c13e543930d08516767b72f70778405e007b6839ec42e7da72483cf3 -DIST smailq-1.2.tar.gz 9144 BLAKE2B 2fb0ea070b2fe5c9add1ab5a55caff7aefe12ae51e12277aaa3fc0673941b359e0fa0f192a63d765f2477a57d1502238d7c869d92b8e16caefb15722f8b32cc2 SHA512 ff3b49e19a534c1c33c71954fd3fdf6e8256f4d5a3c2a35326f60e8a7b3efeb676d7986a1fcbb84bed62bfddd56bbd644c34fe5c98caa06a787b64050b6bf6d2 -DIST smailq-1.3.tar.gz 10697 BLAKE2B 3b7f3fbee78326cb7b37a9c3ff675ba3b9e7d10083b3f1cf739a7401e50e22f7fb12df7d10b005f67e6567e58288e8eddb4f0dfd736c238b1351e9cbac0337bc SHA512 fd48e5735b89989f2fe72927662e9c8c5a1e32af9c2da5314b8087d6aaa4373727a6cc9f4be73e480a17bf9160d4d9707eaee6fb784b9402ef854b9ddbd43f61 -EBUILD smailq-1.0.ebuild 894 BLAKE2B 6fd4c1e61faaa9c5333616e6bc7b262862cbb922b5dd86e980fb68f54ac3202b626c96ac1a96e116b22c83195d57a062cc57847de3eed8724d903e5be05487fb SHA512 2ab7a4f8192fc630a3849a97d469b6ad72cf71ea7c54f74225b28414e987613f6c5676acb93b8f39428186ba4abdb177cde733b2b4addedf47396d85ef033147 -EBUILD smailq-1.1.ebuild 891 BLAKE2B a05d0deb31cdd81b4b8613aef5e45a088dcaaa1c24ac9eee2ea0af94cf385e4fd984fbed8cf9956df60addf3acbf0679475e10694e1f3fdffd79554cdf2d5f9b SHA512 de563c94d143173e5fea8026819eecd2711351701b8603a7305f970aa646051b48f7ec2db84efa4330d449e693aa90df9b67407f2f704551cd4f1cd2c69b53b5 -EBUILD smailq-1.2.ebuild 891 BLAKE2B 4fc05b221869fe03004cb7a002f845debbaccd5328b64c0cc83bcdf36fa51ac89c627eda5c98c4fa0c8d1607d836009df9d4c28d59f9452b1d2e897b74f1e92f SHA512 fa0e70c5190e057ffc3562878747648cb2f23fb6b80b15740c3db48b7f1c1d6ea8692ac7c9e7c41bb5e51e2de44a1ac845e09fea0e91f226a6b5b1d582d61266 -EBUILD smailq-1.3.ebuild 891 BLAKE2B 356887d0c46de96703ffe4ff0f8a71f68004ee2925cbde8c0f29112b7a68df7e3f9f873f78fffd9d99a76d6d24938136e26e37eea25285eab8cf299f4fe20e55 SHA512 327e7184cfe2be01064f6717dcd865c1a91dbd3a2382613d62f4e39c25b8a162822601744d67c0425d0c6830f17f517ddc744486242ce71fb5ff91f965e98daa +DIST smailq-1.0.tar.gz 8676 BLAKE2B 1008eb077a7befeb395c00063cdd09ed76c37ee59ccf30b4fb9b9800c8461d5941e361de68a0a7fce63ce29859ab018b49e09fb1cf20bac6270c8dfa07a1ca71 SHA512 c76e9c8f74c3cdad7c8851ff16c444c6d82acae022e5927b6d9fa320e79db22a857db426fa19b9aa38075752532b8e1d2c07831f19a3998160b2837998e8d207 +DIST smailq-1.1.tar.gz 8696 BLAKE2B 0445702ee70351b6ae6cb0d0db3c4df24e0abe163ad0fc5152b524da63d1aa99bdc25d8ef5fc3e32de47f7852d8d92f0547307c3d6d035f4c1a2adc002408a4f SHA512 dadd669ec93f179f28e036ce0d9fea3af666c459bcd9714e54f0a922d30e03997c7ef64ee4556aad615c535c9e4573f36969ae8358596f0be75e861120300514 +DIST smailq-1.2.tar.gz 9134 BLAKE2B de0991718ad90a32332a1219ac52fae881675a6e719b0af1ad9c196d56bcc7bf6168a6c5ebb897f0b11ac7d47996c87dfd67b3695139aff10427a84ece768ee4 SHA512 2058533af3a553c7c86af3de365965bf68355c4b587c6344f9a454327e335d5eb6bce8db725c94adc023c8bacdcd5e2d4cfe8b5798f28683f22fb51561c19034 +EBUILD smailq-1.0.ebuild 1006 BLAKE2B 822a67c301f2f207263aac53fe6f998e9a78b4c54c44da0d3966e8e69300ae230c76753bb602964f03f5b237440cadad4b17c7414d56f6c226862c6ef106977d SHA512 edcea3fcf55081193db1f9b58f27674fe058338a50f26cae1f434c9c0895dab875d71cd5113a5554688d5d6fa1db6fab4e393285c679dcce469ffc00c881f81f +EBUILD smailq-1.1.ebuild 1006 BLAKE2B 822a67c301f2f207263aac53fe6f998e9a78b4c54c44da0d3966e8e69300ae230c76753bb602964f03f5b237440cadad4b17c7414d56f6c226862c6ef106977d SHA512 edcea3fcf55081193db1f9b58f27674fe058338a50f26cae1f434c9c0895dab875d71cd5113a5554688d5d6fa1db6fab4e393285c679dcce469ffc00c881f81f +EBUILD smailq-1.2.ebuild 1006 BLAKE2B 822a67c301f2f207263aac53fe6f998e9a78b4c54c44da0d3966e8e69300ae230c76753bb602964f03f5b237440cadad4b17c7414d56f6c226862c6ef106977d SHA512 edcea3fcf55081193db1f9b58f27674fe058338a50f26cae1f434c9c0895dab875d71cd5113a5554688d5d6fa1db6fab4e393285c679dcce469ffc00c881f81f MISC metadata.xml 243 BLAKE2B 889d08efb220a9fb8457500f5f3c33c8c737616995e19fa8b621ced4bc9d380d016413d098d4d09925c679cd23f7fbd75e495424fe6ed809a9e873014caae682 SHA512 f9051a65d7e11d7abd1b9568dbbf8be84a6ae68eb994b0c22d57dff5620047d5ad5a324057a5cf4cec10837d16024e5f21a8cf5f1a6247807f62931839eb73bc diff --git a/mail-mta/smailq/smailq-1.0.ebuild b/mail-mta/smailq/smailq-1.0.ebuild index a4393f1..4a689c5 100644 --- a/mail-mta/smailq/smailq-1.0.ebuild +++ b/mail-mta/smailq/smailq-1.0.ebuild @@ -1,17 +1,23 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=5 +EAPI=7 DESCRIPTION="A simple mail queue" HOMEPAGE="http://www.sthu.org/code/smailq.html" -SRC_URI="http://git.sthu.org/?p=smailq.git;a=snapshot;h=v1.0;sf=tgz -> smailq-1.0.tar.gz" - LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~x86 ~amd64" -RESTRICT="mirror" IUSE="+mta" +RESTRICT="mirror" + +if [ "${PV}" == "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://git.sthu.org/repos/smailq.git" +else + SRC_URI="http://git.sthu.org/?p=${PN}.git;a=snapshot;h=refs/tags/v${PV};sf=tgz -> ${P}.tar.gz" + KEYWORDS="~x86 ~amd64" + S="${WORKDIR}/${PN}-v${PV}" +fi DEPEND=" >=dev-lang/python-3.2 @@ -33,7 +39,6 @@ DEPEND=" !>=mail-mta/ssmtp-2.64-r2[mta] " RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-v1.0-6b48c59" src_install() { diff --git a/mail-mta/smailq/smailq-1.1.ebuild b/mail-mta/smailq/smailq-1.1.ebuild index 3c71ca5..4a689c5 100644 --- a/mail-mta/smailq/smailq-1.1.ebuild +++ b/mail-mta/smailq/smailq-1.1.ebuild @@ -1,17 +1,23 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=5 +EAPI=7 DESCRIPTION="A simple mail queue" HOMEPAGE="http://www.sthu.org/code/smailq.html" -SRC_URI="http://git.sthu.org/?p=${PN}.git;a=snapshot;h=v${PV};sf=tgz -> ${P}.tar.gz" - LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~x86 ~amd64" -RESTRICT="mirror" IUSE="+mta" +RESTRICT="mirror" + +if [ "${PV}" == "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://git.sthu.org/repos/smailq.git" +else + SRC_URI="http://git.sthu.org/?p=${PN}.git;a=snapshot;h=refs/tags/v${PV};sf=tgz -> ${P}.tar.gz" + KEYWORDS="~x86 ~amd64" + S="${WORKDIR}/${PN}-v${PV}" +fi DEPEND=" >=dev-lang/python-3.2 @@ -33,7 +39,6 @@ DEPEND=" !>=mail-mta/ssmtp-2.64-r2[mta] " RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-v${PV}-3aec493" src_install() { diff --git a/mail-mta/smailq/smailq-1.2.ebuild b/mail-mta/smailq/smailq-1.2.ebuild index 448592b..4a689c5 100644 --- a/mail-mta/smailq/smailq-1.2.ebuild +++ b/mail-mta/smailq/smailq-1.2.ebuild @@ -1,17 +1,23 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=5 +EAPI=7 DESCRIPTION="A simple mail queue" HOMEPAGE="http://www.sthu.org/code/smailq.html" -SRC_URI="http://git.sthu.org/?p=${PN}.git;a=snapshot;h=v${PV};sf=tgz -> ${P}.tar.gz" - LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~x86 ~amd64" -RESTRICT="mirror" IUSE="+mta" +RESTRICT="mirror" + +if [ "${PV}" == "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://git.sthu.org/repos/smailq.git" +else + SRC_URI="http://git.sthu.org/?p=${PN}.git;a=snapshot;h=refs/tags/v${PV};sf=tgz -> ${P}.tar.gz" + KEYWORDS="~x86 ~amd64" + S="${WORKDIR}/${PN}-v${PV}" +fi DEPEND=" >=dev-lang/python-3.2 @@ -33,7 +39,6 @@ DEPEND=" !>=mail-mta/ssmtp-2.64-r2[mta] " RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-v${PV}-cff9154" src_install() { -- 2.30.2