From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 May 2021 07:31:18 +0100 Subject: gentoo resync : 22.05.2021 --- dev-vcs/stgit/Manifest | 8 ++--- dev-vcs/stgit/metadata.xml | 4 +++ dev-vcs/stgit/stgit-0.23.ebuild | 80 ----------------------------------------- dev-vcs/stgit/stgit-1.0.ebuild | 3 +- dev-vcs/stgit/stgit-1.1.ebuild | 79 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 86 deletions(-) delete mode 100644 dev-vcs/stgit/stgit-0.23.ebuild create mode 100644 dev-vcs/stgit/stgit-1.1.ebuild (limited to 'dev-vcs/stgit') diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest index ec398ea24753..da823c1f6562 100644 --- a/dev-vcs/stgit/Manifest +++ b/dev-vcs/stgit/Manifest @@ -1,5 +1,5 @@ -DIST stgit-0.23.tar.gz 303836 BLAKE2B 018e0caf74a3c449a71362e3694b2ddf030f5ee23e3212a98b378b7118bae9fd15d0e4ab2a2a746a12b34e46aa2edb86657a4a7125f3c5ca8aa0142fe3d73534 SHA512 b3c9b5c0833cb7e5137faf0df48af6a11b9508b994cdf55b587567d1c146fd4ae29e7beb6d1a34b3f87e5b3854af035dd7e5ca35338c20740e91da7b47c4568d DIST stgit-1.0.tar.gz 302201 BLAKE2B 2be1eb648edbefed6270e8f52039afd5d6d4140e8e16656a9f28f6b168eb5ce02c814a3e2b91bc628a80de1e15f0491b82af18fc2cad4e556bcd23ef247fe082 SHA512 e33db953d810f024ee2159ea5bb1b1367a5c673d78d789e8b20ad1d773dccaaf0fe4ccb713b8de082d4a79a3f51d421a2d3d88be24f2e0e770e070e640744894 -EBUILD stgit-0.23.ebuild 1853 BLAKE2B 96f55b091752c9e13a6f04f22c44eb5e8f53b9a0b1635203e983d453c246415ae3f143f8d252a3f0c1907e5d3c541c54880e4d2ab063ebb47c5c9fa7f2eda262 SHA512 473504f44afea4198161f91246d53bb214d2e29c20e83ad2822c2a91836527043d17f3dd88db982d2517abdebf3aa7d37427e444b4cbb6d72fa7c0adf95a9cfc -EBUILD stgit-1.0.ebuild 1853 BLAKE2B 96f55b091752c9e13a6f04f22c44eb5e8f53b9a0b1635203e983d453c246415ae3f143f8d252a3f0c1907e5d3c541c54880e4d2ab063ebb47c5c9fa7f2eda262 SHA512 473504f44afea4198161f91246d53bb214d2e29c20e83ad2822c2a91836527043d17f3dd88db982d2517abdebf3aa7d37427e444b4cbb6d72fa7c0adf95a9cfc -MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8 +DIST stgit-1.1.tar.gz 313862 BLAKE2B 2d15ba7c2f55ff1211f0d9a3002878102f5023e897d0830daa688a2af8c6a386ec0cf076c728b6f45650ee3382379a32fb4efb25d0da3b28302f158dfca6ef62 SHA512 917c645f219b2725d1e88186674a6184c96f1457d5c7722b4da17931d963f0fe0c675cdaaca435ba7405ba498d6db9a01c9f554d1aa3093cc3205d224d9d9759 +EBUILD stgit-1.0.ebuild 1833 BLAKE2B c48cc767a018f9cddd4f22352ae99119b6ad1700ba35e659e3ebf36cc274c80e01f349333d8293c706c84399211c57cbc3b6c4c258530204f677f6326858fbf4 SHA512 d03f5a3d4294363daf91779b86ece5e6d49d122ae0283b25bce55f156929e7a12f29d8f6e76accd946592e5c66d01513e096d6422b4022995f830290c5e974a8 +EBUILD stgit-1.1.ebuild 1839 BLAKE2B 8b1b383b61ac342878b352070e9fa76df4084a134b838d3c26b3b6a5cc6801e8d655fb8fd54c0145c0b15f6d0b50f7bc41c95ede6b294b9c1b0180f1e472d404 SHA512 f0cdf95683f346c12e6a2b4eeb515a7bd7000638d6724606149b36a1e7a01344a4d56fd4f1aa27803c0d46a17c5c3ef7158a566b39a588c5179192a25ec8cad6 +MISC metadata.xml 346 BLAKE2B 7407539392698e06f225fa923759d1511ca2ce2ef3d99abe4253bfcf1776d28623ba24edf140a71bdf6637925bcdd8cc69e0e8e6aeee6a67ff6850b1de623d65 SHA512 22f829c87ae9f67118209cbd3499aea4e830f7737825f26d686bbcf32f29a7de553a8c0da73d09617ceac3fd197f96df4f4dc44b7cafffde933dfb92757aea6a diff --git a/dev-vcs/stgit/metadata.xml b/dev-vcs/stgit/metadata.xml index 4f503c94254e..43dd4526edf3 100644 --- a/dev-vcs/stgit/metadata.xml +++ b/dev-vcs/stgit/metadata.xml @@ -5,4 +5,8 @@ dlan@gentoo.org Yixun Lan + + + stacked-git/stgit + diff --git a/dev-vcs/stgit/stgit-0.23.ebuild b/dev-vcs/stgit/stgit-0.23.ebuild deleted file mode 100644 index 8eb84b347baa..000000000000 --- a/dev-vcs/stgit/stgit-0.23.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_USE_SETUPTOOLS=no - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Manage a stack of patches using GIT as a backend" -HOMEPAGE="https://stacked-git.github.io" -UPSTREAM_VER= -[[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" - -SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${UPSTREAM_PATCHSET_URI}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -RDEPEND=">=dev-vcs/git-1.6.3.3" - -# NOTE: It seems to be quite important which asciidoc version to use. -# So keep an eye on it for the future. -DEPEND="${RDEPEND} - doc? ( - app-text/asciidoc - app-text/xmlto - dev-lang/perl - )" - -pkg_setup() { - if ! use doc; then - echo - ewarn "Manpages will not be built and installed." - ewarn "Enable the 'doc' useflag, if you want them." - echo - fi -} - -python_prepare_all() { - # Upstream's patchset - [[ -n ${UPSTREAM_VER} ]] && \ - eapply "${WORKDIR}"/patches-upstream - - # this will be a noop, as we are working with a tarball, - # but throws git errors --> just get rid of it - echo "version=\"${PV}\"" > "${S}"/stgit/builtin_version.py - - distutils-r1_python_prepare_all -} - -src_compile() { - distutils-r1_src_compile - - # bug 526468 - if use doc; then - emake DESTDIR="${D}" \ - htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \ - mandir="${EPREFIX}/usr/share/man/" \ - doc - fi -} - -src_install() { - if use doc; then - emake DESTDIR="${D}" \ - htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \ - mandir="${EPREFIX}/usr/share/man/" \ - install-doc install-html - fi - - distutils-r1_src_install - - newbashcomp completion/stgit.bash 'stg' -} diff --git a/dev-vcs/stgit/stgit-1.0.ebuild b/dev-vcs/stgit/stgit-1.0.ebuild index 8eb84b347baa..0daa07cbdef7 100644 --- a/dev-vcs/stgit/stgit-1.0.ebuild +++ b/dev-vcs/stgit/stgit-1.0.ebuild @@ -59,8 +59,7 @@ src_compile() { # bug 526468 if use doc; then - emake DESTDIR="${D}" \ - htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \ + emake htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \ mandir="${EPREFIX}/usr/share/man/" \ doc fi diff --git a/dev-vcs/stgit/stgit-1.1.ebuild b/dev-vcs/stgit/stgit-1.1.ebuild new file mode 100644 index 000000000000..adc3ed22386c --- /dev/null +++ b/dev-vcs/stgit/stgit-1.1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=no + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Manage a stack of patches using GIT as a backend" +HOMEPAGE="https://stacked-git.github.io" +UPSTREAM_VER= +[[ -n ${UPSTREAM_VER} ]] && \ + UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" + +SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${UPSTREAM_PATCHSET_URI}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc" + +RDEPEND=">=dev-vcs/git-1.6.3.3" + +# NOTE: It seems to be quite important which asciidoc version to use. +# So keep an eye on it for the future. +DEPEND="${RDEPEND} + doc? ( + app-text/asciidoc + app-text/xmlto + dev-lang/perl + )" + +pkg_setup() { + if ! use doc; then + echo + ewarn "Manpages will not be built and installed." + ewarn "Enable the 'doc' useflag, if you want them." + echo + fi +} + +python_prepare_all() { + # Upstream's patchset + [[ -n ${UPSTREAM_VER} ]] && \ + eapply "${WORKDIR}"/patches-upstream + + # this will be a noop, as we are working with a tarball, + # but throws git errors --> just get rid of it + echo "version=\"${PV}\"" > "${S}"/stgit/builtin_version.py + + distutils-r1_python_prepare_all +} + +src_compile() { + distutils-r1_src_compile + + # bug 526468 + if use doc; then + emake htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \ + mandir="${EPREFIX}/usr/share/man/" \ + doc + fi +} + +src_install() { + if use doc; then + emake DESTDIR="${D}" \ + htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \ + mandir="${EPREFIX}/usr/share/man/" \ + install-doc install-html + fi + + distutils-r1_src_install + + newbashcomp completion/stgit.bash 'stg' +} -- cgit v1.2.3