Respect LDFLAGS (bug #335970), CC.

(Portage version: 2.2_rc83/cvs/Linux i686)

2 files changed, 72 insertions, 1 deletions

diff --git a/net-misc/zebedee/ChangeLog b/net-misc/zebedee/ChangeLog
index 755a9047e901..f89864502bc8 100644
--- a/net-misc/zebedee/ChangeLog
+++ b/net-misc/zebedee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/zebedee
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/ChangeLog,v 1.22 2010/01/21 22:58:03 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/ChangeLog,v 1.23 2010/09/18 04:49:43 jer Exp $
+
+*zebedee-2.5.3-r1 (18 Sep 2010)
+
+  18 Sep 2010; Jeroen Roovers <jer@gentoo.org> +zebedee-2.5.3-r1.ebuild:
+  Respect LDFLAGS (bug #335970), CC.
 
   21 Jan 2010; Dawid Węgliński <cla@gentoo.org> zebedee-2.5.3.ebuild:
   Fix Makefile to respect user CFLAGS
diff --git a/net-misc/zebedee/zebedee-2.5.3-r1.ebuild b/net-misc/zebedee/zebedee-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..691aa26bc7fa
--- /dev/null
+++ b/net-misc/zebedee/zebedee-2.5.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.5.3-r1.ebuild,v 1.1 2010/09/18 04:49:43 jer Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A simple, free, secure TCP and UDP tunnel program"
+HOMEPAGE="http://www.winton.org.uk/zebedee/"
+SRC_URI="mirror://sourceforge/zebedee/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	dev-libs/openssl
+	sys-libs/zlib
+	app-arch/bzip2"
+
+src_prepare() {
+	sed -i Makefile \
+		-e '/^CFLAGS/s:=:+=:' \
+		-e 's| -o zebedee| $(LDFLAGS)&|' \
+		|| die "sed Makefile"
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		BFINC=-I/usr/include/openssl \
+		BFLIB=-lcrypto \
+		ZINC=-I/usr/include \
+		ZLIB=-lz \
+		BZINC=-I/usr/include \
+		BZLIB=-lbz2 \
+		OS=linux || die
+}
+
+src_install() {
+	emake \
+		ROOTDIR="${D}"/usr \
+		MANDIR="${D}"/usr/share/man/man1 \
+		ZBDDIR="${D}"/etc/zebedee \
+		OS=linux \
+		install || die
+
+	rm -f "${D}"/etc/zebedee/*.{txt,html}
+
+	dodoc *.txt
+	dohtml *.html
+
+	doinitd "${FILESDIR}"/zebedee
+}
+
+pkg_postinst() {
+	echo
+	einfo "Before you use the Zebedee rc script (/etc/init.d/zebedee), it is"
+	einfo "recommended that you edit the server config file: "
+	einfo "(/etc/zebedee/server.zbd)."
+	einfo "the \"detached\" directive should remain set to false;"
+	einfo "the rc script takes care of backgrounding automatically."
+	echo
+}