no need for the patch, this can be done from the ebuild.

5 files changed, 45 insertions, 129 deletions

diff --git a/net-misc/zebedee/ChangeLog b/net-misc/zebedee/ChangeLog
index a8a4b25ea2f1..c30f593d7680 100644
--- a/net-misc/zebedee/ChangeLog
+++ b/net-misc/zebedee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/zebedee
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/ChangeLog,v 1.4 2004/02/20 22:53:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/ChangeLog,v 1.5 2004/02/20 23:00:17 seemant Exp $
+
+  20 Feb 2004; Seemant Kulleen <seemant@gentoo.org> zebedee-2.4.1.ebuild,
+  zebedee-2.5.2.ebuild, files/zebedee-2.4.1-Makefile.patch:
+  no need for the patch, this can be done from the ebuild.
 
   20 Feb 2004; Seemant Kulleen <seemant@gentoo.org> zebedee-2.5.2.ebuild:
   change some things, like the installation of keys and examples to /etc/zebedee
diff --git a/net-misc/zebedee/Manifest b/net-misc/zebedee/Manifest
index 7ebce28d7dd4..24cd13947dfe 100644
--- a/net-misc/zebedee/Manifest
+++ b/net-misc/zebedee/Manifest
@@ -1,7 +1,6 @@
-MD5 a01498d3b70add91d23acc997108c529 zebedee-2.5.2.ebuild 1909
-MD5 d8c7c0b962c7e67154b6b8db45f28ea8 zebedee-2.4.1.ebuild 1668
-MD5 687aee7894178f72a557948c629686d9 ChangeLog 806
+MD5 2c368c63cf4a5f2cea310a846d5a9048 zebedee-2.5.2.ebuild 1341
+MD5 08f335a5cb36f623ef9627a4d034cc42 zebedee-2.4.1.ebuild 1343
+MD5 2aa4b9ed6e8043469c661ca4ed96a35f ChangeLog 1000
 MD5 5f7f122f5852fc0e0d3adb2fdebc053c files/zebedee 699
 MD5 9d974b4c676caa1018cfc9d290e58a89 files/digest-zebedee-2.4.1 65
 MD5 8cf68657b127300b9493ffdb0edfe288 files/digest-zebedee-2.5.2 65
-MD5 c7b42f375b3b3c32ace1eeaa1958c930 files/zebedee-2.4.1-Makefile.patch 1572
diff --git a/net-misc/zebedee/files/zebedee-2.4.1-Makefile.patch b/net-misc/zebedee/files/zebedee-2.4.1-Makefile.patch
deleted file mode 100644
index 2d7ecf8e5490..000000000000
--- a/net-misc/zebedee/files/zebedee-2.4.1-Makefile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- Makefile.old	2002-05-29 10:42:08.000000000 -0700
-+++ Makefile	2003-03-17 14:35:01.000000000 -0800
-@@ -5,7 +5,7 @@
- 
- ZBD_VERSION = 2.4.1
- 
--OS = 
-+OS = linux
- 
- ###
- ### Locations of tools, libraries and installation directories.
-@@ -45,19 +45,17 @@
- # BFINC = /usr/include/openssl
- # BFLIB = -lcrypto
- 
--BFINC = -I../blowfish-0.9.5a
--BFLIB = ../blowfish-0.9.5a/libblowfish.a
-+BFINC = /usr/include/openssl
-+BFINC = -lcrypto
- 
- # Location of zlib include and library
- 
--ZINC = -I../zlib-1.1.4
--ZLIB = ../zlib-1.1.4/libz.a
-+ZLIB = /usr/lib/libz.a
- 
- # Location of bzlib include and library
- # Set these empty if you don't want bzib2 support
- 
--BZINC = -I../bzip2-1.0.1
--BZLIB = ../bzip2-1.0.1/libbz2.a
-+BZLIB = /usr/lib/libbz2.a
- 
- #
- # Tools needed for Perl "POD"-format documentation conversion.
-@@ -73,10 +71,9 @@
- 
- # Installation directories for the Linux/Solaris/*NIX World
- 
--ROOTDIR = /usr
-+ROOTDIR = $(DESTDIR)/usr
- BINDIR = $(ROOTDIR)/bin
--ZBDDIR = $(ROOTDIR)/lib/zebedee
--MANDIR = $(ROOTDIR)/man/man1
-+MANDIR = $(ROOTDIR)/share/man/man1
- 
- # This is a BSD-style install
- 
-@@ -224,13 +221,11 @@
- 	rm -f ftpgw.tcl.tmp
- 
- install : precheck zebedee$(EXE) zebedee.1 ftpgw.tcl.1 $(ZBDFILES) $(TXTFILES)
--	-mkdir -p $(BINDIR) $(MANDIR) $(ZBDDIR)
-+	-mkdir -p $(BINDIR) $(MANDIR)
- 	$(INSTALL) zebedee$(EXE) $(BINDIR)
- 	$(INSTALL) -m 0755 ftpgw.tcl $(BINDIR)
- 	$(INSTALL) zebedee.1 $(MANDIR)
- 	$(INSTALL) ftpgw.tcl.1 $(MANDIR)
--	$(INSTALL) $(ZBDFILES) $(ZBDDIR)
--	$(INSTALL) $(TXTFILES) $(ZBDDIR)
- 
- clean :
- 	rm -f zebedee zebedee.exe *.o core *.1 *.html *.tmp *.bak
diff --git a/net-misc/zebedee/zebedee-2.4.1.ebuild b/net-misc/zebedee/zebedee-2.4.1.ebuild
index 420c06553722..1ed607f1ea79 100644
--- a/net-misc/zebedee/zebedee-2.4.1.ebuild
+++ b/net-misc/zebedee/zebedee-2.4.1.ebuild
@@ -1,56 +1,55 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.4 2003/11/14 20:08:57 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.4.1.ebuild,v 1.5 2004/02/20 23:00:17 seemant Exp $
 
+S=${WORKDIR}/${P}
 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"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
-DEPEND=">=dev-libs/openssl-0.9.5a
-	>=sys-libs/zlib-1.1.4
-	>=app-arch/bzip2-1.0.1"
 
-S=${WORKDIR}/${P}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~ppc64"
 
-	cp Makefile Makefile.orig
-	patch -p0 < ${FILESDIR}/${P}-Makefile.patch || die
-	mv zebedee.c zebedee.c.orig
-	cat zebedee.c.orig | \
-		sed "s/^#include \"blowfish\.h\"$/#include \"openssl\/blowfish\.h\"/g" \
-		> zebedee.c
-}
+DEPEND="dev-lang/perl
+	dev-libs/openssl
+	sys-libs/zlib
+	app-arch/bzip2"
 
 src_compile() {
-	emake || die
+	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 DESTDIR=${D} install || die
-	dodoc README.txt LICENCE.txt GPL2.txt CHANGES.txt zebedee.html ftpgw.tcl.html zebedee.ja_JP.html
+	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
-	dodir /etc/zebedee
-	insinto /etc/zebedee
-	doins server.zbd vncviewer.zbd vncserver.zbd
-	newins server.id server.id.example
-	insopts -m 600
-	newins server.key server.key.example
-	newins client1.key client1.key.example
-	newins client2.key client2.key.example
-	newins clients.id clients.id.example
 }
 
 pkg_postinst() {
-	einfo
+	echo
 	einfo "Before you use the Zebedee rc script (/etc/init.d/zebedee), it is"
-	einfo "recommended that you edit the server config file (/etc/zebedee/server.zbd)."
-	einfo "the \"detached\" directive should remain set to false; the rc script takes"
-	einfo "care of backgrounding automatically."
-	einfo
+	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
 }
diff --git a/net-misc/zebedee/zebedee-2.5.2.ebuild b/net-misc/zebedee/zebedee-2.5.2.ebuild
index cb19b34a280e..975c217f81f1 100644
--- a/net-misc/zebedee/zebedee-2.5.2.ebuild
+++ b/net-misc/zebedee/zebedee-2.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.5.2.ebuild,v 1.2 2004/02/20 22:53:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zebedee/zebedee-2.5.2.ebuild,v 1.3 2004/02/20 23:00:17 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A simple, free, secure TCP and UDP tunnel program"
@@ -17,19 +17,6 @@ DEPEND="dev-lang/perl
 	sys-libs/zlib
 	app-arch/bzip2"
 
-
-#src_unpack() {
-#	unpack ${P}.tar.gz
-#	cd ${S}
-#
-#	cp Makefile Makefile.orig
-#	patch -p0 < ${FILESDIR}/${P}-Makefile.patch || die
-#	mv zebedee.c zebedee.c.orig
-#	cat zebedee.c.orig | \
-#		sed "s/^#include \"blowfish\.h\"$/#include \"openssl\/blowfish\.h\"/g" \
-#		> zebedee.c
-#}
-
 src_compile() {
 	emake \
 		BFINC=-I/usr/include/openssl \
@@ -56,16 +43,6 @@ src_install() {
 
 	exeinto /etc/init.d
 	doexe ${FILESDIR}/zebedee
-
-#	insinto /etc/zebedee
-#	doins server.zbd vncviewer.zbd vncserver.zbd
-#	newins server.id server.id.example
-#
-#	insopts -m 600
-#	newins server.key server.key.example
-#	newins client1.key client1.key.example
-#	newins client2.key client2.key.example
-#	newins clients.id clients.id.example
 }
 
 pkg_postinst() {