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 3867C138350 for ; Wed, 15 Jan 2020 15:15:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D5C9E0866; Wed, 15 Jan 2020 15:15:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 42986E0866 for ; Wed, 15 Jan 2020 15:15:55 +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 B702334DF0B for ; Wed, 15 Jan 2020 15:15:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A58373B for ; Wed, 15 Jan 2020 15:15:50 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1579101342.37080c58ac8d5b2481f9b9456bb9c77b518fa07a.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild X-VCS-Directories: media-gfx/imagemagick/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 37080c58ac8d5b2481f9b9456bb9c77b518fa07a X-VCS-Branch: master Date: Wed, 15 Jan 2020 15:15:50 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f7702bab-a90f-4d8e-866a-4604d41a0304 X-Archives-Hash: 95fce15888dd28f5c11fc4308304d329 commit: 37080c58ac8d5b2481f9b9456bb9c77b518fa07a Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Jan 15 15:12:57 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Jan 15 15:15:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37080c58 media-gfx/imagemagick: fix invalid $S Previous version had $S changed because SRC_URI was changed to GitHub because upstream mirror wasn't working. Now that upstream is working again, we have to revert that $S change, too. Closes: https://bugs.gentoo.org/704942 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Thomas Deutschmann gentoo.org> media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild | 4 ++-- media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild index 268eb309477..45e32912305 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.84.ebuild @@ -67,8 +67,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig X? ( x11-base/xorg-proto )" -#S="${WORKDIR}/${MY_P}" -S="${WORKDIR}/ImageMagick6-${MY_PV}" +S="${WORKDIR}/${MY_P}" +#S="${WORKDIR}/ImageMagick6-${MY_PV}" src_prepare() { default diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild index b84069a077d..57ae3d2ccac 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.86.ebuild @@ -67,8 +67,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig X? ( x11-base/xorg-proto )" -#S="${WORKDIR}/${MY_P}" -S="${WORKDIR}/ImageMagick6-${MY_PV}" +S="${WORKDIR}/${MY_P}" +#S="${WORKDIR}/ImageMagick6-${MY_PV}" src_prepare() { default