[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 7f2af8ff87581c1d040cef317b270a36c1c37419
Author: Sam James  gentoo  org>
AuthorDate: Sat May 18 17:03:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 18 17:05:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f2af8ff

app-arch/bzip2: drop 1.0.8-r4

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r4.ebuild | 135 ---
 1 file changed, 135 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
deleted file mode 100644
index c90c3005af92..
--- a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
-#  (since we're building shared libs) ...
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bzip2.gpg
-inherit toolchain-funcs multilib multilib-minimal usr-ldscript verify-sig
-
-DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="https://sourceware.org/bzip2/;
-SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
-SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
-
-LICENSE="BZIP2"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~arm64-macos"
-IUSE="static static-libs"
-
-BDEPEND="
-   verify-sig? ( sec-keys/openpgp-keys-bzip2 )
-"
-PDEPEND="
-   app-alternatives/bzip2
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
-   "${FILESDIR}"/${PN}-1.0.8-saneso.patch
-   "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
-   "${FILESDIR}"/${PN}-1.0.6-progress.patch
-   "${FILESDIR}"/${PN}-1.0.3-no-test.patch
-   "${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573
-   "${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
-)
-
-DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
-HTML_DOCS=( manual.html )
-
-src_prepare() {
-   default
-
-   # - Use right man path
-   # - Generate symlinks instead of hardlinks
-   # - pass custom variables to control libdir
-   sed -i \
-   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-   -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
-   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
-   Makefile || die
-}
-
-bemake() {
-   emake \
-   VPATH="${S}" \
-   CC="$(tc-getCC)" \
-   AR="$(tc-getAR)" \
-   RANLIB="$(tc-getRANLIB)" \
-   "$@"
-}
-
-multilib_src_compile() {
-   bemake -f "${S}"/Makefile-libbz2_so all
-   # Make sure we link against the shared lib #504648
-   ln -s libbz2.so.${PV} libbz2.so || die
-   bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
-}
-
-multilib_src_test() {
-   cp "${S}"/sample* "${BUILD_DIR}" || die
-   bemake -f "${S}"/Makefile check
-}
-
-multilib_src_install() {
-   into /usr
-
-   # Install the shared lib manually.  We install:
-   #  .x.x.x - standard shared lib behavior
-   #  .x.x   - SONAME some distros use #338321
-   #  .x - SONAME Gentoo uses
-   dolib.so libbz2.so.${PV}
-   local v
-   for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
-   dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
-   done
-
-   use static-libs && dolib.a libbz2.a
-
-   if multilib_is_native_abi ; then
-   gen_usr_ldscript -a bz2
-
-   dobin bzip2recover$(get_exeext)
-   into /
-   newbin bzip2$(get_exeext) bzip2-reference$(get_exeext)
-   fi
-}
-
-multilib_src_install_all() {
-   # `make install` doesn't cope with out-of-tree builds, nor with
-   # installing just non-binaries, so handle things ourselves.
-   insinto /usr/include
-   doins bzlib.h
-   into /usr
-   dobin bz{diff,grep,more}
-   doman bz{diff,grep,more}.1
-   newman bzip2.1 bzip2-reference.1
-
-   dosym bzdiff /usr/bin/bzcmp
-   dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
-
-   dosym bzmore /usr/bin/bzless
-   dosym bzmore.1 /usr/share/man/man1/bzless.1
-
-   dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.1
-   local x
-   for x in bz{e,f}grep ; do
-   dosym bzgrep /usr/bin/${x}
-   dosym bzgrep.1 /usr/share/man/man1/${x}.1
-   done
-
-   einstalldocs
-}
-
-pkg_postinst() {
-   # ensure to preserve the symlinks before app-alternatives/bzip2
-   # is installed
-   local x
-   for x in bzip2 bunzip2 bzcat; do
-   if [[ ! -h ${EROOT}/bin/${x} ]]; then
-   ln -s bzip2-reference$(get_exeext) 
"${EROOT}/bin/${x}$(get_exeext)" || die
-   fi
-   done
-}

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Ionen Wolkens]

commit: 6db61cf40b84a1aa39d17d447fedf61fe2141157
Author: Matoro Mahri  matoro  tk>
AuthorDate: Mon Mar 18 18:13:07 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 19 03:42:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db61cf4

app-arch/bzip2: Stabilize 1.0.8-r5 hppa, #925638

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
index 234df1744aeb..8b2111a2bfcb 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~arm64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~arm64-macos"
 IUSE="static static-libs"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 20fbb3894a7e89bb4d543206d5304bdb42e60175
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  3 02:31:43 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  3 02:31:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20fbb389

app-arch/bzip2: Stabilize 1.0.8-r5 arm64, #925638

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
index 8d067f9806d2..234df1744aeb 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~arm64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~arm64-macos"
 IUSE="static static-libs"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 6047fef927e66c698578b65a7dbeb06c8b4bc774
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar  2 22:16:54 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  2 22:16:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6047fef9

app-arch/bzip2: Stabilize 1.0.8-r5 ppc, #925638

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
index d45debdebd0b..8d067f9806d2 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~arm64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~arm64-macos"
 IUSE="static static-libs"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 2834340fbae376e830bf15956b8e95a6139317fb
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Mar  1 14:27:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar  1 18:41:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2834340f

app-arch/bzip2: stable 1.0.8-r5 for sparc, bug #925638

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
index c9139656d2db..d45debdebd0b 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~arm64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~arm64-macos"
 IUSE="static static-libs"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: b78d1c0f0bd5b14d3f0068f9327d47c50b182841
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 27 23:57:26 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 27 23:57:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b78d1c0f

app-arch/bzip2: Stabilize 1.0.8-r5 arm, #925638

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
index 2600b1699fb4..c9139656d2db 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~arm64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~arm64-macos"
 IUSE="static static-libs"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Jakov Smolić]

commit: 645691b331c8be85d6c04d724d0bda3bb74a6269
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Feb 27 23:39:04 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Feb 27 23:39:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645691b3

app-arch/bzip2: Stabilize 1.0.8-r5 amd64, #925638

Signed-off-by: Jakov Smolić  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
index ccfa8635bb23..2600b1699fb4 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~arm64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~arm64-macos"
 IUSE="static static-libs"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 1b32bee75c74b8450f0d2df01dff3dfdffcd237a
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 27 23:20:42 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 27 23:20:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b32bee7

app-arch/bzip2: Stabilize 1.0.8-r5 ppc64, #925638

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
index 6e324291d2fd..ccfa8635bb23 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~arm64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86 ~arm64-macos"
 IUSE="static static-libs"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: f8f7f33124e24c69040317ef2f8c7ff4f90f517f
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 27 23:03:31 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 27 23:03:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8f7f331

app-arch/bzip2: Stabilize 1.0.8-r5 x86, #925638

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
index 5a099bc96f1d..6e324291d2fd 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~arm64-macos"
 IUSE="static static-libs"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 8e743d1447aae739cde59171911ed75d6cf09f7e
Author: Eli Schwartz  gmail  com>
AuthorDate: Tue Feb  6 05:54:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 22:49:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e743d14

app-arch/bzip2: remove usr-ldscript support

Per news item 2024-01-05-usr-initramfs, we no longer support this use
case. It is fragile and hacky and leads to bizarre forms of load errors.

The functionality is, despite being called "split-usr", not really about
split-usr at all.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r5.ebuild | 133 +++
 1 file changed, 133 insertions(+)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r5.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
new file mode 100644
index ..5a099bc96f1d
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.8-r5.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#  (since we're building shared libs) ...
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bzip2.gpg
+inherit toolchain-funcs multilib multilib-minimal verify-sig
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="https://sourceware.org/bzip2/;
+SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
+SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+IUSE="static static-libs"
+
+BDEPEND="
+   verify-sig? ( sec-keys/openpgp-keys-bzip2 )
+"
+PDEPEND="
+   app-alternatives/bzip2
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+   "${FILESDIR}"/${PN}-1.0.8-saneso.patch
+   "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+   "${FILESDIR}"/${PN}-1.0.6-progress.patch
+   "${FILESDIR}"/${PN}-1.0.3-no-test.patch
+   "${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573
+   "${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+   default
+
+   # - Use right man path
+   # - Generate symlinks instead of hardlinks
+   # - pass custom variables to control libdir
+   sed -i \
+   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+   -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+   Makefile || die
+}
+
+bemake() {
+   emake \
+   VPATH="${S}" \
+   CC="$(tc-getCC)" \
+   AR="$(tc-getAR)" \
+   RANLIB="$(tc-getRANLIB)" \
+   "$@"
+}
+
+multilib_src_compile() {
+   bemake -f "${S}"/Makefile-libbz2_so all
+   # Make sure we link against the shared lib #504648
+   ln -s libbz2.so.${PV} libbz2.so || die
+   bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
+}
+
+multilib_src_test() {
+   cp "${S}"/sample* "${BUILD_DIR}" || die
+   bemake -f "${S}"/Makefile check
+}
+
+multilib_src_install() {
+   into /usr
+
+   # Install the shared lib manually.  We install:
+   #  .x.x.x - standard shared lib behavior
+   #  .x.x   - SONAME some distros use #338321
+   #  .x - SONAME Gentoo uses
+   dolib.so libbz2.so.${PV}
+   local v
+   for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+   dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+   done
+
+   use static-libs && dolib.a libbz2.a
+
+   if multilib_is_native_abi ; then
+   dobin bzip2recover$(get_exeext)
+   into /
+   newbin bzip2$(get_exeext) bzip2-reference$(get_exeext)
+   fi
+}
+
+multilib_src_install_all() {
+   # `make install` doesn't cope with out-of-tree builds, nor with
+   # installing just non-binaries, so handle things ourselves.
+   insinto /usr/include
+   doins bzlib.h
+   into /usr
+   dobin bz{diff,grep,more}
+   doman bz{diff,grep,more}.1
+   newman bzip2.1 bzip2-reference.1
+
+   dosym bzdiff /usr/bin/bzcmp
+   dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+   dosym bzmore /usr/bin/bzless
+   dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+   dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.1
+   local x
+   for x in bz{e,f}grep ; do
+   dosym bzgrep /usr/bin/${x}
+   dosym bzgrep.1 /usr/share/man/man1/${x}.1
+   done
+
+   einstalldocs
+}
+
+pkg_postinst() {
+   # ensure to preserve the symlinks before app-alternatives/bzip2
+   # is installed
+   local x
+   for x in 

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: a8d934769ffbdcab11a222ca978aad6b2ca2ee2e
Author: Matija Skala  gmx  com>
AuthorDate: Wed Jun 28 15:25:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 28 16:20:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8d93476

app-arch/bzip2: add .exe support

Signed-off-by: Matija Skala  gmx.com>
Closes: https://github.com/gentoo/gentoo/pull/31656
Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r4.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
index 8486a465d48f..ac04791c8535 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
@@ -7,7 +7,7 @@
 EAPI=7
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg
-inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig
+inherit toolchain-funcs multilib multilib-minimal usr-ldscript verify-sig
 
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://sourceware.org/bzip2/;
@@ -91,9 +91,9 @@ multilib_src_install() {
if multilib_is_native_abi ; then
gen_usr_ldscript -a bz2
 
-   dobin bzip2recover
+   dobin bzip2recover$(get_exeext)
into /
-   newbin bzip2 bzip2-reference
+   newbin bzip2$(get_exeext) bzip2-reference$(get_exeext)
fi
 }
 
@@ -129,7 +129,7 @@ pkg_postinst() {
local x
for x in bzip2 bunzip2 bzcat; do
if [[ ! -h ${EROOT}/bin/${x} ]]; then
-   ln -s bzip2-reference "${EROOT}/bin/${x}" || die
+   ln -s bzip2-reference$(get_exeext) 
"${EROOT}/bin/${x}$(get_exeext)" || die
fi
done
 }

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: a2fb91ef324f29ae9985c9c3e4f127fd23476054
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 24 18:34:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 24 18:35:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2fb91ef

app-arch/bzip2: keyword for ~arm64-macos

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r4.ebuild | 4 ++--
 app-arch/bzip2/bzip2-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
index 38cb103dd55b..8486a465d48f 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~arm64-macos"
 IUSE="static static-libs"
 
 BDEPEND="

diff --git a/app-arch/bzip2/bzip2-.ebuild b/app-arch/bzip2/bzip2-.ebuild
index 025f6378d542..e8b4774ac56e 100644
--- a/app-arch/bzip2/bzip2-.ebuild
+++ b/app-arch/bzip2/bzip2-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ if [[ ${PV} ==  ]] ; then
EGIT_REPO_URI="https://gitlab.com/bzip2/bzip2;
inherit git-r3
 else
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~arm64-macos"
 fi
 
 LICENSE="BZIP2"

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: b531a4e0c53bc0299725fbea05b0fd5ad45dae13
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 27 23:51:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 28 00:32:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b531a4e0

app-arch/bzip2: drop 1.0.8-r3

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r3.ebuild | 126 ---
 1 file changed, 126 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r3.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
deleted file mode 100644
index 1bdda90d94f3..
--- a/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
-#  (since we're building shared libs) ...
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg
-inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig
-
-DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="https://sourceware.org/bzip2/;
-SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
-SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
-
-LICENSE="BZIP2"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
-IUSE="static static-libs"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )"
-RDEPEND="!app-arch/lbzip2[symlink(-)]
-   !app-arch/pbzip2[symlink(-)]"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
-   "${FILESDIR}"/${PN}-1.0.8-saneso.patch
-   "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
-   "${FILESDIR}"/${PN}-1.0.6-progress.patch
-   "${FILESDIR}"/${PN}-1.0.3-no-test.patch
-   "${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573
-   "${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
-)
-
-DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
-HTML_DOCS=( manual.html )
-
-src_prepare() {
-   default
-
-   # - Use right man path
-   # - Generate symlinks instead of hardlinks
-   # - pass custom variables to control libdir
-   sed -i \
-   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-   -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
-   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
-   Makefile || die
-}
-
-bemake() {
-   emake \
-   VPATH="${S}" \
-   CC="$(tc-getCC)" \
-   AR="$(tc-getAR)" \
-   RANLIB="$(tc-getRANLIB)" \
-   "$@"
-}
-
-multilib_src_compile() {
-   bemake -f "${S}"/Makefile-libbz2_so all
-   # Make sure we link against the shared lib #504648
-   ln -s libbz2.so.${PV} libbz2.so || die
-   bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
-}
-
-multilib_src_test() {
-   cp "${S}"/sample* "${BUILD_DIR}" || die
-   bemake -f "${S}"/Makefile check
-}
-
-multilib_src_install() {
-   into /usr
-
-   # Install the shared lib manually.  We install:
-   #  .x.x.x - standard shared lib behavior
-   #  .x.x   - SONAME some distros use #338321
-   #  .x - SONAME Gentoo uses
-   dolib.so libbz2.so.${PV}
-   local v
-   for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
-   dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
-   done
-
-   use static-libs && dolib.a libbz2.a
-
-   if multilib_is_native_abi ; then
-   gen_usr_ldscript -a bz2
-
-   dobin bzip2recover
-   into /
-   dobin bzip2
-   fi
-}
-
-multilib_src_install_all() {
-   # `make install` doesn't cope with out-of-tree builds, nor with
-   # installing just non-binaries, so handle things ourselves.
-   insinto /usr/include
-   doins bzlib.h
-   into /usr
-   dobin bz{diff,grep,more}
-   doman *.1
-
-   dosym bzdiff /usr/bin/bzcmp
-   dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
-
-   dosym bzmore /usr/bin/bzless
-   dosym bzmore.1 /usr/share/man/man1/bzless.1
-
-   local x
-   for x in bunzip2 bzcat bzip2recover ; do
-   dosym bzip2.1 /usr/share/man/man1/${x}.1
-   done
-   for x in bz{e,f}grep ; do
-   dosym bzgrep /usr/bin/${x}
-   dosym bzgrep.1 /usr/share/man/man1/${x}.1
-   done
-
-   einstalldocs
-
-   # move "important" bzip2 binaries to /bin and use the shared libbz2.so
-   dosym bzip2 /bin/bzcat
-   dosym bzip2 /bin/bunzip2
-}

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 5e4c1ddb9aba8bc606a20fbe0a46ff90ece936d4
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 27 19:46:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 27 19:53:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e4c1ddb

app-arch/bzip2: Stabilize 1.0.8-r4 ppc64, #886017

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
index 452de22b5a48..38cb103dd55b 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 IUSE="static static-libs"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 9c1aab711632e82fe89b47c157af6ce0fdce6ce0
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 27 13:39:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 27 13:39:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c1aab71

app-arch/bzip2: Stabilize 1.0.8-r4 arm64, #886017

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
index 99c64079d04d..186e670e2c13 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 IUSE="static static-libs"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 6db50efc3e73cfd6e7251b33bec8541ee19bd393
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 27 11:30:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 27 11:30:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db50efc

app-arch/bzip2: Stabilize 1.0.8-r4 amd64, #886017

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
index 3ac96e3d4ef2..5ad4e1528db9 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" verify-sig? ( 
https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 IUSE="static static-libs"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 90657783651efa366c78e2dfdd44e15a4f372e49
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Nov 30 16:04:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 01:39:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90657783

app-arch/bzip2: Support app-alternatives/bzip2

Signed-off-by: Michał Górny  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/28481
Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r4.ebuild | 135 +++
 app-arch/bzip2/bzip2-.ebuild |  21 +++---
 2 files changed, 145 insertions(+), 11 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
new file mode 100644
index ..3ac96e3d4ef2
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#  (since we're building shared libs) ...
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg
+inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="https://sourceware.org/bzip2/;
+SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
+SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+IUSE="static static-libs"
+
+BDEPEND="
+   verify-sig? ( sec-keys/openpgp-keys-bzip2 )
+"
+PDEPEND="
+   app-alternatives/bzip2
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+   "${FILESDIR}"/${PN}-1.0.8-saneso.patch
+   "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+   "${FILESDIR}"/${PN}-1.0.6-progress.patch
+   "${FILESDIR}"/${PN}-1.0.3-no-test.patch
+   "${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573
+   "${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+   default
+
+   # - Use right man path
+   # - Generate symlinks instead of hardlinks
+   # - pass custom variables to control libdir
+   sed -i \
+   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+   -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+   Makefile || die
+}
+
+bemake() {
+   emake \
+   VPATH="${S}" \
+   CC="$(tc-getCC)" \
+   AR="$(tc-getAR)" \
+   RANLIB="$(tc-getRANLIB)" \
+   "$@"
+}
+
+multilib_src_compile() {
+   bemake -f "${S}"/Makefile-libbz2_so all
+   # Make sure we link against the shared lib #504648
+   ln -s libbz2.so.${PV} libbz2.so || die
+   bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
+}
+
+multilib_src_test() {
+   cp "${S}"/sample* "${BUILD_DIR}" || die
+   bemake -f "${S}"/Makefile check
+}
+
+multilib_src_install() {
+   into /usr
+
+   # Install the shared lib manually.  We install:
+   #  .x.x.x - standard shared lib behavior
+   #  .x.x   - SONAME some distros use #338321
+   #  .x - SONAME Gentoo uses
+   dolib.so libbz2.so.${PV}
+   local v
+   for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+   dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+   done
+
+   use static-libs && dolib.a libbz2.a
+
+   if multilib_is_native_abi ; then
+   gen_usr_ldscript -a bz2
+
+   dobin bzip2recover
+   into /
+   newbin bzip2 bzip2-reference
+   fi
+}
+
+multilib_src_install_all() {
+   # `make install` doesn't cope with out-of-tree builds, nor with
+   # installing just non-binaries, so handle things ourselves.
+   insinto /usr/include
+   doins bzlib.h
+   into /usr
+   dobin bz{diff,grep,more}
+   doman bz{diff,grep,more}.1
+   newman bzip2.1 bzip2-reference.1
+
+   dosym bzdiff /usr/bin/bzcmp
+   dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+   dosym bzmore /usr/bin/bzless
+   dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+   dosym bzip2-reference.1 /usr/share/man/man1/bzip2recover.1
+   local x
+   for x in bz{e,f}grep ; do
+   dosym bzgrep /usr/bin/${x}
+   dosym bzgrep.1 /usr/share/man/man1/${x}.1
+   done
+
+   einstalldocs
+}
+
+pkg_postinst() {
+   # ensure to preserve the symlinks before app-alternatives/bzip2
+   # is installed
+   local x
+   for x in bzip2 bunzip2 bzcat; do
+   if [[ ! -h ${EROOT}/bin/${x} ]]; then
+   ln -s 

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: f727ff81056ed97e0d834f878e750e6e65c738e4
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 29 21:27:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 29 21:27:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f727ff81

app-arch/bzip2: add gitlab upstream metadata

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-arch/bzip2/metadata.xml b/app-arch/bzip2/metadata.xml
index 87e613c2ed69..e3880e673f7f 100644
--- a/app-arch/bzip2/metadata.xml
+++ b/app-arch/bzip2/metadata.xml
@@ -7,5 +7,6 @@
 
 
   cpe:/a:bzip:bzip2
+  bzip2/bzip2
 
 

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 2dfa77422af4661f736539f77a5dfc3c2ae57706
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 23 04:35:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 23 05:17:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dfa7742

app-arch/bzip2: update  repo URL

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-.ebuild | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app-arch/bzip2/bzip2-.ebuild b/app-arch/bzip2/bzip2-.ebuild
index 9d9bd0d4385c..e463fbf759d7 100644
--- a/app-arch/bzip2/bzip2-.ebuild
+++ b/app-arch/bzip2/bzip2-.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson-multilib usr-ldscript
 
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="https://gitlab.com/federicomenaquintero/bzip2;
-if [[ "${PV}" ==  ]] ; then
+HOMEPAGE="https://gitlab.com/bzip2/bzip2;
+if [[ ${PV} ==  ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/bzip2/bzip2;
inherit git-r3
-   EGIT_REPO_URI="https://gitlab.com/federicomenaquintero/bzip2.git;
 else
-   SRC_URI=""
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
+
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
 
 IUSE="static-libs"
 
-RDEPEND="!app-arch/lbzip2[symlink(-)]
-   !app-arch/pbzip2[symlink(-)]"
+RDEPEND="
+   !app-arch/lbzip2[symlink(-)]
+   !app-arch/pbzip2[symlink(-)]
+"
 
 multilib_src_configure() {
local emesonargs=(
@@ -44,7 +46,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-   # move "important" bzip2 binaries to /bin and use the shared libbz2.so
+   # Move "important" bzip2 binaries to /bin and use the shared libbz2.so
dosym bzip2 /bin/bzcat
dosym bzip2 /bin/bunzip2
 

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: c08b76878e08bc3067ee78083a65c15e501d3011
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 23 04:33:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 23 05:17:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c08b7687

app-arch/bzip2: cleanup obsolete hack in 

We already removed it from release versions a few weeks ago.

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-.ebuild | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/app-arch/bzip2/bzip2-.ebuild b/app-arch/bzip2/bzip2-.ebuild
index 38d766cedafc..9d9bd0d4385c 100644
--- a/app-arch/bzip2/bzip2-.ebuild
+++ b/app-arch/bzip2/bzip2-.ebuild
@@ -35,13 +35,6 @@ multilib_src_configure() {
 multilib_src_install() {
meson_src_install
 
-   # Install libbz2.so.1.0 due to accidental soname change in 1.0.7.
-   # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24.
-   # OK to remove one year after 2020-04-11.
-   if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then
-   dosym libbz2.so.1 "/usr/$(get_libdir)/libbz2.so.1.0"
-   fi
-
if multilib_is_native_abi ; then
gen_usr_ldscript -a bz2
 

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mike Gilbert]

commit: 876ad3a2e8d9893a31390c0f7b8a956dad4df17a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Sep  6 16:01:50 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Sep  6 16:10:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876ad3a2

app-arch/bzip2: add blocker against app-arch/pbzip2[symlink]

Bug: https://bugs.gentoo.org/868318
Signed-off-by: Mike Gilbert  gentoo.org>

 app-arch/bzip2/{bzip2-1.0.8-r2.ebuild => bzip2-1.0.8-r3.ebuild} | 3 ++-
 app-arch/bzip2/bzip2-.ebuild| 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r2.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
similarity index 97%
rename from app-arch/bzip2/bzip2-1.0.8-r2.ebuild
rename to app-arch/bzip2/bzip2-1.0.8-r3.ebuild
index b2e7d764d2eb..1bdda90d94f3 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r2.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
@@ -20,7 +20,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv
 IUSE="static static-libs"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )"
-RDEPEND="!app-arch/lbzip2[symlink(-)]"
+RDEPEND="!app-arch/lbzip2[symlink(-)]
+   !app-arch/pbzip2[symlink(-)]"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch

diff --git a/app-arch/bzip2/bzip2-.ebuild b/app-arch/bzip2/bzip2-.ebuild
index 80435914e091..38d766cedafc 100644
--- a/app-arch/bzip2/bzip2-.ebuild
+++ b/app-arch/bzip2/bzip2-.ebuild
@@ -19,7 +19,8 @@ SLOT="0/1" # subslot = SONAME
 
 IUSE="static-libs"
 
-RDEPEND="!app-arch/lbzip2[symlink(-)]"
+RDEPEND="!app-arch/lbzip2[symlink(-)]
+   !app-arch/pbzip2[symlink(-)]"
 
 multilib_src_configure() {
local emesonargs=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mike Gilbert]

commit: 91016d3668de9ce1a9da58f9668db756d1197c63
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Sep  5 15:04:17 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Sep  5 21:32:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91016d36

app-arch/bzip2: add blocker against lbzip2

Closes: https://bugs.gentoo.org/868318
Signed-off-by: Mike Gilbert  gentoo.org>

 .../bzip2/{bzip2-1.0.8-r1.ebuild => bzip2-1.0.8-r2.ebuild}   | 12 +---
 app-arch/bzip2/bzip2-.ebuild |  4 +++-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r2.ebuild
similarity index 89%
rename from app-arch/bzip2/bzip2-1.0.8-r1.ebuild
rename to app-arch/bzip2/bzip2-1.0.8-r2.ebuild
index 62a13959bff9..b2e7d764d2eb 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r2.ebuild
@@ -9,10 +9,6 @@ EAPI=7
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg
 inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig
 
-if [[ ${PVR} != 1.0.8-r1 ]]; then
-   die "Please remove libbz2.so.1.0 logic from multilib_src_install"
-fi
-
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://sourceware.org/bzip2/;
 SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
@@ -24,6 +20,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k 
~mips ppc ppc64 ~riscv
 IUSE="static static-libs"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )"
+RDEPEND="!app-arch/lbzip2[symlink(-)]"
 
 PATCHES=(
"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
@@ -85,13 +82,6 @@ multilib_src_install() {
dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
done
 
-   # Install libbz2.so.1.0 due to accidental soname change in 1.0.7.
-   # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24.
-   # OK to remove one year after 2020-04-11.
-   if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then
-   dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2.so.1.0"
-   fi
-
use static-libs && dolib.a libbz2.a
 
if multilib_is_native_abi ; then

diff --git a/app-arch/bzip2/bzip2-.ebuild b/app-arch/bzip2/bzip2-.ebuild
index a5f4b823c2f1..80435914e091 100644
--- a/app-arch/bzip2/bzip2-.ebuild
+++ b/app-arch/bzip2/bzip2-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,8 @@ SLOT="0/1" # subslot = SONAME
 
 IUSE="static-libs"
 
+RDEPEND="!app-arch/lbzip2[symlink(-)]"
+
 multilib_src_configure() {
local emesonargs=(
-Ddefault_library=$(usex static-libs both shared)

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 86a0bcad235a50769229075c60b15f410d9dba50
Author: Sam James  gentoo  org>
AuthorDate: Tue May 17 06:44:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 06:45:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a0bcad

app-arch/bzip2: run test suite

The Makefile in the builddir lacks a check target
so we'd silently skip it before.

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index a3ee12f8c36c..62a13959bff9 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -67,6 +67,11 @@ multilib_src_compile() {
bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
 }
 
+multilib_src_test() {
+   cp "${S}"/sample* "${BUILD_DIR}" || die
+   bemake -f "${S}"/Makefile check
+}
+
 multilib_src_install() {
into /usr
 

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 7eda253785d276a8439584e4d76b93eb24876fa9
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr  6 23:11:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  6 23:33:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eda2537

app-arch/bzip2: add verify-sig

Not syncing  intentionally as it's a different upstream anyway
& completely different ebuild.

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/Manifest  | 1 +
 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index a4b18f5d5bf2..099151807c27 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1 +1,2 @@
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 
22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad
 SHA512 
083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
+DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 
0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395
 SHA512 
4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d

diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index 20e9e8edeb87..27ae77914b3c 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -6,7 +6,8 @@
 
 EAPI=7
 
-inherit toolchain-funcs multilib-minimal usr-ldscript
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg
+inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig
 
 if [[ ${PVR} != 1.0.8-r1 ]]; then
die "Please remove libbz2.so.1.0 logic from multilib_src_install"
@@ -15,12 +16,15 @@ fi
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://sourceware.org/bzip2/;
 SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
+SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="static static-libs"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )"
+
 PATCHES=(
"${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
"${FILESDIR}"/${PN}-1.0.8-saneso.patch

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mike Gilbert]

commit: 63f2e2bb16a6d2727673100a67d3711a7617
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Feb 18 19:37:32 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Feb 18 19:38:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f2e2bf

app-arch/bzip2: ensure libbz2.so.1.0 gets dropped on the next bump

Signed-off-by: Mike Gilbert  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 6 +-
 1 file changed, 5 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 49d36f93d65a..20e9e8edeb87 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -8,6 +8,10 @@ EAPI=7
 
 inherit toolchain-funcs multilib-minimal usr-ldscript
 
+if [[ ${PVR} != 1.0.8-r1 ]]; then
+   die "Please remove libbz2.so.1.0 logic from multilib_src_install"
+fi
+
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://sourceware.org/bzip2/;
 SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/, app-arch/bzip2/files/

[Andreas Sturmlechner]

commit: 00ea4635e5ed3267b79f544035f9cbff0ce2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 18 17:59:18 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 30 19:37:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00ea4635

app-arch/bzip2: Drop 1.0.6-r11 and 1.0.7-r1

Bug: https://bugs.gentoo.org/768546
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-arch/bzip2/Manifest|   2 -
 app-arch/bzip2/bzip2-1.0.6-r11.ebuild  | 118 -
 app-arch/bzip2/bzip2-1.0.7-r1.ebuild   | 115 
 app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch |  21 
 .../bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch|  18 
 app-arch/bzip2/files/bzip2-1.0.6-mingw.patch   |  27 -
 .../bzip2-1.0.6-nselectors-upper-bound-check.patch |  30 --
 .../files/bzip2-1.0.6-out-of-tree-build.patch  |  79 --
 app-arch/bzip2/files/bzip2-1.0.6-saneso.patch  |  13 ---
 app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch |  24 -
 .../files/bzip2-1.0.7-out-of-tree-build.patch  |  76 -
 app-arch/bzip2/files/bzip2-1.0.7-saneso.patch  |  13 ---
 12 files changed, 536 deletions(-)

diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 697d1445ac9..a4b18f5d5bf 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1,3 +1 @@
-DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B 
b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e
 SHA512 
00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
-DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B 
da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a
 SHA512 
e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8
 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 
22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad
 SHA512 
083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3

diff --git a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
deleted file mode 100644
index 1484da57cb9..000
--- a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
-#  (since we're building shared libs) ...
-
-EAPI=6
-
-inherit toolchain-funcs multilib-minimal usr-ldscript
-
-DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="https://sourceware.org/bzip2/;
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="BZIP2"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
-IUSE="static static-libs"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
-   "${FILESDIR}"/${PN}-1.0.6-saneso.patch
-   "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
-   "${FILESDIR}"/${PN}-1.0.6-progress.patch
-   "${FILESDIR}"/${PN}-1.0.3-no-test.patch
-   "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
-   "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
-   "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
-   "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
-   "${FILESDIR}"/${PN}-1.0.6-ubsan-error.patch
-   "${FILESDIR}"/${PN}-1.0.6-nselectors-upper-bound-check.patch
-)
-
-DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
-HTML_DOCS=( manual.html )
-
-src_prepare() {
-   default
-
-   # - Use right man path
-   # - Generate symlinks instead of hardlinks
-   # - pass custom variables to control libdir
-   sed -i \
-   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-   -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
-   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
-   Makefile || die
-}
-
-bemake() {
-   emake \
-   VPATH="${S}" \
-   CC="$(tc-getCC)" \
-   AR="$(tc-getAR)" \
-   RANLIB="$(tc-getRANLIB)" \
-   "$@"
-}
-
-multilib_src_compile() {
-   bemake -f "${S}"/Makefile-libbz2_so all
-   # Make sure we link against the shared lib #504648
-   ln -s libbz2.so.${PV} libbz2.so || die
-   bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
-}
-
-multilib_src_install() {
-   into /usr
-
-   # Install the shared lib manually.  We install:
-   #  

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Agostino Sarubbo]

commit: d2cce10f69fe37e7c00c2a2f4a2ded9441a6afa0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar 26 12:01:07 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar 26 12:01:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2cce10f

app-arch/bzip2: s390 stable wrt bug #768546

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 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 49d36f93d65..c6ca84ece13 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 89724e75b11ac4d036267b5e8daa87369793a2b9
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 16 22:33:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 16 22:33:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89724e75

app-arch/bzip2: Stabilize 1.0.8-r1 amd64, #768546

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 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 b361f7bbe64..49d36f93d65 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sergei Trofimovich]

commit: f14e07b3f67501d8ec0ca18ac817bfe5038e318f
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Mar 16 16:04:53 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Mar 16 18:10:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f14e07b3

app-arch/bzip2: stable 1.0.8-r1 for hppa/sparc, bug #768546

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 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 61861024e39..b361f7bbe64 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: c08fb75fd6a9ea5eeed08f62dae4d0af8570a3c1
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 03:50:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 03:50:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c08fb75f

app-arch/bzip2: Stabilize 1.0.8-r1 ppc, #768546

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 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 f7494008f5d..61861024e39 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 52467a8cec111a684caace482b011e4018d07063
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 02:26:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 02:26:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52467a8c

app-arch/bzip2: Stabilize 1.0.8-r1 arm, #768546

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 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 70b385f6993..f7494008f5d 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Thomas Deutschmann]

commit: aff696f6cb8fad6b0c8fd268d786db303e1f960a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Mar 15 01:31:28 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Mar 15 01:31:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff696f6

app-arch/bzip2: x86 stable (bug #768546)

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 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 dd0c6061b73..70b385f6993 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc x86"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: eee445d2fb32db2c6c3a0b0391059a39bcd97a31
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 00:51:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 00:51:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eee445d2

app-arch/bzip2: Stabilize 1.0.8-r1 arm64, #768546

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 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 90da12ecacb..dd0c6061b73 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sam James]

commit: 0f5057706c2046876e36024dae137909428c78a5
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 15 00:51:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 15 00:51:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f505770

app-arch/bzip2: Stabilize 1.0.8-r1 ppc64, #768546

Signed-off-by: Sam James  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index 34b92d2ea54..90da12ecacb 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mike Gilbert]

commit: a18a88ccff609edaa1512e1a277e26165b636b18
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 11 17:35:38 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 11 17:46:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18a88cc

Revert "app-arch/bzip2: add landmine to ensure SLOT gets updated"

This reverts commit 5b8f16651df78afbe673c0f695d8c0e21f7c4db1.

Signed-off-by: Mike Gilbert  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 6 --
 app-arch/bzip2/bzip2-.ebuild | 7 +--
 2 files changed, 1 insertion(+), 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 f9c097a85a4..e1e25b90ee4 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-.ebuild b/app-arch/bzip2/bzip2-.ebuild
index 266dd9856aa..a0c9cd7a462 100644
--- a/app-arch/bzip2/bzip2-.ebuild
+++ b/app-arch/bzip2/bzip2-.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=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mike Gilbert]

commit: 970736fe78dc0c25b1497ff8e5f153c8d2dcc5ff
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 11 17:46:09 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 11 17:46:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=970736fe

app-arch/bzip2: ensure libbz2.so.1.0 gets installed

Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1
Signed-off-by: Mike Gilbert  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 8 
 app-arch/bzip2/bzip2-.ebuild | 7 +++
 2 files changed, 15 insertions(+)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index e1e25b90ee4..34b92d2ea54 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -71,6 +71,14 @@ multilib_src_install() {
for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
done
+
+   # Install libbz2.so.1.0 due to accidental soname change in 1.0.7.
+   # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24.
+   # OK to remove one year after 2020-04-11.
+   if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then
+   dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2.so.1.0"
+   fi
+
use static-libs && dolib.a libbz2.a
 
if multilib_is_native_abi ; then

diff --git a/app-arch/bzip2/bzip2-.ebuild b/app-arch/bzip2/bzip2-.ebuild
index a0c9cd7a462..579f0b8f44d 100644
--- a/app-arch/bzip2/bzip2-.ebuild
+++ b/app-arch/bzip2/bzip2-.ebuild
@@ -36,6 +36,13 @@ multilib_src_compile() {
 multilib_src_install() {
meson_src_install
 
+   # Install libbz2.so.1.0 due to accidental soname change in 1.0.7.
+   # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24.
+   # OK to remove one year after 2020-04-11.
+   if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then
+   dosym libbz2.so.1 "/usr/$(get_libdir)/libbz2.so.1.0"
+   fi
+
if multilib_is_native_abi ; then
gen_usr_ldscript -a bz2
 

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mike Gilbert]

commit: 5b8f16651df78afbe673c0f695d8c0e21f7c4db1
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 11 17:25:24 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 11 17:26:03 2020 +
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-.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-.ebuild b/app-arch/bzip2/bzip2-.ebuild
index a0c9cd7a462..266dd9856aa 100644
--- a/app-arch/bzip2/bzip2-.ebuild
+++ b/app-arch/bzip2/bzip2-.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)

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/, app-arch/bzip2/files/

[Lars Wendler]

commit: 98da0ad82192d21ad74ae52366ea8466e2acea24
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sat Apr 11 07:35:36 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Apr 11 11:08:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98da0ad8

app-arch/bzip2: Fix soname of library in 1.0.7 and 1.0.8.

Change soname of library from "libbz2.so.1.0" to "libbz2.so.1".
Soname "libbz2.so.1" is also used by previous version (1.0.6) and by
new build systems (both Meson and CMake) available in next version.

Closes: https://bugs.gentoo.org/695178
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Lars Wendler  gentoo.org>

 app-arch/bzip2/{bzip2-1.0.7.ebuild => bzip2-1.0.7-r1.ebuild} | 0
 app-arch/bzip2/{bzip2-1.0.8.ebuild => bzip2-1.0.8-r1.ebuild} | 0
 app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch | 2 +-
 app-arch/bzip2/files/bzip2-1.0.7-saneso.patch| 2 +-
 app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch | 2 +-
 app-arch/bzip2/files/bzip2-1.0.8-saneso.patch| 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.7.ebuild 
b/app-arch/bzip2/bzip2-1.0.7-r1.ebuild
similarity index 100%
rename from app-arch/bzip2/bzip2-1.0.7.ebuild
rename to app-arch/bzip2/bzip2-1.0.7-r1.ebuild

diff --git a/app-arch/bzip2/bzip2-1.0.8.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
similarity index 100%
rename from app-arch/bzip2/bzip2-1.0.8.ebuild
rename to app-arch/bzip2/bzip2-1.0.8-r1.ebuild

diff --git a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch 
b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
index 977d9b3cd30..64cca58eac3 100644
--- a/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.7-out-of-tree-build.patch
@@ -49,7 +49,7 @@
 @@ -36,24 +36,10 @@
  
  all: $(OBJS)
-   $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o 
libbz2.so.1.0.7 $(OBJS)
+   $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 
$(OBJS)
 -  $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
 -  rm -f libbz2.so.1.0
 -  ln -s libbz2.so.1.0.7 libbz2.so.1.0

diff --git a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch 
b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
index 5ab0cb52d05..d63226684f6 100644
--- a/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.7-saneso.patch
@@ -6,7 +6,7 @@
  all: $(OBJS)
 -  $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.7 $(OBJS)
 -  $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
-+  $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o 
libbz2.so.1.0.7 $(OBJS)
++  $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.7 
$(OBJS)
 +  $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.7
rm -f libbz2.so.1.0
ln -s libbz2.so.1.0.7 libbz2.so.1.0

diff --git a/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch 
b/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
index 4a641fdb2e8..04818265b7e 100644
--- a/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch
@@ -49,7 +49,7 @@
 @@ -36,24 +36,10 @@
  
  all: $(OBJS)
-   $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o 
libbz2.so.1.0.8 $(OBJS)
+   $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 
$(OBJS)
 -  $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
 -  rm -f libbz2.so.1.0
 -  ln -s libbz2.so.1.0.8 libbz2.so.1.0

diff --git a/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch 
b/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
index 08430831baa..63409f5a857 100644
--- a/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch
@@ -6,7 +6,7 @@
  all: $(OBJS)
 -  $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
 -  $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
-+  $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o 
libbz2.so.1.0.8 $(OBJS)
++  $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 
$(OBJS)
 +  $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
rm -f libbz2.so.1.0
ln -s libbz2.so.1.0.8 libbz2.so.1.0

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/files/, app-arch/bzip2/

[Lars Wendler]

commit: f5f60c948b12ac20880e220e29e631c94e0d09b5
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jul 14 13:45:25 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jul 14 13:45:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f60c94

app-arch/bzip2: Bump to version 1.0.8

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler  gentoo.org>

 app-arch/bzip2/Manifest|   1 +
 app-arch/bzip2/bzip2-1.0.8.ebuild  | 114 +
 app-arch/bzip2/files/bzip2-1.0.8-mingw.patch   |  16 +++
 .../files/bzip2-1.0.8-out-of-tree-build.patch  |  76 ++
 app-arch/bzip2/files/bzip2-1.0.8-saneso.patch  |  13 +++
 5 files changed, 220 insertions(+)

diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index ace5eb289ae..697d1445ac9 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1,2 +1,3 @@
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B 
b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e
 SHA512 
00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
 DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B 
da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a
 SHA512 
e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8
+DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 
22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad
 SHA512 
083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3

diff --git a/app-arch/bzip2/bzip2-1.0.8.ebuild 
b/app-arch/bzip2/bzip2-1.0.8.ebuild
new file mode 100644
index 000..fd6f8529985
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#  (since we're building shared libs) ...
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="https://sourceware.org/bzip2/;
+SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static static-libs"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+   "${FILESDIR}"/${PN}-1.0.8-saneso.patch
+   "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+   "${FILESDIR}"/${PN}-1.0.6-progress.patch
+   "${FILESDIR}"/${PN}-1.0.3-no-test.patch
+   "${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573
+   "${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+   default
+
+   # - Use right man path
+   # - Generate symlinks instead of hardlinks
+   # - pass custom variables to control libdir
+   sed -i \
+   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+   -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+   Makefile || die
+}
+
+bemake() {
+   emake \
+   VPATH="${S}" \
+   CC="$(tc-getCC)" \
+   AR="$(tc-getAR)" \
+   RANLIB="$(tc-getRANLIB)" \
+   "$@"
+}
+
+multilib_src_compile() {
+   bemake -f "${S}"/Makefile-libbz2_so all
+   # Make sure we link against the shared lib #504648
+   ln -s libbz2.so.${PV} libbz2.so || die
+   bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
+}
+
+multilib_src_install() {
+   into /usr
+
+   # Install the shared lib manually.  We install:
+   #  .x.x.x - standard shared lib behavior
+   #  .x.x   - SONAME some distros use #338321
+   #  .x - SONAME Gentoo uses
+   dolib.so libbz2.so.${PV}
+   local v
+   for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+   dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+   done
+   use static-libs && dolib.a libbz2.a
+
+   if multilib_is_native_abi ; then
+   gen_usr_ldscript -a bz2
+
+   dobin bzip2recover
+   into /
+   dobin bzip2
+   fi
+}
+
+multilib_src_install_all() {
+   # `make install` doesn't cope with out-of-tree builds, nor with
+   # installing just non-binaries, so handle things ourselves.
+   insinto /usr/include
+   doins 

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/files/, app-arch/bzip2/

[Lars Wendler]

commit: a3f46759232ee0c64311b8790c88966b2a098434
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jul  1 07:43:45 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jul  1 07:44:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3f46759

app-arch/bzip2: Bump to version 1.0.7

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Lars Wendler  gentoo.org>

 app-arch/bzip2/Manifest|   1 +
 app-arch/bzip2/bzip2-1.0.7.ebuild  | 115 +
 .../files/bzip2-1.0.7-out-of-tree-build.patch  |  76 ++
 app-arch/bzip2/files/bzip2-1.0.7-saneso.patch  |  13 +++
 4 files changed, 205 insertions(+)

diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 4db66c194b2..ace5eb289ae 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1 +1,2 @@
 DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B 
b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e
 SHA512 
00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
+DIST bzip2-1.0.7.tar.gz 809680 BLAKE2B 
da185d9771dd83d59f2c13ea32e9a514ce50c97d69145ca2c4c8f28749fc85c1aec491c5100f4fc6b2183ee397015b7e74a0407dc1d7a360db159a0a3676fd7a
 SHA512 
e0e19b493e6b1f7beeb0eeb0be8a6358c24202173f28acb1e902a768835be9e24f2cb966452fbc90fc3e4e692532ce0c7e86d06aef2d52c0d2a9ac16e12ec8c8

diff --git a/app-arch/bzip2/bzip2-1.0.7.ebuild 
b/app-arch/bzip2/bzip2-1.0.7.ebuild
new file mode 100644
index 000..b0538f6ddf1
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.7.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#  (since we're building shared libs) ...
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="https://sourceware.org/bzip2/;
+SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz;
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static static-libs"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+   "${FILESDIR}"/${PN}-1.0.7-saneso.patch
+   "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+   "${FILESDIR}"/${PN}-1.0.6-progress.patch
+   "${FILESDIR}"/${PN}-1.0.3-no-test.patch
+   "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
+   "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
+   "${FILESDIR}"/${PN}-1.0.7-out-of-tree-build.patch
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+   default
+
+   # - Use right man path
+   # - Generate symlinks instead of hardlinks
+   # - pass custom variables to control libdir
+   sed -i \
+   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+   -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+   Makefile || die
+}
+
+bemake() {
+   emake \
+   VPATH="${S}" \
+   CC="$(tc-getCC)" \
+   AR="$(tc-getAR)" \
+   RANLIB="$(tc-getRANLIB)" \
+   "$@"
+}
+
+multilib_src_compile() {
+   bemake -f "${S}"/Makefile-libbz2_so all
+   # Make sure we link against the shared lib #504648
+   ln -s libbz2.so.${PV} libbz2.so || die
+   bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
+}
+
+multilib_src_install() {
+   into /usr
+
+   # Install the shared lib manually.  We install:
+   #  .x.x.x - standard shared lib behavior
+   #  .x.x   - SONAME some distros use #338321
+   #  .x - SONAME Gentoo uses
+   dolib.so libbz2.so.${PV}
+   local v
+   for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+   dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+   done
+   use static-libs && dolib.a libbz2.a
+
+   if multilib_is_native_abi ; then
+   gen_usr_ldscript -a bz2
+
+   dobin bzip2recover
+   into /
+   dobin bzip2
+   fi
+}
+
+multilib_src_install_all() {
+   # `make install` doesn't cope with out-of-tree builds, nor with
+   # installing just non-binaries, so handle things ourselves.
+   insinto /usr/include
+   doins bzlib.h
+   into /usr
+   dobin bz{diff,grep,more}
+   doman *.1
+
+   dosym bzdiff /usr/bin/bzcmp
+   dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+   dosym bzmore /usr/bin/bzless
+   dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+   local x
+   for x in bunzip2 bzcat 

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mike Gilbert]

commit: 475a48b9dcd77431b2b46be955c032e3daa34355
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Jun 26 17:47:11 2019 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Jun 26 17:47:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475a48b9

app-arch/bzip2: restore static-libs support

Package-Manager: Portage-2.3.67_p12, Repoman-2.3.14_p7
Signed-off-by: Mike Gilbert  gentoo.org>

 app-arch/bzip2/bzip2-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-.ebuild b/app-arch/bzip2/bzip2-.ebuild
index efb00d106df..1b4bac424b0 100644
--- a/app-arch/bzip2/bzip2-.ebuild
+++ b/app-arch/bzip2/bzip2-.ebuild
@@ -17,10 +17,11 @@ fi
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
 
-IUSE=""
+IUSE="static-libs"
 
 multilib_src_configure() {
local emesonargs=(
+   -Ddefault_library=$(usex static-libs both shared)
# Requires whole tex stack
-Ddocs="disabled"
)

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Lars Wendler]

commit: 344bcb4ae374c6d91e2286b1af3a0a8e71e2c256
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jun 26 08:01:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jun 26 08:02:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=344bcb4a

app-arch/bzip2: Added live ebuild

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Lars Wendler  gentoo.org>

 app-arch/bzip2/bzip2-.ebuild | 62 
 1 file changed, 62 insertions(+)

diff --git a/app-arch/bzip2/bzip2-.ebuild b/app-arch/bzip2/bzip2-.ebuild
new file mode 100644
index 000..efb00d106df
--- /dev/null
+++ b/app-arch/bzip2/bzip2-.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson multilib-minimal
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="https://gitlab.com/federicomenaquintero/bzip2;
+if [[ "${PV}" ==  ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https://gitlab.com/federicomenaquintero/bzip2.git;
+else
+   SRC_URI=""
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+
+IUSE=""
+
+multilib_src_configure() {
+   local emesonargs=(
+   # Requires whole tex stack
+   -Ddocs="disabled"
+   )
+
+   meson_src_configure
+}
+
+multilib_src_compile() {
+   meson_src_compile
+}
+
+multilib_src_install() {
+   meson_src_install
+
+   if multilib_is_native_abi ; then
+   gen_usr_ldscript -a bz2
+
+   dodir /bin
+   mv "${ED}"/usr/bin/bzip2 "${ED}"/bin || die
+   fi
+}
+
+multilib_src_install_all() {
+   # move "important" bzip2 binaries to /bin and use the shared libbz2.so
+   dosym bzip2 /bin/bzcat
+   dosym bzip2 /bin/bunzip2
+
+   dosym bzdiff /usr/bin/bzcmp
+   dosym bzmore /usr/bin/bzless
+   local x
+   for x in bz{e,f}grep ; do
+   dosym bzgrep /usr/bin/${x}
+   done
+
+   dosym bzip2.1 /usr/share/man/man1/bzip2recover.1
+
+   local DOCS=( AUTHORS NEWS{,-pre-1.0.7} README.md )
+   einstalldocs
+}

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Andreas K. Hüttel]

commit: cf839bcdf5a7dfbb33040efd01e630292c96c995
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri May  3 23:13:15 2019 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Fri May  3 23:17:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf839bcd

app-arch/bzip2: keyword ~riscv

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 app-arch/bzip2/bzip2-1.0.6-r11.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
index 646f6a08d89..0bad400bb1d 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/files/, app-arch/bzip2/

[Thomas Deutschmann]

commit: 1948811390283ff8e5f122bd9ec68f2e7b907450
Author: Amin Hassani  chromium  org>
AuthorDate: Mon Mar 25 18:25:34 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Apr 26 08:34:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19488113

app-arch/bzip2: check for nselector's upperbound

In bzip2 decompressor, the upper bound of nselectors have not been
checked and hence a bad payload can cause a segfault. This patch adds
that required upperbound check.

Signed-off-by: Amin Hassani  chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/11503
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...ip2-1.0.6-r10.ebuild => bzip2-1.0.6-r11.ebuild} |  1 +
 .../bzip2-1.0.6-nselectors-upper-bound-check.patch | 30 ++
 2 files changed, 31 insertions(+)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
similarity index 98%
rename from app-arch/bzip2/bzip2-1.0.6-r10.ebuild
rename to app-arch/bzip2/bzip2-1.0.6-r11.ebuild
index 5fb91d277fa..646f6a08d89 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r11.ebuild
@@ -28,6 +28,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
"${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
"${FILESDIR}"/${PN}-1.0.6-ubsan-error.patch
+   "${FILESDIR}"/${PN}-1.0.6-nselectors-upper-bound-check.patch
 )
 
 DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )

diff --git 
a/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch 
b/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch
new file mode 100644
index 000..a7731f7de8f
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-nselectors-upper-bound-check.patch
@@ -0,0 +1,30 @@
+From 13ca8fee0c897121ae79ae644a212418398dfea7 Mon Sep 17 00:00:00 2001
+From: Amin Hassani 
+Date: Fri, 8 Mar 2019 09:58:20 -0800
+Subject: [PATCH] Check for upper bounds of nselectors.
+
+Currently there is no check for the upper bounds of the
+nselectors. Hence, a corrupt input can cause a segfault.
+
+This issue was discovered by one of our fuzzers. The actual error was:
+
+../bzip2-1.0.6/decompress.c:299:10: runtime error: index 18002 out of bounds 
for type 'UChar [18002]'
+---
+ decompress.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/decompress.c b/decompress.c
+index 311f566..391552d 100644
+--- a/decompress.c
 b/decompress.c
+@@ -288,6 +288,7 @@ Int32 BZ2_decompress ( DState* s )
+   if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
+   GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
+   if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
++  if (nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR);
+   for (i = 0; i < nSelectors; i++) {
+  j = 0;
+  while (True) {
+-- 
+2.21.0.360.g471c308f928-goog
+

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/, app-arch/bzip2/files/

[Thomas Deutschmann]

commit: 66f614c51f017b0693f5aaeb5897db28ef3aff6c
Author: Manoj Gupta  google  com>
AuthorDate: Fri Aug 24 17:43:58 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug 24 17:47:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f614c5

app-arch/bzip2: fix an error reported by ubsan

Use unsigned 1 for shifting instead of signed 1.

Fix an issue with shift caught by undefined behavior
sanitizer in clang.
bzip2-1.0.6/blocksort.c:255:7
runtime error: left shift of 1 by 31 places cannot be represented
in type 'int'.

Closes: https://github.com/gentoo/gentoo/pull/9688
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...zip2-1.0.6-r9.ebuild => bzip2-1.0.6-r10.ebuild} |  1 +
 app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch | 24 ++
 2 files changed, 25 insertions(+)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
similarity index 98%
rename from app-arch/bzip2/bzip2-1.0.6-r9.ebuild
rename to app-arch/bzip2/bzip2-1.0.6-r10.ebuild
index b2bae1f0989..5fb91d277fa 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
@@ -27,6 +27,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
"${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
"${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
+   "${FILESDIR}"/${PN}-1.0.6-ubsan-error.patch
 )
 
 DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )

diff --git a/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch 
b/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch
new file mode 100644
index 000..84b811177ed
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch
@@ -0,0 +1,24 @@
+Author: Manoj Gupta 
+
+Use unsigned 1 for shifting instead of signed 1.
+
+This fixed an issue with shift caught by undefined behavior
+sanitizer in clang.
+bzip2-1.0.6/blocksort.c:255:7
+runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
+
+--- a/blocksort.c
 b/blocksort.c
+@@ -202,9 +202,9 @@ void fallbackQSort3 ( UInt32* fmap,
+   bhtab [ 0 .. 2+(nblock/32) ] destroyed
+ */
+ 
+-#define   SET_BH(zz)  bhtab[(zz) >> 5] |= (1 << ((zz) & 31))
+-#define CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31))
+-#define ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1 << ((zz) & 31)))
++#define   SET_BH(zz)  bhtab[(zz) >> 5] |= (1u << ((zz) & 31))
++#define CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1u << ((zz) & 31))
++#define ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1u << ((zz) & 31)))
+ #define  WORD_BH(zz)  bhtab[(zz) >> 5]
+ #define UNALIGNED_BH(zz)  ((zz) & 0x01f)
+ 

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Thomas Deutschmann]

commit: 85d2b28b741b031c78b1cdb28f4a71be1f482525
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 10 20:23:02 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Aug 10 20:23:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d2b28b

app-arch/bzip2: update HOMEPAGE and SRC_URI

Looks like bzip2 is moving back to its former project home at
sourceware.org.

In the meantime use Gentoo's own mirror.

Closes: https://bugs.gentoo.org/663280
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 app-arch/bzip2/bzip2-1.0.6-r9.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index d4a73abdd21..b2bae1f0989 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -9,8 +9,8 @@ EAPI=6
 inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="http://www.bzip.org/;
-SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
+HOMEPAGE="https://sourceware.org/bzip2/;
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mikle Kolyada]

commit: c6de73e5f38bf747cbd2546ed18243e0b070aa76
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Jul 15 17:40:13 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Jul 15 17:41:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6de73e5

app-arch/bzip2: m68k/sh stable wrt bug #656328

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-arch/bzip2/bzip2-1.0.6-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index 5200b0c3413..d4a73abdd21 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mikle Kolyada]

commit: 2271e85453eb5d84b73cac496c612d576cee1d17
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Jul 15 17:41:17 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Jul 15 17:41:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2271e854

app-arch/bzip2: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 114 ---
 1 file changed, 114 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
deleted file mode 100644
index 167f56e9bfd..000
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
-#  (since we're building shared libs) ...
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="http://www.bzip.org/;
-SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
-
-LICENSE="BZIP2"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="static static-libs"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
-   "${FILESDIR}"/${PN}-1.0.6-saneso.patch
-   "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
-   "${FILESDIR}"/${PN}-1.0.6-progress.patch
-   "${FILESDIR}"/${PN}-1.0.3-no-test.patch
-   "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
-   "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
-   "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
-   "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
-)
-
-src_prepare() {
-   epatch "${PATCHES[@]}"
-
-   # - Use right man path
-   # - Generate symlinks instead of hardlinks
-   # - pass custom variables to control libdir
-   sed -i \
-   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-   -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
-   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
-   Makefile || die
-}
-
-bemake() {
-   emake \
-   VPATH="${S}" \
-   CC="$(tc-getCC)" \
-   AR="$(tc-getAR)" \
-   RANLIB="$(tc-getRANLIB)" \
-   "$@"
-}
-
-multilib_src_compile() {
-   bemake -f "${S}"/Makefile-libbz2_so all
-   # Make sure we link against the shared lib #504648
-   ln -sf libbz2.so.${PV} libbz2.so
-   bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
-}
-
-multilib_src_install() {
-   into /usr
-
-   # Install the shared lib manually.  We install:
-   #  .x.x.x - standard shared lib behavior
-   #  .x.x   - SONAME some distros use #338321
-   #  .x - SONAME Gentoo uses
-   dolib.so libbz2.so.${PV}
-   local v
-   for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
-   dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
-   done
-   use static-libs && dolib.a libbz2.a
-
-   if multilib_is_native_abi ; then
-   gen_usr_ldscript -a bz2
-
-   dobin bzip2recover
-   into /
-   dobin bzip2
-   fi
-}
-
-multilib_src_install_all() {
-   # `make install` doesn't cope with out-of-tree builds, nor with
-   # installing just non-binaries, so handle things ourselves.
-   insinto /usr/include
-   doins bzlib.h
-   into /usr
-   dobin bz{diff,grep,more}
-   doman *.1
-
-   dosym bzdiff /usr/bin/bzcmp
-   dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
-
-   dosym bzmore /usr/bin/bzless
-   dosym bzmore.1 /usr/share/man/man1/bzless.1
-
-   local x
-   for x in bunzip2 bzcat bzip2recover ; do
-   dosym bzip2.1 /usr/share/man/man1/${x}.1
-   done
-   for x in bz{e,f}grep ; do
-   dosym bzgrep /usr/bin/${x}
-   dosym bzgrep.1 /usr/share/man/man1/${x}.1
-   done
-
-   dodoc README* CHANGES manual.pdf
-   dohtml manual.html
-
-   # move "important" bzip2 binaries to /bin and use the shared libbz2.so
-   dosym bzip2 /bin/bzcat
-   dosym bzip2 /bin/bunzip2
-}

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Jeroen Roovers]

commit: a62fbfbc6349be1a2d2d8bc7cd671f46ac82e653
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jun 24 09:57:54 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jun 24 10:02:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a62fbfbc

app-arch/bzip2: Stable for HPPA too.

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --ignore-arches

 app-arch/bzip2/bzip2-1.0.6-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index b31d059865f..6362c8add2c 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mikle Kolyada]

commit: d9b184a81bafaebb524c5e7073bd484d8d553a74
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Jun 22 09:50:19 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Jun 22 09:50:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b184a8

app-arch/bzip2: mark s390 stable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-arch/bzip2/bzip2-1.0.6-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index ffbfc2d2666..b31d059865f 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Tobias Klausmann]

commit: b1f6775657a27599fdb556a8d2b255aca69d930f
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Jun 19 14:31:42 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Jun 19 14:31:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f67756

app-arch/bzip2-1.0.6-r9: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/656328

 app-arch/bzip2/bzip2-1.0.6-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index 71040639128..ffbfc2d2666 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Markus Meier]

commit: 7f8b906ed578cbf766799f300633f07d7d139df3
Author: Markus Meier  gentoo  org>
AuthorDate: Wed May 30 16:28:42 2018 +
Commit: Markus Meier  gentoo  org>
CommitDate: Wed May 30 16:28:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8b906e

app-arch/bzip2: arm stable, bug #656328

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="arm"

 app-arch/bzip2/bzip2-1.0.6-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index 0423546bb50..71040639128 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mart Raudsepp]

commit: 84f3b385218f98fc0ea1b11aa63785e371c46cf0
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat May 26 10:06:03 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat May 26 10:06:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f3b385

app-arch/bzip2-1.0.6-r9: arm64 stable (bug #656328)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 app-arch/bzip2/bzip2-1.0.6-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index 4d52e615926..0423546bb50 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sergei Trofimovich]

commit: 77eb8c746f13ac8e8a8b530334f3493719d90192
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu May 24 05:49:19 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu May 24 06:19:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77eb8c74

app-arch/bzip2: stable 1.0.6-r9 for sparc

Bug: https://bugs.gentoo.org/656328
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 app-arch/bzip2/bzip2-1.0.6-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index 1ca3c20af4c..69a0d6fe477 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mikle Kolyada]

commit: 704b986b98105231d193ef603760f7e7f69b3a9d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed May 23 20:53:56 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed May 23 20:53:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=704b986b

app-arch/bzip2: amd64 stable wrt bug #656328

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-arch/bzip2/bzip2-1.0.6-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index 5d3f038dfa1..1ca3c20af4c 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sergei Trofimovich]

commit: 0983f17514c0f949fa0bd2efb60206ec18d6a362
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed May 23 19:17:20 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed May 23 19:17:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0983f175

app-arch/bzip2: stable 1.0.6-r9 for ia64, bug #656328

Bug: https://bugs.gentoo.org/656328
Package-Manager: Portage-2.3.38, Repoman-2.3.9
RepoMan-Options: --include-arches="ia64"

 app-arch/bzip2/bzip2-1.0.6-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index 35cf13b6d7b..5d3f038dfa1 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/, app-arch/bzip2/files/

[Lars Wendler]

commit: bb520d8bd77ae80115fab881dfb7c62b7cd80b80
Author: Marty E. Plummer  startmail  com>
AuthorDate: Sat Apr  7 03:52:12 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr  9 13:24:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb520d8b

app-arch/bzip2: EAPI update and patch cleanup.

Think of this as a precursor to switching bzip2 to an autotools build.
EAPI has been bumped from 5 to 6, and the patches have been reformatted
to apply with eapply in in addition to epatch (which apparently tries
every -pN option with patch until it hits one that works), so the new
revbump can be tested and stabilized while the old version is still
available without change.

Also changed dodoc/dohtml to DOCS=()/HTML_DOCS=() einstalldocs.

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7848

 app-arch/bzip2/bzip2-1.0.6-r9.ebuild   | 116 +
 app-arch/bzip2/files/bzip2-1.0.3-no-test.patch |   4 +-
 app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch |   4 +-
 .../bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch  |   8 +-
 app-arch/bzip2/files/bzip2-1.0.4-man-links.patch   |   4 +-
 .../bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch|   4 +-
 app-arch/bzip2/files/bzip2-1.0.6-progress.patch|   8 +-
 app-arch/bzip2/files/bzip2-1.0.6-saneso.patch  |   4 +-
 8 files changed, 134 insertions(+), 18 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
new file mode 100644
index 000..35cf13b6d7b
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#  (since we're building shared libs) ...
+
+EAPI=6
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="http://www.bzip.org/;
+SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
+
+LICENSE="BZIP2"
+SLOT="0/1" # subslot = SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static static-libs"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+   "${FILESDIR}"/${PN}-1.0.6-saneso.patch
+   "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+   "${FILESDIR}"/${PN}-1.0.6-progress.patch
+   "${FILESDIR}"/${PN}-1.0.3-no-test.patch
+   "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
+   "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
+   "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
+   "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
+)
+
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
+src_prepare() {
+   default
+
+   # - Use right man path
+   # - Generate symlinks instead of hardlinks
+   # - pass custom variables to control libdir
+   sed -i \
+   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+   -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+   Makefile || die
+}
+
+bemake() {
+   emake \
+   VPATH="${S}" \
+   CC="$(tc-getCC)" \
+   AR="$(tc-getAR)" \
+   RANLIB="$(tc-getRANLIB)" \
+   "$@"
+}
+
+multilib_src_compile() {
+   bemake -f "${S}"/Makefile-libbz2_so all
+   # Make sure we link against the shared lib #504648
+   ln -s libbz2.so.${PV} libbz2.so || die
+   bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
+}
+
+multilib_src_install() {
+   into /usr
+
+   # Install the shared lib manually.  We install:
+   #  .x.x.x - standard shared lib behavior
+   #  .x.x   - SONAME some distros use #338321
+   #  .x - SONAME Gentoo uses
+   dolib.so libbz2.so.${PV}
+   local v
+   for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+   dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+   done
+   use static-libs && dolib.a libbz2.a
+
+   if multilib_is_native_abi ; then
+   gen_usr_ldscript -a bz2
+
+   dobin bzip2recover
+   into /
+   dobin bzip2
+   fi
+}
+
+multilib_src_install_all() {
+   # `make install` doesn't cope with out-of-tree builds, nor with
+   # installing just non-binaries, so handle things ourselves.
+   insinto /usr/include
+   doins bzlib.h
+   into /usr
+   dobin bz{diff,grep,more}
+   doman *.1
+
+   dosym bzdiff /usr/bin/bzcmp
+   dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+   dosym bzmore /usr/bin/bzless
+   dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+   local x
+   for x in bunzip2 bzcat bzip2recover ; do
+  

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Thomas Deutschmann]

commit: a6eb83da9c38ad23a3dd6acdb8691dd51de94bc5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Oct  2 09:11:11 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Oct  2 09:11:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6eb83da

app-arch/bzip2: Security cleanup (bug #620466)

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 app-arch/bzip2/bzip2-1.0.6-r7.ebuild | 114 ---
 1 file changed, 114 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
deleted file mode 100644
index 3d35c6f1574..000
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
-#  (since we're building shared libs) ...
-
-EAPI=4
-
-inherit eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="http://www.bzip.org/;
-SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
-
-LICENSE="BZIP2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="static static-libs"
-
-RDEPEND="abi_x86_32? (
-   !<=app-emulation/emul-linux-x86-baselibs-20130224
-   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-   )"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
-   epatch "${FILESDIR}"/${PN}-1.0.6-saneso.patch
-   epatch "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
-   epatch "${FILESDIR}"/${PN}-1.0.6-progress.patch
-   epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch
-   epatch "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
-   epatch "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
-   epatch "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
-
-   # - Use right man path
-   # - Generate symlinks instead of hardlinks
-   # - pass custom variables to control libdir
-   sed -i \
-   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-   -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
-   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
-   Makefile || die
-}
-
-bemake() {
-   emake \
-   VPATH="${S}" \
-   CC="$(tc-getCC)" \
-   AR="$(tc-getAR)" \
-   RANLIB="$(tc-getRANLIB)" \
-   "$@"
-}
-
-multilib_src_compile() {
-   bemake -f "${S}"/Makefile-libbz2_so all
-   # Make sure we link against the shared lib #504648
-   ln -sf libbz2.so.${PV} libbz2.so
-   bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
-}
-
-multilib_src_install() {
-   into /usr
-
-   # Install the shared lib manually.  We install:
-   #  .x.x.x - standard shared lib behavior
-   #  .x.x   - SONAME some distros use #338321
-   #  .x - SONAME Gentoo uses
-   dolib.so libbz2.so.${PV}
-   local v
-   for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
-   dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
-   done
-   use static-libs && dolib.a libbz2.a
-
-   if multilib_is_native_abi ; then
-   gen_usr_ldscript -a bz2
-
-   dobin bzip2recover
-   into /
-   dobin bzip2
-   fi
-}
-
-multilib_src_install_all() {
-   # `make install` doesn't cope with out-of-tree builds, nor with
-   # installing just non-binaries, so handle things ourselves.
-   insinto /usr/include
-   doins bzlib.h
-   into /usr
-   dobin bz{diff,grep,more}
-   doman *.1
-
-   dosym bzdiff /usr/bin/bzcmp
-   dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
-
-   dosym bzmore /usr/bin/bzless
-   dosym bzmore.1 /usr/share/man/man1/bzless.1
-
-   local x
-   for x in bunzip2 bzcat bzip2recover ; do
-   dosym bzip2.1 /usr/share/man/man1/${x}.1
-   done
-   for x in bz{e,f}grep ; do
-   dosym bzgrep /usr/bin/${x}
-   dosym bzgrep.1 /usr/share/man/man1/${x}.1
-   done
-
-   dodoc README* CHANGES manual.pdf
-   dohtml manual.html
-
-   # move "important" bzip2 binaries to /bin and use the shared libbz2.so
-   dosym bzip2 /bin/bzcat
-   dosym bzip2 /bin/bunzip2
-}

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Thomas Deutschmann]

commit: c837191f5ffabfaa9b390b83bd154145550f3c55
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Oct  2 09:10:28 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Oct  2 09:11:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c837191f

app-arch/bzip2: mark 1.0.6-r8 arm64/m68k/s390/sh stable

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index f83f19da651..5b555febf72 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Lars Wendler]

commit: 84fe49cbda355b53354c11432e54ec7ea15671f1
Author: David Seifert  gentoo  org>
AuthorDate: Wed Sep  6 11:52:26 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Sep  9 21:06:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84fe49cb

app-arch/bzip2: Add sublot

Package-Manager: Portage-2.3.8, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5635

 app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index 22d71f992d4..f83f19da651 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.bzip.org/;
 SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
-SLOT="0"
+SLOT="0/1" # subslot = SONAME
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sergei Trofimovich]

commit: bf3cb611660f5027ef3ead376ba1fb3469b4a657
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep  9 20:02:46 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep  9 20:02:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf3cb611

app-arch/bzip2: stable 1.0.6-r8 for hppa, bug #620466 (thank to Dakon)

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="hppa"

 app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index 4adf228a8eb..22d71f992d4 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Agostino Sarubbo]

commit: 45497ca3297544f6e54898f693b015ad4eb1533f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 21 11:54:49 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 21 11:54:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45497ca3

app-arch/bzip2: ppc stable wrt bug #620466

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index eaaecfc7102..4adf228a8eb 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Markus Meier]

commit: d0e7919872923295cd8659a4bdfe6799d44aad64
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Jun  8 05:09:44 2017 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Jun  8 05:09:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e79198

app-arch/bzip2: arm stable, bug #620466

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index 0adb2223922..4179fc9b49e 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Sergei Trofimovich]

commit: 5d1a9d1ab43b89477c099a1950f85d6e53dddfd4
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jun  4 19:33:23 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jun  4 19:33:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1a9d1a

app-arch/bzip2: ia64 stable, bug #620466

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index b66502f0c42..0adb2223922 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Tobias Klausmann]

commit: 19c3b42e036d3fbe74e02a132645d2ee2e931ea6
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sun Jun  4 19:20:19 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sun Jun  4 19:20:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c3b42e

app-arch/bzip2-1.0.6-r8: add alpha keyword

Gentoo-Bug: 620466

 app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index cbeb5e837eb..b66502f0c42 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Agostino Sarubbo]

commit: 4fab3bc4c313608947ca44a9d7780d9ba0dd91de
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun  4 10:41:33 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun  4 10:42:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fab3bc4

app-arch/bzip2: x86 stable wrt bug #620466

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index 53cabe6bf31..cbeb5e837eb 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Agostino Sarubbo]

commit: fac1397dac0b21e2ef1233882e8627e6ca62a7f3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun  4 10:33:35 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun  4 10:33:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac1397d

app-arch/bzip2: amd64 stable wrt bug #620466

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index c5e3c31b4f8..53cabe6bf31 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/files/, app-arch/bzip2/

[Lars Wendler]

commit: fd4e6acf26c5766cfe17b4d1be223afcd0bab1e0
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jun  3 11:48:46 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jun  3 11:48:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd4e6acf

app-arch/bzip2: Security revbump to fix CVE-2016-3189 (bug #620466).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-arch/bzip2/bzip2-1.0.6-r8.ebuild   | 114 +
 .../bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch|  18 
 2 files changed, 132 insertions(+)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
new file mode 100644
index 000..c5e3c31b4f8
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#  (since we're building shared libs) ...
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="http://www.bzip.org/;
+SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
+
+LICENSE="BZIP2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="static static-libs"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+   "${FILESDIR}"/${PN}-1.0.6-saneso.patch
+   "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+   "${FILESDIR}"/${PN}-1.0.6-progress.patch
+   "${FILESDIR}"/${PN}-1.0.3-no-test.patch
+   "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
+   "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
+   "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
+   "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
+)
+
+src_prepare() {
+   epatch "${PATCHES[@]}"
+
+   # - Use right man path
+   # - Generate symlinks instead of hardlinks
+   # - pass custom variables to control libdir
+   sed -i \
+   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+   -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+   Makefile || die
+}
+
+bemake() {
+   emake \
+   VPATH="${S}" \
+   CC="$(tc-getCC)" \
+   AR="$(tc-getAR)" \
+   RANLIB="$(tc-getRANLIB)" \
+   "$@"
+}
+
+multilib_src_compile() {
+   bemake -f "${S}"/Makefile-libbz2_so all
+   # Make sure we link against the shared lib #504648
+   ln -sf libbz2.so.${PV} libbz2.so
+   bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
+}
+
+multilib_src_install() {
+   into /usr
+
+   # Install the shared lib manually.  We install:
+   #  .x.x.x - standard shared lib behavior
+   #  .x.x   - SONAME some distros use #338321
+   #  .x - SONAME Gentoo uses
+   dolib.so libbz2.so.${PV}
+   local v
+   for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+   dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+   done
+   use static-libs && dolib.a libbz2.a
+
+   if multilib_is_native_abi ; then
+   gen_usr_ldscript -a bz2
+
+   dobin bzip2recover
+   into /
+   dobin bzip2
+   fi
+}
+
+multilib_src_install_all() {
+   # `make install` doesn't cope with out-of-tree builds, nor with
+   # installing just non-binaries, so handle things ourselves.
+   insinto /usr/include
+   doins bzlib.h
+   into /usr
+   dobin bz{diff,grep,more}
+   doman *.1
+
+   dosym bzdiff /usr/bin/bzcmp
+   dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+   dosym bzmore /usr/bin/bzless
+   dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+   local x
+   for x in bunzip2 bzcat bzip2recover ; do
+   dosym bzip2.1 /usr/share/man/man1/${x}.1
+   done
+   for x in bz{e,f}grep ; do
+   dosym bzgrep /usr/bin/${x}
+   dosym bzgrep.1 /usr/share/man/man1/${x}.1
+   done
+
+   dodoc README* CHANGES manual.pdf
+   dohtml manual.html
+
+   # move "important" bzip2 binaries to /bin and use the shared libbz2.so
+   dosym bzip2 /bin/bzcat
+   dosym bzip2 /bin/bunzip2
+}

diff --git a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch 
b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch
new file mode 100644
index 000..1d0c3a6dd34
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch
@@ -0,0 +1,18 @@
+Upstream-Status: Backport
+https://bugzilla.suse.com/attachment.cgi?id=681334
+
+CVE: CVE-2016-3189
+Signed-off-by: Armin Kuster 
+
+Index: bzip2-1.0.6/bzip2recover.c
+===

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Mike Frysinger]

commit: c2621e0cfd1ab910748546f2e608134fc81457c6
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Jan 19 13:31:57 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Jan 19 14:13:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2621e0c

app-arch/bzip2: mark 1.0.6-r7 arm64/m68k/s390/sh stable

 app-arch/bzip2/bzip2-1.0.6-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
index 3ccb87f..4ca358f 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 RDEPEND="abi_x86_32? (

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Lars Wendler]

commit: d16f43903d77cd3b91d42ab6516c4256f75ddf3e
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan 17 15:11:44 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan 17 16:22:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16f4390

app-arch/bzip2: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-arch/bzip2/bzip2-1.0.6-r6.ebuild | 113 ---
 1 file changed, 113 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r6.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r6.ebuild
deleted file mode 100644
index d7b2cdf..
--- a/app-arch/bzip2/bzip2-1.0.6-r6.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
-#  (since we're building shared libs) ...
-
-EAPI=4
-
-inherit eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="http://www.bzip.org/;
-SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
-
-LICENSE="BZIP2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="static static-libs"
-
-RDEPEND="abi_x86_32? (
-   !<=app-emulation/emul-linux-x86-baselibs-20130224
-   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-   )"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
-   epatch "${FILESDIR}"/${PN}-1.0.6-saneso.patch
-   epatch "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
-   epatch "${FILESDIR}"/${PN}-1.0.6-progress.patch
-   epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch
-   epatch "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
-   epatch "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
-   epatch "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
-
-   # - Use right man path
-   # - Generate symlinks instead of hardlinks
-   # - pass custom variables to control libdir
-   sed -i \
-   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-   -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
-   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
-   Makefile || die
-}
-
-bemake() {
-   emake \
-   VPATH="${S}" \
-   CC="$(tc-getCC)" \
-   AR="$(tc-getAR)" \
-   RANLIB="$(tc-getRANLIB)" \
-   "$@"
-}
-
-multilib_src_compile() {
-   bemake -f "${S}"/Makefile-libbz2_so all
-   bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
-}
-
-multilib_src_install() {
-   into /usr
-
-   # Install the shared lib manually.  We install:
-   #  .x.x.x - standard shared lib behavior
-   #  .x.x   - SONAME some distros use #338321
-   #  .x - SONAME Gentoo uses
-   dolib.so libbz2.so.${PV}
-   local v
-   for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
-   dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
-   done
-   use static-libs && dolib.a libbz2.a
-
-   if multilib_is_native_abi ; then
-   gen_usr_ldscript -a bz2
-
-   dobin bzip2recover
-   into /
-   dobin bzip2
-   fi
-}
-
-multilib_src_install_all() {
-   # `make install` doesn't cope with out-of-tree builds, nor with
-   # installing just non-binaries, so handle things ourselves.
-   insinto /usr/include
-   doins bzlib.h
-   into /usr
-   dobin bz{diff,grep,more}
-   doman *.1
-
-   dosym bzdiff /usr/bin/bzcmp
-   dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
-
-   dosym bzmore /usr/bin/bzless
-   dosym bzmore.1 /usr/share/man/man1/bzless.1
-
-   local x
-   for x in bunzip2 bzcat bzip2recover ; do
-   dosym bzip2.1 /usr/share/man/man1/${x}.1
-   done
-   for x in bz{e,f}grep ; do
-   dosym bzgrep /usr/bin/${x}
-   dosym bzgrep.1 /usr/share/man/man1/${x}.1
-   done
-
-   dodoc README* CHANGES manual.pdf
-   dohtml manual.html
-
-   # move "important" bzip2 binaries to /bin and use the shared libbz2.so
-   dosym bzip2 /bin/bzcat
-   dosym bzip2 /bin/bunzip2
-}

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Markus Meier]

commit: 02f0dbda16d44083730bf09f44db6a643de7c800
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Jun  4 04:48:23 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Jun  4 04:48:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02f0dbda

app-arch/bzip2: arm stable, bug #583940

Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --include-arches="arm"

 app-arch/bzip2/bzip2-1.0.6-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
index e5d46c3..c17f685 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 RDEPEND="abi_x86_32? (

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Lars Wendler]

commit: 9a8c8ae6985ffe2febc4e6c6fdb0c6b14e1d5c18
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May 27 12:25:15 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May 27 12:45:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8c8ae6

app-arch/bzip2: amd64 stable (bug #583940).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 app-arch/bzip2/bzip2-1.0.6-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
index 27febcf..e5d46c3 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 RDEPEND="abi_x86_32? (

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Lars Wendler]

commit: 8bfc3abbcd28de3b79fa5f7d73f22a09563f6b30
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May 26 19:45:43 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May 26 20:04:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bfc3abb

app-arch/bzip2: x86 stable (bug #583940).

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="x86"
Signed-off-by: Lars Wendler  gentoo.org>

 app-arch/bzip2/bzip2-1.0.6-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
index 5b16467..27febcf 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 RDEPEND="abi_x86_32? (

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Matt Turner]

commit: 103c87cfc6e24166d0d027d923763156ea94526a
Author: Matt Turner  gentoo  org>
AuthorDate: Wed May 25 04:58:25 2016 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed May 25 06:26:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=103c87cf

app-arch/bzip2: alpha stable, bug 583940.

 app-arch/bzip2/bzip2-1.0.6-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
index 1661938c..5b16467 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 RDEPEND="abi_x86_32? (

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/

[Jeroen Roovers]

commit: 18ccde9c08518d5e5f05e8fd597eee6dfdfc2ac2
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed May 25 05:20:58 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed May 25 05:20:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ccde9c

app-arch/bzip2: Stable for HPPA PPC64 (bug #583940).

Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --ignore-arches

 app-arch/bzip2/bzip2-1.0.6-r7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
index 60d0df3..1661938c 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
 
 LICENSE="BZIP2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
 RDEPEND="abi_x86_32? (

[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/, app-arch/bzip2/files/

[Mike Frysinger]

commit: 86fa1657a0722f6e1179e3d6f1e94a6d6b6995fb
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Mar 30 22:39:17 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Mar 30 23:47:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86fa1657

app-arch/bzip2: drop old <1.0.6-r6 versions

 app-arch/bzip2/bzip2-1.0.6-r1.ebuild|  73 --
 app-arch/bzip2/bzip2-1.0.6-r2.ebuild|  73 --
 app-arch/bzip2/bzip2-1.0.6-r3.ebuild|  80 ---
 app-arch/bzip2/bzip2-1.0.6-r4.ebuild|  87 
 app-arch/bzip2/bzip2-1.0.6.ebuild   |  68 -
 app-arch/bzip2/files/bzip2-1.0.2-progress.patch | 175 
 6 files changed, 556 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r1.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r1.ebuild
deleted file mode 100644
index 8f48338..000
--- a/app-arch/bzip2/bzip2-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils multilib toolchain-funcs flag-o-matic
-
-DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="http://www.bzip.org/;
-SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
-
-LICENSE="BZIP2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="static"
-
-src_unpack() {
-   unpack ${A}
-   cd "${S}"
-   epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
-   epatch "${FILESDIR}"/${PN}-1.0.6-saneso.patch
-   epatch "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
-   epatch "${FILESDIR}"/${PN}-1.0.2-progress.patch
-   epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch
-   epatch "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
-
-   # - Use right man path
-   # - Generate symlinks instead of hardlinks
-   # - pass custom variables to control libdir
-   sed -i \
-   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-   -e 's:ln -s -f $(PREFIX)/bin/:ln -s :' \
-   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
-   Makefile || die
-}
-
-bemake() {
-   emake \
-   CC="$(tc-getCC)" \
-   AR="$(tc-getAR)" \
-   RANLIB="$(tc-getRANLIB)" \
-   "$@" || die
-}
-src_compile() {
-   bemake -f Makefile-libbz2_so all || die
-   use static && append-flags -static
-   bemake all || die
-}
-
-src_install() {
-   emake PREFIX="${D}"/usr LIBDIR=$(get_libdir) install || die
-   dodoc README* CHANGES bzip2.txt manual.*
-
-   # Install the shared lib manually.  We install:
-   #  .x.x.x - standard shared lib behavior
-   #  .x.x   - SONAME some distros use #338321
-   #  .x - SONAME Gentoo uses
-   dolib.so libbz2.so.${PV} || die
-   local s
-   for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
-   dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} || die
-   done
-   gen_usr_ldscript -a bz2
-
-   if ! use static ; then
-   newbin bzip2-shared bzip2 || die
-   fi
-
-   # move "important" bzip2 binaries to /bin and use the shared libbz2.so
-   dodir /bin
-   mv "${D}"/usr/bin/b{zip2,zcat,unzip2} "${D}"/bin/ || die
-   dosym bzip2 /bin/bzcat || die
-   dosym bzip2 /bin/bunzip2 || die
-}

diff --git a/app-arch/bzip2/bzip2-1.0.6-r2.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r2.ebuild
deleted file mode 100644
index 734eea8..000
--- a/app-arch/bzip2/bzip2-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs flag-o-matic
-
-DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
-HOMEPAGE="http://www.bzip.org/;
-SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz;
-
-LICENSE="BZIP2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 
~sparc-fbsd ~x86-fbsd"
-IUSE="static"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
-   epatch "${FILESDIR}"/${PN}-1.0.6-saneso.patch
-   epatch "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
-   epatch "${FILESDIR}"/${PN}-1.0.6-progress.patch
-   epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch
-   epatch "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
-
-   # - Use right man path
-   # - Generate symlinks instead of hardlinks
-   # - pass custom variables to control libdir
-   sed -i \
-   -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
-   -e 's:ln -s -f $(PREFIX)/bin/:ln -s :' \
-   -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
-   Makefile || die
-}
-
-bemake() {
-   emake \
-