[gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/, app-arch/bzip2/files/
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/, app-arch/bzip2/files/
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/, app-arch/bzip2/files/
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/, app-arch/bzip2/files/
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/, app-arch/bzip2/files/
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 \ -