QA fixes bug 332721. Do not block bincimap bug 290353

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

4 files changed, 87 insertions, 8 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/Manifest b/net-mail/uw-imap/Manifest
index 395bfe66cec8..b7d4fc87e119 100644
--- a/net-mail/uw-imap/Manifest
+++ b/net-mail/uw-imap/Manifest
@@ -1,10 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX uw-imap-2004c-amd64-so-fix.patch 675 RMD160 f13adf21e7043175d2b2dd356b2ba48554e9e99f SHA1 fd6aad7b87d71795cb3e9bdee29b70ca72b289e9 SHA256 8f80dff390a5d87afd71ab07bbff0eed00acb14b3bfa2355f33ba22e833af202
+AUX uw-imap-ldflags.patch 1643 RMD160 4d96749b13f0eac32cf22b3c8f8ad2cca4cd06bb SHA1 a25ad9ea586c3f112d03235af99f1d22f3ba6906 SHA256 344eb67975420a661082fee770c4faf48e57ac29c7d95f3caf4f69223c979791
 AUX uw-imap.xinetd 491 RMD160 31830c6e2dad66a1436060d0a66c44bfb4082ae3 SHA1 7102bbb4f16afd6afd1f910d51a4046fb35ca65b SHA256 d3c39241c283df0cd3e10a7bd06c6fb84243199399d355bd22d098418e3ff5fe
 AUX uw-imaps.xinetd 486 RMD160 4374eab026aa9a02e82561d0ec153025aaf20868 SHA1 fd152c1f425bc1a6632c642d35d0ef7e019368f8 SHA256 c17f14aa5f356becb4ba309b68935fefdb08e664ae8e4a69ebc11e388ac5cfd0
 AUX uw-ipop2.xinetd 563 RMD160 bc9ff033aa6f4166d75b38691a9b32203353b4ab SHA1 a7dbaac5bc598918b5ea1f32e1cce6f9ab120208 SHA256 c84a41db19eb8f903f9a1ff3088e1ae193d16f217a96f8bf402f95d8bc47bc8f
 AUX uw-ipop3.xinetd 472 RMD160 e4ad32c91284ffca80876e48d7d2fa649e4ae6f8 SHA1 a8de537d059bd8fe0e6aea693b7969b41ec1f7d4 SHA256 ddcfa0d79ea53edc4905a2eb10fb04bb23951bf02fd4c5cefa03e6303d5a1512
 AUX uw-ipop3s.xinetd 469 RMD160 28b09d47e577643c08f959ed09b7b63371c4e029 SHA1 95531d852a58d41c465a358fe5a4c390344b2eab SHA256 fa2c408770b27f29ea25297540f2bc0789f2e5bd98f72f48a9f1659df3d39264
 DIST imap-2007e.tar.Z 2789469 RMD160 7d6af203419975f763d7ec17b6a4544c94490b50 SHA1 24c63cad8d0e74aa76e4341fcfa54d24f23a8c70 SHA256 be648d0e1aa62d564d9dbe04b77ea948116ee96ed687cb5d169c99ae28286e59
-EBUILD uw-imap-2007e.ebuild 5358 RMD160 b6e3bcb7969f44ffe41857d36ef3d191780b54d8 SHA1 2cf1941f7ffaab2de85ce090642a6019f9c7decd SHA256 763ba52b6fe5a40cce80188e2564501d258260991181fc0bde9a5b524f29a051
-MISC ChangeLog 16064 RMD160 8ee8eeb16a042e934006bfae4376804efccd16e0 SHA1 c969338cadd338db21b6bcda9954761efc2eaf28 SHA256 da206277e71c633585e87ccff4ecc26830a09ee03b72dca728c0bc75f871d540
+EBUILD uw-imap-2007e.ebuild 5381 RMD160 188d0fe0f03cbe315932df9d391176eed4270f2f SHA1 dd5cdbd51770a1dcbef0ec3c9582b6b6bbb55a11 SHA256 f6cbf9111146128a87a6f28a51b2a916752e2b58d671e1e5b5beba6b5dc3680a
+MISC ChangeLog 16219 RMD160 e314f78327ccae452056351b541c7ae407f0092b SHA1 0f13efef7739927d88c0c4c0c97dcbca805669d4 SHA256 c7909074da7820d12e5c956ae3b1eb1b05af54a4c42b67c07edf57bfca5116df
 MISC metadata.xml 265 RMD160 c4e39d87b3e0c333fd24c3aecb66388a923a5c78 SHA1 13fb694a164531d4eac78502764e02a6693c02de SHA256 9c6aaa9b6ac6a0a8e15afb528a944668f2f7ef133021ebdda62dcce87b270e79
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNxSsSAAoJEHfx8XVYajsfm4YP/AuYpEV8/24h5QKwORO38JDa
+12bMppFPtzQF6uR9AQJTdlmJCDQ7KM/o9M7DPXzu7Qv5fyV4VO3cQMsn5v/b5UO+
+PWREJ7TLF7vFfF0xEjoCX05mJ0XPkehz1cCmHyhJfTkZ8aWNKcyz5fx+0ExnHyLW
+pyTwSKn/ia7SC1bblnq49JhcWoo3iTlHe3QFx6YAEMopVoiPW85Wpm2GDc8axn+h
+Av3CHDiV2SetoiVN0olyBlkm4kaLzdd61gG1FkNgoBDX73EqPf786e/Yz1OoGhgq
+9bPbRFdhrl63/O6S4PPNIOSmjx7JIi/eTf38kHZY8q+I4LemRPBQEk0MkzJmkzN+
+bsy+cEV2RQkhXGNVnQzVm7NBTxe8exgC8cJY9xR4FVUUfNpHwf/tkejSD8OvgOUy
+HpVDRM+8OSVIkRFT8dweVcTUaN02YRLz/3CusAa+SpYUppqGRYzrkuN9ClXy5fQV
+X978+H0XCAmFf+N+6I092cQUK3EfASXjaytN1onIv+P1t3uNcX4LX6Xd9ffTEBvG
+eSJRrH2RZ0NAAQM2BxOI+GJ4pcHMhlyM3hnBCZ4w0ieijNBvN07ayFrrJk97bUg5
+7AVOky2xvH9zhULKaI/8icJh8khD0O76W8ye4KyatD037mcZheRXyhQXBlICjOM8
+53n/dgHq8ONLom2oDV7c
+=mCnC
+-----END PGP SIGNATURE-----
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