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 2A64A138350 for ; Sat, 11 Apr 2020 17:26:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51EF3E08AD; Sat, 11 Apr 2020 17:26:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 377AEE08AD for ; Sat, 11 Apr 2020 17:26:37 +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 EA25E34F0B7 for ; Sat, 11 Apr 2020 17:26:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A7674158 for ; Sat, 11 Apr 2020 17:26:33 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1586625963.5b8f16651df78afbe673c0f695d8c0e21f7c4db1.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/bzip2/bzip2-1.0.8-r1.ebuild app-arch/bzip2/bzip2-9999.ebuild X-VCS-Directories: app-arch/bzip2/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 5b8f16651df78afbe673c0f695d8c0e21f7c4db1 X-VCS-Branch: master Date: Sat, 11 Apr 2020 17:26:33 +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: f79d6363-b185-4d81-85a9-d8c9b0a0a448 X-Archives-Hash: c316eda0b651e5d98cfe1ea589ce0c41 commit: 5b8f16651df78afbe673c0f695d8c0e21f7c4db1 Author: Mike Gilbert gentoo org> AuthorDate: Sat Apr 11 17:25:24 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Apr 11 17:26:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8f1665 app-arch/bzip2: add landmine to ensure SLOT gets updated Signed-off-by: Mike Gilbert gentoo.org> app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 6 ++++++ app-arch/bzip2/bzip2-9999.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild index e1e25b90ee4..f9c097a85a4 100644 --- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild +++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild @@ -17,6 +17,12 @@ SLOT="0/1" # subslot = SONAME KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="static static-libs" +if [[ ${PV} == 1.1* ]]; then + eerror "Please update SLOT due to accidental soname change in bzip2-1.0.7." + eerror "See commit 98da0ad82192d21ad74ae52366ea8466e2acea24 for reference." + die "SLOT update needed" +fi + PATCHES=( "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch "${FILESDIR}"/${PN}-1.0.8-saneso.patch diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild index a0c9cd7a462..266dd9856aa 100644 --- a/app-arch/bzip2/bzip2-9999.ebuild +++ b/app-arch/bzip2/bzip2-9999.ebuild @@ -16,9 +16,14 @@ else fi LICENSE="BZIP2" SLOT="0/1" # subslot = SONAME - IUSE="static-libs" +if [[ ${PV} == 1.1* ]]; then + eerror "Please update SLOT due to accidental soname change in bzip2-1.0.7." + eerror "See commit 98da0ad82192d21ad74ae52366ea8466e2acea24 for reference." + die "SLOT update needed" +fi + multilib_src_configure() { local emesonargs=( -Ddefault_library=$(usex static-libs both shared)