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 06DA41395E1 for ; Fri, 4 Nov 2016 20:35:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C2ECE0962; Fri, 4 Nov 2016 20:35:51 +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 F04E8E0962 for ; Fri, 4 Nov 2016 20:35:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D1B234164A for ; Fri, 4 Nov 2016 20:35:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3EEAF7E1 for ; Fri, 4 Nov 2016 20:35:47 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1478291730.6af6f8227f3e68d0ad49cea203492a01e28c29b5.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/mutt/Manifest mail-client/mutt/mutt-1.7.1-r2.ebuild mail-client/mutt/mutt-1.7.1-r3.ebuild X-VCS-Directories: mail-client/mutt/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 6af6f8227f3e68d0ad49cea203492a01e28c29b5 X-VCS-Branch: master Date: Fri, 4 Nov 2016 20:35:47 +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: 15cbec3b-6c67-4891-84ca-26d2817d413c X-Archives-Hash: f0fa77d69880fc9d118b94fd4bce06b7 commit: 6af6f8227f3e68d0ad49cea203492a01e28c29b5 Author: Fabian Groffen gentoo org> AuthorDate: Fri Nov 4 20:35:30 2016 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Nov 4 20:35:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6af6f822 mail-client/mutt: revbump with latest upstream patches Package-Manager: portage-2.3.0 mail-client/mutt/Manifest | 2 +- .../mutt/{mutt-1.7.1-r2.ebuild => mutt-1.7.1-r3.ebuild} | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 9ea7f53..78d938b 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -3,4 +3,4 @@ DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854 DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1 WHIRLPOOL cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7 DIST mutt-1.5.24.tar.gz 3897115 SHA256 a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1 WHIRLPOOL 35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023 DIST mutt-1.7.1.tar.gz 4025008 SHA256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df SHA512 c0b0be7ba792ecf42bb63c31aa03889b4998474a7cac9a839df3041b0bb72766da140bbb38e70eab5f78f4503d684c9c20620c599c0970ec6933624d22f4613d WHIRLPOOL f63a8e8fd0a403f596c041f2afc8e73db7a0b6ba48749e3cdc6663aae9f114589056cc3ddef7dc5c9e1a9282b607e4f76445ecdc6213cc3a337f8cf2284ba2e5 -DIST mutt-gentoo-1.7.1-patches-r2.tar.xz 152444 SHA256 2c4475778393a0905b487d84b5fd70376afd172010fabb2086b19ff8d0bd5343 SHA512 f8f455ebc6385875256724b5def6751223fc6752e9e45eb786fa4911017aae50a77f2a2d65dd33c79be7e1e418917faf5b941af1080732987c8a30069786134f WHIRLPOOL 5d747de0718dda57da9c7d85ac7351d73df9fd51d55ac022882c4927357a7ec190ee0235b4e9c1b483a86ec18bf77c974fd2a3cc7f2f20b32d9fc65cda6d6b71 +DIST mutt-gentoo-1.7.1-patches-r3.tar.xz 154292 SHA256 0f00b28c348af09900228a867d38b6b0c9496717657a67776e6dcaaa4299e33b SHA512 7017687c6c71387265f49a6f65b84b402baf8c980f6e6af3b2bb7ba7cb57e2d06bf9320415d93131c49ab6228722ba3b6244579435204dc7c0872eed6d5713fe WHIRLPOOL 88d22145c2cdfa483741d04d3c83986419eb0a6edfcee7ac0e0365fe65977cfa06d62154b91d85e7bb8e16c22c8f1d38ebfa1dfd2a05ca0ba426e3cdc4ff1696 diff --git a/mail-client/mutt/mutt-1.7.1-r2.ebuild b/mail-client/mutt/mutt-1.7.1-r3.ebuild similarity index 96% rename from mail-client/mutt/mutt-1.7.1-r2.ebuild rename to mail-client/mutt/mutt-1.7.1-r3.ebuild index 6dca570..efe9616 100644 --- a/mail-client/mutt/mutt-1.7.1-r2.ebuild +++ b/mail-client/mutt/mutt-1.7.1-r3.ebuild @@ -6,7 +6,7 @@ EAPI="6" inherit eutils flag-o-matic autotools -PATCHREV="r2" +PATCHREV="r3" PATCHSET="gentoo-${PVR}/${PATCHREV}" DESCRIPTION="A small but very powerful text-based mail client" @@ -114,7 +114,9 @@ src_prepare() { eapply_user && upatches=" with user patches" # patch version string for bug reports - sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s, '"${PATCHSET}${upatches}"')"|' \ + local patchset= + use vanilla || patchset=", ${PATCHSET}" + sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \ muttlib.c || die "failed patching in Gentoo version" # many patches touch the buildsystem, we always need this @@ -124,17 +126,13 @@ src_prepare() { # the dotlock program, resulting in bugs like #278332 sed -i -e 's/@DOTLOCK_GROUP@//' \ Makefile.in || die "sed failed" - - # don't just build documentation (lengthy process, with big dependencies) - if use !doc ; then - sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die - fi } src_configure() { local myconf=( "$(use_enable crypt pgp)" "$(use_enable debug)" + "$(use_enable doc)" "$(use_enable gpg gpgme)" "$(use_enable imap)" "$(use_enable nls)"