bug 105115

(Portage version: 2.0.51.22-r2)

7 files changed, 75 insertions, 6 deletions

diff --git a/net-misc/zebedee/ChangeLog b/net-misc/zebedee/ChangeLog
index 161aeb26fb3a..c774a10d7748 100644
--- a/net-misc/zebedee/ChangeLog
+++ b/net-misc/zebedee/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/zebedee
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/ChangeLog,v 1.10 2005/04/01 16:26:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/ChangeLog,v 1.11 2005/09/07 16:05:59 vanquirius Exp $
+
+*zebedee-2.5.3 (07 Sep 2005)
+*zebedee-2.4.1-r1 (07 Sep 2005)
+
+  07 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -zebedee-2.4.1.ebuild,
+  +zebedee-2.4.1-r1.ebuild, +zebedee-2.5.3.ebuild:
+  Version bump for bug 105115. Thanks to Bill Kenworthy <billk@iinet.net.au>.
 
   01 Apr 2005; Aron Griffis <agriffis@gentoo.org> zebedee-2.5.2.ebuild:
   stable on ia64
diff --git a/net-misc/zebedee/Manifest b/net-misc/zebedee/Manifest
index 95f2aaf61c6b..3c94d91aee46 100644
--- a/net-misc/zebedee/Manifest
+++ b/net-misc/zebedee/Manifest
@@ -1,6 +1,8 @@
 MD5 f06ef27114b90127f2708b225262c119 zebedee-2.5.2.ebuild 1326
-MD5 7e641e123254d8a3306552712a0bf730 zebedee-2.4.1.ebuild 1325
+MD5 4d8f3bb0dc21feaf2f6f1b37afb92e8f zebedee-2.4.1-r1.ebuild 1365
+MD5 af4be196075ddf2b4d320d041002ea0c zebedee-2.5.3.ebuild 1329
 MD5 44e909c8839af86207c4e1997e49433f ChangeLog 1378
 MD5 b9dcf8ebb9db0fb78b1f74cff39bca5a files/zebedee 796
-MD5 9d974b4c676caa1018cfc9d290e58a89 files/digest-zebedee-2.4.1 65
 MD5 8cf68657b127300b9493ffdb0edfe288 files/digest-zebedee-2.5.2 65
+MD5 68d88d75a98379c598ce0236cc84c830 files/digest-zebedee-2.5.3 65
+MD5 c5e389680be29fd73513e0f43f57e953 files/digest-zebedee-2.4.1-r1 66
diff --git a/net-misc/zebedee/files/digest-zebedee-2.4.1 b/net-misc/zebedee/files/digest-zebedee-2.4.1
deleted file mode 100644
index e2de707138ca..000000000000
--- a/net-misc/zebedee/files/digest-zebedee-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d17a556b966b7b8b1a199b2078e32780 zebedee-2.4.1.tar.gz 165130
diff --git a/net-misc/zebedee/files/digest-zebedee-2.4.1-r1 b/net-misc/zebedee/files/digest-zebedee-2.4.1-r1
new file mode 100644
index 000000000000..ab6531278f43
--- /dev/null
+++ b/net-misc/zebedee/files/digest-zebedee-2.4.1-r1
@@ -0,0 +1 @@
+MD5 2333f76aa2852a10636ac303bef9205b zebedee-2.4.1A.tar.gz 165200
diff --git a/net-misc/zebedee/files/digest-zebedee-2.5.3 b/net-misc/zebedee/files/digest-zebedee-2.5.3
new file mode 100644
index 000000000000..b54667b12a03
--- /dev/null
+++ b/net-misc/zebedee/files/digest-zebedee-2.5.3
@@ -0,0 +1 @@
+MD5 8a25832efb563578e66a7aa4195bc8f3 zebedee-2.5.3.tar.gz 176088
diff --git a/net-misc/zebedee/zebedee-2.4.1.ebuild b/net-misc/zebedee/zebedee-2.4.1-r1.ebuild
index f1a2e27bdf41..094e097c6770 100644
--- a/net-misc/zebedee/zebedee-2.4.1.ebuild
+++ b/net-misc/zebedee/zebedee-2.4.1-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.4.1.ebuild,v 1.8 2005/04/01 16:26:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.4.1-r1.ebuild,v 1.1 2005/09/07 16:05:59 vanquirius Exp $
 
+MY_P="${P}A"
 DESCRIPTION="A simple, free, secure TCP and UDP tunnel program"
 HOMEPAGE="http://www.winton.org.uk/zebedee/"
-SRC_URI="http://www.winton.org.uk/zebedee/${P}.tar.gz"
+SRC_URI="http://www.winton.org.uk/zebedee/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -16,6 +17,8 @@ DEPEND="dev-lang/perl
 	sys-libs/zlib
 	app-arch/bzip2"
 
+S="${WORKDIR}/${MY_P}"
+
 src_compile() {
 	emake \
 		BFINC=-I/usr/include/openssl \
diff --git a/net-misc/zebedee/zebedee-2.5.3.ebuild b/net-misc/zebedee/zebedee-2.5.3.ebuild
new file mode 100644
index 000000000000..34447aba7baf
--- /dev/null
+++ b/net-misc/zebedee/zebedee-2.5.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/09/07 16:05:59 vanquirius Exp $
+
+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="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~ia64 ~amd64 ~ppc64 ~s390"
+IUSE=""
+
+
+DEPEND="dev-lang/perl
+	dev-libs/openssl
+	sys-libs/zlib
+	app-arch/bzip2"
+
+src_compile() {
+	emake \
+		BFINC=-I/usr/include/openssl \
+		BFLIB=-lcrypto \
+		ZINC=-I/usr/include \
+		ZLIB=-lz \
+		BZINC=-I/usr/include \
+		BZLIB=-lbz2 \
+		OS=linux || die
+}
+
+src_install() {
+	make \
+		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
+
+	exeinto /etc/init.d
+	doexe ${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
+}