diff options
| author |   Yixun Lan <dlan@gentoo.org> | 2014-05-10 20:01:45 +0000 |
|---|---|---|
| committer | Yixun Lan <dlan@gentoo.org> | 2014-05-10 20:01:45 +0000 |
| commit | 79f5ac67c5cb4bca70b67d488eb83d8778acd486 (patch) | |
| tree | 55f96e1f65153ea891996f7bb967534663ea7479 | |
| parent | Fix LICENSE, add mirror and bindist restrictions, update SRC_URI, bug 506858. (diff) | |
| download | historical-79f5ac67c5cb4bca70b67d488eb83d8778acd486.tar.gz historical-79f5ac67c5cb4bca70b67d488eb83d8778acd486.tar.bz2 historical-79f5ac67c5cb4bca70b67d488eb83d8778acd486.zip | |
pull in a few upstream patches, minor update
Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55
| -rw-r--r-- | dev-vcs/stgit/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-vcs/stgit/Manifest | 25 | ||||
| -rw-r--r-- | dev-vcs/stgit/stgit-0.17.1-r1.ebuild (renamed from dev-vcs/stgit/stgit-0.17.1.ebuild) | 16 |
3 files changed, 44 insertions, 5 deletions
diff --git a/dev-vcs/stgit/ChangeLog b/dev-vcs/stgit/ChangeLog index a2d6c65fa317..5e182d662653 100644 --- a/dev-vcs/stgit/ChangeLog +++ b/dev-vcs/stgit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-vcs/stgit # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/ChangeLog,v 1.21 2014/03/25 17:35:55 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/ChangeLog,v 1.22 2014/05/10 20:01:09 dlan Exp $ + +*stgit-0.17.1-r1 (10 May 2014) + + 10 May 2014; Yixun Lan <dlan@gentoo.org> -stgit-0.17.1.ebuild, + +stgit-0.17.1-r1.ebuild: + pull in a few upstream patches *stgit-0.17.1 (25 Mar 2014) diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest index 0521e41d1487..65a472e0d2f0 100644 --- a/dev-vcs/stgit/Manifest +++ b/dev-vcs/stgit/Manifest @@ -1,10 +1,31 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX stgit-0.16-asciidoc-compat.patch 561 SHA256 3d2e1f78c9857d5e54e3c8de6ae4bf047c9271d44b41408ee2b770316746a637 SHA512 f5a4a260b5b732332a4157a82d7bd153971d0a41c55ce8c38beb58f85a989d7636ec3ff15dc3161d4c5775a392840d4970437abf4fd8c741cdcdf509fd826329 WHIRLPOOL 6dee03e89a11eeeee4a4af9304119f7a0bc9d655651cc4ae4807869fd5ac05fca423d768a5bb74b2e2399a0439058e51fc188afc40883503ae96ace9ff1d4f73 AUX stgit-0.16-man-linkfix.patch 429 SHA256 456ec1faeea9f9a6c937e1afc3f3ee5dda63dc11ca6abd6e7b06cafe03bb6f97 SHA512 a4e240d804646f002089d428ee92e9a8cde5a7d7447ebd5d635514dc5777cf3d56fc59cef9f406f7313daf09775810b553a65685e419846691bbc2fc51afc2f5 WHIRLPOOL db1d2fd61e9b4826e3fd9804d3ae5ef27ec62866e5ac041650316a6e0703db5e2bcc40c5c95988fb3a0e067de8dd0980773d1e06558a87c113aa0ef8d0053413 DIST stgit-0.16-missing-patches.tar.gz 1667 SHA256 f105bb417592be3c68d830ad1cf2e212e6e5cb809bf64cdffb516a0f7badd4f4 SHA512 29d4c3e68121654153b4e5142dd70d818737b09bbc8371d644a36dd9d18afaf78fdda91bc16f953c330bcbae19084384d8bcd216cdfe674df784e33165186db1 WHIRLPOOL c7628853e6c1eff498a95ff22ec3eb3bb69b60dfb0c6dcd5895a650b8d3aba966166dfd426a0c728e3d292f0a2ed197325b0af5ccd63fc99011b5b2e841e7194 DIST stgit-0.16.tar.gz 362687 SHA256 02f1a19350ccf4a26abac1421df8c2d021e78f995c913f9562718a1700318a42 SHA512 782de3d5855aad4f5d040478745990517ebe2b26dc315a3ed41db95399bb46e075d63a70baa0e3aa2ab1012b59e6ad1f5940a904f296ef09d6bca60f66e417dd WHIRLPOOL e2334c041cb260455d549d33b6628fd4f6e1e7da850f2987ba86922504e07aed8177d092550348b52cad8894b0335d20ee1608b855fa1cb6545bdd301a9d38f1 +DIST stgit-0.17.1-upstream-patches-0.tar.xz 5064 SHA256 6e120dd85bcdcbbb64bea98bd5967bb1f01fbc9d3e80b4856d7e328cfcafc31e SHA512 da7b75898466c8be58c48a86aee6209a907f971c7b15b38034940598d353fa6ecb48894b220fbfd8e032e88e746b377c55485c8045c330607e122a082aa0374f WHIRLPOOL aa7b7a5f89703eb35fab26dec0bcf5ceae2e20608b2562c7b6f76e33d43b35113d97282cb6b5f4cdf5da6e11e07faacacb13215cef3f7dac31a862ff809641cb DIST stgit-0.17.1.tar.gz 398466 SHA256 d43365a0c22e41a6fb9ba1a86de164d6475e79054e7f33805d6a829eb4056ade SHA512 3efdfb9bc024c3a7c0d74d49e85f157d5d5209c9a2ad0ce63a07138c02fb1580e92ac4a91796e79bbd221e6884317e975f9f44e35db0b484fd916bc67cd61abe WHIRLPOOL a7c4c83cfeace12ced60e846ed9daaffadea3ed201a90e72239e3f8df310164e00ce5a89174df177f89df4a609a66ac35e905f31419ed654081c3ab0c2cba859 EBUILD stgit-0.16-r1.ebuild 1989 SHA256 b32624b429d646f2cb6a25f0881a8a96f9e0aa6aecb42166050a27b2544e857b SHA512 75a0d8480761f8fdbdef76090899eaf18629c11db0fd4f86b5a8e030cdbe37c6a94eb82fadecc0d301a80855f6c2deb8b90c4237aedf124592dfad55f48c4f51 WHIRLPOOL e6a0d92cad46bb5945c9ac87ba22e050c9b29d252174299ca5e249fd293e34cb12119f99c0a4072b23e3b34e4b5b5fa304d3e8d73071837e974085e64f0c856e EBUILD stgit-0.16-r2.ebuild 1844 SHA256 54ee8057f45f55377743c0b0569a8dc34f7298315e77591e1e79a8bfd4b4f585 SHA512 111cdac54e09ff4fce251961b09ab047da73e9fa647c66d439168df3ba8c599cd7e7d8df7b879fd225aaf7597d71dcdc7b8081da45763428661eb939fac7fa4e WHIRLPOOL 4fbe37aa06a0c69f7a8e27cbaf1ebe9f6d09cbd18b170a21dfad54474eefeda323455345fb8500e815220b0804634904c7476793c9d3d703c86a798408f4f462 -EBUILD stgit-0.17.1.ebuild 1669 SHA256 b654a8112a32844b7a0504ce84126303afd701caccb815295fe3b33fc7b84e83 SHA512 8749f1b877330db1df602ef918d16c6ea246ba3f51ae493c6e7335dc660f438e02ad6eb8a773efabecf0f1a3ff8a24035b54986cf3a714ababfc3f8e7110ea03 WHIRLPOOL e07b491f25658db8c4f4129bccb93a9e9e17004238d6bd3a7fb7b793cde8f0921a8e36944a996d5fdfad6ef2c3f6aa5f637a9cda2287cf0c72c542c3b239c360 -MISC ChangeLog 7981 SHA256 a5e8998c05dfafb27f0af2cb2acf8ddf4de0a894c1b0cf42c355bab182a794b4 SHA512 b23c5fbf64c1930fd4c24afe156ad657e49745700d169bc8a0516164b5190989334a5e5e54807889c7a5d9374b2df0d8fa49be133bad8f3f5400a8f0e6f2f6d6 WHIRLPOOL 496d01209a590dfb10c4b5100d8294b08eb828e66639b11f6ff642813b4f016910c708f35528e8ad6a47fb7498cdc9e082d212cd5c28dec02aa82c9faacb5846 +EBUILD stgit-0.17.1-r1.ebuild 2004 SHA256 7dc4179e5a40b5ac66654c2221e32a7656b41f4f2b98bfd7d2c9398e64a0dac1 SHA512 6dcc8873935047007ed077ee77d52f843b30fa7d35f46c7678db9a2349679b1066bb827bbb8b9ff58f982db13108ecfabbaf7d588203e23aff6042df707bd870 WHIRLPOOL 600ba35dd4c34d6eddb6db629dbcf866203b2bfdcf2c9ba3f737b63546d2ed15bd20514f0fe4c33252c70c1969b93bea5131d9cae7fe396e053189662743b0c4 +MISC ChangeLog 8139 SHA256 c4ea4b0191d1fb79b36bab87ced371d2116db12d0e2515fa70b67ae2e47782e1 SHA512 3d4a9bc62f572620b6a1252843fe13c44cc28558a9d467addeaa624c6676fb6b163fe3add0ec70f8bfd5e9463f0f01e1d82dff1b4008c18d2b57bd175b2115d9 WHIRLPOOL 3e8c03caab2231312d84d3b8ab7e51f426f09bc59d89246ad141ca491279d1614220eacbcf3676ff490fc5976cd0b532ba83f43fe28586c2340bc7e0679ac29b MISC metadata.xml 556 SHA256 90b84b0c6017b201e862052e61ce1bacc58871eb55d4e45d3368e0c3447fa625 SHA512 ca397d3ffd1543512d5cea4a7a43f264d8885962911624bb78f7292af12932325cbe223a8fc7d430cf80f692d5c23f725133f3a85b96c5bc14ab71bb9edef386 WHIRLPOOL 2556b468d8fafcaa81bd4f08c1fd219af7572ef5d82edcb1b4357b0a59aa4cc55535bd4b432a88ce5933f3899bef45ba7b2d87e6da299211e63c0738c3f7a077 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAEBCAAGBQJTboWtAAoJEJIMDbyqvv1VMPYP+wcJ0jOwifmnPnMPDCC+4Nuf +CQsOIIgfY9OvedjtSgBJgi/j1WjICs/rKeFeLlnIqgcaNUKtUwFXtjHWoQ89xE42 +gEI8XIAdCv/jdLfcFuVnLkdKdweS9RlCq14Wte8RTZ/GJxFio3Xc2ey7x58AxA1H +B3sM2+4B7Y0MG5ADDwY/PHmmo0I4Ql8qPUKUsfb4E4oiWTE9hwqv3AHxqzH5jOaA +JsLPyogPi0WBeTIs/OIiZemdaUTbjqQyOoqrb57MHV2OVdgs+AfM0nVcayI0BevD +wCFLQCS99sn9T4tRiPqAzI/FP78+FeWoYv/CTse+5Z8cib2jU36yMNLT5d9DWFdV +lIaWSFSmkSezAmDBtclUQ8qkxrvUsUMbos2mYWDI73wFapTMKNZtjr9yIwQ/9lTQ +bv+aemy+2ibbUqa4WzPnJ6LoXznZDVl6pPGO070wUMtnAJLtvHE5HLha8nKGQaWK +ufkoR5Ytsb9xlOc22fVWno5Hcy+hufQnOSaj3UfCXgv9H5Sdl4TJVGvHDUtb4NLD +EmHeDRgqRZXdcal/+FT1Eo5xJ/IskHeJylQRU9NozmSLBzBgGfTzacyHZRF4RZsA +M97cPTTHrmJEZ/SxMk1ojC3in7NfezZlm5dBaJDxy/FZQNoyBmKfalZimfZFd2PR +wBkMN2YRUJoVbIlM7GWS +=IxAz +-----END PGP SIGNATURE----- diff --git a/dev-vcs/stgit/stgit-0.17.1.ebuild b/dev-vcs/stgit/stgit-0.17.1-r1.ebuild index e0a8d806f6ea..088777d7793e 100644 --- a/dev-vcs/stgit/stgit-0.17.1.ebuild +++ b/dev-vcs/stgit/stgit-0.17.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/stgit-0.17.1.ebuild,v 1.1 2014/03/25 17:35:55 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/stgit-0.17.1-r1.ebuild,v 1.1 2014/05/10 20:01:09 dlan Exp $ EAPI="5" @@ -10,7 +10,12 @@ inherit bash-completion-r1 distutils-r1 DESCRIPTION="Manage a stack of patches using GIT as a backend" HOMEPAGE="http://www.procode.org/stgit/" -SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz" +UPSTREAM_VER=0 +[[ -n ${UPSTREAM_VER} ]] && \ + UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" + +SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz + ${UPSTREAM_PATCHSET_URI}" LICENSE="GPL-2" SLOT="0" @@ -42,6 +47,13 @@ pkg_setup() { } python_prepare_all() { + # Upstream's patchset + if [[ -n ${UPSTREAM_VER} ]]; then + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patches-upstream + fi + # this will be a noop, as we are working with a tarball, # but throws git errors --> just get rid of it sed -i -e 's/version\.write_builtin_version()//' setup.py || die |