bsdiff v4.3 addition, and yoinking of bsdiff-4.1

(Portage version: 2.0.51.22-r2)

6 files changed, 25 insertions, 14 deletions

diff --git a/dev-util/bsdiff/ChangeLog b/dev-util/bsdiff/ChangeLog
index 5ddea218debc..3b02c0a707e3 100644
--- a/dev-util/bsdiff/ChangeLog
+++ b/dev-util/bsdiff/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/bsdiff
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bsdiff/ChangeLog,v 1.14 2005/04/24 12:43:38 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bsdiff/ChangeLog,v 1.15 2005/09/17 07:47:38 ferringb Exp $
+
+*bsdiff-4.3 (17 Sep 2005)
+
+  17 Sep 2005: Brian Harring <ferringb@gentoo.org>: +bsdiff-4.3.ebuild
+  -bsdiff-4.1.ebuild.
+  Version bump, something of a maintenance release it seems. 
+  Changes between 4.2 and 4.3 come down to using libbz2 rather then piping to
+  bzip2.
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> bsdiff-4.2.ebuild:
   Stable on ppc.
diff --git a/dev-util/bsdiff/Manifest b/dev-util/bsdiff/Manifest
index ff7602e35a42..218726bb86bb 100644
--- a/dev-util/bsdiff/Manifest
+++ b/dev-util/bsdiff/Manifest
@@ -1,6 +1,6 @@
-MD5 56e46532cb9aa08b89639cf3e16f1145 metadata.xml 251
+MD5 8d08acb9bc2dc75b3b3e847fb7abb471 bsdiff-4.3.ebuild 868
+MD5 83aa059440f40f03d9fb83e93e24442a bsdiff-4.2.ebuild 811
 MD5 4a1f89fcf54fd2a3df458668c4b2ec55 ChangeLog 1704
-MD5 7137ecee622e06a15f44907a5803f128 bsdiff-4.1.ebuild 730
-MD5 0eb2d003309f0984017498192810bbec bsdiff-4.2.ebuild 728
-MD5 0fa99ba6e99efdc1360e9d4c86572d80 files/digest-bsdiff-4.1 60
+MD5 56e46532cb9aa08b89639cf3e16f1145 metadata.xml 251
 MD5 4dd7da84d8e93412197eab59fc7882ab files/digest-bsdiff-4.2 60
+MD5 00c3335d331ff554e6e63b3bd081d2ba files/digest-bsdiff-4.3 60
diff --git a/dev-util/bsdiff/bsdiff-4.2.ebuild b/dev-util/bsdiff/bsdiff-4.2.ebuild
index e87c03c6dc7d..bd2ba540e2ab 100644
--- a/dev-util/bsdiff/bsdiff-4.2.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bsdiff/bsdiff-4.2.ebuild,v 1.7 2005/04/24 12:43:39 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bsdiff/bsdiff-4.2.ebuild,v 1.8 2005/09/17 07:47:38 ferringb Exp $
 
 IUSE=""
 
@@ -17,8 +17,8 @@ DEPEND="app-arch/bzip2"
 src_compile() {
 	BZIP=`which bzip2`
 	cd ${S}
-	gcc bsdiff.c -o bsdiff -DBZIP2=\"${BZIP}\"
-	gcc bspatch.c -o bspatch -DBZIP2=\"${BZIP}\"
+	$(tc-getCC) bsdiff.c -o bsdiff -DBZIP2=\"${BZIP}\" || die "failed compiling bsdiff"
+	$(tc-getCC) bspatch.c -o bspatch -DBZIP2=\"${BZIP}\" || die "failed compiling bspatch"
 }
 
 src_install() {
diff --git a/dev-util/bsdiff/bsdiff-4.1.ebuild b/dev-util/bsdiff/bsdiff-4.3.ebuild
index 12f2e9909805..3054df954657 100644
--- a/dev-util/bsdiff/bsdiff-4.1.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bsdiff/bsdiff-4.1.ebuild,v 1.12 2005/03/15 10:01:56 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bsdiff/bsdiff-4.3.ebuild,v 1.1 2005/09/17 07:47:38 ferringb Exp $
+
+inherit toolchain-funcs
 
 IUSE=""
 
@@ -10,15 +12,16 @@ SRC_URI="http://www.daemonology.net/bsdiff/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-protection"
-KEYWORDS="x86 ~ppc sparc alpha ~hppa ~mips amd64 ~ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ia64"
 
 DEPEND="app-arch/bzip2"
 
 src_compile() {
-	BZIP=`which bzip2`
+	local BZIP
+	BZIP=$(type -p bzip2)
 	cd ${S}
-	gcc bsdiff.c -o bsdiff -DBZIP2=\"${BZIP}\"
-	gcc bspatch.c -o bspatch -DBZIP2=\"${BZIP}\"
+	$(tc-getCC) -o bsdiff -DBZIP2=\"${BZIP}\" bsdiff.c -lbz2 || die "failed compiling bsdiff"
+	$(tc-getCC) -o bspatch -DBZIP2=\"${BZIP}\" bspatch.c -lbz2 || die "failed compiling bspatch"
 }
 
 src_install() {
diff --git a/dev-util/bsdiff/files/digest-bsdiff-4.1 b/dev-util/bsdiff/files/digest-bsdiff-4.1
deleted file mode 100644
index fa713e20a562..000000000000
--- a/dev-util/bsdiff/files/digest-bsdiff-4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bf69ae7c185ea1a9863c8b40251fbc3a bsdiff-4.1.tar.gz 7721
diff --git a/dev-util/bsdiff/files/digest-bsdiff-4.3 b/dev-util/bsdiff/files/digest-bsdiff-4.3
new file mode 100644
index 000000000000..ec538903a5b2
--- /dev/null
+++ b/dev-util/bsdiff/files/digest-bsdiff-4.3
@@ -0,0 +1 @@
+MD5 e6d812394f0e0ecc8d5df255aa1db22a bsdiff-4.3.tar.gz 5740