Fix bug #208840. Remove mod_gzipfs, too old, breaks compile.

(Portage version: 2.1.5_rc4)

3 files changed, 47 insertions, 14 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 7915cb3c9b56..d71f60d63912 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.167 2008/04/17 07:57:56 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.168 2008/04/17 09:32:05 chtekk Exp $
+
+  17 Apr 2008; Luca Longinotti <chtekk@gentoo.org>
+  +files/proftpd-1.3.1-bug208840.patch, proftpd-1.3.1.ebuild:
+  Fix bug #208840. Remove mod_gzipfs, too old, breaks compile.
 
 *proftpd-1.3.1 (17 Apr 2008)
 
diff --git a/net-ftp/proftpd/files/proftpd-1.3.1-bug208840.patch b/net-ftp/proftpd/files/proftpd-1.3.1-bug208840.patch
new file mode 100644
index 000000000000..90931f99f50f
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.1-bug208840.patch
@@ -0,0 +1,35 @@
+--- acconfig.h	2002/12/15 18:05:09	1.15
++++ acconfig.h	2007/10/15 17:27:25	1.16
+@@ -12,9 +12,6 @@
+ /* Define to `int' if <sys/types.h> doesn't define. */
+ #undef ino_t
+ 
+-/* Define to `mode_t' if <sys/types.h> doesn't define. */
+-#undef umode_t
+-
+ /* Define to `int' if <sys/socket.h> doesn't define. */
+ #undef socklen_t
+ 
+--- config.h.in	2007/10/13 03:05:27	1.118
++++ config.h.in	2007/10/15 17:27:25	1.119
+@@ -37,9 +37,6 @@
+ /* Define to `int' if <sys/socket.h> doesn't define. */
+ #undef socklen_t
+ 
+-/* Define to `mode_t' if <sys/types.h> doesn't define. */
+-#undef umode_t
+-
+ /* Define if you have AIX send_file() semantics. */
+ #undef HAVE_AIX_SENDFILE
+ 
+--- configure.in	2007/10/13 03:05:27	1.261
++++ configure.in	2007/10/15 17:27:25	1.262
+@@ -1119,7 +1119,7 @@
+ AC_CHECK_SIZEOF(time_t, 0)
+ 
+ dnl Check for generic typedefs
+-AC_CHECK_TYPE(umode_t, mode_t)
++AC_CHECK_TYPE(mode_t, mode_t)
+ AC_CHECK_TYPE(ino_t, ino_t)
+ AC_CHECK_TYPE(intptr_t, AC_DEFINE(HAVE_INTPTR_T),, [
+   #if HAVE_INTTYPES_H
diff --git a/net-ftp/proftpd/proftpd-1.3.1.ebuild b/net-ftp/proftpd/proftpd-1.3.1.ebuild
index 1450ac92021a..9de5a79d7996 100644
--- a/net-ftp/proftpd/proftpd-1.3.1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.1.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1.ebuild,v 1.1 2008/04/17 07:57:56 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1.ebuild,v 1.2 2008/04/17 09:32:05 chtekk Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs autotools
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="acl authfile ban case clamav deflate gzipfs hardened ifsession ipv6 ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
+IUSE="acl authfile ban case clamav deflate hardened ifsession ipv6 ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
 
 CASE_VER="0.3"
 CLAMAV_VER="0.7"
 DEFLATE_VER="0.3"
-GZIPFS_VER="0.9rc4"
 SHAPER_VER="0.6.3"
 VROOT_VER="0.7.2"
 
@@ -21,7 +20,6 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
 		case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
 		clamav? ( http://www.thrallingpenguin.com/resources/mod_clamav-${CLAMAV_VER}.tar.gz )
 		deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
-		gzipfs? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-gzipfs-${GZIPFS_VER}.tar.gz )
 		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
 		vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
 
@@ -34,7 +32,6 @@ LICENSE="GPL-2"
 
 DEPEND="acl? ( sys-apps/acl sys-apps/attr )
 		clamav? ( app-antivirus/clamav )
-		gzipfs? ( sys-libs/zlib )
 		ldap? ( >=net-nds/openldap-1.2.11 )
 		mysql? ( virtual/mysql )
 		ncurses? ( sys-libs/ncurses )
@@ -84,12 +81,6 @@ src_unpack() {
 		cp -f mod_deflate/mod_deflate.html doc/
 	fi
 
-	if use gzipfs ; then
-		unpack ${PN}-mod-gzipfs-${GZIPFS_VER}.tar.gz
-		cp -f mod_gzipfs/mod_gzipfs.c contrib/
-		cp -f mod_gzipfs/mod_gzipfs.html doc/
-	fi
-
 	if use shaper ; then
 		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
 		cp -f mod_shaper/mod_shaper.c contrib/
@@ -101,6 +92,10 @@ src_unpack() {
 		cp -f mod_vroot/mod_vroot.c contrib/
 		cp -f mod_vroot/mod_vroot.html doc/
 	fi
+
+	# Fix bug #208840
+	epatch "${FILESDIR}/${P}-bug208840.patch"
+	eautoreconf
 }
 
 src_compile() {
@@ -113,7 +108,6 @@ src_compile() {
 	use case && modules="${modules}:mod_case"
 	use clamav && modules="${modules}:mod_clamav"
 	use deflate && modules="${modules}:mod_deflate"
-	use gzipfs && modules="${modules}:mod_gzipfs"
 	use pam && modules="${modules}:mod_auth_pam"
 	use radius && modules="${modules}:mod_radius"
 	use rewrite && modules="${modules}:mod_rewrite"