Version bump. Removed old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 25 insertions, 159 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index da6085609ace..8d44b8682dcf 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/pure-ftpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.156 2015/05/27 09:23:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.157 2015/06/01 10:00:17 polynomial-c Exp $
+
+*pure-ftpd-1.0.39 (01 Jun 2015)
+
+  01 Jun 2015; Lars Wendler <polynomial-c@gentoo.org>
+  -pure-ftpd-1.0.36-r1.ebuild, -pure-ftpd-1.0.37.ebuild,
+  +pure-ftpd-1.0.39.ebuild:
+  Version bump. Removed old.
 
 *pure-ftpd-1.0.38 (27 May 2015)
 
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 79c97cc6c5e5..0ccfe43253c4 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -6,28 +6,27 @@ AUX pure-ftpd.conf_d-3 3728 SHA256 6b67379efa91a6168bd4cebee56ba09dfa77830a4843b
 AUX pure-ftpd.rc11 2136 SHA256 b59fa0c0ee824ad86a8d39df475f66a343734ec3ed9014adad2d3b016ab001e8 SHA512 1318f85905a0cf7caf12c13db13f985c31d353567cc183aa5b31b2039578611f792f1b49afe58ffcdcb9df6939803d9d070c17db6e401fd6822d05e5a56640c6 WHIRLPOOL c70e886d6aa000f62c268ba759a725bc6a423b7521b22bcb8e2d693e17a17c822b3aadb7e6767a34f6dafcd04d41673082586ccf2288b32c8d90cf4e8826198e
 AUX pure-ftpd.xinetd 247 SHA256 30e166051c7331c48ab1d948d6deecaa71130aaf3cfdc3ffb99124971b64f80c SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d WHIRLPOOL 557d9f627b0ff32975edc674386bdde3676ab8e69d486e28755f889e844171f5a26a53511f313a9416e3376d27f00113b005f12c9605017498b898862c9e3fc1
 DIST pure-ftpd-1.0.36.tar.bz2 487746 SHA256 16e3cff004c80d752ff85e8a011a523867c7f2ab99af0f9c170891118e0fcc6b SHA512 875a9a8e9f63add265077d52b7584e0682786f497b493ca81cac3d72b1084fcd02c11627826742ed94cc28f146b8581b9aa638cab958dcbd3f462fff37da89c6 WHIRLPOOL 0ef07b890bc57b7a7e4d54ea89d674d1f11118e5c09bc5d257e6cd818dd9ad4e02e4e9373107a1b63314e4a9b4c4664836d5d7730bce6d26a400ea94522e9ed6
-DIST pure-ftpd-1.0.37.tar.bz2 491578 SHA256 d7e57c213faff3cf6ff488f052d841160159868ced4f1b20c301edf495969fda SHA512 ef7ec27846fa4a599fa40ea3231a580421cececd1ab1b6574ed6d5474a3da873d7dd2093d39dbae91a6a5f11144728c903a71ae94b20de464b2a5f392ee1b620 WHIRLPOOL b21544243b9e4238dc40337e001920814c0204326c46ec092045350999d9f194716ac1529673cee3727f943755949a8439e23db56da2dba149cc9102144d327f
 DIST pure-ftpd-1.0.38.tar.bz2 494578 SHA256 156a3da1f269f927a66c603b79b7911d8c21d04d3475944f6518abcd261332f3 SHA512 162c46f3d609792b1669dd0f328f67a0241ccfc6872bf5a4fdce746ea07e62416e1eccba4ecc62e08cda6b90c51adde2d4901b1dcb62c8bb1550fd39eb289e6d WHIRLPOOL a32d414f876a013437fd9db90e594d5ab1121d7954d06dcb02c6103b277589591b0676175d189e822fe3502990ab9cf23d885092408352bf76aaba4a715f5f49
-EBUILD pure-ftpd-1.0.36-r1.ebuild 4383 SHA256 b4ebf0af320f242744c7d9354f96d45bae8f767af50b3ad19b043c191e52ce7f SHA512 2bcf98016125a6247e131e6e151a4a8aa16545809cb5ed57db707661d89c4e9d599fefa0f56d9ced548caa6cbfe98c52a591dc01264232e15cf45d24c7b84825 WHIRLPOOL 12ff07d207e9adb2b2f28caf2bac3b264d668865f1951271403d77a7c3bdaf697fb848d281e381851be16b49d60f65be5f9434f320548e31cb4979ca0d21dd0e
+DIST pure-ftpd-1.0.39.tar.bz2 494805 SHA256 09132c420da7aa19e1bd972f8f8d180cf7638a7d869d15496157e7fde5b59353 SHA512 4ce4006184d43452e236c03c1df1cc1127d989cb41e0692c19332cab29b300875636e2267c8404a6d89b83e8d9b92363512d76a6ceda2e6e17f7df242ccd2786 WHIRLPOOL ef5cbbdbba8c941bb2592d3230ccf67baa653a75dd50116e785e62cb60dc7123b7625d37b3ccdf38e4c08f1990621919451e4d9ee71c6ebd357ff0599d481119
 EBUILD pure-ftpd-1.0.36.ebuild 4017 SHA256 bff4ae96bb63350349be1a564aad8c6029512a49692b871c7d7529d28704c0bf SHA512 e436829fe1caf5b46af4aa77906d9df714a7d844be4e73febfda35376ec55adba8d8580ee4f052d09c349926ca1343dad51eb75fc11697668dd937b629091e17 WHIRLPOOL 2c8dd96bc490de454846dcf9d779557b3e4af34124a27abfcca78b9af42662aa679574029cb6a3d89ed9d93196e1724806d81184c993f36cf2325343f5d80a4e
-EBUILD pure-ftpd-1.0.37.ebuild 4386 SHA256 3d4c0277427d6a542c14df18815aaa70adfe9945c1cfd1421f36a4d6f3bf5e73 SHA512 7565ca18a0f6f003b652f0fdaf8c1446f6f559f4b8c795e73b4978ca8bf03a7407e54f00252b9d3ef1c733839a6955232f3f888da470a5ea6b4337442938e3e5 WHIRLPOOL eafd64acaeab4f51fbfa2ac106f1764e18cb6f8f821712a366a44104da77ca11ff441152dc709c7a5659767b7aaaba46ce64eea6f884ea33c05ef1ce2c8f7e26
 EBUILD pure-ftpd-1.0.38.ebuild 4386 SHA256 23e6c4c09f6985a00073f6cddb910cf4a22645a2d4bcc84753a68eda6e3f1a49 SHA512 c2c2a5b273ede7cb6506d52479259b5c89e8ec6379796b77a2d2deec68b6057e1b8b744ad8091d88b27a9d6ae4ebaa328a98ac80a838526037085bf0624aff62 WHIRLPOOL f9e48917a495b7a695d5030fb4349028820a293bb6c4eb036bdbaf80bb90484ab246fbc92c73fbd163a6222ebeed7cceb609fad2fd8729181421997fa34fbf88
-MISC ChangeLog 24581 SHA256 ed07afc68bf0657bc9ca4b002a7831469e71e6a9918369b97bc76a85996cff5b SHA512 82cbd938c33cc7c0f96771aecac77aa3eca8048efdede17a05683b2d97c03a4077616d9f66d67804e6de55be72e6d1aece18763f900628770de1a75e6c79518c WHIRLPOOL b95769a50661a3ae9631dce1cf124debd3911576780da8a751043c70ebe146ba3c6bca6cb38e487f92af2bbb3a2ce3d5924f31726d305a74430bfb4dea178928
+EBUILD pure-ftpd-1.0.39.ebuild 4386 SHA256 ba01c17a5da2282fa718b2fc1fa86cfbe8c5f9167a9dc3a5d487abfec9f62f90 SHA512 10f4f6de67d4a63d5c0962a65096239e267fc934b11e3341a99d8dcdcf24da9d67dab87418b3d581b81122f0ddc621ba16de6d9f4d35e0370c770a6999c83ed9 WHIRLPOOL 9582809f435bb3d3d2b88454402f4640b99a140c05db99b82e5dac324d84af2d606c3b38ea830d982621b179befa9ed0a86fb44f762c2557fdd571c2e72a5966
+MISC ChangeLog 24783 SHA256 fb7fe3416020065a4bef36f4c58a213e3db2d9fb52d2571eb5dac82ac3feb676 SHA512 006d10cfabebd47e18ece86820c61e4ab94fbca82830f65b1fb7502db454b4408eb7b8dc81e4eb0a2c2983ec819af0efc0de9cebe0b8d870ae8002237df53028 WHIRLPOOL a83f8369d3d26307404fb8d550d1681213dcc0c296e01206c2a0e53de57b12f300623d6b18435cb2be6ca638aaba5a40dfbf53a20230d07204f50384e6ff2105
 MISC metadata.xml 1240 SHA256 b84643dabed5b46821ed0540289e8335682981ceb0a8f48ea39d6eba158483b1 SHA512 d5c007246be504b4ea5dfe759d4fe7d64609a38a85b527429972d61484a396c1d703d278f56b657b6857bf93d43845d64d8520888c8a23e5313d5c07d0aa898d WHIRLPOOL 06dcefb0d864cce880416109f9b887dcf8ec81a5f8c2124ecab6d9ecbdd4bc9d63bf2e023dc48be3cfedbf0c028b4ff20d92e9eb8cb80ea88755da8ea8a6aac2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVZYz+AAoJEPiazRVxLXTFbiIP/0LDqAD1n51ba7WjIvlnHvZ5
-Uth172Vsx+LY3VTUAY5TSOO4evDbmgWol/7+Y0bF0c26Y+Wg0EH7HNz326HnpaeV
-Bs8mg8AZNveGeC4yW8JaRj/OaOp+4jzFifQOqnz2dJb8CXDKW+fABSfZVXpsD87R
-a+M4d17U759salQVaRNLd+9ssNiyy8SJooD+cqUcykYFUzPDke97HauSjZi7q8h+
-jxNBXbghWAV42heEvrJWYpTh6mTydOWbcnCCHVl4LM8pKMwHykqip+6orrnxcXYD
-KftFhKjtrgYXger6vMUvwQpNaZ6muYRGYvFaa8Pl7a6lqXLqjMJOO/E2rpZ5yKQv
-mvAWEMhTDz16mRmOgvOagtefkxQHcc607p2Eom30oVDFIQpxRohLjSR1KBFJ7vhg
-miH6coEs7+EyEiJEGkuXmcPP6itUzPRUXxrqEP9LphgkY1ieyZv5D9xTx24Kb6ee
-SbdvcikAPxJaqjpmgtm4BT02yiT/mIxYW7VG3I4Ssrc81wcrL91eFHOoD6vJSllI
-XnFnYE4oWaIw8C/cZvdAcI5cGxG70yIgBdIOVqUI8407FFVYvtjlWxIwpZH+4E0q
-sfXaiNvGidO9cLLbALujKCw+NJ9bRQy66hHNq5eLRIqJnB5TZTf795QZL17i3g6L
-6lVvAvG0r0xxPiJXg/Gs
-=ARjD
+iQIcBAEBCAAGBQJVbC0yAAoJEPiazRVxLXTFg5gQAI57k8ZDSJJ/0AxmO4hogH9c
+pUGAcOUgoUEnl3W6vbOv9liRrwSs5gPI/037uRMJnPPrJqFUXAHdzDsqyrijejTX
+lE8+F1k+LiAv339RrahUNhBoOfng16qIR/SdsfsMf+2p8gqIgLoy+W4/TiosnyN7
+ULPu1JBtxeMhCgx0lfkfPcnSrr3+oapZ8DKt/71KmnympN77g6/+UoopFo/043mI
+gi/UGJ1NGrTJYpNDhPSndiLldpCHlycnY5oLrMPW1ftPqWPIdtVQOvKhQzbWYIci
+KK0HRpUCxxI82tTS049KPqyAelYpyWDTJjzSLl5GVIcsJcMNDeZN1WrBNBZrjvcf
+o1oM9Ktn/tCQKEioq5TM8BQtwST3pQU60od6g6EB+9l21YyOG1NCVevbXfvWWsrT
+c0bdbFA+5COdAlKP7cbMYAqic7R6kghPqbwHvO1a8001O2Ik00nYPJ8donrp+QsN
+7PRj9jY91skVuKhLKbXxuiLcPmLE9ow0I745ftBS6oe2OZRVRmz+8GEaEdVO6JSY
+mkq3NLgUrPWAjtrJWo4ZCzSgK4mISQ8hm2iIfm1KCS3NwLpLKzdQlPZDXyvGTCEs
+iDE+3UU7zxIKlDnLzv8vSrA1olHhdReiaF0suN+so2MVoNnhObGDyTRROpJ7i6L6
+zSQts8VEfdN7m3tQL+E8
+=yGql
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.36-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.36-r1.ebuild
deleted file mode 100644
index 9d7b2155ef74..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.36-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.36-r1.ebuild,v 1.5 2015/04/16 09:35:12 polynomial-c Exp $
-
-EAPI=5
-inherit eutils confutils flag-o-matic
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
-HOMEPAGE="http://www.pureftpd.org/"
-SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
-	http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="anondel anonperm anonren anonres caps charconv implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
-
-REQUIRED_USE="implicittls? ( ssl )"
-
-DEPEND="caps? ( sys-libs/libcap )
-	charconv? ( virtual/libiconv )
-	ldap? ( >=net-nds/openldap-2.0.25 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql:= )
-	ssl? ( >=dev-libs/openssl-0.9.6g:0= )
-	sysquota? ( sys-fs/quota[-rpc] )
-	xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.28-pam.patch
-}
-
-src_configure() {
-	# adjust max user length to something more appropriate
-	# for virtual hosts. See bug #62472 for details.
-	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
-		-i "${S}/src/ftpd.h" || die "sed failed"
-
-	local my_conf=""
-
-	# Let's configure the USE-enabled stuff
-	enable_extension_without	"capabilities"		"caps"
-	enable_extension_with		"rfc2640"		"charconv"		0
-	enable_extension_with		"ldap"			"ldap"			0
-	enable_extension_with		"mysql"			"mysql"			0
-	enable_extension_with		"pam"			"pam"			0
-	enable_extension_with		"paranoidmsg"		"paranoidmsg"		0
-	enable_extension_with		"pgsql"			"postgres"		0
-	enable_extension_with		"tls"			"ssl"			0
-	enable_extension_with		"implicittls"		"implicittls"		0
-	enable_extension_with		"virtualchroot"		"vchroot"		0
-	enable_extension_with		"sysquotas"		"sysquota"		0
-	enable_extension_without	"inetd"			"xinetd"
-
-	# noiplog is a negative flag, we don't want that enabled by default,
-	# so we handle it manually, as confutils can't do that
-	use noiplog && my_conf="${my_conf} --without-iplogging"
-
-	# Those features are only configurable like this, see bug #179375.
-	use anondel && append-cppflags -DANON_CAN_DELETE
-	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren && append-cppflags -DANON_CAN_RENAME
-	use anonres && append-cppflags -DANON_CAN_RESUME
-	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
-
-	# Do not auto-use SSP -- let the user select this.
-	export ax_cv_check_cflags___fstack_protector_all=no
-
-	econf \
-		--with-altlog \
-		--with-cookie \
-		--with-diraliases \
-		--with-extauth \
-		--with-ftpwho \
-		--with-language=${PUREFTPD_LANG:=english} \
-		--with-peruserlimits \
-		--with-privsep \
-		--with-puredb \
-		--with-quotas \
-		--with-ratios \
-		--with-throttling \
-		--with-uploadscript \
-		--with-virtualhosts \
-		--enable-largefile \
-		${my_conf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS
-
-	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
-
-	if use implicittls ; then
-		sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
-			|| die "Adjusting default server port for implicittls usage failed!"
-	fi
-
-	newinitd "${FILESDIR}/pure-ftpd.rc11" pure-ftpd
-
-	dodir /var/lib/run/${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" pure-ftpd
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog
-		elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
-		elog
-		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
-		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
-		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
-		ewarn
-		if use charconv ; then
-			ewarn "Charset conversion is an *experimental* feature!"
-			ewarn "Remember to set a valid charset for your filesystem in the configuration!"
-		fi
-	fi
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.37.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.39.ebuild
index 3eda54b705e6..6dfc8d7c159d 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.37.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.39.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/pure-ftpd/pure-ftpd-1.0.37.ebuild,v 1.1 2015/04/16 09:35:12 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.39.ebuild,v 1.1 2015/06/01 10:00:17 polynomial-c Exp $
 
 EAPI=5
 inherit eutils confutils flag-o-matic