now multilib ready - fix jobserver warning - remove old version

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

6 files changed, 26 insertions, 141 deletions

diff --git a/app-admin/srlog2/ChangeLog b/app-admin/srlog2/ChangeLog
index 03e884a3ca61..5f8bbee29f53 100644
--- a/app-admin/srlog2/ChangeLog
+++ b/app-admin/srlog2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/srlog2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/srlog2/ChangeLog,v 1.4 2009/12/07 11:36:49 bangert Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/srlog2/ChangeLog,v 1.5 2010/01/14 11:21:06 bangert Exp $
+
+  14 Jan 2010; Thilo Bangert <bangert@gentoo.org> -srlog2-0.80.ebuild,
+  -files/srlog2-0.80-fix-execstacks-curve25519.patch, srlog2-0.85.ebuild,
+  +files/srlog2-0.85-jobserver-fix.patch:
+  now multilib ready - fix jobserver warning - remove old version
 
   07 Dec 2009; Thilo Bangert <bangert@gentoo.org> srlog2-0.85.ebuild,
   +files/srlog2-0.85-fix-incude.patch:
diff --git a/app-admin/srlog2/Manifest b/app-admin/srlog2/Manifest
index 695e94bdad24..6c6e71569a95 100644
--- a/app-admin/srlog2/Manifest
+++ b/app-admin/srlog2/Manifest
@@ -1,8 +1,6 @@
-AUX srlog2-0.80-fix-execstacks-curve25519.patch 2676 RMD160 1b898e42f894d091eb21d6e369aca7c8dcb26a0a SHA1 0d2a60bee582310cafa3ebb83f76bee716a51a60 SHA256 21408dab4b278df8b158fc9f92966983aa186224c7954a08b72b90ac9a0d9799
 AUX srlog2-0.85-fix-incude.patch 339 RMD160 7dbfb0e8c3473994c24bbe8fe47a1c3f0ff3859b SHA1 f851cefa788cb3405b34e425f24baffb93889102 SHA256 a3eb6f5e142672fe53610152b4616a08bcb341725e1ead700d1f9faed6b2fc9f
-DIST srlog2-0.80.tar.gz 93231 RMD160 b1096988324453abe0b222071b37b6597738cec3 SHA1 6b7ad78156d1eccfa08fd79c530a8b1e556aa13f SHA256 0445950b8a3366ef9c585c1b26dd727b215dd0d85f4d939ddc230796b7fa24ac
+AUX srlog2-0.85-jobserver-fix.patch 475 RMD160 8f1d24b36b073a4d088a479dd338bfcdd1f8fa73 SHA1 f72f1dae4455c07bf654a5c5c636c199f6484a3f SHA256 b029ec4490c22f7864fbcb61957dfd9e13b61149aa4878cf7477fde651ccfca6
 DIST srlog2-0.85.tar.gz 88825 RMD160 0e8c4a8cafa9f4771287a983a629a380100885d4 SHA1 b725d3486cb04ce6ca07ede5e37c5806b35227d6 SHA256 76d4dc5404027fb45a6692d6155f415945d18f046f570a043e60f86676f71bfb
-EBUILD srlog2-0.80.ebuild 1670 RMD160 c0e739e489012dd4c2d0eca63361870db34b3528 SHA1 5315dc9283829f661d17d54f84044b260d3ddcc6 SHA256 afd8b33869a05907cde4e27b862a7e330e9e6b9a1a8726a7e65cb5e5b4ce7810
-EBUILD srlog2-0.85.ebuild 1662 RMD160 c665a215d2b72daa5ec6bbecb48b2279a806f8ad SHA1 83162bcbb48442d69c86148dd7401ff8e91b20c8 SHA256 8ef083f1d606c2618c4c2e8ba7381c32e949c08e7f58046cc287f804c3f32e7d
-MISC ChangeLog 1119 RMD160 79bcffdb8696c5c0a718b16c32bf58ca2b6594a8 SHA1 fd3760a1a427d6ea7ce3b9f064dc7f5739711122 SHA256 2787846f86a2d841c4bee863d71dfbe9c431ca992e158c4751073bb2b0995cd9
+EBUILD srlog2-0.85.ebuild 1735 RMD160 fa71401c3c03a81ed3762d1ad835b1db3ebac6c3 SHA1 9de761b283fff269281cbb26774029f025cc26e4 SHA256 7296ac68a6e2511c6c45f343730d82e4b0916b43eafbf43243bc93a2ff7e942e
+MISC ChangeLog 1373 RMD160 7e2878c24a789fba9a6da6ff71437348d52e865c SHA1 409bad9efd3f8114d6c1c03932aa953dd968e6f3 SHA256 ae4ce701cfe38a57ca7db3f6026ec67d94899ea578bcf2bd2ce378c4c27003cd
 MISC metadata.xml 311 RMD160 d077c7679097a5502cbaa09a17be3e05abd05a6a SHA1 d653a94fc92c600a617145c9c099ca579c1f64b4 SHA256 0dc503d13bcb3961bb0f5b5b5b4dc4618fd564001b1b3a17d46e373a4033df5d
diff --git a/app-admin/srlog2/files/srlog2-0.80-fix-execstacks-curve25519.patch b/app-admin/srlog2/files/srlog2-0.80-fix-execstacks-curve25519.patch
deleted file mode 100644
index 93908621df12..000000000000
--- a/app-admin/srlog2/files/srlog2-0.80-fix-execstacks-curve25519.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: curve25519/curve25519_athlon_square.s
-===================================================================
---- curve25519/curve25519_athlon_square.s	(revision 182)
-+++ curve25519/curve25519_athlon_square.s	(working copy)
-@@ -296,3 +296,6 @@
- fstpl 72(%ecx)
- add %eax,%esp
- ret
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-Index: curve25519/curve25519_athlon_init.s
-===================================================================
---- curve25519/curve25519_athlon_init.s	(revision 182)
-+++ curve25519/curve25519_athlon_init.s	(working copy)
-@@ -11,3 +11,6 @@
- fldcw curve25519_athlon_rounding
- add %eax,%esp
- ret
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-Index: curve25519/curve25519_athlon_todouble.s
-===================================================================
---- curve25519/curve25519_athlon_todouble.s	(revision 182)
-+++ curve25519/curve25519_athlon_todouble.s	(working copy)
-@@ -142,3 +142,6 @@
- fstpl 72(%ecx)
- add %eax,%esp
- ret
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-Index: curve25519/curve25519_athlon_mainloop.s
-===================================================================
---- curve25519/curve25519_athlon_mainloop.s	(revision 182)
-+++ curve25519/curve25519_athlon_mainloop.s	(working copy)
-@@ -3988,3 +3988,6 @@
- movl 176(%ecx),%ebp
- add %eax,%esp
- ret
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-Index: curve25519/curve25519_athlon_mult.s
-===================================================================
---- curve25519/curve25519_athlon_mult.s	(revision 182)
-+++ curve25519/curve25519_athlon_mult.s	(working copy)
-@@ -408,3 +408,6 @@
- movl 0(%esp),%ebp
- add %eax,%esp
- ret
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-Index: curve25519/curve25519_athlon_const.s
-===================================================================
---- curve25519/curve25519_athlon_const.s	(revision 182)
-+++ curve25519/curve25519_athlon_const.s	(working copy)
-@@ -112,3 +112,6 @@
- curve25519_athlon_rounding:
- 	.byte 0x7f
- 	.byte 0x13
-+#if defined(__linux__) && defined(__ELF__)
-+	.section .note.GNU-stack,"",%progbits
-+#endif
-Index: curve25519/curve25519_athlon_fromdouble.s
-===================================================================
---- curve25519/curve25519_athlon_fromdouble.s	(revision 182)
-+++ curve25519/curve25519_athlon_fromdouble.s	(working copy)
-@@ -193,3 +193,6 @@
- movl 0(%esp),%ebp
- add %eax,%esp
- ret
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/app-admin/srlog2/files/srlog2-0.85-jobserver-fix.patch b/app-admin/srlog2/files/srlog2-0.85-jobserver-fix.patch
new file mode 100644
index 000000000000..3efe52b9cc87
--- /dev/null
+++ b/app-admin/srlog2/files/srlog2-0.85-jobserver-fix.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2010-01-14 12:10:59.000000000 +0100
++++ Makefile	2010-01-14 12:14:09.000000000 +0100
+@@ -51,7 +51,7 @@
+ 
+ curve25519.h: conf-cc
+ 	rm -f curve25519/*.[oa]
+-	( cd curve25519 && env CC="`head -n 1 ../conf-cc`" make curve25519.a; ) \
++	( cd curve25519 && env CC="`head -n 1 ../conf-cc`" $(MAKE) curve25519.a; ) \
+ 	&& ( echo '#define HASCURVE25519 1'; cat curve25519/curve25519_`cat curve25519/curve25519.impl`.h; ) >$@ \
+ 	|| echo '#undef HASCURVE25519' >$@
+ 
diff --git a/app-admin/srlog2/srlog2-0.80.ebuild b/app-admin/srlog2/srlog2-0.80.ebuild
deleted file mode 100644
index 2d1c58148191..000000000000
--- a/app-admin/srlog2/srlog2-0.80.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/srlog2/srlog2-0.80.ebuild,v 1.2 2008/06/26 07:58:40 bangert Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Secure Remote Log transmission system"
-HOMEPAGE="http://untroubled.org/srlog2/"
-SRC_URI="http://untroubled.org/srlog2/archive/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=dev-libs/bglibs-1.041
-		app-crypt/nistp224
-		>=dev-libs/libtomcrypt-1.03"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	echo -n "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo -n "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo -n "/usr/include/bglibs" > conf-bgincs
-	echo -n "/usr/lib/bglibs" > conf-bglibs
-	echo -n /usr/bin > conf-bin
-	echo -n /usr/share/man > conf-man
-
-	epatch "${FILESDIR}"/srlog2-0.80-fix-execstacks-curve25519.patch
-	# Deliberatly don't fix curve25519 as its full of PIC unfriendly asm code
-	# uncomment and follow
-	# http://www.gentoo.org/proj/en/hardened/pic-fix-guide.xml (Thunk it in
-	# assembly) to fix curve25519/*.s
-
-	sed -i -e 's/x86cpuid /x86cpuid -fno-pie /' curve25519/curve25519.impl.do
-	sed -i -e 's/) >/) -fPIC >/g' curve25519/Makefile
-	#If this isn't fixed it just includes th eapp-crypt/nistp224 support only
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install_prefix="${D}" install || die "emake install failed"
-	dodoc ANNOUNCEMENT NEWS README *.html
-}
-
-pkg_postinst() {
-	# even with the pic code fixed this only works on 32 bit cpus
-	#elog 'curve25519 only works on 32-bit x86 systems at the moment'
-	elog 'curve25519 support currenly broken'
-}
diff --git a/app-admin/srlog2/srlog2-0.85.ebuild b/app-admin/srlog2/srlog2-0.85.ebuild
index f9945382ff3f..a5c5897ca45b 100644
--- a/app-admin/srlog2/srlog2-0.85.ebuild
+++ b/app-admin/srlog2/srlog2-0.85.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/srlog2/srlog2-0.85.ebuild,v 1.2 2009/12/07 11:36:49 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/srlog2/srlog2-0.85.ebuild,v 1.3 2010/01/14 11:21:06 bangert Exp $
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils multilib
 
 DESCRIPTION="Secure Remote Log transmission system"
 HOMEPAGE="http://untroubled.org/srlog2/"
@@ -22,7 +22,7 @@ src_unpack() {
 	echo -n "$(tc-getCC) ${CFLAGS}" > conf-cc
 	echo -n "$(tc-getCC) ${LDFLAGS}" > conf-ld
 	echo -n "/usr/include/bglibs" > conf-bgincs
-	echo -n "/usr/lib/bglibs" > conf-bglibs
+	echo -n "/usr/$(get_libdir)/bglibs" > conf-bglibs
 	echo -n /usr/bin > conf-bin
 	echo -n /usr/share/man > conf-man
 
@@ -36,6 +36,7 @@ src_unpack() {
 	#If this isn't fixed it just includes app-crypt/nistp224 support only
 
 	epatch "${FILESDIR}"/srlog2-0.85-fix-incude.patch
+	epatch "${FILESDIR}"/srlog2-0.85-jobserver-fix.patch
 }
 
 src_compile() {