version bump - also fix bug #248441

(Portage version: 2.2_rc61/cvs/Linux i686)

3 files changed, 145 insertions, 2 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/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