From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29B0D139694 for ; Fri, 5 May 2017 19:31:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E15E0E0D10; Fri, 5 May 2017 19:31:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC8BEE0D10 for ; Fri, 5 May 2017 19:31:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 296403416BF for ; Fri, 5 May 2017 19:31:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E82A87439 for ; Fri, 5 May 2017 19:31:30 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1494012576.0443b23240349e09a37e04e32b4f485d9311d470.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/guilt/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/guilt/Manifest dev-vcs/guilt/guilt-0.34.ebuild dev-vcs/guilt/guilt-0.36.ebuild X-VCS-Directories: dev-vcs/guilt/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 0443b23240349e09a37e04e32b4f485d9311d470 X-VCS-Branch: master Date: Fri, 5 May 2017 19:31:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a0c3a23e-1181-4641-a7c6-e263ece03a92 X-Archives-Hash: f4be8ddc644f297b391280cfbadb2039 commit: 0443b23240349e09a37e04e32b4f485d9311d470 Author: Michael Orlitzky gentoo org> AuthorDate: Fri May 5 19:29:05 2017 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Fri May 5 19:29:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0443b232 dev-vcs/guilt: new version 0.36. This new version comes with an update to EAPI=6 and rewrite of parts of the ebuild. By passing some variables to emake, I was able to get the "make install" targets to do the right thing on their own. There's also a new HOMEPAGE, and the SRC_URI is a gitweb tarball associated with a tag upstream. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-vcs/guilt/Manifest | 3 +-- dev-vcs/guilt/guilt-0.34.ebuild | 48 --------------------------------------- dev-vcs/guilt/guilt-0.36.ebuild | 50 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 50 deletions(-) diff --git a/dev-vcs/guilt/Manifest b/dev-vcs/guilt/Manifest index ebda16759f8..10ac9d99b32 100644 --- a/dev-vcs/guilt/Manifest +++ b/dev-vcs/guilt/Manifest @@ -1,4 +1,3 @@ +DIST 22d785dd24329170f66e7696da38b3e90e033d61.tar.gz 64624 SHA256 1e1a86ecfc2162c01b7d62c279ad055c643074d2b5239301d818ca81b31b6c0e SHA512 882438d5b9ed4d16e3dfc95ddbef6ec1d76860d82aa6abc78010351577fb65578f919c6fe55f9d7593c82b0eae2d0dd80d577eee906fff84a426391936242652 WHIRLPOOL 85749fcf66be08164e6a1e8ce58b3351e0a2c114042a8cdd43b05b52300b47f76bdf53d5b0affd809b66a0cfdfaeb327cd5d49c5a3d4793eb51b030e314a4789 DIST guilt-0.32.tar.bz2 42248 SHA256 813ca10e4c803b6d387a8458dbbad2b1046fe0e2f77c60bc050bc0dc272e5162 SHA512 d2e59d8a04e072de36229b2ff5e6c944e87bd0dc18f83804f529807aa0b97aba1c37644ab6d8859abb58a9fe04d2f6562c77a25c7cd8fe4ad7631a1b77a112f9 WHIRLPOOL 91c270eb4bc2902dce1f75b9b551ba96ba56ff616e6a6ddbd2ebc86f02d5dedc990eddce817560f59465fb30fd868817ce1f5b42da99a52c30aa95f95fab39d5 -DIST guilt-0.34.tar.bz2 43563 SHA256 be379dced950d512df0f33dfd385384aba2db8f1eb5a55c11fe2ba28317c8e33 SHA512 9c46dddad3e879939d2b31720660c4b6d62d46114cf4731aa7c826554b1e97eeff044e5373f5bf2f7539d49d969fc451a8a4392f05880ed444a2b0d76a7d22d4 WHIRLPOOL 41568c9dcc547944032aee824d11983f81530c643825755e34efe01a1395168fe1ad7072af7f5018d01c53c23ca379ddf2797749f37a66468a10c9bd035ab6bd DIST guilt-manpages-0.32.tar.bz2 9503 SHA256 8b74f34072d17894eabf1c14abcaf681a5658beee13c99fed082ac95e4b4009e SHA512 6174cdd6e7262efb06a2c212de309e1268c8b05e4aeeaace7f8e5874700f9b62dcc82ca9c596987f81dc7a64e525232816b516f47abcfe26aece438fe571f788 WHIRLPOOL 7ca734852eee65fa85a5a2e009d3eb0e694f6b00952c0c8785745befd0d92b1374dd5531d1d784e4f90d96c34c51c7a5bffa1f321d45042d4a69f4ed9514d583 -DIST guilt-manpages-0.34.tar.bz2 7566 SHA256 0e505de837f3039f96d4d393434034e23e9c8a8e5db48bea75d197cdd2d92b4e SHA512 e5056038d2f646c8fc78f9bc6e2afa81de8767a071f55735125eff34f7d8bb15509613a21545f868f931ee5bc24c41cffacaca047180adb1485ab76ab191be76 WHIRLPOOL ab928d575a29de8383c998dfd3ddb5667c133474ab8f79655036ebe67f7079d9f3b77cfa08dbe739e2db7bbbb430cc47bc5f24973dfe2f27e8ade4e0b9e9c428 diff --git a/dev-vcs/guilt/guilt-0.34.ebuild b/dev-vcs/guilt/guilt-0.34.ebuild deleted file mode 100644 index 470c6fcf7a0..00000000000 --- a/dev-vcs/guilt/guilt-0.34.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -DESCRIPTION="A series of bash scripts which add a quilt-like interface to git" -HOMEPAGE="https://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/" -# create manpages with "make -C Documentation man" -SRC_URI="mirror://kernel/linux/kernel/people/jsipek/${PN}/${P}.tar.bz2 - mirror://gentoo/${PN}-manpages-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="doc" - -RDEPEND="dev-vcs/git" -DEPEND="${RDEPEND} - doc? ( app-text/asciidoc app-text/xmlto )" - -RESTRICT="test" - -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i \ - -e '/^PREFIX/s:=.*:=/usr:' \ - -e "/^htmldir/s:=.*:=/usr/share/doc/${PF}/html:" \ - -e "/^VERSION/s:=.*:=${PV}:" \ - Makefile */Makefile || die -} - -src_compile() { - if use doc ; then - emake -C Documentation html || die - fi -} - -src_install() { - emake install DESTDIR="${D}" || die - - dodoc Documentation/{Contributing,Features,HOWTO,Requirements} - doman Documentation/*.[0-9] || die - - if use doc ; then - dodir "/usr/share/doc/${PF}/html" - emake -C Documentation install-html DESTDIR="${D}" || die - fi -} diff --git a/dev-vcs/guilt/guilt-0.36.ebuild b/dev-vcs/guilt/guilt-0.36.ebuild new file mode 100644 index 00000000000..006b0d76351 --- /dev/null +++ b/dev-vcs/guilt/guilt-0.36.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="A series of bash scripts which add a quilt-like interface to git" +HOMEPAGE="http://repo.or.cz/w/guilt.git" +SRC_URI="${HOMEPAGE}/snapshot/22d785dd24329170f66e7696da38b3e90e033d61.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86" +IUSE="" + +# Since we need to build the man pages anyway, I don't think it makes +# much sense to hide the HTML docs behind USE=doc. +RDEPEND="dev-vcs/git" +DEPEND="${RDEPEND} + app-text/asciidoc + app-text/xmlto + dev-lang/perl" + +RESTRICT="test" + +S="${WORKDIR}/${PN}-22d785d" + +src_prepare() { + default + + # The doc makefile tries to shell out to `git` for the version. + sed -i Documentation/Makefile \ + -e "s/VERSION=.*/VERSION=${PV}/" \ + || die 'failed to set VERSION in Documentation/Makefile' +} + +src_compile() { + emake -C Documentation all +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr install + + dodoc Documentation/{Contributing,Features,HOWTO,Requirements} + emake -C Documentation \ + DESTDIR="${D}" \ + PREFIX=/usr \ + mandir=/usr/share/man \ + htmldir="/usr/share/doc/${PF}/html" \ + install install-html +}