sparc stable wrt bug #550466

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)

3 files changed, 7 insertions, 68 deletions

diff --git a/net-ftp/gproftpd/ChangeLog b/net-ftp/gproftpd/ChangeLog
index a660d6e46793..b036a14b9adc 100644
--- a/net-ftp/gproftpd/ChangeLog
+++ b/net-ftp/gproftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/gproftpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/ChangeLog,v 1.27 2015/05/27 11:00:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/ChangeLog,v 1.28 2015/06/13 10:40:23 zlogene Exp $
+
+  13 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> -gproftpd-8.3.2.ebuild,
+  gproftpd-8.3.2-r1.ebuild:
+  sparc stable wrt bug #550466
 
   27 May 2015; Agostino Sarubbo <ago@gentoo.org> gproftpd-8.3.2-r1.ebuild:
   Stable for x86, wrt bug #550466
diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild
index f28517199645..464e0ae2ea4d 100644
--- a/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild
+++ b/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild,v 1.3 2015/05/27 11:00:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild,v 1.4 2015/06/13 10:40:23 zlogene Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ 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="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 SLOT="0"
 
 IUSE="gnome ssl"
diff --git a/net-ftp/gproftpd/gproftpd-8.3.2.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2.ebuild
deleted file mode 100644
index 2ec64df03c37..000000000000
--- a/net-ftp/gproftpd/gproftpd-8.3.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gproftpd/gproftpd-8.3.2.ebuild,v 1.7 2012/05/03 05:37:17 jdhore Exp $
-
-EAPI=1
-
-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="~amd64 ~ppc sparc x86"
-SLOT="0"
-
-IUSE="gnome ssl"
-
-# Requiring ProFTPD 1.2.9 due to security fixes
-RDEPEND="x11-libs/gtk+:2
-	dev-libs/glib:2
-	>=x11-libs/pango-1.0
-	>=dev-libs/atk-1.0
-	>=media-libs/freetype-2.0
-	ssl? ( >=dev-libs/openssl-0.9.6f )
-	>=net-ftp/proftpd-1.2.9"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	local modules includes myconf
-
-	#location of proftpd.conf
-	myconf="/etc/proftpd"
-
-	if use ssl; then
-		# enable mod_tls
-		modules="${modules}:mod_tls"
-		includes="${include}:/usr/kerberos/include"
-	fi
-
-	econf --sysconfdir=${myconf} \
-		--localstatedir=/var \
-		--with-modules=${modules} \
-		--with-includes=${includes} || die "./configure failed"
-	emake || die "Build failure"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || 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 README
-
-	rm -r "${D}/usr/share/doc/gproftpd"
-}
-
-pkg_postinst() {
-	elog "gproftpd looks for your proftpd.conf file in /etc/proftpd"
-	elog "run gproftpd with the option -c to specify an alternate location"
-	elog "ex: gproftpd -c /etc/proftpd.conf"
-	elog "Do NOT edit /etc/conf.d/proftpd with this program"
-}