Make build system multilib aware

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

3 files changed, 194 insertions, 26 deletions

diff --git a/net-mail/uw-imap/ChangeLog b/net-mail/uw-imap/ChangeLog
index 90d0b57704be..265eee3db9f4 100644
--- a/net-mail/uw-imap/ChangeLog
+++ b/net-mail/uw-imap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/uw-imap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.135 2012/03/09 14:10:36 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/ChangeLog,v 1.136 2012/07/11 19:17:27 eras Exp $
+
+*uw-imap-2007f-r1 (11 Jul 2012)
+
+  11 Jul 2012; Eray Aslan <eras@gentoo.org> +uw-imap-2007f-r1.ebuild:
+  Make build system multilib aware
 
   09 Mar 2012; Eray Aslan <eras@gentoo.org> -uw-imap-2007e-r1.ebuild,
   -uw-imap-2007e-r2.ebuild:
diff --git a/net-mail/uw-imap/Manifest b/net-mail/uw-imap/Manifest
index d92df8cd280c..d33f5ca92df4 100644
--- a/net-mail/uw-imap/Manifest
+++ b/net-mail/uw-imap/Manifest
@@ -1,31 +1,32 @@
 -----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-2007f.tar.Z 2793529 RMD160 14f40284e9e164c0ed7677f1e5d8e3309c7c58c1 SHA1 1c9935e5a261baec85dadcbc0c514b66fa3ce0a5 SHA256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c
-EBUILD uw-imap-2007f.ebuild 4520 RMD160 614f2d5ea9d44b47c89ac2286871b1962f511b79 SHA1 116d618152cb31c771e64487b2be6ae87fa75abe SHA256 55cb982cde9eac93b9cf22c63cca608e3644a5626ccc54cf9e929ab4d3c8bb68
-MISC ChangeLog 18343 RMD160 da6c4131db5834f66e0f904675533b9a571ffca1 SHA1 2ff0927e75666f9a8c4f1d0310138042ed864b11 SHA256 1f5349db1002637f5884fb46ec04295d2f2473d3d9a6778496ef7911fb017bd8
-MISC metadata.xml 265 RMD160 c4e39d87b3e0c333fd24c3aecb66388a923a5c78 SHA1 13fb694a164531d4eac78502764e02a6693c02de SHA256 9c6aaa9b6ac6a0a8e15afb528a944668f2f7ef133021ebdda62dcce87b270e79
+AUX uw-imap-2004c-amd64-so-fix.patch 675 SHA256 8f80dff390a5d87afd71ab07bbff0eed00acb14b3bfa2355f33ba22e833af202 SHA512 7275a7597e346e99e7d4f94423cdc4cfb947a5a93e6e29de8f15ede933dcdcb9a2e951f05e486d93a147bc5def842a089a94e2a9c63b4e841c92c39e7560b37b WHIRLPOOL 4a45bbe60939a8381449be38f4bf641c893522a5cdb24ea11ab87e5d448db4763b0c223f803eea90e083f8d13cf8b25678009bef8cc7b87037c7e223837cd0df
+AUX uw-imap-ldflags.patch 1643 SHA256 344eb67975420a661082fee770c4faf48e57ac29c7d95f3caf4f69223c979791 SHA512 ae3739fe3574a5decf15ce35f51818c8707aa883688ac584ebaa9ba7073c8f0ff606e9a948ecb71a95b98ffb8b644be133f01b3aaeb1a1aefa67085741f2b405 WHIRLPOOL 9690a6c27c797e1b0f29c263a77313b1c013b9574103e11c94f80a67584ab4962a5af913817805242d427ce42d2fb3c1edb8cf8da0669da7e38bdfefeb732dc7
+AUX uw-imap.xinetd 491 SHA256 d3c39241c283df0cd3e10a7bd06c6fb84243199399d355bd22d098418e3ff5fe SHA512 1277d2c583649b6bc481601387f1f19655c720621f26603d64972a45ca0cb14f1ab0499dd23b2e330b889f33ced670edc102f34979deab18b11b17861de81b8a WHIRLPOOL a9e3655ed4654e1c6f5dec2f6416db0d39566a2c9bf54348b6d42aef2b8b84b7dfe74d3596b553b2b5b1eb4f9f1327bf6a99e11d6ab79ee329a24e1b94a1e5fd
+AUX uw-imaps.xinetd 486 SHA256 c17f14aa5f356becb4ba309b68935fefdb08e664ae8e4a69ebc11e388ac5cfd0 SHA512 4ab58f8032ba9f7366af637ab7de7f6e2de6c51b8347fa1d6f0ab0ebc233ba74789dd0ccae98afe6a2f6fb77c59e5965dbe58a49a35445cb76313150ef6f173e WHIRLPOOL 742538114f713e1dd9c0446286c0c2104da32ea588afc97b2ecdf0042231f53d2eea4c4ccdee5836e39a1629448e0f4b745e8aad68622fd11ed2ca2c0f8ecf5d
+AUX uw-ipop2.xinetd 563 SHA256 c84a41db19eb8f903f9a1ff3088e1ae193d16f217a96f8bf402f95d8bc47bc8f SHA512 c7af13c36310698991427c7f83706d09b3d0a4c270de32496f8fa00440d2284a12aefa8cbe453f4135419ee3ae2582ea77bdc099dc494c07a781bc7220a74637 WHIRLPOOL 6df081abe0596f59c2e3c03de1437a7e10a49745d3f192a70858b7b3aa05d543322a50ff8370d81be0785f7008ea523a18c4d3733ec2eb17c33b72d9a24d24ea
+AUX uw-ipop3.xinetd 472 SHA256 ddcfa0d79ea53edc4905a2eb10fb04bb23951bf02fd4c5cefa03e6303d5a1512 SHA512 786e86252d096186f40ed7c541aad2fc21c400e3f0cac488399a2419c7923a81743b30439044fadaae957e95d1f3b68fa119fb8595c84af64d20cda119ed6142 WHIRLPOOL 8f24434dba6cdd494a64612a2cb405acad5bca5fb2020ebfa19b7d2218fc868a754cb3e6f376f89cb0b3c9d07451ef81965b4e34976a4ba5dd3f2b0d1ff4b5f0
+AUX uw-ipop3s.xinetd 469 SHA256 fa2c408770b27f29ea25297540f2bc0789f2e5bd98f72f48a9f1659df3d39264 SHA512 d6c10bd96c70394bcabf1eaa0940d41041ee2ff088dc88fe639e94b55bbc1d14685ab2ed6d658e86b2c093e096e88bee445868d08d2e6e8c0b878339c6a2aac7 WHIRLPOOL fb8fece5f81458bb2139bd16e153fcd798926d80ed82cd801479a7d4833b4ad5d90cd35e28c71bdc57456326ca2495004bb68fb231e6fbcba7d6dc480d2b0cb3
+DIST imap-2007f.tar.Z 2793529 SHA256 870e95f6bd19265832a88fd89b77c54c841c59022fd21e69254050c8b1005e3c SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae WHIRLPOOL 655536d61a178940363241ad8c94a28be75e90abf3b8c585eb61364a6394ff49bb5fd5dc6de4bec5f992f03b592e583df04f0103e8f3c167aa68a476c574c4ec
+EBUILD uw-imap-2007f-r1.ebuild 4793 SHA256 687b872ea88aa4402680e19e5faa7695c9be87fc10d275827787d8d8f9453811 SHA512 c2f1ef38520086526f680b9d7583717af61b2a77c82ad703aa6b38d8ef0e79881f5fe79e37de2a4885b734ed701c927b901347d5ae8857992ad3c68e20e016fb WHIRLPOOL ac29bfaf1818caf676815adc2067700383f4ec9ec2b346927e44546831db996a59b6848264f00bfd2db67e9dba5db9ead4580f1bb992bc20b39f5197f6ffb66d
+EBUILD uw-imap-2007f.ebuild 4520 SHA256 55cb982cde9eac93b9cf22c63cca608e3644a5626ccc54cf9e929ab4d3c8bb68 SHA512 4b8d0a73a90e49530670dddf2d2cb946e4dc7bbd092f1837c6ba22a1c3e76bd73d5845354815746accde5316bc8c39f07be4bb286dd4bb251677521359264719 WHIRLPOOL aa7a8a121a8280ecabc8c1a26ea0150c7b3b196868d24f1cb92e6d33f766bf0309fe4ca40803335254d3e4bb52fddc1a048173da19dc1cbe09fafd5da798d7b3
+MISC ChangeLog 18482 SHA256 169456a06a2507c36b8278cde1b6e8e2ed3114c0b9614bcace622c796888ab5b SHA512 55c5a0c9b6e151e56f0f8edc99b8e8855a547a35eeb50e5d88087d44341a4612e9cfe9b463b9c27e4686fa97a8404eca8a50ed6e28ad55b1fef7a79718d9f137 WHIRLPOOL 4e78f538bdee224d99f7f00738c9bddd471e477d25b7e6e06d7fe15174dbbb37f08c0da4a0f750f1fe09d50bc15be6a41b7cf158546369ea7adb3c4fa291f048
+MISC metadata.xml 265 SHA256 9c6aaa9b6ac6a0a8e15afb528a944668f2f7ef133021ebdda62dcce87b270e79 SHA512 26ad4703afca13bbe3af943fb21f92f2b3cfc3e7a9bd839e2fa04192e23e4bd1104b37a41a39042e15a5f300799bf21856cd59e3b97fdb8f915b4338f4796d81 WHIRLPOOL 4bc5a5a0fd40d08d3fe76c2bc8a0957711d92fa22f197ca16c4f3f91394d0eace8f576c3717219edebf8cacddf5d7a99f18d991d15f5827e217758b841a2d649
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPWg9hAAoJEHfx8XVYajsfc14P/RtTklGIqC+QqqoJMpva3Gy9
-1FiiFXbu87jhDGb9yLXqxhoGKdX66FVAQQitcvaUuYLv8pNDMmyiNC3A4UlCHMTY
-YmORO3TEss9wfSLWl45HSkGZI+4kVFeVzXXQZ8iIE7HMSiTTt0mT4YXWNtk20jYP
-kjQsBKJ14NGkEaUW7FZQOW5P52R/OAB0jMNOR4lJF7mTut9POIv98y7KwxgRHpyC
-MWsLSCtMQOyYIMKys+jwGp6oT06t9hlIatM7ujT/eNjkF8LGJ/khF7k8LcLxrMKU
-Ed6mwg7DJJ6v9X7Y5PUvwD89lCdhG2r83MEkH87+Kk7OfOHmMGYHl1Nj90LYjs4B
-ZFzHRwzyZz7P0nlYnGBnmH3HsVaU7atAQqArzsDQOjXp1qeB2ndbt3b4tjAYcc0o
-vnBehTwPvRzU7fUt4enibNcWWdOq7dqzLP3WKAC9MgYJ83+FSThwRzl00iSmubPD
-uPCfmlYKTnwnUTujNeFczr9jTeMLEuJBf/0Loe06rj+uwLJWDBchr4JjPr1V+b6W
-7NKrH7PiLf6a3rapbxzxXyRhvoO7EN8wI3xlVvPIJT4DREhKnq+X9MEeInBHiJL1
-qo4UOJ5stD3FhYOX4e5JdG/turK+EF4/cN+/+1NMnZJGqDUegZByXvKojypC8aa6
-mMoX9hW2CgfW6Vh9Ureh
-=orU/
+iQIcBAEBCAAGBQJP/dFNAAoJEHfx8XVYajsfCJsQAJUlenlXN/cJ/Ri1eMCYTJjW
+y/+A73bljoTclo/6e0/O92fUVVzizkt8BIgFaWHtQqGLQe/bzVDb3kydwYRNY10x
+O91N1pcULHJ1G+KOaqLgQ7dVW5PGHzeO8j927oYJmwtypn7LSL5YZTQzCovD4kfR
+ksO2qiSjPHmvaUM2IpA19l+HJ5hDRM3QUrdaGdakSUj27zxZbiJRb9o/qhtlFSni
+vipn8Jp/4HMqnnLsXgFswoR5IeLFnlf75hb6p2kAqH1ckucvIm2aDj41cgUHCHyp
+vae/EBmYSbHMwbHBykyy4qfknKT04x2CxXtURYcFA97wIaAdTGqvR2oc3kR2sVfW
+0yCwBKvkdgTLxHqLtIxP7MsnYl9M63NxD6fBXU1RR960e31WQw00HuhlnMF2xfhc
+6FEQ/K1HVXErh/lygjtWydCgKL4bwa35t1SDSqWjW97R1xOAFNY4GYyyWC+S0dGQ
+li6szRWaBYGmtEPn5pborGXSlVkEOh+pEsoLTTNGJGxJzIIKTXRIihBrrA/SQxfl
+kyDMRDazetixUMZzh2FD0zSwTRLCpR2rLsX4UKsdrXrxt8xn8xQT/Mryv52GtanF
+zeX9kIrPEZnvTaoRzYzXb6SMCiZUz2fDSSraD/GdjCDjh6xkMwuEDMCZilb6VH1G
+x10BcLBFhRIGbdG6lSnF
+=1J2j
 -----END PGP SIGNATURE-----
diff --git a/net-mail/uw-imap/uw-imap-2007f-r1.ebuild b/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
new file mode 100644
index 000000000000..ac093f32b3d5
--- /dev/null
+++ b/net-mail/uw-imap/uw-imap-2007f-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2007f-r1.ebuild,v 1.1 2012/07/11 19:17:27 eras Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic ssl-cert multilib
+
+MY_P="imap-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
+HOMEPAGE="http://www.washington.edu/imap/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 +ssl kerberos clearpasswd"
+
+DEPEND="!net-libs/c-client
+	>=sys-libs/pam-0.72
+	>=net-mail/mailbase-0.00-r8[pam]
+	ssl? ( dev-libs/openssl )
+	kerberos? ( app-crypt/mit-krb5 )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/uw-mailutils-${PV}
+	sys-apps/xinetd"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/dovecot
+	!mail-mta/courier
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd"
+
+REQUIRED_USE="!clearpasswd? ( ssl )"
+
+src_unpack() {
+	unpack ${A}
+	# Tarball packed with bad file perms
+	chmod -R ug+w "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2004c-amd64-so-fix.patch
+	epatch "${FILESDIR}/${PN}-ldflags.patch"
+
+	# no interactive build
+	sed -i -e "/read x; case/s/^/#/" Makefile || die
+	sed -i -e "/make noip6/s/.*/\t@echo/" Makefile || die
+
+	# 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 FLAGS."
+
+	# Now there is only c-client left, which should be built with -fPIC
+	append-flags -fPIC
+
+	sed -i \
+		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
+		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
+		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+		src/osdep/unix/Makefile || die
+
+	sed -i \
+		-e "s/CC=cc/CC=$(tc-getCC)/" \
+		-e "s/ARRC=ar/ARRC=$(tc-getAR)/" \
+		-e "s/RANLIB=ranlib/RANLIB=$(tc-getRANLIB)/" \
+		src/osdep/unix/Makefile || die
+
+	sed -i -e "s,GSSDIR=/usr/local,GSSDIR=/usr,g" \
+		src/osdep/unix/Makefile.gss || die
+
+	# Make the build system more multilib aware
+	sed \
+		-e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \
+		-e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \
+		-i src/osdep/unix/Makefile || die "Makefile sed fixing failed"
+}
+
+src_compile() {
+	local mymake ipver ssltype target
+	ipver="IP=4"
+	target=lnp
+	use ipv6 && ipver="IP=6"
+	use kerberos && mymake="EXTRAAUTHENTICATORS=gss"
+	use kernel_FreeBSD && target=bsf
+	if use ssl ; then
+		if use clearpasswd ; then
+			ssltype=unix
+		else
+			ssltype=unix.nopwd
+		fi
+	else
+		ssltype=none
+	fi
+
+	emake -j1 SSLTYPE=${ssltype} ${target} ${mymake} ${ipver} EXTRACFLAGS="${CFLAGS}" EXTRALDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dosbin imapd/imapd ipopd/ipop?d dmail/dmail tmail/tmail
+	dobin mlock/mlock
+
+	dolib.so c-client/libc-client.so.1.0.0
+	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so
+	dosym libc-client.so.1.0.0 /usr/$(get_libdir)/libc-client.so.1
+
+	insinto /usr/include/imap
+	doins src/c-client/{c-client,flstring,mail,imap4r1,rfc822,misc,smtp,nntp,utf8,utf8aux}.h
+	doins src/c-client/{env,fs,ftl,nl,tcp}.h
+	doins src/osdep/unix/env_unix.h
+	doins c-client/linkage.{c,h}
+
+	dolib.a c-client/c-client.a
+	dosym c-client.a /usr/$(get_libdir)/libc-client.a
+
+	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
+	dodoc docs/rfc/*.txt
+
+	# install headers - bug #375393
+	cp c-client/*.h "${D}"/usr/include/imap/ || die
+	cp c-client/linkage.c "${D}"/usr/include/imap/ || die
+	#exclude these dupes (can't do it before now due to symlink hell)
+	rm "${D}"/usr/include/imap/os_*.h
+
+	# gentoo config stuff
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/uw-imap.xinetd  imap
+	newins "${FILESDIR}"/uw-ipop2.xinetd ipop2
+	newins "${FILESDIR}"/uw-ipop3.xinetd ipop3
+	newins "${FILESDIR}"/uw-ipop3s.xinetd ipop3s
+	newins "${FILESDIR}"/uw-imaps.xinetd imaps
+}
+
+pkg_postinst() {
+	if use ssl; then
+	# Let's not make a new certificate if we already have one
+		if ! [[ -e "${ROOT}"/etc/ssl/certs/imapd.pem && \
+			-e "${ROOT}"/etc/ssl/certs/imapd.key ]]; then
+			einfo "Creating SSL certificate for IMAP"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-IMAP Server}"
+			install_cert /etc/ssl/certs/imapd
+		fi
+		if ! [[ -e "${ROOT}"/etc/ssl/certs/ipop3d.pem && \
+			-e "${ROOT}"/etc/ssl/certs/ipop3d.key ]]; then
+			einfo "Creating SSL certificate for POP3"
+			SSL_ORGANIZATION="${SSL_ORGANIZATION:-UW-POP3 Server}"
+			install_cert /etc/ssl/certs/ipop3d
+		fi
+	fi
+}