sparc stable wrt bug #550466

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

4 files changed, 14 insertions, 84 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/Manifest b/net-ftp/gproftpd/Manifest
index 5b77d27b8471..89d3ef7fc8cc 100644
--- a/net-ftp/gproftpd/Manifest
+++ b/net-ftp/gproftpd/Manifest
@@ -2,24 +2,15 @@
 Hash: SHA256
 
 DIST gproftpd-8.3.2.tar.gz 605797 SHA256 6afd290ea8b68c3258f5c355144a8c6adbeb9c2c88ff85a2563916c2f1e3b468 SHA512 71a3b80b2bf18ec17719b1484d45fb6110764d28492edafcd97538ad99ad7cc182ed25723b721226329b61f29e511b48e0153cf01f90c3c7f5ce939f7b233f59 WHIRLPOOL d6929a981b5a44815daae0e4d2d4cce7e5a54e998b663f65cbcc237f215c0cf2882169d4805acdefcc0877c43dba88b4dbb0cc4d746fe8267b68cab0de200814
-EBUILD gproftpd-8.3.2-r1.ebuild 1582 SHA256 61ef71e04c0157a519bab0b6e59000b0cd73d623cbcac2aa5da1b10c3ccdf45a SHA512 211c6420ba2e93c133658a2f941a112680de68c2e66f9bc88ec710b30b3644158f2418a06c3252f1b85eba608929c84dc3e49877cb23006cf2dbad71222402ae WHIRLPOOL bb94ab0d9b6ae56ecb853a8ac604ba9c741285c918d233558c73f3ec9d4a33c6f7ad2f432d0aedd039fc09a85ece96f9c6f9f23c6cdab3e24b6dba4d1442b80a
-EBUILD gproftpd-8.3.2.ebuild 1661 SHA256 9fe28067aa1de034951e4b0f760ea7dc888dd78c23f7ff61e4830c46cfdccc0b SHA512 a5a3c6dc2c7940891d7c0fc5d6f6ad23e01c291842afed22c87bd1410dcc4ccc497c6a007ffb9fe9313be34f2c4aafcb4d3c60cd045333d30a781aae67804d4b WHIRLPOOL 91a9594266ad05a90ed1db8c35467664135e4c92ed18bc1098332b7626fe9b15e71cd9b9a71767d40d17aff2e3576ccb08e957c2b0ee6168c47d7a4de3fd492a
-MISC ChangeLog 3596 SHA256 01f7dfa2673a94d10bae4e7ad6b004665c9e69f45b2fcb7adccbdf5c14fa0688 SHA512 48443bee1d5678fa39c9afd548f5d71575430b7bd79773d0653b3d07afe8d25415faa522290df985b1c82d72442118382aac6af09524db58651db80fddf9ecf8 WHIRLPOOL 6f2ccc4447f86b4484738da9769dc8dc039f2652eaa9ac4b4559ed2dcc644c799dc4eaf51c00e9ad2683199eca866609a7ab34b0ecb6022bc2e786f7e4833ffa
+EBUILD gproftpd-8.3.2-r1.ebuild 1585 SHA256 dceed2868093ffdc509ce0334910319ec431dfe2cca3a443aa505b01c84a7741 SHA512 8a183410c035edcfa6e2734fac3ebf6d13a036e70de99ae1b1f156102c76536c6cc5487726ea01a5f548cc1b2de9681eef0c3f14c0fe1d2f117da8f5bc5965b6 WHIRLPOOL e1b73114a140821d0c66d2c1bdfa87c580c698ccffe938e7bbe8a6b3c876c1bb3a361451c64823d2abef9be21c5665caf2cf1f71e240551e52848ebd11a3cba9
+MISC ChangeLog 3734 SHA256 6f6b7431dadf4401eab66463e22f3d47ee2ff89c4cc28d502bca107f628f81c4 SHA512 ed583f4402770b37ea86803164cccb8f554ea2e379b9b2b1eb937e68690edd14b2634fd4803281c6269bb32a5877551eed3a6a223c21f5bf66f7e439ac744450 WHIRLPOOL 21f5f315276d3ce27217c0baa857a372e9e83a8d93f4d0213ad6f61ba288fc5240f09cab8998bb0dbc0b761953c7804a91c1c3d2954437fae9e4b54ddc6a1935
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVZaPFAAoJELp701BxlEWfpZ4P/2rRGk1mDfLqbY3Kco5nEk0x
-4Iul5CZXX6WFtKGCX2INCJ+mSdPoVmNQWKlxMR7sHA0/Mflw+9mw0kpHY3NXsvUF
-vpZXueCIpF1RvcLwQ6GvBBT4uKWQDQifyi42r9e8HPLilIopeoEtq4mBaM62ZutY
-DPbZ0IeyaFKPPQ8yJmc8U2eckCyPU8J50e9HV+9cl9vqrtM5YSmwSR9LDqkt3G8j
-SgUxjK8pTnPtDgs/pYI7wie0jWRgQ4JGmjWFwZzLhim7lKYEx6VV1wOCyjZfWnyz
-uWm/Mp3XIVjQsYIQk6WO7DK3ULyrNWet0DTjrC9GIgndyG1SQc/wKaAe95A3Nu0Z
-ktqiTIzPznmh4KmU2WUKHzZ29ScIQagF7TtCaE2FqtiKD1t2cMVmEOz9ip34mLsq
-OTmEqcqR5bZFzw27KmwXb1M3eZnmpD54om+EaVfO4BjAkm4EUiXrUz3uOdqrX821
-FkByI3JvdCFLhXhms1h6q2X+PGwzAzX6CwRZxjvQ9qNzFwljxQR6C5XUUe6bYyK6
-dwRydZnRxvtkFoLdLV2oXK53EoBhptp0qV65+58VNIdOYAC+YQfpZqv3irYp2lzX
-ryObJHy9nfC5qDwVzueQzrw50mNdXdBeOILFZHHLMosXtiLR5L8N4h5FLO9IP4in
-+AYHfYBjmfkAWiqJ7UPQ
-=wQc8
+iJwEAQEIAAYFAlV8CB8ACgkQG9wOWsQutdZHyAP/RIYsOP/s2oKJca992fa5KiQF
+ooN4pJho/0biC4GaURUDaOcbRnfY/W8GPoUBzJ37rrMgNJitUcfeG54ctIVoVVwA
+g1+ZooHRxr5Sbc3CcOByjgYD2fvAa2WPYnnBKkNg2nzsqetjexy8frg0giYs1Zuv
+MH+FOIBM0AxxmCZb7Og=
+=wqjJ
 -----END PGP SIGNATURE-----
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"
-}