gentoo resync : 14.12.2020

4 files changed, 2 insertions, 66 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index d1833d29aad8..e105d2f7c0f2 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/gproftpd/Manifest b/net-ftp/gproftpd/Manifest
index df0abc582349..5a80d14935c1 100644
--- a/net-ftp/gproftpd/Manifest
+++ b/net-ftp/gproftpd/Manifest
@@ -2,6 +2,5 @@ AUX gproftpd-8.3.2-desktop.patch 327 BLAKE2B 3c1f56cc44eb3c4f737385bce30df9071bf
 AUX gproftpd-8.3.2-fno-common.patch 509 BLAKE2B d4dff154f0f15426e3f6c7cf610626c1850f40a55b84174e0bda30d792b38ec3e355a637c32d0975856bb5e9dc648a7f34584ab17cf3ba3e30de5ab4ad7f5af3 SHA512 24f23e7b717c58be4c5dec1595deabcff8e55a3a719d60221858b9f2ef34091c6d949349a29c3d28463359c2633737f469f322218fee6385fe851d83264bb7b1
 AUX gproftpd-8.3.2-install.patch 1791 BLAKE2B 8d2b3ef4e3f3a70a0ed887cd384e8f58a8b02886aee541f850451317fc09100c49154cb73d1b5f586d4c3d8736fccab2218b85fb8864ddf7e9e8344e93de6868 SHA512 bd19623a3ac000a9055d3d79078d3e9fe142d0da342cb30cf53cb04ff5ec849ca040787f0f3271526b7af12bf9b48466eedcdd48dee5b114c9113bf8e43ca18c
 DIST gproftpd-8.3.2.tar.gz 605797 BLAKE2B 76d15fb01fb73ebbb639e4ecc6ddf8399ef5bc2b904fb5d2ae433aa14c40db49d9b352ffdf558d45aa784b21e5248dfc453d2f87863c3c886dc2cd6c746d6109 SHA512 71a3b80b2bf18ec17719b1484d45fb6110764d28492edafcd97538ad99ad7cc182ed25723b721226329b61f29e511b48e0153cf01f90c3c7f5ce939f7b233f59
-EBUILD gproftpd-8.3.2-r1.ebuild 1464 BLAKE2B e6ac1423d2b72bcd3af9f0b34bea695d675568a313a2131e14b775f68c2ead076f4a03d4173c430f397a9f5d3ac3279c6233ebc5d5b4ce31a08c1a786ea17c69 SHA512 499040c17b64e7d89c79e681df93664dd422caa0b140b8680f7ec514b40cb1bd2448c211af1f575c120399cfac1acd87bf1d910f989aabf430fe6c6433dc1523
-EBUILD gproftpd-8.3.2-r2.ebuild 1070 BLAKE2B 3dc38e21f686b2d8c5bea85f40978218407b0ce64912bf2a618b04692bebcff3992451a75f12948664250e28d262730e86a9c690c18e53293b82cf19b2cae675 SHA512 d20be32a018a655f1fc0b82f1e5cf7ee5bcab7fa0130f9444b9708685c97285856ba26a95e8fef475e79f9a5c0236232044c39f0df8ca3b875005a803639ffe2
+EBUILD gproftpd-8.3.2-r2.ebuild 1068 BLAKE2B 751f38644d391d0a0b0dfebec9ee4af20cc599ab1912dd59c1e3ff031a6b8bf9be6e1d4c6ef6b6c57a7991a27a21ee23dcdd1274e4d4b292a8506a79bced53f2 SHA512 936d83542cfca6ac2af1c1671f62c3c91d28143c7c18e2f4188df97788292e0864561cafa428da2a0acb341c92dce64e3a00b22f09a84dab05df732f6587107c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild
deleted file mode 100644
index a67b5076d1b1..000000000000
--- a/net-ftp/gproftpd/gproftpd-8.3.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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_configure() {
-	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}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-#         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" || die
-}
-
-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"
-}
diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
index 9f6648c9fb75..ad2fc0d7dc3c 100644
--- a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
+++ b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="GTK frontend to proftpd"
 HOMEPAGE="https://mange.dynalias.org/linux/gproftpd"
 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"
 
 RDEPEND="