summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2020-04-11 13:35:38 -0400
committerMike Gilbert <floppym@gentoo.org>2020-04-11 13:46:48 -0400
commita18a88ccff609edaa1512e1a277e26165b636b18 (patch)
tree99223663271c7ea3d75c2480863b2cbb82cf42f4
parentapp-emulation/diskimage-builder: 2.35.0 stable with cleanup (diff)
downloadgentoo-a18a88ccff609edaa1512e1a277e26165b636b18.tar.gz
gentoo-a18a88ccff609edaa1512e1a277e26165b636b18.tar.bz2
gentoo-a18a88ccff609edaa1512e1a277e26165b636b18.zip
Revert "app-arch/bzip2: add landmine to ensure SLOT gets updated"
This reverts commit 5b8f16651df78afbe673c0f695d8c0e21f7c4db1. Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r--app-arch/bzip2/bzip2-1.0.8-r1.ebuild6
-rw-r--r--app-arch/bzip2/bzip2-9999.ebuild7
2 files changed, 1 insertions, 12 deletions
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index f9c097a85a47..e1e25b90ee47 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -17,12 +17,6 @@ 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 266dd9856aac..a0c9cd7a462f 100644
--- a/app-arch/bzip2/bzip2-9999.ebuild
+++ b/app-arch/bzip2/bzip2-9999.ebuild
@@ -16,13 +16,8 @@ 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
+IUSE="static-libs"
multilib_src_configure() {
local emesonargs=(