1.182 stable on x86. Version bump to 1.217. Removed 1.121, as well as obsolete patches from FILESDIR.

(Portage version: 2.1.2.3)

9 files changed, 45 insertions, 142 deletions

diff --git a/net-mail/imapsync/ChangeLog b/net-mail/imapsync/ChangeLog
index eda091509069..9a8f7cf66e85 100644
--- a/net-mail/imapsync/ChangeLog
+++ b/net-mail/imapsync/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/imapsync
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/ChangeLog,v 1.15 2007/03/25 14:44:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/ChangeLog,v 1.16 2007/04/01 17:51:53 ticho Exp $
+
+*imapsync-1.217 (01 Apr 2007)
+
+  01 Apr 2007; Andrej Kacian <ticho@gentoo.org>
+  -files/imapsync-1.171-gentoo.patch, -files/imapsync-gentoo.patch,
+  -files/imapsync-ssl.patch, -imapsync-1.121.ebuild, imapsync-1.182.ebuild,
+  +imapsync-1.217.ebuild:
+  1.182 stable on x86. Version bump to 1.217. Removed 1.121, as well as
+  obsolete patches from FILESDIR.
 
   25 Mar 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   imapsync-1.182.ebuild:
diff --git a/net-mail/imapsync/files/digest-imapsync-1.121 b/net-mail/imapsync/files/digest-imapsync-1.121
deleted file mode 100644
index a8f810a8859f..000000000000
--- a/net-mail/imapsync/files/digest-imapsync-1.121
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1d0551bc6987204621d467e1e455e969 imapsync-1.121.tgz 41591
-RMD160 4e8e40cab56f538f955968e3cbe68a9ad8b69f9b imapsync-1.121.tgz 41591
-SHA256 d6678951366e0c4b0469969729a8585bab6c4420b88900db99e164d5af62d755 imapsync-1.121.tgz 41591
diff --git a/net-mail/imapsync/files/digest-imapsync-1.217 b/net-mail/imapsync/files/digest-imapsync-1.217
new file mode 100644
index 000000000000..ec9161266cd8
--- /dev/null
+++ b/net-mail/imapsync/files/digest-imapsync-1.217
@@ -0,0 +1,3 @@
+MD5 ebac2e3f360f36ad0903bb5a6f2d937d imapsync-1.217.tgz 117424
+RMD160 9895a3c4c5cdac46bd1e37e78344e460d46efe13 imapsync-1.217.tgz 117424
+SHA256 67b59e950a0ccfa2d9356d967ae2aadc50e0190722419cd64038e2de56514768 imapsync-1.217.tgz 117424
diff --git a/net-mail/imapsync/files/imapsync-1.171-gentoo.patch b/net-mail/imapsync/files/imapsync-1.171-gentoo.patch
deleted file mode 100644
index e6358f38a82d..000000000000
--- a/net-mail/imapsync/files/imapsync-1.171-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.orig	2006-01-16 17:14:22.000000000 -0800
-+++ Makefile	2006-01-16 17:15:20.000000000 -0800
-@@ -3,6 +3,11 @@
- 
- TARGET=imapsync
- 
-+ifdef $(DESTDIR)
-+else
-+	DESTDIR=/usr/bin/
-+endif
-+
- .PHONY: help usage all
- 
- help: usage
-@@ -54,6 +59,7 @@
- .PHONY: install dist
- 
- install: testp
-+	mkdir -p $(DESTDIR)/usr/bin/
- 	cp $(TARGET) $(DESTDIR)/usr/bin/$(TARGET)
- 	chmod 755 $(DESTDIR)/usr/bin/$(TARGET)
- 
diff --git a/net-mail/imapsync/files/imapsync-gentoo.patch b/net-mail/imapsync/files/imapsync-gentoo.patch
deleted file mode 100644
index 245cf1d869ef..000000000000
--- a/net-mail/imapsync/files/imapsync-gentoo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur imapsync-1.118/Makefile imapsync-1.76_gentoo/Makefile
---- imapsync-1.118/Makefile	2004-02-23 01:09:49.000000000 +0000
-+++ imapsync-1.76_gentoo/Makefile	2004-02-24 03:51:03.000000000 +0000
-@@ -2,6 +2,10 @@
- # $Id: imapsync-gentoo.patch,v 1.1 2005/03/06 00:41:19 ferdy Exp $	
- 
- TARGET=imapsync
-+ifdef $(DESTDIR)
-+else
-+	DESTDIR=/usr/bin/
-+endif
- 
- .PHONY: help usage all
- 
-@@ -54,8 +58,8 @@
- .PHONY: install dist
- 
- install: testp
--	cp $(TARGET) /usr/bin/$(TARGET)
--	chmod 755 /usr/bin/$(TARGET)
-+	cp $(TARGET) $(DESTDIR)$(TARGET)
-+	chmod 755 $(DESTDIR)$(TARGET)
- 
- DIST_NAME=$(TARGET)-$(VERSION)
- DIST_FILE=$(DIST_NAME).tgz
-@@ -80,6 +84,13 @@
- clean_dist:
- 	rm -f dist/*
- 
-+dep:
-+	perl -MCPAN -e "install 'Getopt::Long';"
-+	perl -MCPAN -e "install 'Parse::RecDescent';"
-+	perl -MCPAN -e "install 'Mail::IMAPClient';"
-+	perl -MCPAN -e "install 'Digest::MD5';"
-+	perl -MCPAN -e "install 'Digest::HMAC';"
-+
- # Local goals
- 
- .PHONY: lfo
diff --git a/net-mail/imapsync/files/imapsync-ssl.patch b/net-mail/imapsync/files/imapsync-ssl.patch
deleted file mode 100644
index 30d697a5f56c..000000000000
--- a/net-mail/imapsync/files/imapsync-ssl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- patches/imapsync-ssl.orig.diff	2005-01-28 11:52:47.307847624 -0800
-+++ patches/imapsync-ssl.diff	2005-01-28 11:58:18.738462512 -0800
-@@ -1,4 +1,4 @@
----- imapsync	Fri Jul  9 11:08:43 2004
-+--- imapsync-ssl	Fri Jul  9 11:08:43 2004
- +++ imapsync-ssl	Tue Aug 31 12:13:06 2004
- @@ -33,9 +33,9 @@ $Revision: 1.1 $
-    imapsync --help
-@@ -45,8 +45,8 @@
-  $user2 || missing_option("--user2");
-  $password2 || $passfile2 || missing_option("--passfile2 or --password2");
-  $password2 = (defined($passfile2)) ? firstline ($passfile2) : $password2;
--@@ -402,38 +404,56 @@ unless ($md5_supported) {
-- $timestart = time();
-+@@ -402,39 +404,57 @@ unless ($md5_supported) {
-+ $timebefore = $timestart;
-  
-  $debugimap and print "From connection\n";
- -$from = login_imap($host1, $port1, $user1, $password1, $debugimap, $timeout);
-@@ -86,6 +86,7 @@
- +	$imap->State($imap->Connected());
- +
-  	$imap->Fast_io(1);
-+ 	$imap->Buffer(65536);
-  	$imap->Uid(1);
-  	$imap->Peek(1);
-  	$imap->Debug($debugimap);
diff --git a/net-mail/imapsync/imapsync-1.121.ebuild b/net-mail/imapsync/imapsync-1.121.ebuild
deleted file mode 100644
index 78e381f556e0..000000000000
--- a/net-mail/imapsync/imapsync-1.121.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/imapsync-1.121.ebuild,v 1.5 2006/02/13 14:57:32 mcummings Exp $
-
-inherit eutils
-
-DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another."
-HOMEPAGE="http://www.linux-france.org/prj/"
-SRC_URI="http://www.linux-france.org/prj/imapsync/dist/${P}.tgz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="ssl"
-
-DEPEND=">=dev-perl/Mail-IMAPClient-2.1.4"
-
-RDEPEND="${DEPEND}
-	virtual/perl-Digest-MD5
-	dev-perl/Digest-HMAC"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-gentoo.patch || \
-		die "failed to patch ${P}-gentoo.patch"
-
-	if use ssl; then
-		echo $PWD
-		cp imapsync imapsync-ssl
-		epatch ${FILESDIR}/${PN}-ssl.patch || die "patch failed"
-		epatch ${S}/patches/imapsync-ssl.diff || \
-			die "failed to patch imapsync-ssl.diff"
-	fi
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "make failed"
-	#into /usr
-	dobin imapsync imapsync-ssl
-	rm ${D}/imapsync || die "failed to rm imapsync"
-
-	dodoc CREDITS ChangeLog FAQ INSTALL README TODO || \
-		die "dodoc failed"
-
-}
diff --git a/net-mail/imapsync/imapsync-1.182.ebuild b/net-mail/imapsync/imapsync-1.182.ebuild
index dbca2066ec73..cd7ca3d7556f 100644
--- a/net-mail/imapsync/imapsync-1.182.ebuild
+++ b/net-mail/imapsync/imapsync-1.182.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/imapsync-1.182.ebuild,v 1.4 2007/03/25 14:44:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/imapsync-1.182.ebuild,v 1.5 2007/04/01 17:51:53 ticho Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.linux-france.org/prj/imapsync/dist/${P}.tgz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND=">=dev-perl/Mail-IMAPClient-2.1.4"
diff --git a/net-mail/imapsync/imapsync-1.217.ebuild b/net-mail/imapsync/imapsync-1.217.ebuild
new file mode 100644
index 000000000000..957e26582136
--- /dev/null
+++ b/net-mail/imapsync/imapsync-1.217.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/imapsync-1.217.ebuild,v 1.1 2007/04/01 17:51:53 ticho Exp $
+
+inherit eutils
+
+DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another."
+HOMEPAGE="http://www.linux-france.org/prj/"
+SRC_URI="http://www.linux-france.org/prj/imapsync/dist/${P}.tgz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=dev-perl/Mail-IMAPClient-2.1.4"
+
+RDEPEND="${DEPEND}
+	virtual/perl-Digest-MD5
+	dev-perl/Net-SSLeay
+	virtual/perl-MIME-Base64
+	dev-perl/TermReadKey
+	dev-perl/IO-Socket-SSL"
+
+RESTRICT="test"
+
+src_install() {
+	make DESTDIR="${D}" install || die "make failed"
+	dodoc CREDITS ChangeLog FAQ README TODO || die "dodoc failed"
+}