Only move "important" bzip2 binaries to / #226175 by Alexander Skwar.

Package-Manager: portage-2.2_pre8/cvs/Linux 2.6.25 x86_64

3 files changed, 84 insertions, 9 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index 62a62b12d516..7ea4e4e54e2f 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/bzip2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.67 2008/03/21 05:14:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.68 2008/06/21 06:05:23 vapier Exp $
+
+*bzip2-1.0.5-r1 (21 Jun 2008)
+
+  21 Jun 2008; Mike Frysinger <vapier@gentoo.org> +bzip2-1.0.5-r1.ebuild:
+  Only move "important" bzip2 binaries to / #226175 by Alexander Skwar.
 
   21 Mar 2008; Mike Frysinger <vapier@gentoo.org>
   -files/bzip2-1.0.3-shared-largefile-support.patch,
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index da0304030f6a..2baf9120cf06 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -7,17 +7,15 @@ AUX bzip2-1.0.4-POSIX-shell.patch 672 RMD160 1863eb33a8fd89cb25d3a907e67e4e8c989
 AUX bzip2-1.0.4-makefile-CFLAGS.patch 545 RMD160 0f17d8400091277a8f2cf700c62c3817da715c86 SHA1 23c23353869b5dedf6255b077d2a738d9e9e1e00 SHA256 1cf6a18c3a2c941825d5bf0096f17037c3bf8f4c74cfee6abe6b6459b07f0ec8
 AUX bzip2-1.0.4-man-links.patch 413 RMD160 ce3b8ae5b5c87024c959b95ace2868930a4ebcac SHA1 9f34a13a9c0e8c3f4808bf053f73a5e73158aaff SHA256 1fc9d91f3f7bd3eecd86149b9c95b3162d9d7956f7de543aa8bc41cbcd04f88b
 AUX bzip2-1.0.4-saneso.patch 439 RMD160 3ac613223c1cd57023cae7b60d236452be87161f SHA1 20dd82b41420b42f612b8a8c419df1463b353e69 SHA256 a3c343536f0292017d11f453f19f2afc4118de20b9200fcca83d1c641821b8e9
-DIST bzip2-1.0.4.tar.gz 841221 RMD160 438365cb911ef84b3bd6643e0d39f6b7567f0447 SHA1 f2388ec8f2c506e02aa89e67577b3c6331cbaa4c SHA256 f41c3898fbd53e68e0b052418960e538813cc98afcd72b2b604079d8de3e529c
 DIST bzip2-1.0.5.tar.gz 841402 RMD160 2b31a22138e3914d82a656fee28e2bf029cbc3d4 SHA1 8b02713ea0c8eb501cc8bdac4432d7f29700f767 SHA256 f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22
-EBUILD bzip2-1.0.4-r1.ebuild 2146 RMD160 26e9b2fb183c4e2cd5fb180737cb1982cae9295a SHA1 5211c90278f6b55c0dcf8a58b846369a58a1dbd7 SHA256 68c6e1516852c9ae6f7463b7ec6806c559a237768e63ec1f5ca74bfab7869180
-EBUILD bzip2-1.0.4.ebuild 2083 RMD160 558426e37ce4b13687d9dec1bf36e8780140ec5c SHA1 aab4cedd3766d156110c8a3dbba0f4c65586b75c SHA256 7abad872b729ee96c8b4831c40baafd8e9b0d3373d3fbcaf301268e5474c19cb
+EBUILD bzip2-1.0.5-r1.ebuild 2239 RMD160 10297410a1faf044ed9861e0761e5df6c4123bdf SHA1 46ea37cbd4636f832c7caab1cf4ec81f2f7163e0 SHA256 5c217a4e2fad6855de4bf9b888ca8c2d3b55f1028db25b43c53c44b512c67ca0
 EBUILD bzip2-1.0.5.ebuild 2311 RMD160 e441ef68203e41530b56ff6b50d631dd1a5608b3 SHA1 9daf3ba535e70c00dd74e4c9ba334ade3842cb77 SHA256 471e84b230174d43030630089957725f73894f8ab1cbf81c19daeeef6937db07
-MISC ChangeLog 11397 RMD160 727feaf3e705baf5b7aabbb3248f8ee54d646abe SHA1 8fb4455b8d11c20d9f736c191aab119bdf6ade1c SHA256 f40d7babf222a42f008cfb0f955c6b3603b391b67451b07e07d38c9fc2718580
+MISC ChangeLog 11575 RMD160 4594407401e127606ba3b29d5918a5f7d9a28d58 SHA1 b62307cc84b95d70bf06d47e30b01dd052bafc87 SHA256 d43d7b9f59e4c0f4872dcf8e80a7407b59d6b8562d3ffcdee80aaa3bf99d0a40
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH55nqj9hvisErhMIRAst7AKCGhr/SawG5EoCyvbZ5gTXJZhLFvwCeNQ31
-+AR32PLBIUtTB4IOu487rgA=
-=Uly3
+iEYEARECAAYFAkhcmigACgkQ67wieSYcaxc1ngCgp9M8d12CWUwjFPvAdhV2gWN/
+pN8An1JVaMbsMzYT8hgPKWLLiPS+FPvl
+=hsH0
 -----END PGP SIGNATURE-----
diff --git a/app-arch/bzip2/bzip2-1.0.5-r1.ebuild b/app-arch/bzip2/bzip2-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..fc3d37dde930
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.5-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.5-r1.ebuild,v 1.1 2008/06/21 06:05:23 vapier Exp $
+
+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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="static"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	epatch "${FILESDIR}"/${PN}-1.0.4-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
+	sed -i -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' Makefile || die "sed manpath"
+
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die "sed links"
+
+	# fixup broken version stuff
+	sed -i \
+		-e "s:1\.0\.4:${PV}:" \
+		bzip2.1 bzip2.txt Makefile-libbz2_so manual.{html,ps,xml} || die
+}
+
+src_compile() {
+	local makeopts="
+		CC=$(tc-getCC)
+		AR=$(tc-getAR)
+		RANLIB=$(tc-getRANLIB)
+	"
+	emake ${makeopts} -f Makefile-libbz2_so all || die "Make failed libbz2"
+	use static && append-flags -static
+	emake LDFLAGS="${LDFLAGS}" ${makeopts} all || die "Make failed"
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr LIBDIR=$(get_libdir) install || die
+	dodoc README* CHANGES bzip2.txt manual.*
+
+	# 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
+	dosym bzip2 /bin/bunzip2
+	into /
+	if ! use static ; then
+		newbin bzip2-shared bzip2 || die "dobin shared"
+	fi
+
+	dolib.so libbz2.so.${PV} || die "dolib shared"
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /$(get_libdir)/${v}
+	done
+	gen_usr_ldscript libbz2.so
+}