Version bump #160283 by armin76.

Package-Manager: portage-2.1.2_rc4-r6

6 files changed, 153 insertions, 13 deletions

diff --git a/app-arch/bzip2/ChangeLog b/app-arch/bzip2/ChangeLog
index 9ae286ddee73..66fc06ecbc92 100644
--- a/app-arch/bzip2/ChangeLog
+++ b/app-arch/bzip2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/bzip2
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.44 2006/10/17 11:14:02 uberlord Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.45 2007/01/06 01:50:31 vapier Exp $
+
+*bzip2-1.0.4 (06 Jan 2007)
+
+  06 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/bzip2-1.0.4-makefile-CFLAGS.patch, +files/bzip2-1.0.4-saneso.patch,
+  +bzip2-1.0.4.ebuild:
+  Version bump #160283 by armin76.
 
   17 Oct 2006; Roy Marples <uberlord@gentoo.org> bzip2-1.0.3-r6.ebuild:
   Added ~sparc-fbsd keyword.
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
index 30b242d4efc2..e4eb968ceca0 100644
--- a/app-arch/bzip2/Manifest
+++ b/app-arch/bzip2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bzip2-1.0.2-NULL-ptr-check.patch 838 RMD160 fb3131d6770357f9515c4fe7862fb83846ead484 SHA1 02c3112f173bca5d9b15a516a6b01da1c116ba59 SHA256 68b3fb53c688499c79b0fc4d1d69903bfeb599f4ad852d50f5643a1e26d26e3e
 MD5 cc73bebefba3a38c58fc49b49d7d25a7 files/bzip2-1.0.2-NULL-ptr-check.patch 838
 RMD160 fb3131d6770357f9515c4fe7862fb83846ead484 files/bzip2-1.0.2-NULL-ptr-check.patch 838
@@ -34,26 +37,42 @@ AUX bzip2-1.0.3-shared-largefile-support.patch 404 RMD160 b8720c32af7133135bc81e
 MD5 613ebf0fa8c5fd2ed2973ffe0d727e2a files/bzip2-1.0.3-shared-largefile-support.patch 404
 RMD160 b8720c32af7133135bc81ef3e9b1b906ef6b6d44 files/bzip2-1.0.3-shared-largefile-support.patch 404
 SHA256 a253e534237980430bd5a5eb2d6f142c0b6ec2be644bc827126548a479dcfd85 files/bzip2-1.0.3-shared-largefile-support.patch 404
+AUX bzip2-1.0.4-makefile-CFLAGS.patch 533 RMD160 4831a37a93946fda1b6a6dc705f1b151901aadb8 SHA1 572b5a19f8a8ecf4aee948f474a4d589821c021d SHA256 8109840b6536027b92e1916afab60961087c6b53a8226dccbfd6cb01af61ff39
+MD5 72e9198047a8e090890af292d4708246 files/bzip2-1.0.4-makefile-CFLAGS.patch 533
+RMD160 4831a37a93946fda1b6a6dc705f1b151901aadb8 files/bzip2-1.0.4-makefile-CFLAGS.patch 533
+SHA256 8109840b6536027b92e1916afab60961087c6b53a8226dccbfd6cb01af61ff39 files/bzip2-1.0.4-makefile-CFLAGS.patch 533
+AUX bzip2-1.0.4-saneso.patch 439 RMD160 3ac613223c1cd57023cae7b60d236452be87161f SHA1 20dd82b41420b42f612b8a8c419df1463b353e69 SHA256 a3c343536f0292017d11f453f19f2afc4118de20b9200fcca83d1c641821b8e9
+MD5 e78c82ad8261bf7dcc7335363e812da4 files/bzip2-1.0.4-saneso.patch 439
+RMD160 3ac613223c1cd57023cae7b60d236452be87161f files/bzip2-1.0.4-saneso.patch 439
+SHA256 a3c343536f0292017d11f453f19f2afc4118de20b9200fcca83d1c641821b8e9 files/bzip2-1.0.4-saneso.patch 439
 DIST bzip2-1.0.3.tar.gz 669075 RMD160 7ac2a122c254d1fcd54ca8af96a1814e9e245a1a SHA1 7e749510f65c86fbfff37b97144a02f1b8b8617f SHA256 4aaa8e7b4ecf03d91c33e8bf92d489533fa6c1f99e825c34058003f18eb68c13
-EBUILD bzip2-1.0.3-r5.ebuild 2220 RMD160 7f3a8e66079eb79ba56b7bb0297f4d972f5afc52 SHA1 c99d018d9792e63114eed7a3170563090c5be20a SHA256 edb05fcb75ce487ad0699eba566b35957fe470476db25bd88b07005dc5d2c54b
-MD5 a8859052e282ebc02dafdb66abf24dec bzip2-1.0.3-r5.ebuild 2220
-RMD160 7f3a8e66079eb79ba56b7bb0297f4d972f5afc52 bzip2-1.0.3-r5.ebuild 2220
-SHA256 edb05fcb75ce487ad0699eba566b35957fe470476db25bd88b07005dc5d2c54b bzip2-1.0.3-r5.ebuild 2220
+DIST bzip2-1.0.4.tar.gz 841221 RMD160 438365cb911ef84b3bd6643e0d39f6b7567f0447 SHA1 f2388ec8f2c506e02aa89e67577b3c6331cbaa4c SHA256 f41c3898fbd53e68e0b052418960e538813cc98afcd72b2b604079d8de3e529c
 EBUILD bzip2-1.0.3-r6.ebuild 2400 RMD160 2157cc07128189c8b08d75be0675588896b8cd84 SHA1 755b176e22325de9000d68892e3e941d8557b761 SHA256 9cf819425163eb0bc3012506a8c8ade63f72f3ad099cda68b47799c21c5848d4
 MD5 9c730ca16827ef4e7ab7f1c51f37fb61 bzip2-1.0.3-r6.ebuild 2400
 RMD160 2157cc07128189c8b08d75be0675588896b8cd84 bzip2-1.0.3-r6.ebuild 2400
 SHA256 9cf819425163eb0bc3012506a8c8ade63f72f3ad099cda68b47799c21c5848d4 bzip2-1.0.3-r6.ebuild 2400
-MISC ChangeLog 8565 RMD160 b6cbbbe96f82d2738132bb244e43d523fa1ab413 SHA1 c15d87bad38af179d00b6de9cc02a5ad1ab6ce01 SHA256 64fea6ee334ac213d6056e5293b740df52e99c2a50d0480111cf6eff4b895bcd
-MD5 1b7b6caf99cc434ea6db5c8200987b9b ChangeLog 8565
-RMD160 b6cbbbe96f82d2738132bb244e43d523fa1ab413 ChangeLog 8565
-SHA256 64fea6ee334ac213d6056e5293b740df52e99c2a50d0480111cf6eff4b895bcd ChangeLog 8565
+EBUILD bzip2-1.0.4.ebuild 2130 RMD160 3b53714042836f596629c18aacecb9d10754bcfe SHA1 86d17e386b696992132ac87e21108b15421431f4 SHA256 13125c24821c504f05ad34c0335c1c5e17c7bb664124123ec456f4f09204ac02
+MD5 62f3628ec2d7bcfe0ba57a2aecc42f51 bzip2-1.0.4.ebuild 2130
+RMD160 3b53714042836f596629c18aacecb9d10754bcfe bzip2-1.0.4.ebuild 2130
+SHA256 13125c24821c504f05ad34c0335c1c5e17c7bb664124123ec456f4f09204ac02 bzip2-1.0.4.ebuild 2130
+MISC ChangeLog 8777 RMD160 6cf44ff9d2568f1d089448e0d2b8c9f8d289f309 SHA1 f3d82a40795e498fd1a3c387742d48cc6e004f51 SHA256 cf963c7523df277a14fe1119957fdfceaa255bf174c351a951cd8581a2093ecb
+MD5 bb3b85b86b5bdd77a0b16c9aa62dee17 ChangeLog 8777
+RMD160 6cf44ff9d2568f1d089448e0d2b8c9f8d289f309 ChangeLog 8777
+SHA256 cf963c7523df277a14fe1119957fdfceaa255bf174c351a951cd8581a2093ecb ChangeLog 8777
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 22697ba9a4a75c2f675d528a5e3c4604 files/digest-bzip2-1.0.3-r5 235
-RMD160 65663f650ee924ec32e9a25930e8c6e46c6ddaca files/digest-bzip2-1.0.3-r5 235
-SHA256 6382eb176f58def89afcb6a2df6ef92d99ecf768602dec13b3f93da5e92a2559 files/digest-bzip2-1.0.3-r5 235
 MD5 22697ba9a4a75c2f675d528a5e3c4604 files/digest-bzip2-1.0.3-r6 235
 RMD160 65663f650ee924ec32e9a25930e8c6e46c6ddaca files/digest-bzip2-1.0.3-r6 235
 SHA256 6382eb176f58def89afcb6a2df6ef92d99ecf768602dec13b3f93da5e92a2559 files/digest-bzip2-1.0.3-r6 235
+MD5 e129ffea4ed644007e79d8e6a0a933d1 files/digest-bzip2-1.0.4 235
+RMD160 09e51a8df9c88f8164b974d5a40d6059b1d69f6d files/digest-bzip2-1.0.4 235
+SHA256 472ae9716d8a5b133b1e7cfd6449a90fcd71a3d9a29c311e35a83b461dacc711 files/digest-bzip2-1.0.4 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFnwB18bi6rjpTunYRAhSXAJ0WjB0U1y3Ye31Exkh/lnju51FT8ACgzvzj
+/Obkju7l4PRn6/PJMks671M=
+=3/2Z
+-----END PGP SIGNATURE-----
diff --git a/app-arch/bzip2/bzip2-1.0.4.ebuild b/app-arch/bzip2/bzip2-1.0.4.ebuild
new file mode 100644
index 000000000000..03bc3fba5250
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2007 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.1 2007/01/06 01:50:31 vapier Exp $
+
+inherit eutils multilib toolchain-funcs flag-o-matic
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="http://www.bzip.org/"
+SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="static"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	epatch "${FILESDIR}"/${PN}-1.0.4-saneso.patch
+	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"
+
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -s :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		Makefile || die "sed links"
+}
+
+src_compile() {
+	local makeopts="
+		CC=$(tc-getCC)
+		AR=$(tc-getAR)
+		RANLIB=$(tc-getRANLIB)
+	"
+	if ! use build ; then
+		emake ${makeopts} -f Makefile-libbz2_so all || die "Make failed libbz2"
+	fi
+	use static && append-flags -static
+	emake LDFLAGS="${LDFLAGS}" ${makeopts} all || die "Make failed"
+
+	if ! tc-is-cross-compiler ; then
+		make check || die "test failed"
+	fi
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr LIBDIR=$(get_libdir) install || die
+
+	# move bzip2 binaries to /bin and use the shared libbz2.so
+	mkdir -p "${D}"/bin
+	mv "${D}"/usr/bin/* "${D}"/bin/
+	into /
+	if ! use static ; then
+		newbin bzip2-shared bzip2 || die "dobin shared"
+	fi
+	dolib.so "${S}"/libbz2.so.${PV} || die "dolib shared"
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /$(get_libdir)/${v}
+	done
+	gen_usr_ldscript libbz2.so
+
+	dodoc README* CHANGES bzip2.txt manual.*
+
+	dosym bzip2 /bin/bzcat
+	dosym bzip2 /bin/bunzip2
+}
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
new file mode 100644
index 000000000000..de881af2b3d0
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch
@@ -0,0 +1,25 @@
+--- Makefile
++++ Makefile
+@@ -18,10 +18,9 @@
+ CC=gcc
+ AR=ar
+ RANLIB=ranlib
+-LDFLAGS=
+ 
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS+=-Wall -Winline $(BIGFILES)
+ 
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr/local
+--- Makefile-libbz2_so
++++ Makefile-libbz2_so
+@@ -24,7 +24,7 @@
+ SHELL=/bin/sh
+ CC=gcc
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS+=-fpic -fPIC -Wall -Winline
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
diff --git a/app-arch/bzip2/files/bzip2-1.0.4-saneso.patch b/app-arch/bzip2/files/bzip2-1.0.4-saneso.patch
new file mode 100644
index 000000000000..0469f46b8a56
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.4-saneso.patch
@@ -0,0 +1,13 @@
+--- Makefile-libbz2_so
++++ Makefile-libbz2_so
+@@ -35,8 +35,8 @@
+       bzlib.o
+ 
+ all: $(OBJS)
+-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
+-	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
++	$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
+ 	rm -f libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.4 libbz2.so.1.0
+ 
diff --git a/app-arch/bzip2/files/digest-bzip2-1.0.4 b/app-arch/bzip2/files/digest-bzip2-1.0.4
new file mode 100644
index 000000000000..a1b2965623ed
--- /dev/null
+++ b/app-arch/bzip2/files/digest-bzip2-1.0.4
@@ -0,0 +1,3 @@
+MD5 fc310b254f6ba5fbb5da018f04533688 bzip2-1.0.4.tar.gz 841221
+RMD160 438365cb911ef84b3bd6643e0d39f6b7567f0447 bzip2-1.0.4.tar.gz 841221
+SHA256 f41c3898fbd53e68e0b052418960e538813cc98afcd72b2b604079d8de3e529c bzip2-1.0.4.tar.gz 841221