eapi=2 - introduce vanilla use flag - disable tests, as they only check installation - improve pkg_postinst

Package-Manager: portage-2.2_rc42/cvs/Linux i686

3 files changed, 88 insertions, 3 deletions

diff --git a/www-servers/publicfile/ChangeLog b/www-servers/publicfile/ChangeLog
index d38dd6f7c22e..9b3908a134af 100644
--- a/www-servers/publicfile/ChangeLog
+++ b/www-servers/publicfile/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/publicfile
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/ChangeLog,v 1.12 2009/01/03 19:48:09 bangert Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/ChangeLog,v 1.13 2009/10/14 11:55:10 bangert Exp $
+
+*publicfile-0.52-r2 (14 Oct 2009)
+
+  14 Oct 2009; Thilo Bangert <bangert@gentoo.org>
+  +publicfile-0.52-r2.ebuild:
+  eapi=2 - introduce vanilla use flag - disable tests, as they only check
+  installation - improve pkg_postinst
 
   03 Jan 2009; Thilo Bangert <bangert@gentoo.org> publicfile-0.52-r1.ebuild:
   fix quoting
diff --git a/www-servers/publicfile/Manifest b/www-servers/publicfile/Manifest
index 6bfacd30c48f..a8953135b0ad 100644
--- a/www-servers/publicfile/Manifest
+++ b/www-servers/publicfile/Manifest
@@ -2,6 +2,7 @@ DIST ftp-ls-patch 3280 RMD160 2685dbc4d91a3140eb635383b1b47ee674aaae01 SHA1 1316
 DIST publicfile-0.52-filetype-diff 1101 RMD160 e11c38d40d184bbc2046446b3d13aee2b05f8381 SHA1 4a67c20dcf1d93bf8ce62e39eb9c7676b5c5446a SHA256 451f70a2817943b5be0a09941cab9f2473991933097bc21ceb368d68ada414b6
 DIST publicfile-0.52.tar.gz 34892 RMD160 02d2bff245e9d474f26ac29a96775c8eeed0799c SHA1 067e5a0c57bf8ac04c578cac47bd80c2d88eddeb SHA256 3f9fcf737bfe48910812cc357a31bf1f2e3da2490dbd175ce535830f251c08ef
 EBUILD publicfile-0.52-r1.ebuild 1642 RMD160 fcafdc4f18dc58591e10d4fbd90268b9e4361eeb SHA1 9a0c99dbee9c979d3d057468ad7f3dd76511cc1d SHA256 742dd8a8f1b5553b28d5e58d5fe764c64c28c0b9e7bbb25b3b4289e0b25dbafd
+EBUILD publicfile-0.52-r2.ebuild 1995 RMD160 129cd8614fa24ef26d9f9874684cccc54be428e8 SHA1 7dc76388270d8bd121357ef5d7b49581f6c80f87 SHA256 a213b1287e2f064e8c94a2bae6defdd28afcc48bca628d917d0445f69398ba80
 EBUILD publicfile-0.52.ebuild 1472 RMD160 0b9a6fc7a6e413f842b62a1b3539aeadacb8b734 SHA1 2d312b2ae51ff8e035990a8d2cda1826c73a4516 SHA256 70a40fe08199a2aead8c6434c1fa07a8502edfe14015fac7f6611171fbd5247b
-MISC ChangeLog 3082 RMD160 53823e035d924f81307eb45cec81c4e9ad6d9d4d SHA1 e8c635fd7fdd72d95f56f58a3e72220f62e66405 SHA256 423eb49e8722038c2af4e2efc6777e4cc0484882962b89cefa27dd9b5879334e
+MISC ChangeLog 3310 RMD160 a717dee6e400b1cecadc8c1c50eea7a56b1005bc SHA1 b4891b005ff25226cfc519efd7ed3742aefc3066 SHA256 45e9bcf2bae441dc9d565d0115773a0c5486a7a1e10dc20ca091d62bebc5e7be
 MISC metadata.xml 166 RMD160 cd7b5b3e4e4943d69bae98184debdf0a6f9bab9d SHA1 b57962de7999732b1690e79d2e462f8a6f1b121b SHA256 80accb0cd0be4f5ddbc51eaa01a2e74901a5f4a0e86a27b94e4eaee6d0b54b9b
diff --git a/www-servers/publicfile/publicfile-0.52-r2.ebuild b/www-servers/publicfile/publicfile-0.52-r2.ebuild
new file mode 100644
index 000000000000..a3314d215564
--- /dev/null
+++ b/www-servers/publicfile/publicfile-0.52-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/publicfile/publicfile-0.52-r2.ebuild,v 1.1 2009/10/14 11:55:10 bangert Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+IUSE="selinux vanilla"
+DESCRIPTION="publish files through FTP and HTTP"
+HOMEPAGE="http://cr.yp.to/publicfile.html"
+SRC_URI="http://cr.yp.to/publicfile/${P}.tar.gz
+	http://www.ohse.de/uwe/patches/${P}-filetype-diff
+	http://www.publicfile.org/ftp-ls-patch"
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+RDEPEND=">=sys-process/daemontools-0.70
+	>=sys-apps/ucspi-tcp-0.83
+	selinux? ( sec-policy/selinux-publicfile )
+	!net-ftp/netkit-ftpd"
+
+src_prepare() {
+	# filetypes in env using daemontools
+	use vanilla || epatch "${DISTDIR}"/${P}-filetype-diff
+
+	# "normal" ftp listing
+	use vanilla || epatch "${DISTDIR}"/ftp-ls-patch
+
+	# fix for glibc-2.3.2 errno issue
+	sed -i -e 's|extern int errno;|#include <errno.h>|' error.h
+}
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+	echo "/usr" > conf-home
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe ftpd httpd
+	newexe configure publicfile-conf
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+}
+
+pkg_preinst() {
+	enewgroup nofiles
+	enewuser ftp -1 -1 /home/public nofiles
+	enewuser ftplog -1 -1 /home/public nofiles
+}
+
+pkg_postinst() {
+	if [ ! -d /home/public/httpd ]; then
+		einfo "Setting up server root in /home/public"
+		if [ -d /home/public ]; then
+			backupdir=public.old-$(date +%s)
+			einfo "Serverroot exists... backing up to ${backupdir}"
+			mv /home/public /home/${backupdir}
+		fi
+		/usr/bin/publicfile-conf ftp ftplog /home/public `hostname`
+	fi
+	echo
+	einfo "httpd and ftpd are serving out of /home/public."
+	einfo "Remember to start the servers with:"
+	einfo "  ln -s /home/public/httpd /home/public/ftpd /service"
+	echo
+}