fix underlinking (bug 350994)

(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 24 insertions, 52 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/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
+