Sanitize patches (#226797).

(Portage version: 2.1.4.4)

4 files changed, 62 insertions, 161 deletions

diff --git a/net-mail/vmailmgr/ChangeLog b/net-mail/vmailmgr/ChangeLog
index cacfd8748181..e00b4a142ecb 100644
--- a/net-mail/vmailmgr/ChangeLog
+++ b/net-mail/vmailmgr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/vmailmgr
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/ChangeLog,v 1.29 2007/09/26 04:54:46 mrness Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/ChangeLog,v 1.30 2008/06/22 22:18:05 mrness Exp $
+
+  22 Jun 2008; Alin Năstac <mrness@gentoo.org>
+  files/vmailmgr-0.97-gentoo.patch,
+  -files/vmailmgr-0.97-no-authvmailmgr.patch, vmailmgr-0.97.ebuild:
+  Sanitize patches (#226797).
 
   26 Sep 2007; Alin Năstac <mrness@gentoo.org> vmailmgr-0.97.ebuild:
   Sanitize ebuild code.
diff --git a/net-mail/vmailmgr/files/vmailmgr-0.97-gentoo.patch b/net-mail/vmailmgr/files/vmailmgr-0.97-gentoo.patch
index 9f9f49cf865f..671aabc2e960 100644
--- a/net-mail/vmailmgr/files/vmailmgr-0.97-gentoo.patch
+++ b/net-mail/vmailmgr/files/vmailmgr-0.97-gentoo.patch
@@ -1,44 +1,63 @@
 diff -Nru vmailmgr-0.97.orig/authenticate/Makefile.am vmailmgr-0.97/authenticate/Makefile.am
---- vmailmgr-0.97.orig/authenticate/Makefile.am	2003-12-02 05:46:43.000000000 +0200
-+++ vmailmgr-0.97/authenticate/Makefile.am	2005-12-25 10:41:07.000000000 +0200
-@@ -1,6 +1,6 @@
+--- vmailmgr-0.97.orig/authenticate/Makefile.am	2008-06-23 00:06:53.000000000 +0200
++++ vmailmgr-0.97/authenticate/Makefile.am	2008-06-23 00:04:28.000000000 +0200
+@@ -1,6 +1,4 @@
  bin_PROGRAMS = checkvpw vauthenticate
- authlib_PROGRAMS = authvmailmgr
+-authlib_PROGRAMS = authvmailmgr
 -authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
-+authlibdir = ${libdir}/courier-imap/authlib/
  
  noinst_PODS = checkvpw.pod vauthenticate.pod
  noinst_HTMLS = $(noinst_PODS:.pod=.html)
-diff -Nru vmailmgr-0.97.orig/authenticate/Makefile.in vmailmgr-0.97/authenticate/Makefile.in
---- vmailmgr-0.97.orig/authenticate/Makefile.in	2005-09-04 08:01:56.000000000 +0300
-+++ vmailmgr-0.97/authenticate/Makefile.in	2005-12-25 10:41:07.000000000 +0200
-@@ -85,7 +85,7 @@
- 
- bin_PROGRAMS = checkvpw vauthenticate
- authlib_PROGRAMS = authvmailmgr
--authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
-+authlibdir = ${libdir}/courier-imap/authlib/
- 
- noinst_PODS = checkvpw.pod vauthenticate.pod
- noinst_HTMLS = $(noinst_PODS:.pod=.html)
-diff -Nru vmailmgr-0.97.orig/configure vmailmgr-0.97/configure
---- vmailmgr-0.97.orig/configure	2005-09-04 07:26:50.000000000 +0300
-+++ vmailmgr-0.97/configure	2005-12-25 10:41:07.000000000 +0200
-@@ -3431,7 +3431,7 @@
-   WANTPYTHON_FALSE=
- fi
+@@ -25,8 +23,5 @@
+ checkvpw_SOURCES = checkvpw.cc authvlib.cc authvlib.h
+ checkvpw_LDADD = ../lib/libvmailmgr.a
+ 
+-authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h
+-authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod
+-
+ vauthenticate_SOURCES = vauthenticate.cc authvlib.cc authvlib.h
+ vauthenticate_LDADD = ../lib/libvmailmgr.a
+diff -Nru vmailmgr-0.97.orig/configure.in vmailmgr-0.97/configure.in
+--- vmailmgr-0.97.orig/configure.in	2008-06-23 00:06:53.000000000 +0200
++++ vmailmgr-0.97/configure.in	2008-06-23 00:04:28.000000000 +0200
+@@ -62,7 +62,7 @@
+ AC_SUBST(pythonlibdir)
+ AM_CONDITIONAL(WANTPYTHON, test x$local_cv_python_lib_dir != xNONE)
  
 -phpdir="/home/httpd/php"
 +phpdir="${libdir}/php"
+ AC_SUBST(phpdir)
  
- 
- # Extract the first word of "w3m", so it can be a program name with args.
-@@ -5570,7 +5570,7 @@
- done
- 
+ AC_PATH_PROG(W3M, w3m)
+@@ -113,7 +113,7 @@
+ AC_CHECK_FUNCS(gethostname gettimeofday mkdir putenv rmdir socket)
+ AC_CHECK_FUNCS(srandom random crypt)
  
 -cgidir='${prefix}/cgi-bin'
 +cgidir='/var/www/localhost/cgi-bin'
- 
- 
-                                                                                                                                                                                                                   ac_config_files="$ac_config_files Makefile cgi/Makefile authenticate/Makefile commands/Makefile daemon/Makefile doc/Makefile lib/Makefile lib/cdb++/Makefile lib/cgi/Makefile lib/cli++/Makefile lib/config/Makefile lib/courier-authlib/Makefile lib/fdbuf/Makefile lib/misc/Makefile lib/mystring/Makefile lib/vdomain/Makefile lib/vpwentry/Makefile lib/vpwtable/Makefile scripts/Makefile php/Makefile python/Makefile"
+ AC_SUBST(cgidir)
+ 
+ AC_OUTPUT(Makefile
+diff -Nru vmailmgr-0.97.orig/lib/Makefile.am vmailmgr-0.97/lib/Makefile.am
+--- vmailmgr-0.97.orig/lib/Makefile.am	2008-06-23 00:06:53.000000000 +0200
++++ vmailmgr-0.97/lib/Makefile.am	2008-06-23 00:04:28.000000000 +0200
+@@ -1,5 +1,4 @@
+-SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli++ fdbuf mystring config \
+-	courier-authlib
++SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli++ fdbuf mystring config
+ noinst_LIBRARIES = libvmailmgr.a libcgi.a libcli.a
+ EXTRA_DIST = mergelib.sh
+ 
+diff -Nru vmailmgr-0.97.orig/Makefile.am vmailmgr-0.97/Makefile.am
+--- vmailmgr-0.97.orig/Makefile.am	2008-06-23 00:06:53.000000000 +0200
++++ vmailmgr-0.97/Makefile.am	2008-06-23 00:07:07.000000000 +0200
+@@ -1,7 +1,7 @@
+ if WANTPYTHON
+-SUBDIRS = python php lib authenticate commands daemon cgi doc scripts
++SUBDIRS = python php lib authenticate commands daemon cgi scripts
+ else
+-SUBDIRS = php lib authenticate commands daemon cgi doc scripts
++SUBDIRS = php lib authenticate commands daemon cgi scripts
+ endif
+ 
+ dist-hook:
diff --git a/net-mail/vmailmgr/files/vmailmgr-0.97-no-authvmailmgr.patch b/net-mail/vmailmgr/files/vmailmgr-0.97-no-authvmailmgr.patch
deleted file mode 100644
index ad11aa3de295..000000000000
--- a/net-mail/vmailmgr/files/vmailmgr-0.97-no-authvmailmgr.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Nru vmailmgr-0.97.orig/authenticate/Makefile.am vmailmgr-0.97/authenticate/Makefile.am
---- vmailmgr-0.97.orig/authenticate/Makefile.am	2005-12-26 11:33:33.000000000 +0200
-+++ vmailmgr-0.97/authenticate/Makefile.am	2005-12-26 11:37:00.914606250 +0200
-@@ -1,6 +1,4 @@
- bin_PROGRAMS = checkvpw vauthenticate
--authlib_PROGRAMS = authvmailmgr
--authlibdir = ${libdir}/courier-imap/authlib/
- 
- noinst_PODS = checkvpw.pod vauthenticate.pod
- noinst_HTMLS = $(noinst_PODS:.pod=.html)
-@@ -25,8 +23,5 @@
- checkvpw_SOURCES = checkvpw.cc authvlib.cc authvlib.h
- checkvpw_LDADD = ../lib/libvmailmgr.a
- 
--authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h
--authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod
--
- vauthenticate_SOURCES = vauthenticate.cc authvlib.cc authvlib.h
- vauthenticate_LDADD = ../lib/libvmailmgr.a
-diff -Nru vmailmgr-0.97.orig/authenticate/Makefile.in vmailmgr-0.97/authenticate/Makefile.in
---- vmailmgr-0.97.orig/authenticate/Makefile.in	2005-12-26 11:33:33.000000000 +0200
-+++ vmailmgr-0.97/authenticate/Makefile.in	2005-12-26 11:38:28.700092500 +0200
-@@ -84,8 +84,6 @@
- pythonlibdir = @pythonlibdir@
- 
- bin_PROGRAMS = checkvpw vauthenticate
--authlib_PROGRAMS = authvmailmgr
--authlibdir = ${libdir}/courier-imap/authlib/
- 
- noinst_PODS = checkvpw.pod vauthenticate.pod
- noinst_HTMLS = $(noinst_PODS:.pod=.html)
-@@ -100,9 +98,6 @@
- checkvpw_SOURCES = checkvpw.cc authvlib.cc authvlib.h
- checkvpw_LDADD = ../lib/libvmailmgr.a
- 
--authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h
--authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod
--
- vauthenticate_SOURCES = vauthenticate.cc authvlib.cc authvlib.h
- vauthenticate_LDADD = ../lib/libvmailmgr.a
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -115,9 +110,6 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--authvmailmgr_OBJECTS =  authvmailmgr.o authvlib.o
--authvmailmgr_DEPENDENCIES =  ../lib/libvmailmgr.a
--authvmailmgr_LDFLAGS = 
- checkvpw_OBJECTS =  checkvpw.o authvlib.o
- checkvpw_DEPENDENCIES =  ../lib/libvmailmgr.a
- checkvpw_LDFLAGS = 
-@@ -143,8 +135,8 @@
- 
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(authvmailmgr_SOURCES) $(checkvpw_SOURCES) $(vauthenticate_SOURCES)
--OBJECTS = $(authvmailmgr_OBJECTS) $(checkvpw_OBJECTS) $(vauthenticate_OBJECTS)
-+SOURCES = $(checkvpw_SOURCES) $(vauthenticate_SOURCES)
-+OBJECTS = $(checkvpw_OBJECTS) $(vauthenticate_OBJECTS)
- 
- all: all-redirect
- .SUFFIXES:
-@@ -226,10 +218,6 @@
- 
- maintainer-clean-compile:
- 
--authvmailmgr: $(authvmailmgr_OBJECTS) $(authvmailmgr_DEPENDENCIES)
--	@rm -f authvmailmgr
--	$(CXXLINK) $(authvmailmgr_LDFLAGS) $(authvmailmgr_OBJECTS) $(authvmailmgr_LDADD) $(LIBS)
--
- checkvpw: $(checkvpw_OBJECTS) $(checkvpw_DEPENDENCIES)
- 	@rm -f checkvpw
- 	$(CXXLINK) $(checkvpw_LDFLAGS) $(checkvpw_OBJECTS) $(checkvpw_LDADD) $(LIBS)
-@@ -332,12 +320,6 @@
- 	../lib/vpwentry/vpwentry.h ../lib/misc/lookup.h \
- 	../lib/vdomain/vdomain.h ../lib/vpwtable/vpwtable.h \
- 	../lib/misc/response.h
--authvmailmgr.o: authvmailmgr.cc ../config.h ../lib/misc/exec.h \
--	../lib/vpwentry/vpwentry.h ../lib/mystring/mystring.h \
--	../lib/mystring/rep.h ../lib/mystring/iter.h \
--	../lib/mystring/join.h ../lib/misc/strlist.h authvlib.h \
--	../lib/misc/pwentry.h ../lib/config/configrc.h \
--	../lib/courier-authlib/auth.h ../lib/courier-authlib/authmod.h
- checkvpw.o: checkvpw.cc ../config.h ../lib/config/configrc.h \
- 	../lib/mystring/mystring.h ../lib/mystring/rep.h \
- 	../lib/mystring/iter.h ../lib/mystring/join.h \
-diff -Nru vmailmgr-0.97.orig/configure vmailmgr-0.97/configure
---- vmailmgr-0.97.orig/configure	2005-12-26 11:33:33.000000000 +0200
-+++ vmailmgr-0.97/configure	2005-12-26 11:40:22.367196250 +0200
-@@ -5573,7 +5573,7 @@
- cgidir='/var/www/localhost/cgi-bin'
- 
- 
--                                                                                                                                                                                                                  ac_config_files="$ac_config_files Makefile cgi/Makefile authenticate/Makefile commands/Makefile daemon/Makefile doc/Makefile lib/Makefile lib/cdb++/Makefile lib/cgi/Makefile lib/cli++/Makefile lib/config/Makefile lib/courier-authlib/Makefile lib/fdbuf/Makefile lib/misc/Makefile lib/mystring/Makefile lib/vdomain/Makefile lib/vpwentry/Makefile lib/vpwtable/Makefile scripts/Makefile php/Makefile python/Makefile"
-+                                                                                                                                                                                                                  ac_config_files="$ac_config_files Makefile cgi/Makefile authenticate/Makefile commands/Makefile daemon/Makefile doc/Makefile lib/Makefile lib/cdb++/Makefile lib/cgi/Makefile lib/cli++/Makefile lib/config/Makefile lib/fdbuf/Makefile lib/misc/Makefile lib/mystring/Makefile lib/vdomain/Makefile lib/vpwentry/Makefile lib/vpwtable/Makefile scripts/Makefile php/Makefile python/Makefile"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-diff -Nru vmailmgr-0.97.orig/lib/Makefile.am vmailmgr-0.97/lib/Makefile.am
---- vmailmgr-0.97.orig/lib/Makefile.am	2002-11-20 17:54:45.000000000 +0200
-+++ vmailmgr-0.97/lib/Makefile.am	2005-12-26 12:29:10.010162500 +0200
-@@ -1,5 +1,4 @@
--SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli++ fdbuf mystring config \
--	courier-authlib
-+SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli++ fdbuf mystring config
- noinst_LIBRARIES = libvmailmgr.a libcgi.a libcli.a
- EXTRA_DIST = mergelib.sh
- 
-diff -Nru vmailmgr-0.97.orig/lib/Makefile.in vmailmgr-0.97/lib/Makefile.in
---- vmailmgr-0.97.orig/lib/Makefile.in	2005-09-04 08:01:53.000000000 +0300
-+++ vmailmgr-0.97/lib/Makefile.in	2005-12-26 12:29:15.062478250 +0200
-@@ -83,7 +83,7 @@
- phpdir = @phpdir@
- pythonlibdir = @pythonlibdir@
- 
--SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli++ fdbuf mystring config 	courier-authlib
-+SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli++ fdbuf mystring config
- 
- noinst_LIBRARIES = libvmailmgr.a libcgi.a libcli.a
- EXTRA_DIST = mergelib.sh
diff --git a/net-mail/vmailmgr/vmailmgr-0.97.ebuild b/net-mail/vmailmgr/vmailmgr-0.97.ebuild
index c66cc0df565a..69017386119b 100644
--- a/net-mail/vmailmgr/vmailmgr-0.97.ebuild
+++ b/net-mail/vmailmgr/vmailmgr-0.97.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.97.ebuild,v 1.8 2007/09/26 04:54:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.97.ebuild,v 1.9 2008/06/22 22:18:05 mrness Exp $
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs eutils autotools
 
 DESCRIPTION="virtual domains for qmail"
 HOMEPAGE="http://www.vmailmgr.org/"
@@ -21,12 +21,9 @@ RDEPEND=">=sys-apps/ucspi-unix-0.34
 src_unpack() {
 	unpack ${A}
 
+	cd "${S}" || die "source dir not found"
 	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	#Remove support for courier-imap authentication
-	#since it is incompatible with the latest version of courier-authlib
-	epatch "${FILESDIR}/${P}-no-authvmailmgr.patch"
-	rm -rf "${S}/lib/courier-authlib"
+	eautoreconf
 }
 
 src_install() {