Add support for symlink decompression #309683

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 91 insertions, 17 deletions

diff --git a/app-arch/lbzip2/ChangeLog b/app-arch/lbzip2/ChangeLog
index b242d93c7a22..337d4a4195fc 100644
--- a/app-arch/lbzip2/ChangeLog
+++ b/app-arch/lbzip2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/lbzip2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.4 2010/03/04 07:17:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/ChangeLog,v 1.5 2010/03/27 09:48:27 jlec Exp $
+
+*lbzip2-0.23-r1 (27 Mar 2010)
+
+  27 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +files/0.23-s_isreg.patch, +lbzip2-0.23-r1.ebuild:
+  Add support for symlink decompression #309683
 
 *lbzip2-0.23 (04 Mar 2010)
 
diff --git a/app-arch/lbzip2/Manifest b/app-arch/lbzip2/Manifest
index 91e95066ed6c..c125c6c214fb 100644
--- a/app-arch/lbzip2/Manifest
+++ b/app-arch/lbzip2/Manifest
@@ -3,18 +3,20 @@ Hash: SHA1
 
 AUX 0.20-Makefile.patch 1421 RMD160 8ddbb18af454e17b88af17778cf428a03df1daf1 SHA1 dbfed4e90b83cb55d63a82743a1feb4152066d86 SHA256 6e9a50209ce7523af3543b7323ef6c385282d2e6467d6dfa41614142cd7321d4
 AUX 0.22-Makefile.patch 1421 RMD160 8ddbb18af454e17b88af17778cf428a03df1daf1 SHA1 dbfed4e90b83cb55d63a82743a1feb4152066d86 SHA256 6e9a50209ce7523af3543b7323ef6c385282d2e6467d6dfa41614142cd7321d4
+AUX 0.23-s_isreg.patch 350 RMD160 7df41d6497744477c8976a9d04c607cca3863bec SHA1 26c5dab3730669b6bf36f35ce0258ccdf62a5119 SHA256 38c1c133faf8c30440164fad7c1539df555cee606934a3e75ed6a149eeb5d1d6
 DIST lbzip2-0.20.tar.gz 75983 RMD160 e2fc720341bcfba65370411bd67b4a484cb41426 SHA1 5ec3dd318c55c8ff9b24ed06a4a4a0cfdae4b71e SHA256 d73942a99f1158bc59bfc5828a2abbe00d738a961651e050fb362621825482da
 DIST lbzip2-0.22.tar.gz 76373 RMD160 2ee38fcab11f8c365d7c403e1f464c06bc13ecd9 SHA1 76e13c4b88e2a055daa73ebab1aa86c17fa1c702 SHA256 759d737928a665f06a690667ae930a1a84d993103ca997b8afeb19ada36060a3
 DIST lbzip2-0.23.tar.gz 77720 RMD160 404cdfdfde7f65f7742a8c9345512238c310d9d8 SHA1 b4b9eee37ebaf5b9370a63a7e7042acfccf5e9f1 SHA256 2838cc2be818b8107ab1311208e6344baf9969168199be84287a32fef4733411
-EBUILD lbzip2-0.20.ebuild 1420 RMD160 17d99463dba9655d317e51c51aefcf3b07b707e3 SHA1 2ae2455b51923ba1924353579631aae1de65904f SHA256 e9f1143bd6dcdea2ba0692a6f77a86356e84718ec38418571006cc1dbe15706d
-EBUILD lbzip2-0.22.ebuild 1402 RMD160 cb3f0e8f1043c42555358d80798f9296803a47bc SHA1 37836cd0d2b72d82e2966abae6c3867a676cecde SHA256 a2767d481e45fb4199d4b5aad47a9470e7755672cb5bdf9adb7e4c34b2a31810
-EBUILD lbzip2-0.23.ebuild 1445 RMD160 c5aeb1b93fc6e3daebdffce4187b1c0d5cbfaafe SHA1 17111059c12f2b8d1a58b36e6a9174d77296a49b SHA256 b32f214d92bbf4d7f990ebde0d321229708aa288fc2b45787b4e9a70121417ff
-MISC ChangeLog 900 RMD160 4029a7ac2132d49f701c857ff29affbbb7eeb506 SHA1 7e862db88675651377aba521632524ccdd4c649c SHA256 0efa26c508a4f53d692129b2e5321400b6ecdec2dc4cdea5a04559f471d23b92
+EBUILD lbzip2-0.20.ebuild 1364 RMD160 bccd2f444042d8d29691fa61f3c54a31812c40ef SHA1 d2b65060e517b30426879175f578a5b041a87842 SHA256 8cbc90a31162c33a4d70e6b91ef4420105ec33fd832a7a20f30a3825ab7aed85
+EBUILD lbzip2-0.22.ebuild 1364 RMD160 69bfd4f8f142cbe36bb19e1023c56fc4bba107f6 SHA1 63bd2dba735b9402806ac4f46a9460429aba6708 SHA256 464ed1a486e58be9d10afcc0c7a0d0a33790be2da56474cca02e19788c3ad3ec
+EBUILD lbzip2-0.23-r1.ebuild 1408 RMD160 6e102d71605b13a47ee3a9c8a3801c78418082e5 SHA1 b2808b959f2805d9b83cccf457f07c24dda5cd2b SHA256 40e5d51197645b3b84c9117d86716e76a73c8fb146601a8f68358d089dd0889c
+EBUILD lbzip2-0.23.ebuild 1407 RMD160 d05315c20c464fc7e6be3aff48084262527b0270 SHA1 a7f88048797c05343eac864bd6029f89c9d845aa SHA256 78f1de16bcc65934d10a72c868eeca5b3d40d8e06528d4d20e8af892ab0e52f5
+MISC ChangeLog 1087 RMD160 f06299d79004b5619f724f28dc05b6d35105ef4f SHA1 c254b7a924932cb975d8092918f163ebdab145ee SHA256 8a554c37bd4838edfff42ef9950e0c0d65f1171733a73c502e358ec235f3e285
 MISC metadata.xml 356 RMD160 b494f5f323ebda03ffc9db73b486bd5e5bde39aa SHA1 c5b72e048a77edd25f33902bf800150def378278 SHA256 a35f53eb2dd594d9062144ab0121c23a34bbbaa4b7e84ee2bd5f3406dd8eac1d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuPXooACgkQgAnW8HDreRbSNgCfeA+YMfmwqYrWxktEW720lnml
-M3QAni7S1a9BNjRYfSJXdlZHlXNM7fNb
-=zQWG
+iEYEARECAAYFAkut1HIACgkQgAnW8HDreRZFegCfa8IQxw8oYdp9uDuCfuDICeEg
+gG4An1uqIiX99zAbyeZqLO8Cqc8bIZsf
+=1PIO
 -----END PGP SIGNATURE-----
diff --git a/app-arch/lbzip2/files/0.23-s_isreg.patch b/app-arch/lbzip2/files/0.23-s_isreg.patch
new file mode 100644
index 000000000000..aab683244d73
--- /dev/null
+++ b/app-arch/lbzip2/files/0.23-s_isreg.patch
@@ -0,0 +1,11 @@
+--- main.c.orig	2010-03-03 02:12:45.000000000 +0100
++++ main.c	2010-03-15 10:20:19.562892780 +0100
+@@ -1252,7 +1252,7 @@
+       return -1;
+     }
+ 
+-    if (!S_ISREG(sbuf->st_mode)) {
++    if (!decompress && !S_ISREG(sbuf->st_mode)) {
+       log_warning("%s: skipping \"%s\": not a regular file\n", pname,
+           operand->val);
+       return -1;
diff --git a/app-arch/lbzip2/lbzip2-0.20.ebuild b/app-arch/lbzip2/lbzip2-0.20.ebuild
index 3c58a84ba727..84692a073e83 100644
--- a/app-arch/lbzip2/lbzip2-0.20.ebuild
+++ b/app-arch/lbzip2/lbzip2-0.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-0.20.ebuild,v 1.1 2010/02/09 20:19:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-0.20.ebuild,v 1.2 2010/03/27 09:48:27 jlec Exp $
 
 EAPI="3"
 
@@ -52,7 +52,6 @@ src_install() {
 	doins corr-perf.sh malloc_trace.pl || die
 
 	if use symlink; then
-		dosym /usr/bin/${PN} /usr/bin/gzip || die
-		dosym /usr/bin/un${PN} /usr/bin/gunzip || die
+		dosym ${PN} /usr/bin/bzip2 || die
 	fi
 }
diff --git a/app-arch/lbzip2/lbzip2-0.22.ebuild b/app-arch/lbzip2/lbzip2-0.22.ebuild
index 760ea05634e5..c10b81905fc5 100644
--- a/app-arch/lbzip2/lbzip2-0.22.ebuild
+++ b/app-arch/lbzip2/lbzip2-0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-0.22.ebuild,v 1.1 2010/02/19 09:20:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-0.22.ebuild,v 1.2 2010/03/27 09:48:27 jlec Exp $
 
 EAPI="3"
 
@@ -52,7 +52,6 @@ src_install() {
 	doins corr-perf.sh malloc_trace.pl || die
 
 	if use symlink; then
-		dosym ${PN} /usr/bin/gzip || die
-		dosym un${PN} /usr/bin/gunzip || die
+		dosym ${PN} /usr/bin/bzip2 || die
 	fi
 }
diff --git a/app-arch/lbzip2/lbzip2-0.23-r1.ebuild b/app-arch/lbzip2/lbzip2-0.23-r1.ebuild
new file mode 100644
index 000000000000..10d65dcb8c88
--- /dev/null
+++ b/app-arch/lbzip2/lbzip2-0.23-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-0.23-r1.ebuild,v 1.1 2010/03/27 09:48:27 jlec Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Pthreads-based parallel bzip2/bunzip2 filter, passable to GNU tar"
+HOMEPAGE="http://lacos.hu/"
+SRC_URI="http://lacos.web.elte.hu/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="symlink test"
+
+RDEPEND="app-arch/bzip2"
+DEPEND="${REDEPEND}
+	test? (
+		app-shells/dash
+		sys-process/time
+	)"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-s_isreg.patch
+	epatch "${FILESDIR}"/0.22-Makefile.patch
+}
+
+src_compile() {
+	append-lfs-flags
+	emake CC=$(tc-getCC) || die "emake failed"
+}
+
+src_test() {
+	if [ -t 0 ] || return; then
+		rm -rf "${T}/scratch" "${T}/results" "${T}/rnd"
+		hexdump -n 10485760 /dev/urandom > "${T}/rnd"
+		emake -j1 SHELL="${EPREFIX}"/bin/dash PATH="${S}:${PATH}" TESTFILE="${T}/rnd" check \
+			|| die "make check failed"
+	else
+		ewarn "make check must be run attached to a terminal"
+	fi
+}
+
+src_install() {
+	dobin ${PN} || die "Installation of ${PN} failed"
+	dodoc ChangeLog README || die "no docs"
+	doman ${PN}.1 || die "no man"
+	insinto /usr/share/${PN}
+	doins corr-perf.sh malloc_trace.pl || die
+
+	if use symlink; then
+		dosym ${PN} /usr/bin/bzip2 || die
+	fi
+}
diff --git a/app-arch/lbzip2/lbzip2-0.23.ebuild b/app-arch/lbzip2/lbzip2-0.23.ebuild
index 780508098233..984a29253bf7 100644
--- a/app-arch/lbzip2/lbzip2-0.23.ebuild
+++ b/app-arch/lbzip2/lbzip2-0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-0.23.ebuild,v 1.1 2010/03/04 07:17:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-0.23.ebuild,v 1.2 2010/03/27 09:48:27 jlec Exp $
 
 EAPI="3"
 
@@ -53,7 +53,6 @@ src_install() {
 	doins corr-perf.sh malloc_trace.pl || die
 
 	if use symlink; then
-		dosym ${PN} /usr/bin/gzip || die
-		dosym un${PN} /usr/bin/gunzip || die
+		dosym ${PN} /usr/bin/bzip2 || die
 	fi
 }