version bump - also fix bug #248441

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 149 insertions, 3 deletions

diff --git a/dev-libs/bglibs/ChangeLog b/dev-libs/bglibs/ChangeLog
index be8fd5c9e810..fd2b0a44c1c5 100644
--- a/dev-libs/bglibs/ChangeLog
+++ b/dev-libs/bglibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/bglibs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/bglibs/ChangeLog,v 1.49 2009/09/23 17:16:03 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/bglibs/ChangeLog,v 1.50 2010/01/13 08:12:08 bangert Exp $
+
+*bglibs-1.106 (13 Jan 2010)
+
+  13 Jan 2010; Thilo Bangert <bangert@gentoo.org> +bglibs-1.106.ebuild,
+  +files/bglibs-1.106-parallel-fix.patch:
+  version bump - also fix bug #248441
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> bglibs-1.041.ebuild,
   bglibs-1.104.ebuild:
diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest
index c6a8af4f45ff..d9ca1eadb509 100644
--- a/dev-libs/bglibs/Manifest
+++ b/dev-libs/bglibs/Manifest
@@ -1,7 +1,10 @@
 AUX bglibs-1.104-parallel-fix.patch 3908 RMD160 eaa739576e68b0d93c4167f42d173693a7ca18aa SHA1 21aef57b30663ada2ef168bc0f5d889e5e956746 SHA256 456d9bcacb231e843bf9cea38ce33a81a8e84a5590787cbc8e0227b9ed22f35d
+AUX bglibs-1.106-parallel-fix.patch 2142 RMD160 8ac57a7b0931263836625f71a17786ed412d997d SHA1 4cab293f6b43e61cc477fe6f435f9f460cd4df52 SHA256 21430429272ef7907193b90f4bbbbd6571c5ad4d753febccbaa7e9a648b6ab99
 DIST bglibs-1.041.tar.gz 317199 RMD160 abb064c688b50baf5c2e22308497cffd64c20d77 SHA1 72cfa8af888715e27a4536a1c9de6cfd53dcc7eb SHA256 da09ff048d37ecdb691c495007580b99e8a2c1b3fcd8dede61bd0299846ec70b
 DIST bglibs-1.104.tar.gz 442643 RMD160 9df66f29035622e4b1bb7b665e4641e5a78e54a7 SHA1 2286c5540e160ffbf79765c35f06c0651eecc777 SHA256 5593213ee3aedf297eff5fabddf535e4d2a85ad8c8f2a2b1d4dce210991022af
+DIST bglibs-1.106.tar.gz 481564 RMD160 d3ac009a0b9196701ff90b6cddbd58596ab480a9 SHA1 5f1914299c0f91a3d5c83bf6c8c1d0b824ffe624 SHA256 5c8ae51c2d88e58ff2fccc32d3000e88054d87fd69b6bfa6d0f70528e8538df0
 EBUILD bglibs-1.041.ebuild 1328 RMD160 867565b2853920d8830d57aaf068bd483aa745dd SHA1 f63a8da4e78c2db48536a827e7f9e872cd561d24 SHA256 bf7935a069441e723ce1b5b72776c4ed04b3931d3837041189f86b6b6c843a80
 EBUILD bglibs-1.104.ebuild 1736 RMD160 d8c73c8509146797b80cbab530f5082b1922c257 SHA1 1cdc2e81b05bf590c767059222be86ad0ad0d272 SHA256 159306e3b51dc3c21220abd198664ffd0a297e865581ae4201e639e04c7c34d1
-MISC ChangeLog 6241 RMD160 c8e2f2ea573a4aa7c1c3597dec3e8a29c5b26fa9 SHA1 b8c331dde863256f729657968ee6d87176a199e9 SHA256 95a45c3fdb17771bbc6ee45f5156bf3d5ffc8cafedea2eba31158c2fbd97b5e9
+EBUILD bglibs-1.106.ebuild 2285 RMD160 11610863a4bbb3315a7dbd5a5af588d852ed2c3b SHA1 9e68f6ea06605c1794831c2238ae5d7045e9612c SHA256 af4751629b5e81a396d1c447904a0e89e371f565f9d79188f47183e9456e3d8b
+MISC ChangeLog 6423 RMD160 bdc9156a96d5a3c7af8ca9495cae8bf1cf8359ca SHA1 0d9f9d25c69294c0875afe14fc439cfc0d2e7dc7 SHA256 ebefe9d480d5793a897bf41d0d1214b0201de821ea801c6e45aa88e5911d46db
 MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543
diff --git a/dev-libs/bglibs/bglibs-1.106.ebuild b/dev-libs/bglibs/bglibs-1.106.ebuild
new file mode 100644
index 000000000000..512f64e5ee84
--- /dev/null
+++ b/dev-libs/bglibs/bglibs-1.106.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/bglibs/bglibs-1.106.ebuild,v 1.1 2010/01/13 08:12:08 bangert Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs eutils multilib
+
+DESCRIPTION="Bruce Guenters Libraries Collection"
+HOMEPAGE="http://untroubled.org/bglibs/"
+SRC_URI="http://untroubled.org/bglibs/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.106-parallel-fix.patch
+	# disable tests as we want them manually
+	sed -i \
+		-e '/^all:/s|selftests||' \
+		"${S}"/Makefile
+	sed -i \
+		-e '/selftests/d' \
+		"${S}"/TARGETS
+	#sed -i \
+	#	-e 's,^libraries:,LIBS = ,g' \
+	#	-e '/^LIBS =/alibs-static: $(filter %.a,$(LIBS))' \
+	#	-e '/^LIBS =/alibs-shared: $(filter %.la,$(LIBS))' \
+	#	-e '/^LIBS =/alibraries: libs-static libs-shared' \
+	#	"${S}"/Makefile
+}
+
+src_compile() {
+	echo "${D}/usr/bin" > conf-bin
+	echo "${D}/usr/$(get_libdir)/bglibs" > conf-lib
+	echo "${D}/usr/include/bglibs" > conf-include
+	echo "${D}/usr/share/man" > conf-man
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	emake || die
+}
+
+src_test() {
+	einfo "Running selftests"
+	emake selftests
+}
+
+src_install () {
+	einstall || die "install failed"
+
+	#make backwards compatible symlinks
+	dosym /usr/lib/bglibs /usr/lib/bglibs/lib
+	dosym /usr/include/bglibs /usr/lib/bglibs/include
+
+	#install .so in LDPATH
+	mv "${D}"/usr/$(get_libdir)/bglibs/libbg.so.1.1.1 "${D}"/usr/$(get_libdir)/
+	mv "${D}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.so.1.1.1 "${D}"/usr/$(get_libdir)/
+	dosym libbg.so.1.1.1 /usr/$(get_libdir)/libbg.so.1
+	dosym libbg.so.1.1.1 /usr/$(get_libdir)/libbg.so
+	dosym libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/libbg-sysdeps.so.1
+	dosym libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/libbg-sysdeps.so
+
+	dosym ../libbg.so.1.1.1 /usr/$(get_libdir)/bglibs/libbg.so.1.1.1
+	dosym ../libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/bglibs/libbg-sysdeps.so.1.1.1
+
+	rm "${D}"/usr/$(get_libdir)/bglibs/libbg.la
+	rm "${D}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.la
+
+	dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION
+	dohtml doc/html/*
+	docinto latex
+	dodoc doc/latex/*
+}
diff --git a/dev-libs/bglibs/files/bglibs-1.106-parallel-fix.patch b/dev-libs/bglibs/files/bglibs-1.106-parallel-fix.patch
new file mode 100644
index 000000000000..30c13e8c75fa
--- /dev/null
+++ b/dev-libs/bglibs/files/bglibs-1.106-parallel-fix.patch
@@ -0,0 +1,61 @@
+Forward port to 1.106 by Thilo Bangert <bangert@gentoo.org>
+Fixes for parallel compile.
+
+- Redirection straight to an output target that is later used for dependancies
+  is not safe. The output file must be come into existence atomically.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Naur bglibs-1.106.orig/Makefile bglibs-1.106/Makefile
+--- bglibs-1.106.orig/Makefile	2009-11-20 11:52:29.000000000 +0100
++++ bglibs-1.106/Makefile	2009-11-20 11:56:01.000000000 +0100
+@@ -152,37 +152,43 @@
+ 	./compile crc-gentab.c
+ 
+ crc/crc16_arc_table.c: crc-gentab
+-	./crc-gentab crc16_arc 16 0x8005 reflected >$@
++	./crc-gentab crc16_arc 16 0x8005 reflected >$@.tmp
++	mv $@.tmp $@
+ 
+ crc/crc16_arc_table.lo crc/crc16_arc_table.o: ltcompile crc/crc16_arc_table.c
+ 	./ltcompile crc/crc16_arc_table.c
+ 
+ crc/crc16_ccitt_table.c: crc-gentab
+-	./crc-gentab crc16_ccitt 16 0x1021 normal >$@
++	./crc-gentab crc16_ccitt 16 0x1021 normal >$@.tmp
++	mv $@.tmp $@
+ 
+ crc/crc16_ccitt_table.lo crc/crc16_ccitt_table.o: ltcompile crc/crc16_ccitt_table.c
+ 	./ltcompile crc/crc16_ccitt_table.c
+ 
+ crc/crc16_xmodem_table.c: crc-gentab
+-	./crc-gentab crc16_xmodem 16 0x8408 reflected >$@
++	./crc-gentab crc16_xmodem 16 0x8408 reflected >$@.tmp
++	mv $@.tmp $@
+ 
+ crc/crc16_xmodem_table.lo crc/crc16_xmodem_table.o: ltcompile crc/crc16_xmodem_table.c
+ 	./ltcompile crc/crc16_xmodem_table.c
+ 
+ crc/crc32_table.c: crc-gentab
+-	./crc-gentab crc32 32 0x04C11DB7 reflected >$@
++	./crc-gentab crc32 32 0x04C11DB7 reflected >$@.tmp
++	mv $@.tmp $@
+ 
+ crc/crc32_table.lo crc/crc32_table.o: ltcompile crc/crc32_table.c
+ 	./ltcompile crc/crc32_table.c
+ 
+ crc/crc32c_table.c: crc-gentab
+-	./crc-gentab crc32c 32 0x1EDC6F41 reflected >$@
++	./crc-gentab crc32c 32 0x1EDC6F41 reflected >$@.tmp
++	mv $@.tmp $@
+ 
+ crc/crc32c_table.lo crc/crc32c_table.o: ltcompile crc/crc32c_table.c
+ 	./ltcompile crc/crc32c_table.c
+ 
+ crc/crc64_table.c: crc-gentab
+-	./crc-gentab crc64 64 0x42F0E1EBA9EA3693 normal >$@
++	./crc-gentab crc64 64 0x42F0E1EBA9EA3693 normal >$@.tmp
++	mv $@.tmp $@
+ 
+ crc/crc64_table.lo crc/crc64_table.o: ltcompile crc/crc64_table.c
+ 	./ltcompile crc/crc64_table.c