fix as-needed properly - bug #370421

Package-Manager: portage-2.1.10/cvs/Linux x86_64

3 files changed, 33 insertions, 34 deletions

diff --git a/net-libs/c-client/ChangeLog b/net-libs/c-client/ChangeLog
index e9209bc88756..c382d29d90e3 100644
--- a/net-libs/c-client/ChangeLog
+++ b/net-libs/c-client/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/c-client
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.71 2011/06/07 12:03:34 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.72 2011/06/07 13:11:08 eras Exp $
+
+  07 Jun 2011; Eray Aslan <eras@gentoo.org> files/c-client-2007e-ldflags.patch:
+  Fix as-needed properly - bug #370421
 
   07 Jun 2011; Eray Aslan <eras@gentoo.org> files/c-client-2007e-ldflags.patch:
   Fix as-needed flag - bug #370421
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 91052df5913d..0b62b346df91 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -5,27 +5,27 @@ AUX 2002d-Makefile.patch 2174 RMD160 ab95295b15a9f8cceb73a1b2431453ec1e137c0e SH
 AUX c-client-2006k_GENTOO_Makefile.patch 2441 RMD160 4c1fbe17eadd6dac6aa0b615757cd95b4c688d75 SHA1 4d55c0eea05605a4d42e95f0284be90dbe20ff3c SHA256 6f7bf2d23f346f0f8eed4c4ae61e5b5c95d1a12e15e7fb4192a5a723754255f8
 AUX c-client-2006k_GENTOO_amd64-so-fix.patch 665 RMD160 a2a4747dea49279f4464b99234f338a5f7faf022 SHA1 a858f66db06625a102db0db4b503c64e9a8ad5c0 SHA256 77de7621946c69638295ac11275124d0c405a4c6ba284a068f9a96c4994f3184
 AUX c-client-2006k_KOLAB_Annotations.patch 14551 RMD160 932f866a70f709d980c92a37890fcc38a4f74c06 SHA1 8e92dbb7311430c45dbdcfb0b8b698f9048ec85a SHA256 cd8833d4eabd8fbad6a1588e3ee5375fced007964f1c6bcd016b34bee5d8eaf2
-AUX c-client-2007e-ldflags.patch 1790 RMD160 d57097c92412fdf301d755eeb8f2983b599da0f8 SHA1 a6f125850280e90087c1e4eec3595bd94db4846d SHA256 73fd7fe40837c95d1d85c407d098f26dcad4c96d5fa9f1100fafb15b561520f9
+AUX c-client-2007e-ldflags.patch 1635 RMD160 d1b8cea2b3f555db8429d5d190cdac201a4b3097 SHA1 40bbbed8614c0cd91785e35612c168a08d362cb9 SHA256 6eddb2951525fc002652f9e7d38cb39b813526ded71f5a58be596d93d6e375c2
 DIST imap-2007e.tar.Z 2789469 RMD160 7d6af203419975f763d7ec17b6a4544c94490b50 SHA1 24c63cad8d0e74aa76e4341fcfa54d24f23a8c70 SHA256 be648d0e1aa62d564d9dbe04b77ea948116ee96ed687cb5d169c99ae28286e59
 EBUILD c-client-2007e-r1.ebuild 3350 RMD160 5ac3bb92d5ea20705d611656ea6ed8ef00485808 SHA1 d71e3c8992ba4032473374080b63a5abba5fb22b SHA256 20d41f0d251a85acdc6f1ead896bc615956655eb3f377233ddde5ecdbc363ece
 EBUILD c-client-2007e-r2.ebuild 3168 RMD160 e53d23f40ef30659675d1c8c2d0cdbd6c6ce0501 SHA1 a594bd4c2f6676acb8742c1c32983cc2ecb4abc7 SHA256 87ad9fc49977f5d97139c59cf361e94f1b4f0c9ca86a25a14b27891fb3c87248
 EBUILD c-client-2007e.ebuild 3155 RMD160 2cf0e674e18462e22a2198728ba76289f7306e9e SHA1 a98a1d315768e8f1aa06d4be69cd77285a8998d1 SHA256 b75aa452fead7ee8287dad647022995e2db2309b25acdc0d5eb5f7a0f4427385
-MISC ChangeLog 9674 RMD160 e0f015c462d07839f75c48dfb1888ab2024225cd SHA1 e6dc16ab3000422e55e9fa0756230e2495a4624a SHA256 50683e48fbf82457b0c9d50401d1653b3018480bd3c5e9eef56145d4347c74cc
+MISC ChangeLog 9794 RMD160 bc3e391d2f69e7155a9eaaf709138577439f363a SHA1 70fc51d6c6e1c8da0821feae4b333377ffc89ce9 SHA256 f2d8a5b515c3aa6483f62ebd15b1e42c25cd38d3c74347267194e366ceacea55
 MISC metadata.xml 235 RMD160 f4321297652cea09baaafb300aeba2d8c2744e00 SHA1 ab2e8ef3058ceaabd7fbcb52b524502b8de0d6d1 SHA256 52bdb2e9321c82e6ecec49b9cbd88c0fe21bbd7135c5bf28af450620a4860f06
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN7hOjAAoJEHfx8XVYajsfLjEP/0+FfQ8rw5jBGHa6Lasj+SFG
-ITVwy/qfebEo1y6flPGgSOxkNrrl1vrLIUg7mPjD8ywV+r6xuDOEB9pOn1a5A2Im
-l9CpzBTdcuk/qkBwdNs9XTrwoGOvJDNkA/fgslOhabtoIV34qxRnURFEGe+TAOJ/
-LsyBBGNNpSxciyZ9U9iEK9Px3s8iJ8xjcq4POwXw7GZQUKo5GgpE3Z7/jEzZweKT
-LJB08XxMngooT5PoXiytS75Qa3DlXB5k7FSr8iulelPipKeTJxYD62dsLpQG/oNi
-5K3vySBwmEkLxObQnuOh0rUNWtLFoS+RzM1o0vsiPn8NoIMSBKlmLPuTsrwrRUbQ
-vtKBhffEEik4HqJUYOaJpf8fFxaaPcrv7VuAS85OJQxpDoWX7dZADp+6b+ZWQUFE
-acCWls44SF5Uo06NK1X+KMtWZLO+dmi5WU+YmXoQmsPR5DzbWTMuZoVmuAVqdHHc
-Ub7hBxLfSqOM+xYsoy6Q+uF8RlejgI6I+hrXEDHeT7d7Ztmu5lrmmHsbT4gfquvT
-y3Nq/i9O0dkSz6dqnAupgFpxRFHkyVfPKt1gqSCrFSpXo5MSNep7KoEOAizF+s9/
-3rngVIuACoWfa0nrT+t5db/TaCIqs5fK9HqV7clXFyDI/jWVebs6YoHKhc9HJeD5
-mDznYWt/qG68Ubfr42ri
-=sp7k
+iQIcBAEBCAAGBQJN7iN5AAoJEHfx8XVYajsf1CcP/iU09k1641Wxj3/dWqAkKlRn
+ipZEDJyWSCsdonC/kgCpJW7ufB0dtrTURMI9lNcPNm45RS6l9eN5r7xaNKrmrEug
+IVYKB5QiAcocRhQcY6FsX1pXsjrlrI5aA5v/gmxlr8c0pAJWHEDovNkLBYe9ZanT
+sTi4Tjypv1larVhmGu4Hq8RUYm/XJ8P8ZS4ya4bo+UeHhXSDISiIE53Tza6iJkx3
+qceNQMN0U9lkM0dM0Z/DBZtstIoIiBoAVAlkyGGGFzzU8PBGes56AycdXTSCaCvz
+07XGiOBsIcovleZfdQkWEIS24vBlD/e84kWkxw5f+RRGerD6CtDJPw7Kj/2PfBID
+8UwXim6srT5Sli9s8yKUGVKnlJ/Z5sprNpSx4B9RqbWHZWsSfztfKN2cghS9ZvqU
+G5brYOf6KCHQPAdUgNx+zMN+upJcdWN2qJM10To55yFfXp0c2nL+Jf4kUq1A/h6e
+HsdXEczLYYd/92k5s/jmkUT+T5jZ2ooIcujykO9WZd0bhlywHVsZfxgY7/jv7Uxv
+TrivGoxPOaKYpBDguF6LEpW1h9DhNmSTGhu2sh0FkX/oBLIfMjWx/62Zpv/MaY7M
+iNIt4GUMtW5rz9On0KR1M1bgu7JReuUg1AhnhbdQsBEY0ZKf1UOuWFTSufFr0MQ4
+nBdgULIUXpoJqIXQE8CL
+=Qt+U
 -----END PGP SIGNATURE-----
diff --git a/net-libs/c-client/files/c-client-2007e-ldflags.patch b/net-libs/c-client/files/c-client-2007e-ldflags.patch
index 819eda6b8756..7ca0942e3364 100644
--- a/net-libs/c-client/files/c-client-2007e-ldflags.patch
+++ b/net-libs/c-client/files/c-client-2007e-ldflags.patch
@@ -1,12 +1,18 @@
---- src/osdep/unix/Makefile~	2010-08-08 02:30:48.000000000 -0400
-+++ src/osdep/unix/Makefile	2010-08-08 02:31:08.758000018 -0400
-@@ -959,17 +959,17 @@
+--- src/osdep/unix/Makefile~	2011-06-07 16:04:29.000000000 +0300
++++ src/osdep/unix/Makefile	2011-06-07 15:55:31.000000000 +0300
+@@ -954,23 +954,24 @@
+ 
+ # Once-only environment setup
+ 
+-once:	onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
++once:	ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c
+ 
  onceenv:
  	@echo Once-only environment setup...
  	echo $(CC) > CCTYPE
 -	echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
-+	echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
 -	echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
++	echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
 +	echo `$(CAT) OSCFLAGS` -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
  	 -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
  	 -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
@@ -15,23 +21,13 @@
  	 -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
  	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
 -	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
++	echo `$(CAT) LDFLAGS` > LIBS
 +	echo $(EXTRALDFLAGS) `$(CAT) LDFLAGS` -lcrypt $(BASELDFLAGS) > LDFLAGS
  	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
 -	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
-+	echo "`$(CAT) CCTYPE` `$(CAT) LDFLAGS` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
 -	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
-+	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" `$(CAT) LDFLAGS` \
++	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` $(EXTRALDFLAGS) `$(CAT) OSFLAGS` -shared \
++	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" `$(CAT) LIBS` $(BASELDFLAGS) \
  	 >> ARCHIVE
  	echo $(OS) > OSTYPE
-	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
---- src/osdep/unix/Makefile~	2010-08-08 04:25:00.000000000 -0400
-+++ src/osdep/unix/Makefile	2010-08-08 04:36:49.720000021 -0400
-@@ -954,7 +954,7 @@
- 
- # Once-only environment setup
- 
--once:	onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
-+once:	ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c
- 
- onceenv:
- 	@echo Once-only environment setup...
+ 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy