summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-06-23 07:42:54 +0000
committerPacho Ramos <pacho@gentoo.org>2013-06-23 07:42:54 +0000
commit8ad4e2bd19eefc80c497a3e33da349599d2e5700 (patch)
tree5a174e0a4013ed610efc65f129314c7de14c4f5f /app-arch
parentMask packages currently included in emul-linux-x86-baselibs that are incorpor... (diff)
downloadhistorical-8ad4e2bd19eefc80c497a3e33da349599d2e5700.tar.gz
historical-8ad4e2bd19eefc80c497a3e33da349599d2e5700.tar.bz2
historical-8ad4e2bd19eefc80c497a3e33da349599d2e5700.zip
Add ebuild supporting native multilib (#457134, thanks to mgorny and vapier for their help)
Package-Manager: portage-2.1.12.9/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/bzip2/ChangeLog8
-rw-r--r--app-arch/bzip2/Manifest19
-rw-r--r--app-arch/bzip2/bzip2-1.0.6-r4.ebuild86
3 files changed, 98 insertions, 15 deletions
diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index 4b7d6cb6e245..74704a2532af 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-arch/bzip2
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.105 2013/06/05 00:08:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.106 2013/06/23 07:42:43 pacho Exp $
+
+*bzip2-1.0.6-r4 (23 Jun 2013)
+
+ 23 Jun 2013; Pacho Ramos <pacho@gentoo.org> +bzip2-1.0.6-r4.ebuild:
+ Add ebuild supporting native multilib (#457134, thanks to mgorny and vapier
+ for their help)
05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index cf948408ca5d..89ccef861d8e 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -13,23 +13,14 @@ DIST bzip2-1.0.6.tar.gz 782025 SHA256 a2848f34fcd5d6cf47def00461fcb528a0484d8ede
EBUILD bzip2-1.0.6-r1.ebuild 2183 SHA256 4d7615ffc4a8b3fa39d5626a7c2fa3d18ec9e34577a6983bf0c87039f1c2bbe3 SHA512 4533d46cdf546a870405ee19478aabaf17e97271275711abb562e224eede97b2f2b8b514195e53398ae6e4dae206effbf30e121e883e6597992c869c18744107 WHIRLPOOL 5271b12d3fc5474e02a98b487e1fbdeadbf319c0153325df2fcdf85730c9507f7bf09b2003af15f62d588d2ecf86af5d0b316f0b426c09fd98622ab93e8a5183
EBUILD bzip2-1.0.6-r2.ebuild 2155 SHA256 664d950904d6a048cb299fc6eb93f18cb820c6fa009b32394d72b255c627eb15 SHA512 5187182a3260c6e131d72a78c86beceab6cadedac9e2410a7e0ae1e1fd4596baefbf457b415c8c3ad964d3a7d141a20dcab4bc95be031d76e5764d2ac0e429b3 WHIRLPOOL 261c2b2fdebac16d41cf5b8deb5f6f0c31f9aa715fac0366b53b28932be5f614990c837bd55cd29333bce1de5567c4cbbc968365eef4829207adac2a62b70ace
EBUILD bzip2-1.0.6-r3.ebuild 2426 SHA256 780f1ab3808463a24d83316973eea0b70477104f5f304ba66a4ef2a899695363 SHA512 ce8e0b2c93ce84efe8356348f24d4f3ff6877a6295e41ddd8848b46bc9c08be89ced4d1b17c7a669cd7361c41ed8d539be82b997a2048214f66d000fc5c3661c WHIRLPOOL 1bc5264b6840881bc67396795ae5d6f59a1b32d221827c547d0de183534fc6637aef6fdac92fa5f6b4b92c0ab74f89545d0445c1dbe3ef62c5ac629c671b664d
+EBUILD bzip2-1.0.6-r4.ebuild 2551 SHA256 6b4ae7364b897a494d26b81d0304cce022bbf474d2baaf466894c0cc346b6bee SHA512 f48592ba2f4d19bbe70f44fdfa765414d7ca9ab10ddb70f220beff0ee52c59d6f937278dbeb5f4255aa8c438e25741474a47c090acdfaa7b573f3878338200c9 WHIRLPOOL c249bfe593ce1b33344b645be89385e2072ba3897c1ff20452be63a7cbc8db807ce68c0dd9aa94f94df9cf1505ba74e912eb82ee23f9953cd5a0a98d47c7456d
EBUILD bzip2-1.0.6.ebuild 2045 SHA256 c8d2600e7a05cfe24a1c252ea0a44f66ea6239dc9f87ee8d2c1fd06e32e69196 SHA512 5c8a274078b798d74f66f41fb44691b80f5c077d2f68fd0416fa8d1ab2f4a1fa73d0a6e87c8b8851fb98cd235fd4c10cbc72ef29512b1b27b841e8ed3ab1d725 WHIRLPOOL 8e2215e34cae5792eb025490a9dad88b6458f127ed2dd2abd09e8c973ae5c07e618237b3ff4da1eedebf277f6826cc2e12f859be9ba67df92199aa57e827b04f
-MISC ChangeLog 15961 SHA256 556514cfc6b9ec61a85754202f4ddfdbc211776a3dd5c17026b5d3b59fcad97f SHA512 84afb382da7ff493fadd857bb9930f116ced35b614e408a3c46b6b929fa0086f78d28be71591e83357f1f84299e496911669f605d22705ee8de9b75594f21358 WHIRLPOOL 2a858f1062708fa42b4081dbe06311819a32f58f72e60860a3aab1c96428683e8af2e3b7d17b8f6aee86619860bb67691ec475349ee275d0ec6928ff885b187e
+MISC ChangeLog 16158 SHA256 32147f813283466a4bcbf7d933d2b5868d1d4afc40c26929f9b49041da3ae7f6 SHA512 9dcb9593340ad9be3421e73f5b1156d1f5cac6637737b221b7494ff661f1b37e0e395363016c522f3b7436fbc71f641d48e5d40d428f704774d150d05afd20fd WHIRLPOOL 6b845c76483cf6889fff2eee03c83bd1725e5f67a73d1f4f523ab9d534885645e52dc64e72dcbaa7dc25aa850a83335d04898332665a3b2dd4a1bde6965b8576
MISC metadata.xml 241 SHA256 c9ef9f8a652ceb4655983472cec571c6762f53934447a83b38b311cf9e50254d SHA512 23ed7f7371d00caf97235d7a4f905286637cd286f9e8fc7c0413865dbab0772ff00dd9ecf65b5f199d694b42f032dc14ad9d3ac447cf1bb95124abf9203c0f1d WHIRLPOOL d687e040f4378e573d241a08b46ba7bd0f4c9d5ef4c9cf836a479102e5f8902e67244308747adf34b6bc605511244d37873b796f8089dc3e181a627302843d02
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJRroGbAAoJELEHsLL7fEFW7B0QAL3WORtyWgU+AixqGorct+zk
-ovoyZMGieDom3iwwy29u13C5X0xB4LDMHfrDfDN5D8VFae0P7ZVKdpBQF9TM6Xsy
-YkNTS2mx1U70azGtYMYe2wpnrUk806lE7LMgTdCU/0ZRPl8NkyCw6oSGJojEeOCp
-lLGWOli2FJXWxvKT7TAxxl+lSZuXy/0MqCl9lQg47bRPJeoGrXf/txnoCiUVn5tp
-hjQpW+aAeErVkAS/PjcZSgD1F8Oqq/o3iDJUcMJKdIlfnPXdIqQquVqvLIekl59H
-kVb69bGx6nNIk0XX+Kh67/vP2J620hIgeMFsS0EXQz/nMWWfYEQfWy3Wuq8Zjf4h
-4ZfG622OeenHCT9fWfwss9KJnR5BPI+0Fmz0fHiD3o+gBG4voaX39i2nu+tQu1ud
-552R/+OYwUg89tMvUaQ+JB3xSvOywtb/PWQX22RXu4roPMw7TeR4qa14HfMM8UN2
-KDdsXYvrJ6MAGeJQw3U/CMMrGIP2GcU/M6qfTt4pO1+RnTnVez9tUncZy+sR1mjn
-3q/+ryK0ttEVe1+BfZCjU/aBxbtUCUjEN4I6ZmNLftQcr3w+Abmq2wC0eThZg2fP
-j1BMOW0EpNzVKjo7rf4dccKFlHO9Cv6tBaL9gmN8CPqeh9qg3RE6810DTRiE/YZM
-gwAYp8G8bWzcrgkGFFrJ
-=2re2
+iEYEAREIAAYFAlHGpvQACgkQCaWpQKGI+9SsjwCfbEx15jlkzmC76ZpoaqHZ2c8V
+/+kAn3+gOl4i/zE+eLB+CHqSlgIqKXw4
+=V+tB
-----END PGP SIGNATURE-----
diff --git a/app-arch/bzip2/bzip2-1.0.6-r4.ebuild b/app-arch/bzip2/bzip2-1.0.6-r4.ebuild
new file mode 100644
index 000000000000..a6f51bfe8154
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 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-r4.ebuild,v 1.1 2013/06/23 07:42:43 pacho 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 flag-o-matic 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 ~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 )"
+
+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
+
+ # - 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 -f -s :' \
+ -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+ -e 's:ln -s bzip2.1:& -f:g' \
+ Makefile || die
+
+ multilib_copy_sources
+}
+
+bemake() {
+ emake \
+ CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ RANLIB="$(tc-getRANLIB)" \
+ "$@"
+}
+
+multilib_src_compile() {
+ bemake -f Makefile-libbz2_so all
+ use static && append-flags -static
+ bemake all
+}
+
+multilib_src_install() {
+ emake PREFIX="${ED}"/usr LIBDIR=$(get_libdir) install
+
+ # 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
+ gen_usr_ldscript -a bz2
+
+ use static || newbin bzip2-shared bzip2
+}
+
+multilib_src_install_all() {
+ dodoc README* CHANGES bzip2.txt manual.*
+
+ # move "important" bzip2 binaries to /bin and use the shared libbz2.so
+ dodir /bin
+ mv "${ED}"/usr/bin/b{zip2,zcat,unzip2} "${ED}"/bin/ || die
+ dosym bzip2 /bin/bzcat
+ dosym bzip2 /bin/bunzip2
+
+ use static-libs || find "${ED}"/usr -name libbz2.a -delete
+}