Fiy bzip2 1.0.2 <-> 1.0.3 problem by adding a static 1.0.2, bug 89475

(Portage version: 1.586-cvs)

5 files changed, 87 insertions, 1 deletions

diff --git a/app-portage/deltup/ChangeLog b/app-portage/deltup/ChangeLog
index 6257c441f578..b8c85578ca1f 100644
--- a/app-portage/deltup/ChangeLog
+++ b/app-portage/deltup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/deltup
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/ChangeLog,v 1.7 2005/03/05 09:30:40 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/ChangeLog,v 1.8 2005/04/28 10:03:17 genstef Exp $
+
+*deltup-0.4.2-r1 (28 Apr 2005)
+
+  28 Apr 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/bzip2-1.0.2-makefile-CFLAGS.patch, +deltup-0.4.2-r1.ebuild:
+  Fiy bzip2 1.0.2 <-> 1.0.3 problem by adding a static 1.0.2, bug 89475
 
 *deltup-0.4.2 (05 Mar 2005)
 
diff --git a/app-portage/deltup/Manifest b/app-portage/deltup/Manifest
index 91d5875e642b..99823b08eff2 100644
--- a/app-portage/deltup/Manifest
+++ b/app-portage/deltup/Manifest
@@ -1,4 +1,7 @@
 MD5 8bc0e51e9d8e17a1f1be741df41b6a9c deltup-0.4.2.ebuild 709
 MD5 6990a7837cd4e8fa8519cbe9bfca2805 ChangeLog 566
 MD5 8b3c0a00d01e47f2b1eddab5aa68eca7 metadata.xml 271
+MD5 afc949563ba3d85643d0961ff35c9370 deltup-0.4.2-r1.ebuild 1331
+MD5 065889a05aed13c33d8d81b75dffa429 files/digest-deltup-0.4.2-r1 126
 MD5 f7ba8e0d9a7c333d637288601e02f951 files/digest-deltup-0.4.2 63
+MD5 378e8d34dd95cc65b7f65565df5d85f7 files/bzip2-1.0.2-makefile-CFLAGS.patch 841
diff --git a/app-portage/deltup/deltup-0.4.2-r1.ebuild b/app-portage/deltup/deltup-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..e7d4e8819f1d
--- /dev/null
+++ b/app-portage/deltup/deltup-0.4.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/deltup-0.4.2-r1.ebuild,v 1.1 2005/04/28 10:03:17 genstef Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Delta-Update - patch system for updating source-archives."
+HOMEPAGE="http://deltup.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+		http://www.bzip.org/1.0.2/bzip2-1.0.2.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE=""
+
+DEPEND="dev-libs/openssl
+	sys-libs/zlib
+	>=app-arch/bzip2-1.0.0
+	virtual/libc"
+RDEPEND="${DEPEND}
+	>=dev-util/xdelta-1.1.3
+	>=app-arch/bzip2-1.0.3"
+
+src_unpack () {
+	unpack ${A}
+	cd ${S}
+	sed -i -e "s/a .9 version/a 1.0.2 version/g" deltup.cpp
+	sed -i -e "s/1.0.0/1.0.3/g" deltup.cpp
+
+	cd ${WORKDIR}/bzip2-1.0.2
+	epatch ${FILESDIR}/bzip2-1.0.2-makefile-CFLAGS.patch
+}
+
+src_compile () {
+	emake || "emake getdelta failed"
+
+	cd ${WORKDIR}/bzip2-1.0.2
+	local makeopts="
+		CC=$(tc-getCC)
+		AR=$(tc-getAR)
+		RANLIB=$(tc-getRANLIB)"
+	append-flags -static
+	emake ${makeopts} bzip2 || die "emake bzip2 failed"
+	mv bzip2 bzip2_old
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc README ChangeLog GENTOO
+	doman deltup.1
+
+	dobin ${WORKDIR}/bzip2-1.0.2/bzip2_old
+}
diff --git a/app-portage/deltup/files/bzip2-1.0.2-makefile-CFLAGS.patch b/app-portage/deltup/files/bzip2-1.0.2-makefile-CFLAGS.patch
new file mode 100644
index 000000000000..bf7d430f9496
--- /dev/null
+++ b/app-portage/deltup/files/bzip2-1.0.2-makefile-CFLAGS.patch
@@ -0,0 +1,22 @@
+--- Makefile.orig	2004-12-26 16:30:06.354116536 -0500
++++ Makefile	2004-12-26 16:32:13.617769520 -0500
+@@ -9,7 +9,7 @@
+ 
+ # Suitably paranoid flags to avoid bugs in gcc-2.7
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
++CFLAGS+=-Wall -Winline -fno-strength-reduce $(BIGFILES)
+ 
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr
+--- Makefile-libbz2_so.orig	2004-12-26 16:32:23.972195408 -0500
++++ Makefile-libbz2_so	2004-12-26 16:32:34.835543928 -0500
+@@ -9,7 +9,7 @@
+ SHELL=/bin/sh
+ CC=gcc
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
++CFLAGS+=-fpic -fPIC -Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
diff --git a/app-portage/deltup/files/digest-deltup-0.4.2-r1 b/app-portage/deltup/files/digest-deltup-0.4.2-r1
new file mode 100644
index 000000000000..a4aec1c0222e
--- /dev/null
+++ b/app-portage/deltup/files/digest-deltup-0.4.2-r1
@@ -0,0 +1,2 @@
+MD5 ac097b01b67719e51df8c6d677d28cd7 deltup-0.4.2.tar.gz 15714
+MD5 ee76864958d568677f03db8afad92beb bzip2-1.0.2.tar.gz 665198