Merge shared-largefile-support.patch into makefile-CFLAGS.patch #214093 by Gilles Espinasse.

(Portage version: 2.2_pre5)

6 files changed, 13 insertions, 22 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index c9e572c871d4..62a62b12d516 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,13 @@
 # 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.66 2008/03/19 18:58:42 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.67 2008/03/21 05:14:22 vapier Exp $
+
+  21 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+  -files/bzip2-1.0.3-shared-largefile-support.patch,
+  files/bzip2-1.0.4-makefile-CFLAGS.patch, bzip2-1.0.4.ebuild,
+  bzip2-1.0.4-r1.ebuild, bzip2-1.0.5.ebuild:
+  Merge shared-largefile-support.patch into makefile-CFLAGS.patch #214093 by
+  Gilles Espinasse.
 
   19 Mar 2008; Markus Rothe <corsair@gentoo.org> bzip2-1.0.5.ebuild:
   Stable on ppc64; bug #213820
diff --git a/app-arch/bzip2/bzip2-1.0.4-r1.ebuild b/app-arch/bzip2/bzip2-1.0.4-r1.ebuild
index 53fe7aba5f42..27f0fbe8e922 100644
--- a/app-arch/bzip2/bzip2-1.0.4-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4-r1.ebuild,v 1.7 2008/02/04 21:49:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.4-r1.ebuild,v 1.8 2008/03/21 05:14:22 vapier Exp $
 
 inherit eutils multilib toolchain-funcs flag-o-matic
 
@@ -21,7 +21,6 @@ src_unpack() {
 	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.3-shared-largefile-support.patch
 	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
diff --git a/app-arch/bzip2/bzip2-1.0.4.ebuild b/app-arch/bzip2/bzip2-1.0.4.ebuild
index 7240f44d8a08..1462211f953c 100644
--- a/app-arch/bzip2/bzip2-1.0.4.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.4.ebuild,v 1.12 2007/04/18 14:37:31 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.4.ebuild,v 1.13 2008/03/21 05:14:22 vapier Exp $
 
 inherit eutils multilib toolchain-funcs flag-o-matic
 
@@ -21,7 +21,6 @@ src_unpack() {
 	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.3-shared-largefile-support.patch
 	epatch "${FILESDIR}"/${PN}-1.0.2-progress.patch
 	epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch
 	sed -i -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' Makefile || die "sed manpath"
diff --git a/app-arch/bzip2/bzip2-1.0.5.ebuild b/app-arch/bzip2/bzip2-1.0.5.ebuild
index a14bc6150d57..a776f3bd422b 100644
--- a/app-arch/bzip2/bzip2-1.0.5.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.6 2008/03/19 18:58:42 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.5.ebuild,v 1.7 2008/03/21 05:14:22 vapier Exp $
 
 inherit eutils multilib toolchain-funcs flag-o-matic
 
@@ -21,7 +21,6 @@ src_unpack() {
 	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.3-shared-largefile-support.patch
 	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
diff --git a/app-arch/bzip2/files/bzip2-1.0.3-shared-largefile-support.patch b/app-arch/bzip2/files/bzip2-1.0.3-shared-largefile-support.patch
deleted file mode 100644
index c6ce1e8cb0f8..000000000000
--- a/app-arch/bzip2/files/bzip2-1.0.3-shared-largefile-support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix shared makefile to also add $(BIGFILES), bug #98802
-
---- bzip2-1.0.3/Makefile-libbz2_so	2005-07-13 12:11:19.000000000 +0200
-+++ bzip2-1.0.3.az/Makefile-libbz2_so	2005-07-13 12:09:00.000000000 +0200
-@@ -9,7 +9,7 @@
- SHELL=/bin/sh
- CC=gcc
- BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS+=-fpic -fPIC -Wall -Winline
-+CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES)
- 
- OBJS= blocksort.o  \
-       huffman.o    \
diff --git a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
index de881af2b3d0..cc10a1e8ada0 100644
--- a/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
+++ b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
@@ -19,7 +19,7 @@
  CC=gcc
  BIGFILES=-D_FILE_OFFSET_BITS=64
 -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS+=-fpic -fPIC -Wall -Winline
++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES)
  
  OBJS= blocksort.o  \
        huffman.o    \