Version bump, bug #150173, includes parallel compile fixes for longstanding libtool-caused breakage.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.28-rc2-07920-g65fc716 x86_64

4 files changed, 163 insertions, 2 deletions

diff --git a/dev-libs/bglibs/ChangeLog b/dev-libs/bglibs/ChangeLog
index 2f88be8e2228..5b69529dc21a 100644
--- a/dev-libs/bglibs/ChangeLog
+++ b/dev-libs/bglibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/bglibs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/bglibs/ChangeLog,v 1.46 2008/02/27 03:51:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/bglibs/ChangeLog,v 1.47 2008/11/06 08:18:10 robbat2 Exp $
+
+*bglibs-1.104 (06 Nov 2008)
+
+  06 Nov 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/bglibs-1.104-parallel-fix.patch, +bglibs-1.104.ebuild:
+  Version bump, bug #150173, includes parallel compile fixes for
+  longstanding libtool-caused breakage.
 
   27 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> bglibs-1.041.ebuild:
   Add ~ppc64.
diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest
index 1143239d3cfb..2165b3aa3f8c 100644
--- a/dev-libs/bglibs/Manifest
+++ b/dev-libs/bglibs/Manifest
@@ -1,3 +1,4 @@
+AUX bglibs-1.104-parallel-fix.patch 3908 RMD160 eaa739576e68b0d93c4167f42d173693a7ca18aa SHA1 21aef57b30663ada2ef168bc0f5d889e5e956746 SHA256 456d9bcacb231e843bf9cea38ce33a81a8e84a5590787cbc8e0227b9ed22f35d
 DIST bglibs-1.001.tar.gz 62354 RMD160 1367940d714a6a62fbb993b6d5360b9efc854af1 SHA1 d527c39a185a8eead632da305834c8e4edace3dd SHA256 a4060b8f703e87068c076b3edc1675d97672425d584c8ce0b8d84f3024366ddb
 DIST bglibs-1.009.tar.gz 197281 RMD160 ebd1a0eb8a3a7732f6da33a5d72c96c870c4bd24 SHA1 64b63d2b8b5213b306dcdf070b6815a9bd712f67 SHA256 366a5bb0fb6efe585fcecac3f4dbb28554e97c7392e39e5d75005125e529ba21
 DIST bglibs-1.011.tar.gz 190730 RMD160 97fa72bedd84cdebf58e3eaa6aa1c9b8f2577254 SHA1 6d327ccac99aca4e27dceb3417572c1def8e737c SHA256 e59fddc1f3cb221c18c596582f9c3d89f1f209f6d955846d8efe7703a7739d86
@@ -5,6 +6,7 @@ DIST bglibs-1.017.tar.gz 232691 RMD160 8523d0035b638d3bcd34ecee40b3bded7fbfc703
 DIST bglibs-1.019.tar.gz 266793 RMD160 0e74c9b17c2db588d6d142ec25431070c2738f91 SHA1 851e74a3b3a1fc9ea6edd3cc04693db4187580b2 SHA256 fc71d035b9addfef117455580617c3f27e432a0720e695d882436afad2f2a414
 DIST bglibs-1.031.tar.gz 305841 RMD160 ff7979f526fa74052e8063655ed86f6799a20b2c SHA1 88c46d4d3f233bc98549e84f024d484663b2dfd3 SHA256 93491478c4759633f8a6e16503780406ba4f9bbf0055ca5575e2ac5960f5dce0
 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
 EBUILD bglibs-1.001.ebuild 658 RMD160 b9f081a73f7dad3547dc9b2b50cf91431bd699f1 SHA1 998d5c9d8b55f200dd294e7b44943a3b60b51575 SHA256 29b20d502df69f47b3298f8f9bf05cbc172480d2e86273dd0f49c1b4c5091b1e
 EBUILD bglibs-1.009-r1.ebuild 1190 RMD160 fb7acfee491452ec08475859c1f5f29cbd95dc02 SHA1 d2cb43e5c0145989f43a494aa7a8c37b8667feaf SHA256 2c4d8034563ff7dbcaafd44eca359338ab2252b557a21e49073961b9ca6320c1
 EBUILD bglibs-1.009.ebuild 702 RMD160 b6fcfc75ecadf3fe9056bce46d317e3e725cdfee SHA1 498554775b4db8ab0cfc58cff5dc5ab8060738b5 SHA256 b8435bc1b997e593898e8fed3cd548c9f15ea20bf03651bea9918f4b6b9a6293
@@ -14,5 +16,6 @@ EBUILD bglibs-1.019-r1.ebuild 1417 RMD160 b61efe3427e0a814e33d1ffeb4de8ed2c1fa1a
 EBUILD bglibs-1.019.ebuild 1133 RMD160 2623ad5390536025f8576746e7ce16bace25c5c4 SHA1 f0167ff29122fd2ddc862ca17b5e5aed7a5c9c1c SHA256 1888f36a370441c487ecf16c56db4ec56c42d7014bb2e3b188cc47b40ec18c75
 EBUILD bglibs-1.031.ebuild 1266 RMD160 e3efd8c031c821a88dc96b5e7d5bd632730f7236 SHA1 be801a14cb38b25f4c046d856cc17169da36c0f5 SHA256 0dd5c73869735f0157aa7e4b3e0461759b2808cadd1f70211134a85e5e9cbfed
 EBUILD bglibs-1.041.ebuild 1316 RMD160 7b7a830eefa8ce8069634d3f54d5d64673f51487 SHA1 efe0e12da32d3ee66a8397c7a4ec6b590e03a856 SHA256 f42ae789870cbaaffb473dc035f2f28418e9b2d9f3527fb9c44b89990186c324
-MISC ChangeLog 5520 RMD160 f1b4c5802360678770093c7d78e3dc611133c0ae SHA1 a8cf64906f6a23ee3e707ce2ae13ce1b9d7d3d56 SHA256 5dbf0d2f703452978a7cda50cb8ee9f38985a7755449c8ff589ffc228f86afd9
+EBUILD bglibs-1.104.ebuild 1730 RMD160 3a2d0e3743f9386632a9f34129eb6a7615fa9253 SHA1 199ea580fbf91fcd3c620fc183b699f743568395 SHA256 000439fa17104c7f9e0d8509acfa981bf8ec7d99452cfd4e14b62f10ab579437
+MISC ChangeLog 5772 RMD160 f8a0f1062ae5cb66877e2bbbd05d5851bbab9613 SHA1 30abcf94bfd7430d7750577509f4c3b90dce7331 SHA256 2cb70f67a58a77626d7b5c7d98cccd6deec9e100db924be8223aa3059857aee3
 MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543
diff --git a/dev-libs/bglibs/bglibs-1.104.ebuild b/dev-libs/bglibs/bglibs-1.104.ebuild
new file mode 100644
index 000000000000..6d493150fb47
--- /dev/null
+++ b/dev-libs/bglibs/bglibs-1.104.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/bglibs/bglibs-1.104.ebuild,v 1.1 2008/11/06 08:18:10 robbat2 Exp $
+
+inherit toolchain-funcs eutils
+
+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="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/bglibs-1.104-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/lib/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
+	# Fails if we do parallel build of shared+static at the same time
+	emake libs-shared || die
+	emake libs-static || die 
+	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
+
+	dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION
+	dohtml doc/html/*
+	docinto latex
+	dodoc doc/latex/*
+}
diff --git a/dev-libs/bglibs/files/bglibs-1.104-parallel-fix.patch b/dev-libs/bglibs/files/bglibs-1.104-parallel-fix.patch
new file mode 100644
index 000000000000..d0717c2dd0f3
--- /dev/null
+++ b/dev-libs/bglibs/files/bglibs-1.104-parallel-fix.patch
@@ -0,0 +1,87 @@
+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.
+- libtool-2.x writes to .o AND .lo, regardless of the -o parameter. Because of
+  this, if you get a run order of compile then libcompile and makelib
+  simultaneously, there is a chance that the .o file from the original compile
+  can vanish and cause the makelib to fail. To deal with this, we split the
+  libraries target into shared and non-shared, and deliberately call the build
+  process as 3 phases: libs-shared, libs-static, all
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- bglibs-1.104/Makefile.orig	2008-04-09 08:24:31.000000000 -0700
++++ bglibs-1.104/Makefile	2008-11-05 19:05:16.304710791 -0800
+@@ -254,7 +254,8 @@
+ 	./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: libcompile crc/crc16_arc_table.c
+ 	./libcompile crc/crc16_arc_table.c
+@@ -263,7 +264,8 @@
+ 	./compile 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: libcompile crc/crc16_ccitt_table.c
+ 	./libcompile crc/crc16_ccitt_table.c
+@@ -272,7 +274,8 @@
+ 	./compile 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: libcompile crc/crc16_xmodem_table.c
+ 	./libcompile crc/crc16_xmodem_table.c
+@@ -281,7 +284,8 @@
+ 	./compile 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: libcompile crc/crc32_table.c
+ 	./libcompile crc/crc32_table.c
+@@ -290,7 +294,8 @@
+ 	./compile 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: libcompile crc/crc32c_table.c
+ 	./libcompile crc/crc32c_table.c
+@@ -299,7 +304,8 @@
+ 	./compile 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: libcompile crc/crc64_table.c
+ 	./libcompile crc/crc64_table.c
+@@ -1025,7 +1025,10 @@
+ libpwcmp.a: makelib pwcmp/client.o pwcmp/hex_encode.o
+ 	./makelib libpwcmp.a pwcmp/client.o pwcmp/hex_encode.o
+ 
+-libraries: libbg.la libbg-sysdeps.la libbg-crc.a libpwcmp.a libbg-path.a libbg-instcheck.a libbg-base64.a libbg-adt.a libbg-installer.a libvmailmgr.a libbg-sysdeps.a libbg-str.a libbg-fmt.a libpwcmp-module.a libbg-misc.a libbg-instshow.a libbg-dict.a libbg-crypto.a libbg-cli.a libbg-cdb.a libbg-msg.a libbg-iobuf.a libbg-net.a libbg-unix.a
++LIBS = libbg.la libbg-sysdeps.la libbg-crc.a libpwcmp.a libbg-path.a libbg-instcheck.a libbg-base64.a libbg-adt.a libbg-installer.a libvmailmgr.a libbg-sysdeps.a libbg-str.a libbg-fmt.a libpwcmp-module.a libbg-misc.a libbg-instshow.a libbg-dict.a libbg-crypto.a libbg-cli.a libbg-cdb.a libbg-msg.a libbg-iobuf.a libbg-net.a libbg-unix.a
++libs-shared: $(filter %.la,$(LIBS))
++libs-static: $(filter %.a,$(LIBS))
++libraries: libs-shared libs-static
+ 
+ libvmailmgr.a: makelib vmailmgr/req_arg.o vmailmgr/req_init.o vmailmgr/req_write.o vmailmgr/resp_read.o vmailmgr/vpwentry_export.o vmailmgr/vpwentry_free.o vmailmgr/vpwentry_import.o
+ 	./makelib libvmailmgr.a vmailmgr/req_arg.o vmailmgr/req_init.o vmailmgr/req_write.o vmailmgr/resp_read.o vmailmgr/vpwentry_export.o vmailmgr/vpwentry_free.o vmailmgr/vpwentry_import.o