Version bump. Removed old. Adjusted openssl and postgresql slot dependency

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

7 files changed, 79 insertions, 208 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 7768a794c890..8af1cfee79f2 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/pure-ftpd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.154 2014/12/28 16:23:21 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.155 2015/04/16 09:35:12 polynomial-c Exp $
+
+*pure-ftpd-1.0.37 (16 Apr 2015)
+
+  16 Apr 2015; Lars Wendler <polynomial-c@gentoo.org>
+  -pure-ftpd-1.0.29-r1.ebuild, pure-ftpd-1.0.36.ebuild,
+  pure-ftpd-1.0.36-r1.ebuild, +pure-ftpd-1.0.37.ebuild,
+  -files/pure-ftpd.conf_d-2, -files/pure-ftpd.rc10:
+  Version bump. Removed old. Adjusted openssl and postgresql slot dependency.
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org>
   pure-ftpd-1.0.29-r1.ebuild, pure-ftpd-1.0.36.ebuild,
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 7c45fe8aa9d2..94d70ae549bc 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -2,22 +2,30 @@
 Hash: SHA256
 
 AUX pure-ftpd-1.0.28-pam.patch 564 SHA256 21b340701ba18454cc55b7a719033c71d758960b02cc626ff60183a5dae50fc7 SHA512 dfaa24a95747fcc85e48e87bc31b8c8ee5c2e80128fcac02a2dc9ad9addd2c17724c9369c03c1b5a44d9ecc751f0135a35a16263a3f476b1b64a4201a3ce49f7 WHIRLPOOL de9ede827c171a5a0a312470b83d6072d21f9cd4fd9d932d879f44c34bbbf5a11d7ebf2cddd5de7e23cdc92cce64825ec08c0d284da4a58e9425a1092cdf6c07
-AUX pure-ftpd.conf_d-2 3778 SHA256 8e48df3365bd74a1d8fa7c394e035c69bf7953a70ccc417377c9c881097bddca SHA512 928391a16daf32ce3a57462a4c1fe36665b9406185024d8d2d850ae1934d655ba23ffc35309055138c746e45dd7d13b339dc68262837e31b18f6ffc3d9aba98e WHIRLPOOL 3bd83c0db9cd83e54fab898826e6bb31ae9bf659eb7f99a635bedd483210be043a8646074d7985d666a07cbcfbc289844c0d48415e280e5c1c20dc2c3c49b681
 AUX pure-ftpd.conf_d-3 3728 SHA256 6b67379efa91a6168bd4cebee56ba09dfa77830a4843b25edb7a85f1bb88e5fa SHA512 a5cc8e59178a5d0f7b5909d09009ef6ace1f8e6874bd733e21bc30f4899447e70b020a0369077132751ceb28afa971588efedcce3dea83e9b043b1545caf3393 WHIRLPOOL 5004cbac643d05b0315309d943c1718c30778f07bcbfb834fb3957a7b9060b24ad98607793060549dc17a61ec7714a5081d80151dfa80b0d41d0f9abad77c312
-AUX pure-ftpd.rc10 2016 SHA256 fa04d693578ff449a36f291ced5ee553f6f27f0995e1243acdfe53d666eb2f8a SHA512 895b3c3ba29696e2518963e82381e1543ac85ae81e83a9516a93ea6e5bb4d4243da080300657a589be7d3d5f0d01cc88498cff9488810952504a538d11682875 WHIRLPOOL de085a1698f61263d221037139d1eb7152132af0c691f56249562a0741ad9e2cb50fff11de39d3b5a25679930c15aed9939f1278196fd9be0602522a119bdcca
 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.29.tar.bz2 466867 SHA256 b9217802d2674c0471fc43004565d4630e0938ca8530c3a1b73361d405259f5f
 DIST pure-ftpd-1.0.36.tar.bz2 487746 SHA256 16e3cff004c80d752ff85e8a011a523867c7f2ab99af0f9c170891118e0fcc6b SHA512 875a9a8e9f63add265077d52b7584e0682786f497b493ca81cac3d72b1084fcd02c11627826742ed94cc28f146b8581b9aa638cab958dcbd3f462fff37da89c6 WHIRLPOOL 0ef07b890bc57b7a7e4d54ea89d674d1f11118e5c09bc5d257e6cd818dd9ad4e02e4e9373107a1b63314e4a9b4c4664836d5d7730bce6d26a400ea94522e9ed6
-EBUILD pure-ftpd-1.0.29-r1.ebuild 3802 SHA256 abb1e570dd0d7d1a0d432acec75b61f63377e8d19358995e8683a3fbaabff9ad SHA512 829024a86ba303104126349ff3dedf6f921a427defbf387ba046a52954fad89d951a81c94986d40d3171a5bd070fba44a288ceccd27ece9f10b667c13fc142fd WHIRLPOOL 9321f595e199f7aeece34afae905db09a5d191395a9dc69e59f5ecaa5b83432b882ddabac69836832d48d3c10cda69bc7b78853b58573d38714391f0c18ae3c0
-EBUILD pure-ftpd-1.0.36-r1.ebuild 4376 SHA256 872172e9487beee1b16f677e03d08f75bffc63ac484c3b5815ab537a77083fff SHA512 3a3a90702488b6e26e79260a5a179ccc1c8a65fdc3045767d895a893887cd9c434b0a631b279e4a03200f6a2233b3b0344172d5d4547bc6347601ab09cadb11e WHIRLPOOL 8371014858036ff5aaf121b9a7219a461749c7e06fbd1ed75d3cff97867f594e8984308efab810de905eda5518cc1f50f3ef4484ba1535fe3decd420735a0f86
-EBUILD pure-ftpd-1.0.36.ebuild 4010 SHA256 325ddcc49bf7a00011751654987f469fa2bfced5fac7bfbbf06c3abab8142bc3 SHA512 a81379d9317053d739192f4ac76e3718e0d7cb08f9c660d6058dc19b771237e4bff9d139aaac917557c4674a5c5d2ee11f65c9c8076e89b53f884fad050094d1 WHIRLPOOL 3b8f61e5cfce22a1cd554fce0fe81bb51f20e31b2af8b76ec76ac4c872d95a1f003a4eca94ee9fd813399153dbf6dc261993be109d6c5fcb8ea2164df2a945c9
-MISC ChangeLog 24119 SHA256 0a17309e22a480e0a2215f45e52f20f3be0c3d1f50779c64e57c208a57c73700 SHA512 e31396f9f8eb8b245308cd6f668a05e762b7b01ded4eb46dc338af04efc00fd5073b9bf84be4de2221b5577c14ed883ddfac0ab4aa220bc1d924db7181ba807f WHIRLPOOL 53aa75e04ec309349d7086ae4299524f70dff2136d7744206ebe882fec350b26492767fa92c0d37aed1e56d1d4697281e43558bbb943ca05c6911d43b9f060a1
+DIST pure-ftpd-1.0.37.tar.bz2 491578 SHA256 d7e57c213faff3cf6ff488f052d841160159868ced4f1b20c301edf495969fda SHA512 ef7ec27846fa4a599fa40ea3231a580421cececd1ab1b6574ed6d5474a3da873d7dd2093d39dbae91a6a5f11144728c903a71ae94b20de464b2a5f392ee1b620 WHIRLPOOL b21544243b9e4238dc40337e001920814c0204326c46ec092045350999d9f194716ac1529673cee3727f943755949a8439e23db56da2dba149cc9102144d327f
+EBUILD pure-ftpd-1.0.36-r1.ebuild 4383 SHA256 b4ebf0af320f242744c7d9354f96d45bae8f767af50b3ad19b043c191e52ce7f SHA512 2bcf98016125a6247e131e6e151a4a8aa16545809cb5ed57db707661d89c4e9d599fefa0f56d9ced548caa6cbfe98c52a591dc01264232e15cf45d24c7b84825 WHIRLPOOL 12ff07d207e9adb2b2f28caf2bac3b264d668865f1951271403d77a7c3bdaf697fb848d281e381851be16b49d60f65be5f9434f320548e31cb4979ca0d21dd0e
+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
+MISC ChangeLog 24451 SHA256 605391df33ee9377f97dbb8ed4ce0b9e1e284f9ed9a3097c1881cc2078da6afb SHA512 b5fb49974d096102d385ba629c7a22ac95f1d8d5c559b51dee245257874360fd7ae13f4fce293c2ad2f98c5dfb511c40b31bf94e018e682a690584b31f0f5acb WHIRLPOOL 89e89494f9dbe135133b55bb5abcdf35c7b286d601f62333ae2b7f5434ad5f7237ab183a33a4149f30f24e631a4c3476dc9acf7d620b26c82892be84c7404999
 MISC metadata.xml 1240 SHA256 b84643dabed5b46821ed0540289e8335682981ceb0a8f48ea39d6eba158483b1 SHA512 d5c007246be504b4ea5dfe759d4fe7d64609a38a85b527429972d61484a396c1d703d278f56b657b6857bf93d43845d64d8520888c8a23e5313d5c07d0aa898d WHIRLPOOL 06dcefb0d864cce880416109f9b887dcf8ec81a5f8c2124ecab6d9ecbdd4bc9d63bf2e023dc48be3cfedbf0c028b4ff20d92e9eb8cb80ea88755da8ea8a6aac2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSgLnsACgkQVxOqA9G7/aCXrAD7BstxkoF5FqfV2bR4zTOllfvI
-15JBAGUS+tgszMLa5woA/As1ZR5otNM/X8cO42aFTtnXK2BYauxJF1AFvNNw8QPL
-=woCZ
+iQIcBAEBCAAGBQJVL4JRAAoJEPiazRVxLXTFSIEP/1AMG113hB2I+xKXME5JsNpw
+r5nr86GO24ghnMHtlCHMK3bxZ8JUPVmAvVAgFEENWejpQi65G4HuS/+SDsTJll6k
+wl6HPW/Yk2k/02RUNUwpSwS0z7U/YsZcAfuemhl1edL8IsjHwe36JgsMFoaajYIH
+83MP8ZkPXQeGFIt0DqfY8vJLpDoTR9GxOJarfq1wCaBqS4EyA/Xv2h5VyketN4Jm
+L01oRwgH5HpU3mqeiI5Y152qdIF+QIW7KSKs85OtnvFnqZ6HWyhTLjeIn/qdCYNr
+VdJxJ//lg/U7KEiG8LKRClG9y6NhpNAzeTX59S/nMIwojcBGupHWZBmtV3QIKASD
+mWZSLqWQFcKVeE5sCCsvoiEoUo0at5uSmFBJZXX4vCBhEtuRQ6aGjcKMFz+v1Mbn
+ZMRhap1K3719pXqn2LiUOMsdQjiO6VXANhtoQgyXN+kmGRhNQFt1ZfTx8Kqw3lHK
+7g5dPdxgnuSmZ6CIEKw4jPZXcwl8fwE20b2xBpp9sSXDO5BQnlLAfzWn9KQr0fVG
+ATeVuxRWtQXqscykVUx0s2/6KnhyBVjsBEIhbOtKCw/oZJm/nCYQ/6JBGohL362Z
+JG+X1ek/6S/wudJkbpIR39S02SbKWSlmWHd45vtF2eRbPSnw611Rgw95NmUVhucq
+wi432A7sANbVLLwD3Cpy
+=Rk64
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-2 b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-2
deleted file mode 100644
index f14cb0b19c6b..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-2
+++ /dev/null
@@ -1,93 +0,0 @@
-# Config file for /etc/init.d/pure-ftpd
-##Comment variables out to disable its features, or change the values in it... ##
-
-## This variable must be uncommented in order for the server to start ##
-#IS_CONFIGURED="yes"
-
-## FTP Server,Port (separated by comma) ##
-## If you prefer host names over IP addresses, it's your choice:
-## SERVER="-S ftp.rtchat.com,21"
-## IPv6 addresses are supported.
-## !!! WARNING !!!
-## Using an invalid IP will result in the server not starting,
-## but reporting a correct start!
-## SERVER="-S 192.168.0.1,21"
-## By default binds to all available IPs.
-SERVER="-S 21"
-
-## Number of simultaneous connections in total, and per IP ##
-MAX_CONN="-c 30"
-MAX_CONN_IP="-C 10"
-
-## Start daemonized in background ##
-DAEMON="-B"
-
-## Don't allow uploads if the partition is more full then this var ##
-DISK_FULL="-k 90%"
-
-## If your FTP server is behind a NAT box, uncomment this ##
-#USE_NAT="-N"
-
-## Authentication mechanisms (others are 'pam', ...) ##
-## Further infos can be found in the README file.
-AUTH="-l unix"
-
-## Change the maximum idle time (in minutes) ##
-## If this variable is not defined, it will default to 15 minutes.
-#TIMEOUT="-I <timeout>'"
-
-## Facility used for syslog logging ##
-## If this variable is not defined, it will default to the 'ftp' facility.
-## Logging can be disabled with '-f none'.
-#LOG="-f <facility>"
-
-## Charset conversion support *experimental* ##
-## Only works if USE "charconv" is enabled (only Pure-FTPd >=1.0.21).
-## Set the charset of the filesystem.
-# CHARCONV="--fscharset <charset>"
-
-## If you want to process each file uploaded through Pure-FTPd, enter the name
-## of the script that should process the files below.
-## man pure-uploadscript to learn more about how to write this script.
-# UPLOADSCRIPT="/path/to/uploadscript"
-
-## Misc. Others ##
-MISC_OTHER="-A -x -j -R -Z"
-
-#
-# Use these inside $MISC_OTHER
-# More can be found on "http://download.pureftpd.org/pub/pure-ftpd/doc/README"
-#
-# -A [ chroot() everyone, but root ]
-# -e [ Only allow anonymous users ]
-# -E [ Only allow authenticated users. Anonymous logins are prohibited. ]
-# -i [ Disallow upload for anonymous users, whatever directory perms are ]
-# -j [ If the home directory of a user doesn't exist, auto-create it ]
-# -M [ Allow anonymous users to create directories. ]
-# -R [ Disallow users (even non-anonymous ones) usage of the CHMOD command ]
-# -x [ In  normal  operation mode, authenticated users can read/write
-#	files beginning with a dot ('.'). Anonymous users can't, for security reasons
-#	(like changing banners or a forgotten .rhosts). When '-x' is used, authenticated
-#	users can download dot-files, but not overwrite/create  them,  even  if they own
-#	them. ]
-# -X [ This  flag  is  identical  to  the  previous one (writing
-#       dot-files is prohibited), but in addition, users can't even *read* files and
-#       directories beginning with a dot (like "cd .ssh"). ]
-# -D [ List files beginning with a dot ('.') even when the client doesn't
-#      append the '-a' option to the list command. A workaround for badly
-#      configured FTP clients. ]
-# -G [ Disallow renaming. ]
-# -d [ Send various debugging messages to the syslog. ONLY for DEBUG ]
-# -F <fortune file> [ Display a fortune cookie on login. Check the README file ]
-# -H [ By default, fully-qualified host names are logged. The '-H' flag avoids host names resolution. ]
-
-
-# Some filesystems don't like accesses being memory mapped. This happens for
-# example with ftpwho on JFFS2 filesystems (bug #330563). If you happen to 
-# have such a filesystem on /var set TMPFS_MOUNT to "true".
-TMPFS_MOUNT="false"
-
-# Special mount options (like nosuid or nodev) for the tmpfs mount can be added 
-# here. Several options must be separated by comma: "nodev,nosuid"
-#TMPFS_OPTS=""
-
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc10 b/net-ftp/pure-ftpd/files/pure-ftpd.rc10
deleted file mode 100644
index 961ce187402f..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc10
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc10,v 1.2 2011/08/05 09:30:34 polynomial-c Exp $
-
-ftpd_pidfile="/var/run/pure-ftpd.pid"
-script_pidfile="/var/run/pure-uploadscript.pid"
-ftpd_rundir="/var/lib/run/pure-ftpd"
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "$IS_CONFIGURED" ] ; then
-		eerror "You need to setup /etc/conf.d/pure-ftpd first!"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	if ${TMPFS_MOUNT:-false} && grep -q tmpfs /proc/filesystems ; then
-		[ -n "${TMPFS_OPTS}" ] && MOUNT_OPTS="-o ${TMPFS_OPTS}"
-		einfo "Mounting tmpfs on ${ftpd_rundir}"
-		mount ${MOUNT_OPTS} -t tmpfs tmpfs ${ftpd_rundir} \
-			|| eerror "Unable to mount tmpfs"
-	fi
-
-	# only works with openrc
-	WAIT=""
-	if [ -f /etc/init.d/sysfs ]; then
-		WAIT="--wait 100"
-	fi
-
-	UPSCRIPT=""
-	if [ -n "$UPLOADSCRIPT" ] ; then
-		UPSCRIPT="--uploadscript"
-	fi
-	ebegin "Starting Pure-FTPd"
-	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} --exec /usr/sbin/pure-ftpd ${WAIT} -- --pidfile ${ftpd_pidfile} $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
-	result=$?
-	if [ $result -ne 0 ] ; then
-		eend 1 "Could not launch Pure-FTPd"
-	else
-		eend $result
-		if [ -n "$UPLOADSCRIPT" ] ; then
-			ebegin "Starting Pure-FTPd upload script"
-			start-stop-daemon --start --quiet --make-pidfile --pidfile ${script_pidfile} --exec /usr/sbin/pure-uploadscript --background ${WAIT} -- -r $UPLOADSCRIPT
-			eend $?
-		fi
-	fi
-}
-
-stop() {
-	ebegin "Stopping Pure-FTPd"
-	start-stop-daemon --stop --retry 20 --quiet --pidfile ${ftpd_pidfile}
-	eend $?
-	if [ -n "$UPLOADSCRIPT" ] ; then
-		ebegin "Stopping Pure-FTPd upload script"
-		start-stop-daemon --stop --retry 20 --quiet --pidfile ${script_pidfile}
-		eend $?
-	fi
-
-	if ${TMPFS_MOUNT:-false} && mount | grep -q ${ftpd_rundir} ; then
-		umount ${ftpd_rundir} >/dev/null 2>&1
-	fi
-}
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
index 796ff09b4696..9d7b2155ef74 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.36-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.36-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.4 2014/12/28 16:23:21 titanofold Exp $
+# $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
@@ -24,8 +24,8 @@ DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( >=net-nds/openldap-2.0.25 )
 	mysql? ( virtual/mysql )
 	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
+	postgres? ( dev-db/postgresql:= )
+	ssl? ( >=dev-libs/openssl-0.9.6g:0= )
 	sysquota? ( sys-fs/quota[-rpc] )
 	xinetd? ( virtual/inetd )"
 
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
index 2baab8ba64c8..ebbd68cfb28d 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.ebuild,v 1.15 2014/12/28 16:23:21 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild,v 1.16 2015/04/16 09:35:12 polynomial-c Exp $
 
 EAPI=5
 inherit eutils confutils flag-o-matic
@@ -22,8 +22,8 @@ DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( >=net-nds/openldap-2.0.25 )
 	mysql? ( virtual/mysql )
 	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
+	postgres? ( dev-db/postgresql:= )
+	ssl? ( >=dev-libs/openssl-0.9.6g:0= )
 	sysquota? ( sys-fs/quota[-rpc] )
 	xinetd? ( virtual/inetd )"
 
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.37.ebuild
index ce1f4d4155ca..3eda54b705e6 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.37.ebuild
@@ -1,31 +1,36 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.29-r1.ebuild,v 1.10 2014/12/28 16:23:21 titanofold Exp $
+# $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 $
 
-EAPI=2
+EAPI=5
 inherit eutils confutils flag-o-matic
 
-KEYWORDS="~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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"
+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 ldap mysql noiplog pam paranoidmsg postgres selinux ssl vchroot xinetd"
+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 )
+	postgres? ( dev-db/postgresql:= )
+	ssl? ( >=dev-libs/openssl-0.9.6g:0= )
+	sysquota? ( sys-fs/quota[-rpc] )
 	xinetd? ( virtual/inetd )"
 
 RDEPEND="${DEPEND}
+	dev-libs/libsodium
 	net-ftp/ftpbase
 	selinux? ( sec-policy/selinux-ftp )"
 
@@ -36,20 +41,23 @@ src_prepare() {
 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"
+	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_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		"paranoidmsg"		"paranoidmsg"		0
 	enable_extension_with		"pgsql"			"postgres"		0
 	enable_extension_with		"tls"			"ssl"			0
-	enable_extension_with		"virtualchroot"	"vchroot"		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,
@@ -61,6 +69,7 @@ src_configure() {
 	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
@@ -81,17 +90,22 @@ src_configure() {
 		--with-uploadscript \
 		--with-virtualhosts \
 		--enable-largefile \
-		${my_conf} || die "econf failed"
+		${my_conf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 
 	dodoc AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS
 
-	newconfd "${FILESDIR}/pure-ftpd.conf_d-2" pure-ftpd
+	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.rc10" pure-ftpd
+	newinitd "${FILESDIR}/pure-ftpd.rc11" pure-ftpd
 
 	dodir /var/lib/run/${PN}
 
@@ -110,15 +124,18 @@ src_install() {
 }
 
 pkg_postinst() {
-	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!"
+	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
 }