QA fixes bug 332721. Do not block bincimap bug 290353

(Portage version: 2.1.9.47/cvs/Linux x86_64)

3 files changed, 64 insertions, 6 deletions

diff --git a/net-mail/uw-imap/ChangeLog b/net-mail/uw-imap/ChangeLog
index 8d24a468a4f9..be3068bfcecb 100644
--- a/net-mail/uw-imap/ChangeLog
+++ b/net-mail/uw-imap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/uw-imap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.116 2011/03/19 17:03:13 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.117 2011/05/07 11:20:37 eras Exp $
+
+  07 May 2011; Eray Aslan <eras@gentoo.org> uw-imap-2007e.ebuild,
+  +files/uw-imap-ldflags.patch:
+  QA fixes bug 332721. Do not block bincimap bug 290353
 
   19 Mar 2011; Eray Aslan <eras@gentoo.org> uw-imap-2007e.ebuild:
   remove old style virtual/imapd
diff --git a/net-mail/uw-imap/files/uw-imap-ldflags.patch b/net-mail/uw-imap/files/uw-imap-ldflags.patch
new file mode 100644
index 000000000000..41bd0925ed14
--- /dev/null
+++ b/net-mail/uw-imap/files/uw-imap-ldflags.patch
@@ -0,0 +1,52 @@
+diff --git a/Makefile b/Makefile
+index e6e4987..8acfe23 100644
+--- a/Makefile
++++ b/Makefile
+@@ -257,7 +257,7 @@ EXTRACFLAGS=
+ 
+ # Extra linker flags (additional/alternative libraries, etc.)
+ 
+-EXTRALDFLAGS=
++EXTRALDFLAGS=${LDFLAGS}
+ 
+ 
+ # Special make flags (e.g. to override make environment variables)
+diff --git a/src/mlock/Makefile b/src/mlock/Makefile
+index d425da8..9c3020b 100644
+--- a/src/mlock/Makefile
++++ b/src/mlock/Makefile
+@@ -36,7 +36,7 @@ CFLAGS = -O2 -pipe -march=core2
+ all:	mlock
+ 
+ mlock:	mlock.o
+-	$(CC) $(CFLAGS) -o mlock mlock.o
++	$(CC) $(CFLAGS) ${LDFLAGS} -o mlock mlock.o
+ 
+ install: mlock
+ 	chgrp mail mlock
+diff --git a/Makefile b/Makefile
+index 8acfe23..70f889d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -698,7 +698,7 @@ rebuild:
+ 	@echo Rebuilding c-client for `$(CAT) OSTYPE`...
+ 	@$(TOUCH) SPECIALS
+ 	$(CD) c-client;$(MAKE) all CC=`$(CAT) CCTYPE` \
+-	 CFLAGS="`$(CAT) CFLAGS`" `$(CAT) SPECIALS`
++	 CFLAGS="`$(CAT) CFLAGS`" LDFLAGS=${LDFLAGS} `$(CAT) SPECIALS`
+ 
+ rebuildclean:
+ 	$(SH) -c '$(RM) rebuild || true'
+diff --git a/src/osdep/unix/Makefile b/src/osdep/unix/Makefile
+index ef1d059..a53318c 100644
+--- a/src/osdep/unix/Makefile
++++ b/src/osdep/unix/Makefile
+@@ -969,7 +969,7 @@ onceenv:
+ 	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
+ 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+ 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
+-	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
++	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` `$(CAT) LDFLAGS` -shared \
+ 	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
+ 	 >> ARCHIVE
+ 	echo $(OS) > OSTYPE
diff --git a/net-mail/uw-imap/uw-imap-2007e.ebuild b/net-mail/uw-imap/uw-imap-2007e.ebuild
index 42247db16449..654b4a09210a 100644
--- a/net-mail/uw-imap/uw-imap-2007e.ebuild
+++ b/net-mail/uw-imap/uw-imap-2007e.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2007e.ebuild,v 1.11 2011/03/19 17:03:13 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2007e.ebuild,v 1.12 2011/05/07 11:20:37 eras Exp $
 
 inherit eutils flag-o-matic
 
@@ -32,7 +32,6 @@ RDEPEND="${DEPEND}
 RDEPEND="${RDEPEND}
 	!net-mail/dovecot
 	!mail-mta/courier
-	!net-mail/bincimap
 	!net-mail/courier-imap
 	!net-mail/cyrus-imapd"
 
@@ -75,13 +74,15 @@ src_unpack() {
 		# Apply our patch to actually build the shared library for PHP5
 		epatch "${FILESDIR}"/${PN}-2004c-amd64-so-fix.patch
 	fi
+	epatch "${FILESDIR}/${PN}-ldflags.patch"
 
 	# Now we must make all the individual Makefiles use different CFLAGS,
 	# otherwise they would all use -fPIC
 	sed -i -e "s|\`cat \$C/CFLAGS\`|${CFLAGS}|g" src/dmail/Makefile \
 		src/imapd/Makefile src/ipopd/Makefile src/mailutil/Makefile \
 		src/mlock/Makefile src/mtest/Makefile src/tmail/Makefile \
-		|| die "sed failed patching Makefile CFLAGS."
+		|| die "sed failed patching Makefile FLAGS."
+
 	# Now there is only c-client left, which should be built with -fPIC
 	append-flags -fPIC
 
@@ -173,11 +174,12 @@ src_install() {
 	doins c-client/linkage.{c,h}
 	doins c-client/{osdep,env_unix,env,fs,ftl,nl,tcp}.h
 	dolib.a c-client/c-client.a
-	dosym /usr/$(get_libdir)/c-client.a /usr/$(get_libdir)/libc-client.a
+	cd "${D}"/usr/$(get_libdir)
+	dosym c-client.a libc-client.a
+	cd "${S}"
 
 	doman src/ipopd/ipopd.8 src/imapd/imapd.8
 	doman src/dmail/dmail.1 src/tmail/tmail.1
-
 	dodoc README docs/*.txt docs/CONFIG docs/RELNOTES
 
 	docinto rfc