fix underlinking (bug 350994)

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

6 files changed, 32 insertions, 61 deletions

diff --git a/net-mail/fdm/ChangeLog b/net-mail/fdm/ChangeLog
index ed3080311a00..1fb233467cdf 100644
--- a/net-mail/fdm/ChangeLog
+++ b/net-mail/fdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/fdm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/ChangeLog,v 1.6 2013/03/13 09:56:36 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/ChangeLog,v 1.7 2013/06/26 14:37:35 xmw Exp $
+
+  26 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/fdm-1.6-r1-underlinking.patch, -fdm-1.5-r1.ebuild, fdm-1.6-r1.ebuild,
+  fdm-1.7.ebuild:
+  fix underlinking (bug 350994)
 
 *fdm-1.7 (13 Mar 2013)
 
@@ -39,4 +44,3 @@
   Initial import, fixes bug #163496, thanks to Manuel Wächter, Paul
   Bredbury, Maximilian Gaß, Henri Kemppainen and Dennis Schridde for the
   original ebuilds.
-
diff --git a/net-mail/fdm/Manifest b/net-mail/fdm/Manifest
index fb8597a29523..2e4f3deee3c3 100644
--- a/net-mail/fdm/Manifest
+++ b/net-mail/fdm/Manifest
@@ -3,18 +3,17 @@ Hash: SHA256
 
 AUX fdm-1.5-r1-GNUmakefile.patch 969 SHA256 4ca7b42d38e9ea327f710e8a374a9af05e8e2447af7a38099a5da9bf52deb2a4 SHA512 aea157857621f8a5b3bdbe41c47da4a9ad0c72c0f7d32250b017f7e4fe21529c9807b6ff77a88b8e2483a2c130f987314634d2c48a65ad34ca62bb1400b63e6c WHIRLPOOL 5e099604743f97ae2c574e7fff57130d6b1c4c0c4d9f216f121689e820b910627996d2a7903d07a44b36e46137fd042439e7a7b20ab1db1a5084e25ce28c1b80
 AUX fdm-1.6-r1-GNUmakefile.patch 1514 SHA256 b6f7406bbd65beb891cf9b16b06f4b7df64c430f9cb6750516811e6a05584319 SHA512 89a3437d5687ba345dc74809be0d5ec22754baaef525b168cb769c7f0ad27c1d337353ebbc285371788847ec79ac938c503d0e25e32df2217b6db1af5cca3f9f WHIRLPOOL ed2b35fce9b432c54d971a7c121c8e97b676aed6bb6d48ec4c6dc4e2af01577ce319bd94b79206d8d7529f1ad21e825cd3e12d558a6e7744591c53fbe5fb3288
-DIST fdm-1.5.tar.gz 187289 SHA256 d823e30a5a6bb65b13240b1c30096505d2eae0e8a606c6071e3280de74aa394d
+AUX fdm-1.6-r1-underlinking.patch 204 SHA256 71b5d8e78d2b5e313275e2003d0163cf714efb00db1590432440eed738cb610b SHA512 48e258e2edf693cd16ab9987418d6b078de115c257e8e7385d6ad75e50be8235a5103671acd2c67ed70180a04f2b2dbe0aa30132531c65cc7ab6dc92705aa131 WHIRLPOOL 39d3bc2f3229db1dd90eb298bb7321f2a8369c2d6e2443b62db2a06dbd987c9321e39d56373fd7516a6c4f6660073cdf4ec4b4a0bc1671cb25d6f51c5a5203e2
 DIST fdm-1.6.tar.gz 192159 SHA256 7269a40a27378f49c0d3cc92b4229d1e066bba486ef9ff85caa2ec4cbcea3706 SHA512 8ea1304f1233c63785ed64715701443a6378de338860e690858644fb00270f9ed475cb1f64c79b5949fd73b7cd4f62de31a9f8f659ba3ece9839222e0bd51d61 WHIRLPOOL 46cdfa26f150d6d938d630530485b6b5ecb8c488fd4b2cba7814cc364d6b66ea34def7bf1147517a665e2733ad917c63465fa960c9c588c337d9f1303c62d02c
 DIST fdm-1.7.tar.gz 199808 SHA256 484474094f124ce438c89dfab05519fe7b3aa8c8346d00f790a512ab950cef2a SHA512 d438c96b1d3bdf08d14cfbb3b78ab5180e6bbc32121b7dfdd47ac14a4f8a19d1309f7742f78cc9db2d68b64b3422ec96f8f729931168d2fc411c36d0cc3e9386 WHIRLPOOL ad5f7b1253f660424f29237d99b9ec0f9d7c9e701e76ea1d49a0fd340527e20f429f517333a1eeee08b81f23a29488c7fc25cc0fda4d9e44b26b16222075209c
-EBUILD fdm-1.5-r1.ebuild 919 SHA256 4eebf4e3aa9c917564e57532a68118ba19a60f4ec6069b1c31ede6f3939a24f1 SHA512 80a8624d4d38757bea7f1db02d1fd307eedb8bbe2dc0f235b3b196e6f4012f5589076641bd09142ffdc72bb69c803fc239e9b430c18fa4c8eff317f3a7673e5e WHIRLPOOL ebd0a78c605792ffee19a60a166c1b0c91f0c8b3f7b543cbe18864e0f991ecce3f00d78325d9d9f5fb753c82fcb513df55687efb9531f953098979016aad8d01
-EBUILD fdm-1.6-r1.ebuild 1020 SHA256 286b8dc8b9f91528a6c80df824e6cde66cbbc4cdcc412f85829b41852c6adfae SHA512 f6c38c5556f2b2ed5c91ecb9af97decb7c075e9512d544a58a625be15f291f82c701f0dfa8a246586667c4031f47f5cb54830f37fed7dd5c51f34bb59ed20663 WHIRLPOOL d562ddf6984a6756e6123dac6c68296ed71df44ec8acdb932bc2e56f885ba17d5d7ecaa1e788a351b0d0ac94951c69783c26b9865f9285ca006b47fd2cb9f81b
-EBUILD fdm-1.7.ebuild 1085 SHA256 ff70bb6ec5b80b1b7f8dfd1f930d34b4f780bed32a6b7fb60e51fc08355ad974 SHA512 8b145461f8b6468f558a600b0108baec39b9d435c33049a186b0d5cdcaac8efe9d6885b6e4cba2d1ce79a48d2db31b52c03d659f40a3753cae30da5e88eece3d WHIRLPOOL 04cbf21a5faeda7e4812cb7593d0947351435ed517d77f4f0b36dc8d0a8d26c2a4414ef0178623d858a83234fe41942879df2693025ec671b01250fe7e4a83b2
-MISC ChangeLog 1612 SHA256 ff7d936ff7da181ebf393a161bf0e72748451c5931dd3bfda6e339a71dbadd2f SHA512 dcd138a41ee6a5cd67da6ed716d8d3de64bbf92e4f685ff02db155f6f30e1f1cdf30c8291018d431f2fd9a43449ed9e474240cb475952aa5a70e4b68ee9cfc77 WHIRLPOOL d0f50c71d399ef43f796113a817ac39e17fccefc4b1caaff60e6fd546a7db499011f369d3a94d68f3c7c4db469d4a258a671b2cb70fe47dd5cbb92a6b7356e52
+EBUILD fdm-1.6-r1.ebuild 1061 SHA256 b6de99ecec7bb04e204cde4b2bd5950f118780b1280a869ac15d0df23fb6e4a4 SHA512 033eaded3ab36ef23a27cb1516faf81ebe501536b5d638060770a8c9dd124ef2691d9e71c501198ea4696c2ad5487c7843bae5bd83cd4743d880c322647ad44a WHIRLPOOL d00ef2adae6b314cd53e7c6c8e763d146aeeb2d6d11d1c33e8f040e629f657ed86f0e3813e147ea73b2de80740d9fb863ef857e2c51722da06db096f9d0b3aae
+EBUILD fdm-1.7.ebuild 1090 SHA256 384134e7910b4e661621674ca4fdbd8276b0446382f2fcb6b37f639e79d6fb20 SHA512 bc4dba7232b6287cd5efaef0352511e7c7a96255650166329b77957bc126fb213f90a65bc0e8904ca44c83cf2e450e8cdf5de250179822de3323ef144082f8b9 WHIRLPOOL 10eaf9d6bc2bd665a37bf4c1755346f63da01d04e373ce6374cafb2fa3ed264057a33b1ba5a5d024ad90c2a8f756c942b2942d532e5b144403887c36ebec0a11
+MISC ChangeLog 1787 SHA256 729413ac8d54168d5dc6127e4921f4994d5bd9c532a971f920d9f8ad91d5a7c9 SHA512 aa76faf31f1572326b7ee41722db78c640c90f0da827061ea27bee6542078ca1cd25b47cd72853859a31f458fbc21a328662d38e55632c2dbc011c04397e27db WHIRLPOOL 0d17e968af78889527cda298ce07a2ba6cb597c41a72cbb56cdc3d211762e3ce30329eff451a10da37841750202d19877cfda6b5c53e2881616f3dce7dc12ae5
 MISC metadata.xml 318 SHA256 d4d3915bdae163f4a5e098070ba36ff5c544498968e65799528343ef31221c91 SHA512 c72cf1cc81e0f8df04c6768dc59c956d599225999503bc999e9ef1d8d8009d37cb3ac636655402deac9ee7683c4b2c796779a293d12791b938efef3266863bf1 WHIRLPOOL e7cbfc75e3ce5b52e72f2aec71a0a0356f7b26f843946f217ac3b19ec64361c92113e8299ac29889186ad323d3472d08c6b72bdcb464727fd668ff9383381cab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlFATWEACgkQknrdDGLu8JCieQD/bH0XqeMpTYkAEHAeFH2c5/fy
-y5Mmlx3TskdeMghl8UsA/0nfsCk21RscPcNI7bZEHGxHqRXMQ4w+hy3GBtOb0bpd
-=d+Eu
+iF4EAREIAAYFAlHK/KoACgkQknrdDGLu8JDsrwEAkM5X7dUx+tQtNAb0NfAL2fnv
+uiDnj5KH3pKT03nLoJAA/3f34FWv3AMxzgUz6/Zf3786OFtAEXWM5lR8NauCot76
+=VpiP
 -----END PGP SIGNATURE-----
diff --git a/net-mail/fdm/fdm-1.5-r1.ebuild b/net-mail/fdm/fdm-1.5-r1.ebuild
deleted file mode 100644
index 3ff7607ddc4f..000000000000
--- a/net-mail/fdm/fdm-1.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/fdm-1.5-r1.ebuild,v 1.1 2010/09/12 19:12:24 xmw Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="fetch, filter and deliver mail"
-HOMEPAGE="http://fdm.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples pcre"
-
-DEPEND="dev-libs/openssl
-	sys-libs/tdb
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewuser _fdm
-}
-
-src_prepare() {
-	rm Makefile || die
-	epatch "${FILESDIR}"/${PF}-GNUmakefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		PCRE=$(use pcre && echo 1) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die
-	dodoc CHANGES MANUAL README TODO || die
-	if use examples ; then
-		docinto examples
-		dodoc examples/* || die
-	fi
-}
diff --git a/net-mail/fdm/fdm-1.6-r1.ebuild b/net-mail/fdm/fdm-1.6-r1.ebuild
index cfded57a85a0..860b0238e960 100644
--- a/net-mail/fdm/fdm-1.6-r1.ebuild
+++ b/net-mail/fdm/fdm-1.6-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/fdm-1.6-r1.ebuild,v 1.3 2010/11/03 10:05:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/fdm-1.6-r1.ebuild,v 1.4 2013/06/26 14:37:35 xmw Exp $
 
 EAPI=2
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs user
 
 DESCRIPTION="fetch, filter and deliver mail"
 HOMEPAGE="http://fdm.sourceforge.net"
@@ -27,7 +27,8 @@ pkg_setup() {
 
 src_prepare() {
 	rm Makefile || die
-	epatch "${FILESDIR}"/${PF}-GNUmakefile.patch
+	epatch "${FILESDIR}"/${PF}-GNUmakefile.patch \
+		"${FILESDIR}"/${PF}-underlinking.patch
 }
 
 src_compile() {
diff --git a/net-mail/fdm/fdm-1.7.ebuild b/net-mail/fdm/fdm-1.7.ebuild
index 585df4e66185..b143f6e2135b 100644
--- a/net-mail/fdm/fdm-1.7.ebuild
+++ b/net-mail/fdm/fdm-1.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/fdm-1.7.ebuild,v 1.1 2013/03/13 09:56:36 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fdm/fdm-1.7.ebuild,v 1.2 2013/06/26 14:37:35 xmw Exp $
 
 EAPI=5
 
-inherit eutils multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs user
 
 DESCRIPTION="fetch, filter and deliver mail"
 HOMEPAGE="http://fdm.sourceforge.net"
diff --git a/net-mail/fdm/files/fdm-1.6-r1-underlinking.patch b/net-mail/fdm/files/fdm-1.6-r1-underlinking.patch
new file mode 100644
index 000000000000..1962ed445f95
--- /dev/null
+++ b/net-mail/fdm/files/fdm-1.6-r1-underlinking.patch
@@ -0,0 +1,11 @@
+--- fdm-1.6/GNUmakefile
++++ fdm-1.6/GNUmakefile
+@@ -97,7 +97,7 @@
+ LIBS+= -lpcre
+ endif
+ 
+-LIBS+= -lssl -ltdb -lz
++LIBS+= -lssl -lcrypto -ltdb -lz
+ 
+ CLEANFILES= $(PROG) y.tab.c y.tab.h $(OBJS) .depend
+