Several small fixes. Correctly install init script. Use enewuser.

6 files changed, 59 insertions, 47 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 075a0135230e..58c018149306 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/lighttpd
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.6 2004/11/02 20:22:44 stuart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.7 2005/01/04 13:34:15 swegener Exp $
+
+  04 Jan 2005; Sven Wegener <swegener@gentoo.org> lighttpd-1.3.5.ebuild:
+  Several small fixes. Correctly install init script. Use enewuser.
 
 *lighttpd-1.3.5 (02 Nov 2004)
 
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index ddf12f8c5bf1..30c2a510719d 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,14 +1,24 @@
-MD5 4d6b3a498dfc3fd781ad937ace09ebe8 ChangeLog 2844
-MD5 3e1d889652f2bbbe1a7213102f9e27ac lighttpd-1.1.8-r1.ebuild 1924
-MD5 5667b4c4ad06685e3896ed5938557680 lighttpd-1.1.8.ebuild 1921
-MD5 fae1d9e209a9d8a9179bcc689184910f lighttpd-1.2.2.ebuild 2046
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9f868dd6e44f769ec736159e342cf417 lighttpd-1.3.5.ebuild 2342
+MD5 06f884c7ab1b91b0e2910d79fb4f9c74 lighttpd-1.1.8.ebuild 1923
+MD5 276acf7b725ea3cc31e0ff3ad79d24eb lighttpd-1.1.8-r1.ebuild 1926
+MD5 e364228aeb989e884f85826d8e9d43d1 ChangeLog 2988
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
-MD5 5a0f22442b0f8a6d1cf333d662209293 lighttpd-1.3.5.ebuild 2502
-MD5 eb94c0fc2149e2543beb50e93058de99 files/digest-lighttpd-1.1.8 66
-MD5 eb94c0fc2149e2543beb50e93058de99 files/digest-lighttpd-1.1.8-r1 66
-MD5 0d9277bbfb98755640329afa81c8bee2 files/digest-lighttpd-1.2.2 66
-MD5 352e2fac9cb73bdae7672f977b044894 files/lighttpd-1.1.8-gentoo.diff 1301
+MD5 4084d21b36bf6a0dc9349fa75ccacde9 lighttpd-1.2.2.ebuild 2046
 MD5 32569e20d3ecdd51ac0534cc85d52354 files/lighttpd-1.2.2-php.diff 1184
 MD5 dcfa5883c3433b49204b6b4de25a9a3c files/lighttpd-1.2.2.initd 800
 MD5 0b20460d5762811ccb8312c2666107e6 files/lighttpd.initd 635
+MD5 eb94c0fc2149e2543beb50e93058de99 files/digest-lighttpd-1.1.8 66
+MD5 0d9277bbfb98755640329afa81c8bee2 files/digest-lighttpd-1.2.2 66
 MD5 0cf0d92da4da90a9fc4f1b9a58b4eb1e files/digest-lighttpd-1.3.5 66
+MD5 352e2fac9cb73bdae7672f977b044894 files/lighttpd-1.1.8-gentoo.diff 1301
+MD5 eb94c0fc2149e2543beb50e93058de99 files/digest-lighttpd-1.1.8-r1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB2ptdI1lqEGTUzyQRAv0yAJwIlf4WPXfXWmIt8aHVY0FpT5LaOwCcCR/B
+elL9FIk+d8eXKNuQ0JveQ0k=
+=l/cI
+-----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/lighttpd-1.1.8-r1.ebuild b/www-servers/lighttpd/lighttpd-1.1.8-r1.ebuild
index 80bbeddcc44c..231954373213 100644
--- a/www-servers/lighttpd/lighttpd-1.1.8-r1.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.1.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.1.8-r1.ebuild,v 1.1 2004/08/08 17:28:06 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.1.8-r1.ebuild,v 1.2 2005/01/04 13:34:15 swegener Exp $
 
 inherit eutils
 
diff --git a/www-servers/lighttpd/lighttpd-1.1.8.ebuild b/www-servers/lighttpd/lighttpd-1.1.8.ebuild
index fcb45bec7502..23f1fdaad7a1 100644
--- a/www-servers/lighttpd/lighttpd-1.1.8.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.1.8.ebuild,v 1.1 2004/08/08 17:28:06 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.1.8.ebuild,v 1.2 2005/01/04 13:34:15 swegener Exp $
 
 inherit eutils
 
diff --git a/www-servers/lighttpd/lighttpd-1.2.2.ebuild b/www-servers/lighttpd/lighttpd-1.2.2.ebuild
index 18756e04d7b8..f237d5141340 100644
--- a/www-servers/lighttpd/lighttpd-1.2.2.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.2.2.ebuild,v 1.2 2004/09/03 15:58:51 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.2.2.ebuild,v 1.3 2005/01/04 13:34:15 swegener Exp $
 
 inherit eutils
 
diff --git a/www-servers/lighttpd/lighttpd-1.3.5.ebuild b/www-servers/lighttpd/lighttpd-1.3.5.ebuild
index 5f4dbf960286..70fd8b68d446 100644
--- a/www-servers/lighttpd/lighttpd-1.3.5.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.3.5.ebuild
@@ -1,79 +1,78 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.5.ebuild,v 1.1 2004/11/02 20:22:44 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.5.ebuild,v 1.2 2005/01/04 13:34:15 swegener Exp $
 
 inherit eutils confutils
 
-URI_ROOT="http://jan.kneschke.de/projects/lighttpd/download/"
 DESCRIPTION="lightweight high-performance web server"
 HOMEPAGE="http://jan.kneschke.de/projects/lighttpd/"
-SRC_URI="$URI_ROOT/${P}.tar.gz"
+SRC_URI="http://jan.kneschke.de/projects/lighttpd/download/${P}.tar.gz"
 LICENSE="QPL-1.0"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE="mysql ssl php modchat modcache modlocalizer xattr ldap"
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 		>=dev-libs/libpcre-3.1
 		>=sys-libs/zlib-1.1
-		>=sys-devel/libtool-1.4
 		>=dev-libs/localizer-0.3.3
 		mysql? ( >=dev-db/mysql-4.0.0 )
-		ssl?   ( >=dev-libs/openssl-0.9.7 )
-		php?   ( >=dev-php/php-cgi-4.3.0 net-www/spawn-fcgi )"
-RDEPEND=">=sys-libs/zlib-1.1
-		 >=sys-devel/libtool-1.4
-		 mysql? ( >=dev-db/mysql-4.0.0 )
-		 ssl?   ( >=dev-libs/openssl-0.9.7 )"
-S=${WORKDIR}/${P}
+		ssl? ( >=dev-libs/openssl-0.9.7 )
+		php? (
+			>=dev-php/php-cgi-4.3.0
+			net-www/spawn-fcgi
+		)"
+
 LIGHTTPD_DIR="/var/www/localhost/htdocs/"
 LOG_DIR="/var/log/lighttpd/"
 
 pkg_setup() {
-	if ! grep -q ^lighttpd: /etc/passwd ; then
-		useradd  -g nofiles -s /bin/false -d ${LIGHTTPD_DIR} \
-			-c "lighttpd" lighttpd || die "problem adding user lighttpd"
-	fi
+	enewuser lighttpd /bin/false "${LIGHTTPD_DIR}" nofiles
 }
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	epatch ${FILESDIR}/${PN}-1.1.8-gentoo.diff
+
 	if useq php ; then
 		epatch ${FILESDIR}/${PN}-1.2.2-php.diff
 	fi
 }
 
 src_compile() {
-	local my_conf
+	local my_conf="--libdir=/usr/$(get_libdir)/${PN}"
 
-	my_conf="--libdir=/usr/lib/${PN}"
 	#                       extension		USE flag		shared?
 	# -----------------------------------------------------------------
 	enable_extension_enable mod-chat 		modchat			0
 	enable_extension_enable mod-cache		modcache		0
-	enable_extension_enable mod-localizer	modlocalizer	0
+	enable_extension_enable mod-localizer		modlocalizer		0
 	enable_extension_enable attr			xattr			0
 	enable_extension_enable ldap			ldap			0
-	enable_extension_enable openssl			ssl				0
+	enable_extension_enable openssl			ssl			0
 	enable_extension_enable mysql			mysql			0
 	# -----------------------------------------------------------------
 	#                       extension		USE flag		shared?
 
-	econf $my_conf || die "econf failed"
+	econf ${my_conf} || die "econf failed"
 
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README COPYING
-	newdoc doc/lighttpd.conf lighttpd.conf.example
-	dodoc doc/fastcgi.txt doc/authentification.txt
-	insinto /etc;  doins doc/lighttpd.conf
-	exeinto /etc/init.d;   newexe ${FILESDIR}/${PN}-${PV}.initd ${PN}
-	dodir ${LIGHTTPD_DIR} ${LOG_DIR}
-	chown lighttpd:root ${D}/${LOG_DIR}
+	make DESTDIR=${D} install || die "make install failed"
+
+	insinto /etc
+	doins doc/lighttpd.conf || die "doins failed"
+
+	newinitd ${FILESDIR}/${PN}-1.2.2.initd ${PN} || die "newinitd failed"
+
+	keepdir ${LIGHTTPD_DIR} ${LOG_DIR} || die "keepdir failed"
+	fowners lighttpd:root ${LOG_DIR} || die "fowners failed"
+
+	dodoc README COPYING doc/fastcgi.txt doc/authentification.txt || die "dodoc failed"
+	newdoc doc/lighttpd.conf lighttpd.conf.example || die "newdoc failed"
 }
 
 pkg_postinst () {