[gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/, sys-devel/binutils/, sys-devel/gcc/, sys-devel/binutils-config/, ...

2023-05-25 Thread Fabian Groffen 
commit: b53ff9c274845244747c618bb22537b4133c1c99
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu May 25 20:05:08 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu May 25 20:05:08 2023 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b53ff9c2

*/*: remove x86-winnt/x64-cygwin keyword

Signed-off-by: Fabian Groffen  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r4.ebuild| 2 +-
 dev-lang/python/python-3.10.4.ebuild| 2 +-
 dev-lang/python/python-3.11.3.ebuild| 2 +-
 dev-lang/python/python-3.8.8_p1-r1.ebuild   | 2 +-
 dev-lang/python/python-3.9.12.ebuild| 2 +-
 dev-lang/python/python-3.9.6_p1-r1.ebuild   | 2 +-
 sys-apps/coreutils/coreutils-9.0-r2.ebuild  | 2 +-
 sys-apps/coreutils/coreutils-9.1-r2.ebuild  | 2 +-
 sys-apps/debianutils/debianutils-4.11.2.ebuild  | 2 +-
 sys-apps/help2man/help2man-1.47.16.ebuild   | 2 +-
 sys-apps/help2man/help2man-1.48.5.ebuild| 2 +-
 sys-apps/portage/portage-3.0.21.ebuild  | 2 +-
 sys-apps/portage/portage-3.0.30.1-r1.ebuild | 2 +-
 sys-apps/portage/portage-3.0.30.1.ebuild| 2 +-
 sys-apps/portage/portage-3.0.34.2.ebuild| 2 +-
 sys-apps/sed/sed-4.8.ebuild | 2 +-
 sys-apps/sed/sed-4.9.ebuild | 2 +-
 sys-devel/binutils-config/binutils-config-5.1-r5.ebuild | 2 +-
 sys-devel/binutils/binutils-2.34-r1.ebuild  | 2 +-
 sys-devel/binutils/binutils-2.39-r2.ebuild  | 2 +-
 sys-devel/binutils/binutils-2.39-r4.ebuild  | 2 +-
 sys-devel/binutils/binutils-2.40-r2.ebuild  | 2 +-
 sys-devel/gcc-config/gcc-config-1.9.1.ebuild| 2 +-
 sys-devel/gcc-config/gcc-config-2.7-r1.ebuild   | 2 +-
 sys-devel/gcc/gcc-10.2.0-r5.ebuild  | 2 +-
 sys-devel/gcc/gcc-10.3.0-r2.ebuild  | 2 +-
 sys-devel/gcc/gcc-11.2.0.ebuild | 2 +-
 sys-devel/gcc/gcc-8.3.0.ebuild  | 2 +-
 sys-devel/gcc/gcc-9.2.0-r3.ebuild   | 2 +-
 sys-libs/newlib/newlib-.ebuild  | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
index b2350df085..4d83cd7561 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="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris ~x86-winnt"
+KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="static static-libs"
 
 BDEPEND="

diff --git a/dev-lang/python/python-3.10.4.ebuild 
b/dev-lang/python/python-3.10.4.ebuild
index 5bb9ea07c2..e5ffd5fd7c 100644
--- a/dev-lang/python/python-3.10.4.ebuild
+++ b/dev-lang/python/python-3.10.4.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="aqua bluetooth build examples gdbm hardened libedit lto +ncurses pgo 
+readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 

diff --git a/dev-lang/python/python-3.11.3.ebuild 
b/dev-lang/python/python-3.11.3.ebuild
index 578dc6e405..259ba2a81e 100644
--- a/dev-lang/python/python-3.11.3.ebuild
+++ b/dev-lang/python/python-3.11.3.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="
aqua
bluetooth build +ensurepip examples gdbm hardened libedit lto

diff --git a/dev-lang/python/python-3.8.8_p1-r1.ebuild 
b/dev-lang/python/python-3.8.8_p1-r1.ebuild
index 001ec159a6..fea14f43b3 100644
--- a/dev-lang/python/python-3.8.8_p1-r1.ebuild
+++ b/dev-lang/python/python-3.8.8_p1-r1.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~x64-solaris"
 IUSE="aqua bluetooth build examples gdbm hardened ipv6 +ncurses +readline 
+sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 

diff --git a/dev-lang/python/python-3.9.12.ebuild 
b/dev-lang/python/python-3.9.12.ebuild
index fb1aec2b38..8c79a1970f 100644
--- a/dev-lang/python/python-3.9.12.ebuild
+++ b/dev-lang/python/python-3.9.12.ebuild
@@ -27,7

[gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/, sys-devel/binutils-config/, sys-apps/coreutils/, ...

2023-05-25 Thread Fabian Groffen 
commit: d4b5922c8fb900a45cc3eb634f62640c00750c48
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu May 25 19:52:05 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu May 25 19:52:05 2023 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d4b5922c

*/*: remove sparc-solaris keyword

Signed-off-by: Fabian Groffen  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r4.ebuild| 2 +-
 dev-lang/python/python-3.10.4.ebuild| 2 +-
 dev-lang/python/python-3.11.3.ebuild| 2 +-
 dev-lang/python/python-3.8.8_p1-r1.ebuild   | 2 +-
 dev-lang/python/python-3.9.12.ebuild| 2 +-
 dev-lang/python/python-3.9.6_p1-r1.ebuild   | 2 +-
 dev-util/dialog/dialog-1.3.20181022.ebuild  | 2 +-
 sys-apps/coreutils/coreutils-9.0-r2.ebuild  | 2 +-
 sys-apps/coreutils/coreutils-9.1-r2.ebuild  | 2 +-
 sys-apps/debianutils/debianutils-4.11.2.ebuild  | 2 +-
 sys-apps/help2man/help2man-1.47.16.ebuild   | 2 +-
 sys-apps/help2man/help2man-1.48.5.ebuild| 2 +-
 sys-apps/portage/portage-3.0.21.ebuild  | 2 +-
 sys-apps/portage/portage-3.0.30.1-r1.ebuild | 2 +-
 sys-apps/portage/portage-3.0.30.1.ebuild| 2 +-
 sys-apps/portage/portage-3.0.34.2.ebuild| 2 +-
 sys-apps/sed/sed-4.8.ebuild | 2 +-
 sys-apps/sed/sed-4.9.ebuild | 2 +-
 sys-devel/binutils-config/binutils-config-5.1-r5.ebuild | 2 +-
 sys-devel/binutils/binutils-2.34-r1.ebuild  | 2 +-
 sys-devel/binutils/binutils-2.39-r2.ebuild  | 2 +-
 sys-devel/binutils/binutils-2.39-r4.ebuild  | 2 +-
 sys-devel/binutils/binutils-2.40-r2.ebuild  | 2 +-
 sys-devel/gcc-config/gcc-config-1.9.1.ebuild| 2 +-
 sys-devel/gcc-config/gcc-config-2.7-r1.ebuild   | 2 +-
 sys-devel/gcc/gcc-10.2.0-r5.ebuild  | 2 +-
 sys-devel/gcc/gcc-10.3.0-r2.ebuild  | 2 +-
 sys-devel/gcc/gcc-11.2.0.ebuild | 2 +-
 sys-devel/gcc/gcc-12.1.0.ebuild | 2 +-
 sys-devel/gcc/gcc-12.2.0-r2.ebuild  | 2 +-
 sys-devel/gcc/gcc-8.3.0.ebuild  | 2 +-
 sys-devel/gcc/gcc-9.2.0-r3.ebuild   | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r4.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r4.ebuild
index 7b1a8b3cae..5e95637e82 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="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-winnt"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~sparc64-solaris ~x64-solaris ~x86-winnt"
 IUSE="static static-libs"
 
 BDEPEND="

diff --git a/dev-lang/python/python-3.10.4.ebuild 
b/dev-lang/python/python-3.10.4.ebuild
index 893e046206..ef0309ca1d 100644
--- a/dev-lang/python/python-3.10.4.ebuild
+++ b/dev-lang/python/python-3.10.4.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="aqua bluetooth build examples gdbm hardened libedit lto +ncurses pgo 
+readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 

diff --git a/dev-lang/python/python-3.11.3.ebuild 
b/dev-lang/python/python-3.11.3.ebuild
index 6426d37ae9..e00362a3a5 100644
--- a/dev-lang/python/python-3.11.3.ebuild
+++ b/dev-lang/python/python-3.11.3.ebuild
@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="
aqua
bluetooth build +ensurepip examples gdbm hardened libedit lto

diff --git a/dev-lang/python/python-3.8.8_p1-r1.ebuild 
b/dev-lang/python/python-3.8.8_p1-r1.ebuild
index 63107c39e0..31bf53fdb0 100644
--- a/dev-lang/python/python-3.8.8_p1-r1.ebuild
+++ b/dev-lang/python/python-3.8.8_p1-r1.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~sparc64-solaris

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

2022-12-31 Thread Fabian Groffen 
commit: 9e0c9cfea7698608fc671bd231a2636b85bf64f8
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Dec 31 14:38:11 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Dec 31 14:38:11 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9e0c9cfe

app-arch/bzip2: sync with gx86

Signed-off-by: Fabian Groffen  gentoo.org>

 app-arch/bzip2/bzip2-1.0.8-r1.ebuild   | 142 -
 ...bzip2-1.0.8-r3.ebuild => bzip2-1.0.8-r4.ebuild} |  31 +++--
 2 files changed, 20 insertions(+), 153 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
deleted file mode 100644
index 2ba7042d39..00
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,142 +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=7
-
-inherit toolchain-funcs multilib-minimal usr-ldscript prefix
-
-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="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-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
-
-   hprefixify -w "/^PATH=/" bz{diff,grep,more}
-   # this a makefile for Darwin, which already "includes" saneso
-   cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib Makefile-libbz2_dylib || die
-
-   if [[ ${CHOST} == *-cygwin* ]] ; then
-   sed -i -e "s/-o 
libbz2\.so\.${PV}/-Wl,--out-implib=libbz2$(get_libname ${PV})/" \
-  -e "s/-Wl,-soname -Wl,libbz2\.so\.1/-o 
cygbz2-${PV%%.*}.dll/" \
-  -e "s/libbz2\.so/libbz2$(get_libname)/g" \
-   Makefile-libbz2_so
-   fi
-}
-
-bemake() {
-   emake \
-   VPATH="${S}" \
-   CC="$(tc-getCC)" \
-   AR="$(tc-getAR)" \
-   RANLIB="$(tc-getRANLIB)" \
-   "$@"
-}
-
-multilib_src_compile() {
-   local checkopts=
-   case "${CHOST}" in
-   *-darwin*)
-   bemake PREFIX="${EPREFIX}"/usr -f 
"${S}"/Makefile-libbz2_dylib all
-   ;;
-   *)
-   bemake -f "${S}"/Makefile-libbz2_so all
-   ;;
-   esac
-   # Make sure we link against the shared lib #504648
-   ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname) || 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$(get_libname ${PV})
-   [[ ${CHOST} == *-cygwin* ]] && dobin cygbz2-${PV%%.*}.dll
-   local v
-   for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) 
libbz2$(get_libname ${PV%.*}) ; do
-   dosym libbz2$(get_libname ${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$(get_libname 1.0)" ]]; then
-   dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2$(get_libname 
1.0)"
-   fi
-
-   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,

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

2022-09-07 Thread Fabian Groffen 
commit: 59698abcabd93bfcc95244f65009b4345182c1c7
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Sep  7 19:34:19 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Sep  7 19:34:57 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=59698abc

app-arch/bzip2-1.0.8-r3: revision bump

Signed-off-by: Fabian Groffen  gentoo.org>

 app-arch/bzip2/Manifest|  2 +-
 ...zip2-1.0.6-r10.ebuild => bzip2-1.0.8-r3.ebuild} | 39 +++---
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 03ffea8912..099151807c 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1,2 +1,2 @@
-DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B 
b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e
 SHA512 
00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
 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.6-r10.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
similarity index 78%
rename from app-arch/bzip2/bzip2-1.0.6-r10.ebuild
rename to app-arch/bzip2/bzip2-1.0.8-r3.ebuild
index 990d3c1c6e..1c2b65d3b8 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
@@ -1,33 +1,36 @@
-# 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
 #  (since we're building shared libs) ...
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs multilib-minimal prefix
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg
+inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig prefix
 
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="https://sourceware.org/bzip2/;
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+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="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 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.6-saneso.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.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.8-mingw.patch #393573
+   "${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch
 )
 
 DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
@@ -48,13 +51,6 @@ src_prepare() {
hprefixify -w "/^PATH=/" bz{diff,grep,more}
# this a makefile for Darwin, which already "includes" saneso
cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib Makefile-libbz2_dylib || die
-
-   if [[ ${CHOST} == *-cygwin* ]] ; then
-   sed -i -e "s/-o 
libbz2\.so\.${PV}/-Wl,--out-implib=libbz2$(get_libname ${PV})/" \
-  -e "s/-Wl,-soname -Wl,libbz2\.so\.1/-o 
cygbz2-${PV%%.*}.dll/" \
-  -e "s/libbz2\.so/libbz2$(get_libname)/g" \
-   Makefile-libbz2_so
-   fi
 }
 
 bemake() {
@@ -67,7 +63,6 @@ bemake() {
 }
 
 multilib_src_compile() {
-   local checkopts=
case "${CHOST}" in
*-darwin*)
bemake PREFIX="${EPREFIX}"/usr -f 
"${S}"/Makefile-libbz2_dylib all
@@ -77,10 +72,15 @@ multilib_src_compile() {
;;
esac
# Make sure we link against the shared lib #504648
-   ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname)
+

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

2021-01-06 Thread Fabian Groffen 
commit: a962683e666ad5c4b8a7b9f9d8e493dd306cfa3c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 11:55:58 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 11:55:58 2021 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a962683e

app-arch/bzip2: drop x86-macos

Package-Manager: Portage-3.0.12.0.2-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 app-arch/bzip2/bzip2-1.0.6-r10.ebuild | 4 ++--
 app-arch/bzip2/bzip2-1.0.8-r1.ebuild  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
index c41ed39dff..990d3c1c6e 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.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="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static static-libs"
 
 PATCHES=(

diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index ee1d4cd81a..2ba7042d39 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="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static static-libs"
 
 PATCHES=(

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

2021-01-02 Thread Fabian Groffen 
commit: 8773c1994ef72cd311a4c986e5cd4219cd18b6a8
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jan  2 19:38:01 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jan  2 19:38:01 2021 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8773c199

app-arch/bzip2-1.0.8: sync

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 app-arch/bzip2/Manifest|   1 +
 app-arch/bzip2/bzip2-1.0.8-r1.ebuild   | 142 +
 .../bzip2/files/bzip2-1.0.8-Makefile-libbz2_dylib  |  42 ++
 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 ++
 6 files changed, 290 insertions(+)

diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 4db66c194b..03ffea8912 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.8.tar.gz 810029 BLAKE2B 
22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad
 SHA512 
083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3

diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild 
b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
new file mode 100644
index 00..ee1d4cd81a
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -0,0 +1,142 @@
+# 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=7
+
+inherit toolchain-funcs multilib-minimal usr-ldscript prefix
+
+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="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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
+
+   hprefixify -w "/^PATH=/" bz{diff,grep,more}
+   # this a makefile for Darwin, which already "includes" saneso
+   cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib Makefile-libbz2_dylib || die
+
+   if [[ ${CHOST} == *-cygwin* ]] ; then
+   sed -i -e "s/-o 
libbz2\.so\.${PV}/-Wl,--out-implib=libbz2$(get_libname ${PV})/" \
+  -e "s/-Wl,-soname -Wl,libbz2\.so\.1/-o 
cygbz2-${PV%%.*}.dll/" \
+  -e "s/libbz2\.so/libbz2$(get_libname)/g" \
+   Makefile-libbz2_so
+   fi
+}
+
+bemake() {
+   emake \
+   VPATH="${S}" \
+   CC="$(tc-getCC)" \
+   AR="$(tc-getAR)" \
+   RANLIB="$(tc-getRANLIB)" \
+   "$@"
+}
+
+multilib_src_compile() {
+   local checkopts=
+   case "${CHOST}" in
+   *-darwin*)
+   bemake PREFIX="${EPREFIX}"/usr -f 
"${S}"/Makefile-libbz2_dylib all
+   ;;
+   *)
+   bemake -f "${S}"/Makefile-libbz2_so all
+   ;;
+   esac
+   # Make sure we link against the shared lib #504648
+   ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname) || 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
+   #

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

2020-12-27 Thread Fabian Groffen 
commit: 19b5e7f05524f7788c35cc0e13f437358ca43f1c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Dec 27 10:25:11 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec 27 10:25:11 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=19b5e7f0

app-arch/bzip2: drop one more mint remnant

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 app-arch/bzip2/bzip2-1.0.6-r10.ebuild | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
index 7a3d83fdd5..c41ed39dff 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
@@ -71,16 +71,13 @@ multilib_src_compile() {
case "${CHOST}" in
*-darwin*)
bemake PREFIX="${EPREFIX}"/usr -f 
"${S}"/Makefile-libbz2_dylib all
-   # FWIW, #504648 like for .so below
-   ln -sf libbz2.${PV}.dylib libbz2.dylib
;;
*)
bemake -f "${S}"/Makefile-libbz2_so all
-   # Make sure we link against the shared lib #504648
-   [[ $(get_libname) != $(get_libname ${PV}) ]] &&
-   ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname)
;;
esac
+   # Make sure we link against the shared lib #504648
+   ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname)
bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
 }
 
@@ -94,7 +91,6 @@ multilib_src_install() {
dolib.so libbz2$(get_libname ${PV})
[[ ${CHOST} == *-cygwin* ]] && dobin cygbz2-${PV%%.*}.dll
local v
-   [[ $(get_libname) != $(get_libname ${PV}) ]] &&
for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) 
libbz2$(get_libname ${PV%.*}) ; do
dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v}
done

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

2020-12-27 Thread Fabian Groffen 
commit: 3b6cfa78aeff9555090651627b7f488661fd6afe
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Dec 27 10:14:01 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec 27 10:14:01 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3b6cfa78

app-arch/bzip2: drop AIX, HPUX, FreeMiNT remnants

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
index afd2cbacec..7a3d83fdd5 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
@@ -28,8 +28,6 @@ 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-r7-checkenv.patch # for AIX, Darwin?
 )
 
 DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
@@ -51,13 +49,6 @@ src_prepare() {
# this a makefile for Darwin, which already "includes" saneso
cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib Makefile-libbz2_dylib || die
 
-   if [[ ${CHOST} == *-hpux* ]] ; then
-   sed -i -e 's,-soname,+h,' Makefile-libbz2_so || die "cannot 
replace -soname with +h"
-   if [[ ${CHOST} == hppa*-hpux* && ${CHOST} != hppa64*-hpux* ]] ; 
then
-   sed -i -e '/^SOEXT/s,so,sl,' Makefile-libbz2_so || die 
"cannot replace so with sl"
-   sed -i -e '/^SONAME/s,=,=${EPREFIX}/lib/,' 
Makefile-libbz2_so || die "cannt set soname"
-   fi
-   fi
if [[ ${CHOST} == *-cygwin* ]] ; then
sed -i -e "s/-o 
libbz2\.so\.${PV}/-Wl,--out-implib=libbz2$(get_libname ${PV})/" \
   -e "s/-Wl,-soname -Wl,libbz2\.so\.1/-o 
cygbz2-${PV%%.*}.dll/" \
@@ -96,8 +87,6 @@ multilib_src_compile() {
 multilib_src_install() {
into /usr
 
-   if ! tc-is-static-only; then
-
# Install the shared lib manually.  We install:
#  .x.x.x - standard shared lib behavior
#  .x.x   - SONAME some distros use #338321
@@ -110,8 +99,6 @@ multilib_src_install() {
dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v}
done
 
-   fi  # tc-is-static-only
-
use static-libs && dolib.a libbz2.a
 
if multilib_is_native_abi ; then

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

2020-12-26 Thread Fabian Groffen 
commit: 96ba653936d43e55b15c436e3ab3eed0fed26e31
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Dec 26 13:07:28 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Dec 26 13:07:28 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=96ba6539

app-arch/bzip2: drop ~m68k-mint

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 app-arch/bzip2/bzip2-1.0.6-r10.ebuild | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
index ccd13a7ad5..afd2cbacec 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="BZIP2"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static static-libs"
 
 PATCHES=(
@@ -83,10 +83,6 @@ multilib_src_compile() {
# FWIW, #504648 like for .so below
ln -sf libbz2.${PV}.dylib libbz2.dylib
;;
-   *-mint*)
-   # do nothing, no shared libraries
-   :
-   ;;
*)
bemake -f "${S}"/Makefile-libbz2_so all
# Make sure we link against the shared lib #504648

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

2020-12-15 Thread Fabian Groffen 
commit: 1f0fb78d68b1ce7f257f5256a257946b5ec3d5c1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec 15 19:03:55 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec 15 19:03:55 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1f0fb78d

app-arch/bzip2: drop ~ppc-aix

Bug: https://bugs.gentoo.org/760057
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
index ee2e4b825a..ccd13a7ad5 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static static-libs"
 
 PATCHES=(

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

2018-11-19 Thread Fabian Groffen 
commit: c018e504275b5e4745d50900d6f244f9660e22fe
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 19 16:30:42 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 19 16:30:42 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c018e504

app-arch/bzip2: sync

Signed-off-by: Fabian Groffen  gentoo.org>
Package-Manager: Portage-2.3.40.3-prefix, Repoman-2.3.9

 ...zip2-1.0.6-r8.ebuild => bzip2-1.0.6-r10.ebuild} | 22 ++--
 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-prefix.patch  | 42 --
 app-arch/bzip2/files/bzip2-1.0.6-progress.patch|  8 ++---
 app-arch/bzip2/files/bzip2-1.0.6-r7-checkenv.patch |  4 +--
 app-arch/bzip2/files/bzip2-1.0.6-saneso.patch  |  4 +--
 app-arch/bzip2/files/bzip2-1.0.6-ubsan-error.patch | 24 +
 11 files changed, 56 insertions(+), 72 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
similarity index 91%
rename from app-arch/bzip2/bzip2-1.0.6-r8.ebuild
rename to app-arch/bzip2/bzip2-1.0.6-r10.ebuild
index 498b5bb32c..ee2e4b825a 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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
+EAPI=6
 
-inherit eutils toolchain-funcs multilib multilib-minimal prefix
+inherit toolchain-funcs multilib-minimal prefix
 
 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
@@ -27,13 +27,16 @@ 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
 
"${FILESDIR}"/${PN}-1.0.6-r7-checkenv.patch # for AIX, Darwin?
-   "${FILESDIR}"/${PN}-1.0.6-prefix.patch
 )
 
+DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf )
+HTML_DOCS=( manual.html )
+
 src_prepare() {
-   epatch "${PATCHES[@]}"
+   default
 
# - Use right man path
# - Generate symlinks instead of hardlinks
@@ -44,7 +47,7 @@ src_prepare() {
-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
Makefile || die
 
-   eprefixify bz{diff,grep,more}
+   hprefixify -w "/^PATH=/" bz{diff,grep,more}
# this a makefile for Darwin, which already "includes" saneso
cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib Makefile-libbz2_dylib || die
 
@@ -148,8 +151,7 @@ multilib_src_install_all() {
dosym bzgrep.1 /usr/share/man/man1/${x}.1
done
 
-   dodoc README* CHANGES manual.pdf
-   dohtml manual.html
+   einstalldocs
 
# move "important" bzip2 binaries to /bin and use the shared libbz2.so
dosym bzip2 /bin/bzcat

diff --git a/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch 
b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch
index 672c89dfbd..9e554f7951 100644
--- a/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch
@@ -1,5 +1,5 @@
 Makefile
-+++ Makefile
+--- a/Makefile
 b/Makefile
 @@ -23,5 +23,5 @@
bzlib.o
  

diff --git a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch 
b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch
index b31cc061db..74f8df000b 100644
--- a/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.4-POSIX-shell.patch
@@ -3,8 +3,8 @@ with calls to sed so POSIX shells work
 
 http://bugs.gentoo.org/193365
 
 bzgrep
-+++ bzgrep
+--- a/bzgrep
 b/bzgrep
 @@ -63,10 +63,9 @@
  bzip2 -cdfq "$i" | $grep $opt "$pat"
  r=$?

diff --git a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch 
b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
index 5a95ed68b2..04bd0d9abd 100644
--- a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
@@ -1,5 +1,5 @@
 Makefile
-+++ Makefile
+--- a/Makefile
 b/Makefile
 @@ -18,10 +18,9 @@
  CC=gcc
  AR=ar
@@ -12,8 +12,8 @@
  
  # Where you want it installed when you do 'make install'
  PREFIX=/usr/local
 Makefile-libbz2_so
-+++ Makefile-libbz2_so
+--- a/Makefile-libbz2_so

[gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/, app-arch/unzip/

2017-12-12 Thread Fabian Groffen 
commit: fd1181f0299554d5c8591744360c32bcf31b7b60
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Dec 13 07:29:25 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Dec 13 07:29:25 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=fd1181f0

app-arch/*: update manifests

Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6

 app-arch/bzip2/Manifest | 2 +-
 app-arch/unzip/Manifest | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 01344aac5f..4db66c194b 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1 +1 @@
-DIST bzip2-1.0.6.tar.gz 782025 SHA256 
a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd SHA512 
00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
 WHIRLPOOL 
8e92c24f77c3711f5103a26d6fefbe61fe49a7d1e46879d259d46347c606ca956b7228ab011aa88007db771f86a500d4954057c7f9c70bd8380ca6c9430bd81e
+DIST bzip2-1.0.6.tar.gz 782025 BLAKE2B 
b31533af7c71d715e6600874bb0a11b9b3aebbb08af0414a6d88bd5a2ad879a482ad408338159cb6c241815da8f48798d2ea7789ea971431d0be42ee827b0a7e
 SHA512 
00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12

diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index f7a457161c..3b13649240 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -1,2 +1,2 @@
-DIST unzip60.tar.gz 1376845 SHA256 
036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 
0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
 WHIRLPOOL 
eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808
-DIST unzip_6.0-20.debian.tar.xz 16680 SHA256 
7ddfafb1a771ae8d6b4e25c5e31f22c717e0fe606b1bafadcdd574c01f671490 SHA512 
7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe
 WHIRLPOOL 
ea5ebd5d95638ff8cd2e91eb77f5be544e33ac6fd478aa00c04da193cd3fad980c5ac1975dfedb2c242192cee6c4eee8bbaf3581299f6c3fa45faa639f0169fd
+DIST unzip60.tar.gz 1376845 BLAKE2B 
5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47
 SHA512 
0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
+DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 
17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48
 SHA512 
7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe

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

2017-11-27 Thread Fabian Groffen 
commit: 3ebaafa07c70197d1de7d8961c3af56bfa8ff590
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Nov 27 10:02:50 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Nov 27 10:02:50 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3ebaafa0

app-arch/bzip2: remove interrevision

Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4

 app-arch/bzip2/bzip2-1.0.6-r07.1.ebuild| 157 --
 app-arch/bzip2/files/bzip2-1.0.2-progress.patch| 175 -
 app-arch/bzip2/files/bzip2-1.0.4-prefix.patch  |  57 ---
 app-arch/bzip2/files/bzip2-1.0.4-saneso.patch  |  13 --
 .../bzip2/files/bzip2-1.0.5-Makefile-libbz2_dylib  |  60 ---
 app-arch/bzip2/files/bzip2-1.0.5-checkenv.patch|  21 ---
 app-arch/bzip2/files/bzip2-1.0.5-soldflags.patch   |  31 
 7 files changed, 514 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r07.1.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r07.1.ebuild
deleted file mode 100644
index 4d5efcff0e..00
--- a/app-arch/bzip2/bzip2-1.0.6-r07.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r7.ebuild,v 1.2 
2014/04/28 17:18:31 mgorny Exp $
-
-# 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 prefix
-
-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="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
-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
-
-   epatch "${FILESDIR}"/${PN}-1.0.6-r7-checkenv.patch # for AIX, Darwin?
-   epatch "${FILESDIR}"/${PN}-1.0.6-prefix.patch
-   eprefixify bz{diff,grep,more}
-   # this a makefile for Darwin, which already "includes" saneso
-   cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib Makefile-libbz2_dylib || die
-
-   # - 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
-
-   if [[ ${CHOST} == *-hpux* ]] ; then
-   sed -i -e 's,-soname,+h,' Makefile-libbz2_so || die "cannot 
replace -soname with +h"
-   if [[ ${CHOST} == hppa*-hpux* && ${CHOST} != hppa64*-hpux* ]] ; 
then
-   sed -i -e '/^SOEXT/s,so,sl,' Makefile-libbz2_so || die 
"cannot replace so with sl"
-   sed -i -e '/^SONAME/s,=,=${EPREFIX}/lib/,' 
Makefile-libbz2_so || die "cannt set soname"
-   fi
-   fi
-   if [[ ${CHOST} == *-cygwin* ]] ; then
-   sed -i -e "s/-o 
libbz2\.so\.${PV}/-Wl,--out-implib=libbz2$(get_libname ${PV})/" \
-  -e "s/-Wl,-soname -Wl,libbz2\.so\.1/-o 
cygbz2-${PV%%.*}.dll/" \
-  -e "s/libbz2\.so/libbz2$(get_libname)/g" \
-   Makefile-libbz2_so
-   fi
-}
-
-bemake() {
-   emake \
-   VPATH="${S}" \
-   CC="$(tc-getCC)" \
-   AR="$(tc-getAR)" \
-   RANLIB="$(tc-getRANLIB)" \
-   "$@"
-}
-
-multilib_src_compile() {
-   local checkopts=
-   case "${CHOST}" in
-   *-darwin*)
-   bemake PREFIX="${EPREFIX}"/usr -f 
"${S}"/Makefile-libbz2_dylib all
-   # FWIW, #504648 like for .so below
-   ln -sf libbz2.${PV}.dylib libbz2.dylib
-   ;;
-   *-mint*)
-   # do nothing, no shared libraries
-   :
-   ;;
-   *)
-   bemake -f "${S}"/Makefile-libbz2_so all
-   # Make sure we link against the shared lib #504648
-

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

2017-11-19 Thread Fabian Groffen 
commit: 9fbf7589d45aa09df2007ffd817dba72c37b94da
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov 19 12:40:56 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Nov 19 12:40:56 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9fbf7589

app-arch/bzip2: fix install on Darwin, bug #637966

Bug: https://bugs.gentoo.org/637966
Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4

 app-arch/bzip2/bzip2-1.0.6-r8.ebuild | 21 ++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild 
b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
index eeb7f85da2..498b5bb32c 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -73,9 +73,24 @@ bemake() {
 }
 
 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
+   local checkopts=
+   case "${CHOST}" in
+   *-darwin*)
+   bemake PREFIX="${EPREFIX}"/usr -f 
"${S}"/Makefile-libbz2_dylib all
+   # FWIW, #504648 like for .so below
+   ln -sf libbz2.${PV}.dylib libbz2.dylib
+   ;;
+   *-mint*)
+   # do nothing, no shared libraries
+   :
+   ;;
+   *)
+   bemake -f "${S}"/Makefile-libbz2_so all
+   # Make sure we link against the shared lib #504648
+   [[ $(get_libname) != $(get_libname ${PV}) ]] &&
+   ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname)
+   ;;
+   esac
bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
 }

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

2017-11-15 Thread Fabian Groffen 
commit: ab12f95ca1503bbcf12964e3d4d5673993f422a1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Nov 15 15:31:41 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Nov 15 15:31:41 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ab12f95c

app-arch/bzip2: sync for CVE, bug #637572

Bug: https://bugs.gentoo.org/637572
Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4

 app-arch/bzip2/bzip2-1.0.6-r1.ebuild   | 113 ---
 app-arch/bzip2/bzip2-1.0.6-r3.ebuild   | 121 -
 ...bzip2-1.0.6-r7.ebuild => bzip2-1.0.6-r8.ebuild} |  65 +--
 .../bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch|  18 +++
 4 files changed, 43 insertions(+), 274 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 a88f13ce09..00
--- a/app-arch/bzip2/bzip2-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r1.ebuild,v 1.1 
2010/09/23 09:19:49 vapier Exp $
-
-inherit eutils multilib toolchain-funcs flag-o-matic prefix
-
-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="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-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
-   epatch "${FILESDIR}"/${PN}-1.0.5-checkenv.patch # for AIX, Darwin?
-   epatch "${FILESDIR}"/${PN}-1.0.4-prefix.patch
-   eprefixify bz{diff,grep,more}
-   # this a makefile for Darwin, which already "includes" saneso
-   cp "${FILESDIR}"/${P}-Makefile-libbz2_dylib Makefile-libbz2_dylib || die
-
-   # - 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
-
-   if [[ ${CHOST} == *-hpux* ]] ; then
-   sed -i -e 's,-soname,+h,' Makefile-libbz2_so || die "cannot 
replace -soname with +h"
-   if [[ ${CHOST} == hppa*-hpux* && ${CHOST} != hppa64*-hpux* ]] ; 
then
-   sed -i -e '/^SOEXT/s,so,sl,' Makefile-libbz2_so || die 
"cannot replace so with sl"
-   sed -i -e '/^SONAME/s,=,=${EPREFIX}/lib/,' 
Makefile-libbz2_so || die "cannt set soname"
-   fi
-   elif [[ ${CHOST} == *-interix* ]] ; then
-   sed -i -e 's,-soname,-h,' Makefile-libbz2_so || die "cannot 
replace -soname with -h"
-   sed -i -e 's,-fpic,,' -e 's,-fPIC,,' Makefile-libbz2_so || die 
"cannot replace pic options"
-   fi
-}
-
-bemake() {
-   emake \
-   CC="$(tc-getCC)" \
-   AR="$(tc-getAR)" \
-   RANLIB="$(tc-getRANLIB)" \
-   "$@" || die
-}
-src_compile() {
-   local checkopts=
-   case "${CHOST}" in
-   *-darwin*)
-   bemake PREFIX="${EPREFIX}"/usr -f Makefile-libbz2_dylib 
|| die
-   ;;
-   *-mint*)
-   # do nothing, no shared libraries
-   :
-   ;;
-   *)
-   bemake -f Makefile-libbz2_so all || die
-   ;;
-   esac
-   use static && append-flags -static
-   bemake all || die
-}
-
-src_install() {
-   make PREFIX="${D}${EPREFIX}"/usr LIBDIR="$(get_libdir)" install || die
-   dodoc README* CHANGES bzip2.txt manual.*
-
-   if [[ $(get_libname) != ".irrelevant" ]] ; then
-
-   # 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$(get_libname ${PV}) || die
-   local s
-   for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) 
libbz2$(get_libname ${PV%.*}) ; do
-   dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v} || die
-   done
-   gen_usr_ldscript -a bz2
-
-   if ! use static ; then
-   newbin bzip2-shared bzip2 || die
-   fi
-
-   fi
-
-

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

2016-04-28 Thread Michael Haubenwallner 
commit: 5306100a4e38cf250329ccbcbfaf94502c39913a
Author: Michael Haubenwallner  ssi-schaefer 
 com>
AuthorDate: Thu Apr 28 15:05:31 2016 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Thu Apr 28 15:05:43 2016 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5306100a

bzip2-1.0.6-r7: Cygwin port

 app-arch/bzip2/bzip2-1.0.6-r7.ebuild | 11 ++-
 1 file changed, 10 insertions(+), 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 d07ed3d..23a6674 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -55,6 +55,12 @@ src_prepare() {
sed -i -e '/^SONAME/s,=,=${EPREFIX}/lib/,' 
Makefile-libbz2_so || die "cannt set soname"
fi
fi
+   if [[ ${CHOST} == *-cygwin* ]] ; then
+   sed -i -e "s/-o 
libbz2\.so\.${PV}/-Wl,--out-implib=libbz2$(get_libname ${PV})/" \
+  -e "s/-Wl,-soname -Wl,libbz2\.so\.1/-o 
cygbz2-${PV%%.*}.dll/" \
+  -e "s/libbz2\.so/libbz2$(get_libname)/g" \
+   Makefile-libbz2_so
+   fi
 }
 
 bemake() {
@@ -81,7 +87,8 @@ 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
+   [[ $(get_libname) != $(get_libname ${PV}) ]] &&
+   ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname)
;;
esac
bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static 
'')"
@@ -97,7 +104,9 @@ multilib_src_install() {
#  .x.x   - SONAME some distros use #338321
#  .x - SONAME Gentoo uses
dolib.so libbz2$(get_libname ${PV})
+   [[ ${CHOST} == *-cygwin* ]] && dobin cygbz2-${PV%%.*}.dll
local v
+   [[ $(get_libname) != $(get_libname ${PV}) ]] &&
for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) 
libbz2$(get_libname ${PV%.*}) ; do
dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v}
done