x86 stable 8.1.4. Fixes to 8.1.4 and version bump

6 files changed, 96 insertions, 10 deletions

diff --git a/net-ftp/gproftpd/ChangeLog b/net-ftp/gproftpd/ChangeLog
index 005ffd8202da..30237fd932df 100644
--- a/net-ftp/gproftpd/ChangeLog
+++ b/net-ftp/gproftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/gproftpd
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/ChangeLog,v 1.4 2004/06/05 00:49:58 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/ChangeLog,v 1.5 2004/06/08 22:25:45 dragonheart Exp $
+
+*gproftpd-8.1.6 (09 Jun 2004)
+
+  09 Jun 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  gproftpd-8.1.4.ebuild, +gproftpd-8.1.6.ebuild:
+  x86 stable 8.1.4. Fixes to 8.1.4 and version bump thanks to
+  scootersmk@chartertn.net in bug 33798
 
   04 Jun 2004; Jason Wever <weeve@gentoo.org> gproftpd-8.1.4.ebuild:
   Added ~sparc keyword to resolve bug #53022.
diff --git a/net-ftp/gproftpd/Manifest b/net-ftp/gproftpd/Manifest
index 2a9c8dfd7b2a..e24e9d6205a3 100644
--- a/net-ftp/gproftpd/Manifest
+++ b/net-ftp/gproftpd/Manifest
@@ -1,3 +1,6 @@
-MD5 6dd8643b33e674fe78d4ad9822aeab68 ChangeLog 673
-MD5 cbb42f645440e3d7469a8c635a1b082e gproftpd-8.1.4.ebuild 1216
+MD5 07702051a4dcf92eda3238bacdf05a05 ChangeLog 672
+MD5 cbe150bd390acafc670dd91290ee57c8 gproftpd-8.1.6.ebuild 1629
+MD5 0bb5d5f284ed83766d2b8876f0b58ee2 gproftpd-8.1.4.ebuild 1224
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 24fb97610de7a1146a7a63c4f72a0093 files/digest-gproftpd-8.1.6 66
 MD5 100294a5871bb7bc1ddde12efb4c6190 files/digest-gproftpd-8.1.4 66
diff --git a/net-ftp/gproftpd/files/digest-gproftpd-8.1.6 b/net-ftp/gproftpd/files/digest-gproftpd-8.1.6
new file mode 100644
index 000000000000..6adc2cebc07f
--- /dev/null
+++ b/net-ftp/gproftpd/files/digest-gproftpd-8.1.6
@@ -0,0 +1 @@
+MD5 623e70c01bc16407b4f2ad1f59f743ec gproftpd-8.1.6.tar.gz 250535
diff --git a/net-ftp/gproftpd/gproftpd-8.1.4.ebuild b/net-ftp/gproftpd/gproftpd-8.1.4.ebuild
index 8351845fc299..ff541e227b23 100644
--- a/net-ftp/gproftpd/gproftpd-8.1.4.ebuild
+++ b/net-ftp/gproftpd/gproftpd-8.1.4.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/gproftpd-8.1.4.ebuild,v 1.2 2004/06/05 00:49:58 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/gproftpd-8.1.4.ebuild,v 1.3 2004/06/08 22:25:45 dragonheart Exp $
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="GTK frontend to proftpd"
 HOMEPAGE="http://mange.dynup.net/linux.html"
 SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz"
 LICENSE="GPL-2"
 
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 
 SLOT="0"
 
-IUSE="X gtk"
+IUSE="X gtk gnome"
 
 # Requiring ProFTPD 1.2.9 due to security fixes
 DEPEND=">=net-ftp/proftpd-1.2.9
@@ -25,9 +24,7 @@ DEPEND=">=net-ftp/proftpd-1.2.9
 #	>=x11-libs/xft-2.0  //this is blocked by xfree4.3.99
 
 src_compile() {
-	econf --sysconfdir=/etc || die "./configure failed"
-	# --sysconfdir=/path/to/proftpd/conf/file
-	# or you can remove the --sysconfdir line and specify when starting the app proftpd -c /etc/proftpd.conf
+	econf --sysconfdir=/etc/proftpd || die "./configure failed"
 	emake || die "Build failure"
 }
 
@@ -42,3 +39,10 @@ src_install () {
 
 	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README
 }
+
+pkg_postinst() {
+	einfo "gproftpd looks for your proftpd.conf file in /etc/proftpd"
+	einfo "run gproftpd with the option -c to specify an alternate location"
+	einfo "ex: gproftpd -c /etc/proftpd.conf"
+	ewarn "Do NOT edit /etc/conf.d/proftpd with this program"
+}
diff --git a/net-ftp/gproftpd/gproftpd-8.1.6.ebuild b/net-ftp/gproftpd/gproftpd-8.1.6.ebuild
new file mode 100644
index 000000000000..fd4eac3023ec
--- /dev/null
+++ b/net-ftp/gproftpd/gproftpd-8.1.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/gproftpd-8.1.6.ebuild,v 1.1 2004/06/08 22:25:45 dragonheart Exp $
+
+
+DESCRIPTION="GTK frontend to proftpd"
+HOMEPAGE="http://mange.dynup.net/linux.html"
+SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc"
+SLOT="0"
+
+IUSE="X gtk ssl gnome"
+
+# Requiring ProFTPD 1.2.9 due to security fixes
+DEPEND=">=net-ftp/proftpd-1.2.9
+	>=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2.0
+	>=x11-libs/pango-1.0
+	>=dev-libs/atk-1.0
+	>=media-libs/freetype-2.0
+	ssl? ( >=dev-libs/openssl-0.9.6f )"
+
+#	>=x11-libs/xft-2.0  //this is blocked by xfree4.3.99
+
+src_compile() {
+	local modules includes myconf
+
+	#location of proftpd.conf
+	myconf="/etc/proftpd"
+
+	if use ssl; then
+		einfo ssl
+		# enable mod_tls
+		modules="${modules}:mod_tls"
+		includes="${include}:/usr/kerberos/include"
+	fi
+
+	econf --sysconfdir=${myconf} \
+		--with-modules=${modules} \
+		--with-includes=${includes} || die "./configure failed"
+	emake || die "Build failure"
+}
+
+src_install () {
+	einstall || die "Installation failure"
+
+#         Add the Gnome menu entry
+	if use gnome; then
+		insinto /usr/share/gnome/apps/Internet/
+		doins ${S}/desktop/net-gproftpd.desktop
+	fi
+
+	dodoc AUTHORS ChangeLog COPYING INSTALL README
+}
+
+pkg_postinst() {
+	einfo "gproftpd looks for your proftpd.conf file in /etc/proftpd"
+	einfo "run gproftpd with the option -c to specify an alternate location"
+	einfo "ex: gproftpd -c /etc/proftpd.conf"
+	ewarn "Do NOT edit /etc/conf.d/proftpd with this program"
+}
diff --git a/net-ftp/gproftpd/metadata.xml b/net-ftp/gproftpd/metadata.xml
new file mode 100644
index 000000000000..d8b96be3c5cd
--- /dev/null
+++ b/net-ftp/gproftpd/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>bug-wranglers@gentoo.org</email>
+		<description>This package lacks a primary herd or maintainer.</description>
+	</maintainer>
+</pkgmetadata>