Cleanup 1.3.* as per #208668

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64)

3 files changed, 5 insertions, 228 deletions

diff --git a/net-mail/bincimap/ChangeLog b/net-mail/bincimap/ChangeLog
index 6582a7581ac7..aa464113b2bd 100644
--- a/net-mail/bincimap/ChangeLog
+++ b/net-mail/bincimap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/bincimap
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.48 2008/06/15 11:28:55 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/ChangeLog,v 1.49 2008/06/28 12:49:54 dertobi123 Exp $
+
+  28 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/bincimap-1.3.4-gentoo.diff, -bincimap-1.3.4.ebuild:
+  Cleanup 1.3.* as per #208668
 
   15 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   -files/bincimap-1.2.11-gentoo.diff, +files/bincimap-1.2-gcc43.patch,
diff --git a/net-mail/bincimap/bincimap-1.3.4.ebuild b/net-mail/bincimap/bincimap-1.3.4.ebuild
deleted file mode 100644
index 62333ad4a90f..000000000000
--- a/net-mail/bincimap/bincimap-1.3.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bincimap/bincimap-1.3.4.ebuild,v 1.5 2008/03/15 22:58:44 halcy0n Exp $
-
-inherit eutils
-
-DESCRIPTION="IMAP server for Maildir"
-SRC_URI="http://www.bincimap.org/dl/tarballs/1.3/${P}.tar.bz2"
-HOMEPAGE="http://www.bincimap.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="ssl"
-
-DEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-	sys-process/daemontools
-	sys-apps/ucspi-tcp
-	net-mail/checkpassword
-	!virtual/imapd"
-
-PROVIDE="virtual/imapd"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-}
-
-src_compile() {
-	econf $(use_enable ssl) --sysconfdir=/etc/bincimap \
-		--datadir=/usr/share/doc/${PF} \
-		--localstatedir=/etc/bincimap || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR="${D}" prefix=/usr install || die
-	keepdir /var/log/bincimap || die
-	if use ssl; then
-		keepdir /var/log/bincimap-ssl || die
-	fi
-
-	# backward compatibility
-	dosym /etc/bincimap/service/bincimap /etc/bincimap/service/imap
-	dosym /etc/bincimap/service/bincimaps /etc/bincimap/service/imaps
-
-	# rename
-	mv "${D}"/etc/xinetd.d/{xinetd-bincimap,bincimap}
-	mv "${D}"/etc/xinetd.d/{xinetd-bincimaps,bincimaps}
-}
-
-pkg_postinst() {
-	elog "To start bicimap at boot you have to enable the /etc/init.d/svscan rc file"
-	elog "and create the following link:"
-	elog "ln -sf /etc/bincimap/service/bincimap /service/"
-	elog
-
-	if use ssl; then
-		elog "If you want to use ssl connections, create the following link instead of above link."
-		elog "ln -sf /etc/bincimap/service/bincimaps /service/"
-		elog
-		elog "And this command will setup bincimap-ssl on your system."
-		elog "emerge --config =${CATEGORY}/${PF}"
-		elog
-	fi
-
-	#elog "NOTE: Default Maildir path is '~/.maildir'. If you want to modify it, "
-	#elog "edit /etc/bincimap/bincimap.conf"
-	#elog
-}
-
-pkg_config() {
-	if use ssl; then
-		local pemfile=/etc/bincimap/bincimap.pem
-		if [ ! -f $pemfile ]; then
-			echo "Creating a self-signed ssl-cert:"
-			/usr/bin/openssl req -new -x509 -nodes -out $pemfile -days 366 -keyout $pemfile
-			chmod 640 $pemfile
-
-			einfo "If You want to have a signed cert, do the following:"
-			einfo "openssl req -new -nodes -out req.pem \\"
-			einfo "-keyout $pemfile"
-			einfo "chmod 640 $pemfile"
-			einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
-			einfo "cat signed_req.pem >> $pemfile"
-		fi
-	fi
-}
diff --git a/net-mail/bincimap/files/bincimap-1.3.4-gentoo.diff b/net-mail/bincimap/files/bincimap-1.3.4-gentoo.diff
deleted file mode 100644
index df829f30f47c..000000000000
--- a/net-mail/bincimap/files/bincimap-1.3.4-gentoo.diff
+++ /dev/null
@@ -1,135 +0,0 @@
-diff -Naru bincimap-1.3.3.org/Makefile.in bincimap-1.3.3/Makefile.in
---- bincimap-1.3.3.org/Makefile.in	2004-11-09 20:18:55.000000000 +0000
-+++ bincimap-1.3.3/Makefile.in	2004-11-19 09:54:41.000000000 +0000
-@@ -397,28 +397,28 @@
- 	@$(BINC_INSTALL_CONF) $(srcdir)/conf/bincimap-localconfig $(DESTDIR)$(sysconfdir) 755
- 	@echo
- 	@echo "* Run files"
--	@$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimap $(DESTDIR)$(sysconfdir)
--	@$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimaps $(DESTDIR)$(sysconfdir)
-+	@$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimap $(DESTDIR)/etc/xinetd.d
-+	@$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimaps $(DESTDIR)/etc/xinetd.d
- 	@echo
- 	@echo "* Service/run files"
--	@$(BINC_INSTALL_CONF) $(srcdir)/service/plain/run $(DESTDIR)$(datadir)/service/bincimap 755
--	@$(BINC_INSTALL_CONF) $(srcdir)/service/plain/log/run $(DESTDIR)$(datadir)/service/bincimap/log 755
--	@$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/log/run $(DESTDIR)$(datadir)/service/bincimaps/log 755
--	@$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/run $(DESTDIR)$(datadir)/service/bincimaps 755
-+	@$(BINC_INSTALL_CONF) $(srcdir)/service/plain/run $(DESTDIR)$(sysconfdir)/service/bincimap 755
-+	@$(BINC_INSTALL_CONF) $(srcdir)/service/plain/log/run $(DESTDIR)$(sysconfdir)/service/bincimap/log 755
-+	@$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/log/run $(DESTDIR)$(sysconfdir)/service/bincimaps/log 755
-+	@$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/run $(DESTDIR)$(sysconfdir)/service/bincimaps 755
- 	@echo
- 	@echo "* Documentation"
- 	@$(BINC_INSTALL_DOC) $(srcdir)/man/bincimap.1 $(DESTDIR)$(mandir)/man1
--	@$(BINC_INSTALL_DOC) $(srcdir)/ChangeLog $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/AUTHORS $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/COPYING $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/COPYING.OpenSSL $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/README $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/TODO $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-goals.html $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-imapdir.html $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-tech.html $(DESTDIR)$(datadir)/doc/bincimap
--	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)/doc/bincimap
-+	@$(BINC_INSTALL_DOC) $(srcdir)/ChangeLog $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/AUTHORS $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/COPYING $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/COPYING.OpenSSL $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/README $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/TODO $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-goals.html $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-imapdir.html $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-tech.html $(DESTDIR)$(datadir)
-+	@$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)
- 	@echo
- 	@echo "* Binaries"
- 	@$(BINC_INSTALL_BIN) src/bincimapd $(DESTDIR)$(bindir)
-diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimap bincimap-1.3.3/conf/xinetd-bincimap
---- bincimap-1.3.3.org/conf/xinetd-bincimap	2004-11-09 20:08:05.000000000 +0000
-+++ bincimap-1.3.3/conf/xinetd-bincimap	2004-11-19 09:51:30.000000000 +0000
-@@ -13,14 +13,14 @@
- # description: Binc IMAP
- service imap
- {
--	disable		= no
-+	disable		= yes
- 	flags		= REUSE
- 	socket_type	= stream        
- 	wait		= no
- 	user		= root
- 	group		= root
- 	instances	= UNLIMITED
--	server		= /usr/local/etc/bincimap-config
--	server_args	= /usr/local/bin/bincimap-up -- /bin/checkpassword /usr/local/etc/bincimap-localconfig /usr/local/bin/bincimapd Maildir
-+	server		= /etc/bincimap/bincimap-config
-+	server_args	= /usr/bin/bincimap-up -- /bin/checkpassword /etc/bincimap/bincimap-localconfig /usr/bin/bincimapd Maildir
- 	log_type	= SYSLOG daemon info
- }
-diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimap.in bincimap-1.3.3/conf/xinetd-bincimap.in
---- bincimap-1.3.3.org/conf/xinetd-bincimap.in	2004-05-24 10:17:16.000000000 +0100
-+++ bincimap-1.3.3/conf/xinetd-bincimap.in	2004-11-29 01:35:09.020518914 +0000
-@@ -13,7 +13,7 @@
- # description: Binc IMAP
- service imap
- {
--	disable		= no
-+	disable		= yes
- 	flags		= REUSE
- 	socket_type	= stream        
- 	wait		= no
-diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimaps bincimap-1.3.3/conf/xinetd-bincimaps
---- bincimap-1.3.3.org/conf/xinetd-bincimaps	2004-11-09 20:08:05.000000000 +0000
-+++ bincimap-1.3.3/conf/xinetd-bincimaps	2004-11-19 09:50:53.000000000 +0000
-@@ -13,14 +13,14 @@
- # description: Binc IMAP, SSL
- service imaps
- {
--	disable		= no
-+	disable		= yes
- 	flags		= REUSE
- 	socket_type	= stream        
- 	wait		= no
- 	user		= root
- 	group		= root
- 	instances	= UNLIMITED
--	server		= /usr/local/etc/bincimap-config
--	server_args	= /usr/local/bin/bincimap-up --enable-ssl -- /bin/checkpassword /usr/local/etc/bincimap-localconfig /usr/local/bin/bincimapd Maildir
-+	server		= /etc/bincimap/bincimap-config
-+	server_args	= /usr/bin/bincimap-up --enable-ssl -- /bin/checkpassword /etc/bincimap/bincimap-localconfig /usr/bin/bincimapd Maildir
- 	log_type	= SYSLOG daemon info
- }
-diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimaps.in bincimap-1.3.3/conf/xinetd-bincimaps.in
---- bincimap-1.3.3.org/conf/xinetd-bincimaps.in	2004-05-24 10:17:16.000000000 +0100
-+++ bincimap-1.3.3/conf/xinetd-bincimaps.in	2004-11-29 01:35:20.008893378 +0000
-@@ -13,7 +13,7 @@
- # description: Binc IMAP, SSL
- service imaps
- {
--	disable		= no
-+	disable		= yes
- 	flags		= REUSE
- 	socket_type	= stream        
- 	wait		= no
-diff -Naru bincimap-1.3.3.org/service/plain/log/run.in bincimap-1.3.3/service/plain/log/run.in
---- bincimap-1.3.3.org/service/plain/log/run.in	2004-06-17 21:37:33.000000000 +0100
-+++ bincimap-1.3.3/service/plain/log/run.in	2004-11-16 14:52:51.000000000 +0000
-@@ -14,5 +14,5 @@
- 
- exec 2>&1
- 
--exec multilog t n5 s1048576 @localstatedir@/log/bincimap
-+exec multilog t n5 s1048576 /var/log/bincimap
- 
-diff -Naru bincimap-1.3.3.org/service/ssl/log/run.in bincimap-1.3.3/service/ssl/log/run.in
---- bincimap-1.3.3.org/service/ssl/log/run.in	2004-06-17 21:37:33.000000000 +0100
-+++ bincimap-1.3.3/service/ssl/log/run.in	2004-11-16 14:52:58.000000000 +0000
-@@ -14,5 +14,5 @@
- 
- exec 2>&1
- 
--exec multilog t n5 s1048576 @localstatedir@/log/bincimap-ssl
-+exec multilog t n5 s1048576 /var/log/bincimap-ssl
-