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

Package-Manager: portage-2.2_pre5

7 files changed, 28 insertions, 28 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/Manifest b/app-arch/bzip2/Manifest
index 3a5201838cfc..36cfc644c013 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1,14 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bzip2-1.0.2-progress.patch 6141 RMD160 213842d0d7742dce4c1d938b79134b9e910bc8ec SHA1 90a0032645886b633c9b730d0a1abb88c88a9873 SHA256 a76f6d082a1a1fef2eff111177d7c7568e1d457fb2b98cde71bbbe6ea1c7c787
 AUX bzip2-1.0.3-no-test.patch 161 RMD160 8611ae7d6fe578e7fd24585e158c10468caca2f1 SHA1 6a8a9495e71f291aaf5bd89b134e83ccd0b5e006 SHA256 806dcb0f9f46a2b0b3ef04212405708198a25e281617e27a44c565948c159a49
-AUX bzip2-1.0.3-shared-largefile-support.patch 404 RMD160 b8720c32af7133135bc81ef3e9b1b906ef6b6d44 SHA1 5bc282decc6aeaa75ecee47e69a2e94421710e2b SHA256 a253e534237980430bd5a5eb2d6f142c0b6ec2be644bc827126548a479dcfd85
 AUX bzip2-1.0.4-POSIX-shell.patch 672 RMD160 1863eb33a8fd89cb25d3a907e67e4e8c989bf88f SHA1 43ccd410482c2d51240afed34db59fee90344fa5 SHA256 34bc42c1d6c980e0970a517c9602b904efb2f676ec191e80fcbcd185ccb6b1fe
-AUX bzip2-1.0.4-makefile-CFLAGS.patch 533 RMD160 4831a37a93946fda1b6a6dc705f1b151901aadb8 SHA1 572b5a19f8a8ecf4aee948f474a4d589821c021d SHA256 8109840b6536027b92e1916afab60961087c6b53a8226dccbfd6cb01af61ff39
+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 2208 RMD160 95e76d46fcce692af227fe05829d88a3fc5de7ce SHA1 27c2b54d8706013d90ec3a83c309a81918ecfc74 SHA256 9b6d5fcfc9e76dafa0ad53f8817d2db4d8ec8600eb7059ece7c17bfd65367ea7
-EBUILD bzip2-1.0.4.ebuild 2147 RMD160 c6457e4e71c144b97af9d80324e1e48343877ec0 SHA1 340ddcc0c174bc43ca8c0edcb0f4dee28aee3271 SHA256 b9d3b2c7750c6f05912b080c4a0ff36b67843986d4ccb4ffc4790d1ce5779cee
-EBUILD bzip2-1.0.5.ebuild 2381 RMD160 f20b9ebffb932c23fb832124d4619a03b0b3bc1a SHA1 450ef2bbec63dcb535057689206317b0d320a705 SHA256 a1c836c0153aab64b416df9c4d42b9385948420fd4b0f50400a454dad41962b5
-MISC ChangeLog 11089 RMD160 9674dbd281453dba16ac5250ac0b2edf8f4b32e8 SHA1 08a5fdc07bc08c448a4f5af9f55eb9d638b16566 SHA256 2d9230edc1de35214a899f18f979e6e94f3265c1d2a738d769400ed6ae017112
+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.ebuild 2315 RMD160 7a2fd7c024e10797ab33dedec5c31caa23c8d04a SHA1 20e2746adf4bc81ee3e90793e4b03c9172d849c1 SHA256 557fc8340f847729f83f4c9a19756834e6481e119a10af765f75c45aebe6f164
+MISC ChangeLog 11397 RMD160 727feaf3e705baf5b7aabbb3248f8ee54d646abe SHA1 8fb4455b8d11c20d9f736c191aab119bdf6ade1c SHA256 f40d7babf222a42f008cfb0f955c6b3603b391b67451b07e07d38c9fc2718580
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH40Suj9hvisErhMIRAil4AJ9bl0cjnqphFpbzVRWbtG+/TBoGfgCgwCYp
+10iE8E1LrPSIvXTGh9l8fDM=
+=lCsv
+-----END PGP SIGNATURE-----
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    \