Improved ebuild

Package-Manager: portage-2.0.53

8 files changed, 174 insertions, 80 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 36bdbc28ea84..1270e8a0e486 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,9 +1,17 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.18 2005/11/13 23:22:09 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.19 2005/12/27 09:19:48 bass Exp $
 
 *cherokee-0.4.29 (13 Nov 2005)
 
+  27 Dec 2005; josé Alberto Suárez López <bass@gentoo.org>
+  +files/cherokee-0.4.25-fix-static.diff, cherokee-0.4.23.ebuild,
+  cherokee-0.4.24.ebuild, cherokee-0.4.24-r1.ebuild, cherokee-0.4.25.ebuild,
+  cherokee-0.4.29.ebuild:
+  Improve ebuild to solve a few bugs (thanks ka0ttic).
+  Removed "PIC" abuse in some ebuilds.
+  Cleaned some old ebuilds.
+
   13 Nov 2005; josé Alberto Suárez López <bass@gentoo.org>
   +cherokee-0.4.29.ebuild:
   new version
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index b1801e1cc36f..b7443b61ce78 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,32 +1,26 @@
-MD5 d81bf5f9012286774993f8f1db3a2409 cherokee-0.4.22.ebuild 1587
-MD5 f2ec437f17bfba12373c7b935772aeaa cherokee-0.4.29.ebuild 1464
-MD5 c5ca2a469c5ba3b48b9bbf36f1841453 cherokee-0.4.24.ebuild 1582
-MD5 0324ea00a11bb9c0f61328812a4b707a cherokee-0.4.21.ebuild 1428
-MD5 693100f7d7a22ddb1762918c931a3885 cherokee-0.4.17.ebuild 1315
+MD5 573a36d59fa80312247d00370966b08f ChangeLog 7958
 MD5 987e734e6bc2d0d2845efb991e7ccd3d cherokee-0.4.17.1.ebuild 1542
-MD5 9076a50201009e7f130c64691cae1d92 cherokee-0.4.23.ebuild 1589
+MD5 693100f7d7a22ddb1762918c931a3885 cherokee-0.4.17.ebuild 1315
 MD5 9866faff941afcb8b5834588c14c0b3e cherokee-0.4.19.ebuild 1413
 MD5 8a190d1da8b8cac0b51a645ca36517cb cherokee-0.4.21-r1.ebuild 1885
-MD5 436739a3454cf5a5e6014b71a255c44d cherokee-0.4.25.ebuild 1464
+MD5 0324ea00a11bb9c0f61328812a4b707a cherokee-0.4.21.ebuild 1428
+MD5 d81bf5f9012286774993f8f1db3a2409 cherokee-0.4.22.ebuild 1587
+MD5 29321d8fedb392dd369ee22bc7ba9225 cherokee-0.4.23.ebuild 1530
+MD5 6e6b0e5f544610a7184ed159767bfb78 cherokee-0.4.24-r1.ebuild 1610
+MD5 7004a21e7a4df93caff0aefefe15ca9e cherokee-0.4.24.ebuild 1523
+MD5 1e768d84a82e3580b461fffbc369445f cherokee-0.4.25.ebuild 2775
+MD5 61ea17bfef7a6039414b3ef5652e6fdd cherokee-0.4.29.ebuild 2841
 MD5 2a338274e3b176bc1b83221670a84b46 cherokee-0.4.5.ebuild 1723
-MD5 29c583a6a53a235ece6ef4cc04585d8d ChangeLog 7604
-MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
-MD5 122a7f85162e14925a82292f4797a31e cherokee-0.4.24-r1.ebuild 1669
-MD5 e0af76fef298222ff6ad8e6e5aeb10d7 files/cherokee-0.4.21-no-handler_admin.diff 1151
-MD5 fbddeb3fc079036d82ba359c98cc4bf1 files/digest-cherokee-0.4.21-r1 68
-MD5 90214e6f2bb27a3eae7e97e5d90dbe68 files/digest-cherokee-0.4.24-r1 68
-MD5 289de164081060280437629085fce186 files/digest-cherokee-0.4.17.1 69
-MD5 8278b4acda7637c68885863ddd58f712 files/cherokee-0.4.5-cherokee.conf 2769
 MD5 b44b2de7ebfdc07ee94d54a514a738f0 files/cherokee-0.4.17-cherokee.conf 2611
 MD5 13c50109a3ebd047c357fcf95f70bed7 files/cherokee-0.4.17-init.d 789
-MD5 7abc32dac306688c90e1ef1757603b3a files/digest-cherokee-0.4.17 67
-MD5 c8394a4871a8edbc12c1bddfbaea22fd files/digest-cherokee-0.4.19 68
-MD5 fbddeb3fc079036d82ba359c98cc4bf1 files/digest-cherokee-0.4.21 68
-MD5 dbf8285e5a19940db8b60f76b25cf7ae files/digest-cherokee-0.4.22 68
+MD5 e0af76fef298222ff6ad8e6e5aeb10d7 files/cherokee-0.4.21-no-handler_admin.diff 1151
+MD5 29f1a34d26b0830d4a62b2b42241b64a files/cherokee-0.4.25-fix-static.diff 728
+MD5 6da94000869b804248b03d61703b69bb files/cherokee-0.4.5-Makefile.am.patch 956
+MD5 8278b4acda7637c68885863ddd58f712 files/cherokee-0.4.5-cherokee.conf 2769
+MD5 a9f08f404f9b738a52e2c82c7ed88e04 files/cherokee-0.4.5-init.d 787
 MD5 ff48fbffa275e24d9f2efe79b7f9048c files/digest-cherokee-0.4.23 68
 MD5 90214e6f2bb27a3eae7e97e5d90dbe68 files/digest-cherokee-0.4.24 68
+MD5 90214e6f2bb27a3eae7e97e5d90dbe68 files/digest-cherokee-0.4.24-r1 68
 MD5 bd3ba68faf6e5b4e83dfef434fcaa48f files/digest-cherokee-0.4.25 68
 MD5 1f1bbadf4636ffe419c566bfdd31a8e3 files/digest-cherokee-0.4.29 68
-MD5 298dfdd3c83893b3123d85278d1c1e7e files/digest-cherokee-0.4.5 66
-MD5 a9f08f404f9b738a52e2c82c7ed88e04 files/cherokee-0.4.5-init.d 787
-MD5 6da94000869b804248b03d61703b69bb files/cherokee-0.4.5-Makefile.am.patch 956
+MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
diff --git a/www-servers/cherokee/cherokee-0.4.23.ebuild b/www-servers/cherokee/cherokee-0.4.23.ebuild
index 6279da790266..9fbda3001f5c 100644
--- a/www-servers/cherokee/cherokee-0.4.23.ebuild
+++ b/www-servers/cherokee/cherokee-0.4.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.23.ebuild,v 1.2 2005/05/25 02:54:18 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.23.ebuild,v 1.3 2005/12/27 09:19:48 bass Exp $
 
 inherit eutils
 
@@ -19,7 +19,7 @@ DEPEND=">=sys-devel/automake-1.7.5
 
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 SLOT="0"
-IUSE="ipv6 ssl gnutls pic static"
+IUSE="ipv6 ssl gnutls static"
 
 src_unpack() {
 	unpack ${A}
@@ -38,9 +38,6 @@ src_compile() {
 	else
 		myconf="${myconf} --disable-ssl"
 	fi
-	if use pic ; then
-		myconf="${myconf} --with-pic"
-	fi
 	if ! use ipv6 ; then
 		myconf="${myconf} --disable-ipv6"
 	fi
diff --git a/www-servers/cherokee/cherokee-0.4.24-r1.ebuild b/www-servers/cherokee/cherokee-0.4.24-r1.ebuild
index 7c18ad0f4588..7d7cc7d72210 100644
--- a/www-servers/cherokee/cherokee-0.4.24-r1.ebuild
+++ b/www-servers/cherokee/cherokee-0.4.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.24-r1.ebuild,v 1.1 2005/07/19 11:43:24 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.24-r1.ebuild,v 1.2 2005/12/27 09:19:48 bass Exp $
 
 inherit eutils
 
@@ -19,7 +19,7 @@ DEPEND=">=sys-devel/automake-1.7.5
 
 KEYWORDS="~x86 ~ppc ~sparc"
 SLOT="0"
-IUSE="ipv6 ssl gnutls pic static"
+IUSE="ipv6 ssl gnutls static"
 
 src_unpack() {
 	unpack ${A}
@@ -38,9 +38,6 @@ src_compile() {
 	else
 		myconf="${myconf} --disable-ssl"
 	fi
-	if use pic ; then
-		myconf="${myconf} --with-pic"
-	fi
 	if ! use ipv6 ; then
 		myconf="${myconf} --disable-ipv6"
 	fi
diff --git a/www-servers/cherokee/cherokee-0.4.24.ebuild b/www-servers/cherokee/cherokee-0.4.24.ebuild
index fa096c8746ef..966fecb5e89f 100644
--- a/www-servers/cherokee/cherokee-0.4.24.ebuild
+++ b/www-servers/cherokee/cherokee-0.4.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.24.ebuild,v 1.1 2005/07/15 12:18:54 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.24.ebuild,v 1.2 2005/12/27 09:19:48 bass Exp $
 
 inherit eutils
 
@@ -19,7 +19,7 @@ DEPEND=">=sys-devel/automake-1.7.5
 
 KEYWORDS="~x86 ~ppc ~sparc"
 SLOT="0"
-IUSE="ipv6 ssl gnutls pic static"
+IUSE="ipv6 ssl gnutls static"
 
 src_unpack() {
 	unpack ${A}
@@ -38,9 +38,6 @@ src_compile() {
 	else
 		myconf="${myconf} --disable-ssl"
 	fi
-	if use pic ; then
-		myconf="${myconf} --with-pic"
-	fi
 	if ! use ipv6 ; then
 		myconf="${myconf} --disable-ipv6"
 	fi
diff --git a/www-servers/cherokee/cherokee-0.4.25.ebuild b/www-servers/cherokee/cherokee-0.4.25.ebuild
index 28b1a89b5cd1..f62056f03873 100644
--- a/www-servers/cherokee/cherokee-0.4.25.ebuild
+++ b/www-servers/cherokee/cherokee-0.4.25.ebuild
@@ -1,59 +1,99 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.25.ebuild,v 1.3 2005/08/28 20:06:42 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.25.ebuild,v 1.4 2005/12/27 09:19:48 bass Exp $
 
-inherit eutils
+inherit eutils pam
 
 DESCRIPTION="An extremely fast and tiny web server."
 SRC_URI="http://www.0x50.org/download/${PV%.*}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://www.0x50.org/"
-LICENSE="GPL-2"
 
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4-r1"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="ipv6 ssl gnutls static doc pam"
 
-DEPEND=">=sys-devel/automake-1.7.5
+RDEPEND=">=sys-libs/zlib-1.1.4-r1
 	gnutls? ( net-libs/gnutls )
 	ssl? ( dev-libs/openssl )
-	${RDEPEND}"
+	pam? ( virtual/pam )"
 
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-IUSE="ipv6 ssl gnutls static"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7.5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if use static ; then
+		epatch ${FILESDIR}/${P}-fix-static.diff
+
+		einfo "Regenerating automake/autoconf files"
+		libtoolize --copy --force --automake || die "libtoolize failed"
+		aclocal -I ${S}/m4 || die "aclocal failed"
+		autoheader || die "autoheader failed"
+		automake -a || die "automake failed"
+		autoconf || die "autoconf failed"
+	fi
+
+	# remove "doc" from SUBDIRS so that html docs don't get installed
+	# to the wrong place (/usr/share/doc/cherokee) and we can install
+	# them conditionally via dohtml in src_install.
+	sed -i -e 's|\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \
+		die "sed Makefile.in failed"
+
+	# use cherokee user/group
+	sed -i -e 's|^#\(User \).*$|\1cherokee|' \
+		   -e 's|^#\(Group \).*$|\1cherokee|' cherokee.conf.sample.pre || \
+		   die "sed cherokee.conf failed"
+}
 
 src_compile() {
 	local myconf
 
 	if use ssl && use gnutls ; then
-		myconf="${myconf} --enable-ssl=gnutls"
+		myconf="${myconf} --enable-tls=gnutls"
 	elif use ssl && ! use gnutls ; then
-		myconf="${myconf}  --enable-ssl=openssl"
+		myconf="${myconf}  --enable-tls=openssl"
 	else
-		myconf="${myconf} --disable-ssl"
-	fi
-	if ! use ipv6 ; then
-		myconf="${myconf} --disable-ipv6"
+		myconf="${myconf} --disable-tls"
 	fi
+
 	if use static ; then
-		myconf="${myconf} --enable-static --enable-static-module=all --disable-shared"
+		myconf="${myconf} --enable-static --enable-static-module=all"
 	else
 		myconf="${myconf} --disable-static"
 	fi
 
 	econf \
 		${myconf} \
+		$(use_enable pam) \
+		$(use_enable ipv6) \
 		--enable-os-string="Gentoo Linux" \
+		--with-wwwroot=/var/www/localhost/htdocs \
 		|| die "configure failed"
 
 	emake || die "emake failed"
 }
 
 src_install () {
-	dodir /var/www/localhost/htdocs
-	dodir /var/www/localhost/cgi-bin
-
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
+	dodoc AUTHORS ChangeLog INSTALL README TODO
+	use doc && dohtml -r doc/*
 
+	newpamd pam.d_cherokee ${PN} || die "newpamd failed"
 	newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed"
+
+	# be nice and don't overwrite a user's pre-existing index.html
+	# (unless they're the same).
+	if [[ -f ${ROOT}/var/www/localhost/htdocs/index.html ]] ; then
+		diff ${ROOT}/var/www/localhost/htdocs/index.html \
+		${D}/var/www/localhost/htdocs/index.html &>/dev/null || \
+			mv ${D}/var/www/localhost/htdocs/{,cherokee-}index.html
+	fi
+}
+
+pkg_postinst() {
+	enewgroup cherokee
+	enewuser cherokee -1 -1 /var/www/localhost cherokee
 }
diff --git a/www-servers/cherokee/cherokee-0.4.29.ebuild b/www-servers/cherokee/cherokee-0.4.29.ebuild
index bab71f77e0fa..a6c019fc4190 100644
--- a/www-servers/cherokee/cherokee-0.4.29.ebuild
+++ b/www-servers/cherokee/cherokee-0.4.29.ebuild
@@ -1,59 +1,99 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.29.ebuild,v 1.1 2005/11/13 23:22:09 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-0.4.29.ebuild,v 1.2 2005/12/27 09:19:48 bass Exp $
 
-inherit eutils
+inherit eutils pam
 
 DESCRIPTION="An extremely fast and tiny web server."
 SRC_URI="http://www.0x50.org/download/${PV%.*}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://www.0x50.org/"
-LICENSE="GPL-2"
 
-RDEPEND="virtual/libc
-	>=sys-libs/zlib-1.1.4-r1"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="ipv6 ssl gnutls static doc pam"
 
-DEPEND=">=sys-devel/automake-1.7.5
+RDEPEND=">=sys-libs/zlib-1.1.4-r1
 	gnutls? ( net-libs/gnutls )
 	ssl? ( dev-libs/openssl )
-	${RDEPEND}"
+	pam? ( virtual/pam )"
 
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-IUSE="ipv6 ssl gnutls static"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7.5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+#     if use static ; then
+#         epatch ${FILESDIR}/${P}-fix-static.diff
+
+#         einfo "Regenerating automake/autoconf files"
+#         libtoolize --copy --force --automake || die "libtoolize failed"
+#         aclocal -I ${S}/m4 || die "aclocal failed"
+#         autoheader || die "autoheader failed"
+#         automake -a || die "automake failed"
+#         autoconf || die "autoconf failed"
+#     fi
+
+	# remove "doc" from SUBDIRS so that html docs don't get installed
+	# to the wrong place (/usr/share/doc/cherokee) and we can install
+	# them conditionally via dohtml in src_install.
+	sed -i -e 's|\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \
+		die "sed Makefile.in failed"
+
+	# use cherokee user/group
+	sed -i -e 's|^#\(User \).*$|\1cherokee|' \
+		   -e 's|^#\(Group \).*$|\1cherokee|' cherokee.conf.sample.pre || \
+		   die "sed cherokee.conf failed"
+}
 
 src_compile() {
 	local myconf
 
 	if use ssl && use gnutls ; then
-		myconf="${myconf} --enable-ssl=gnutls"
+		myconf="${myconf} --enable-tls=gnutls"
 	elif use ssl && ! use gnutls ; then
-		myconf="${myconf}  --enable-ssl=openssl"
+		myconf="${myconf}  --enable-tls=openssl"
 	else
-		myconf="${myconf} --disable-ssl"
-	fi
-	if ! use ipv6 ; then
-		myconf="${myconf} --disable-ipv6"
+		myconf="${myconf} --disable-tls"
 	fi
+
 	if use static ; then
-		myconf="${myconf} --enable-static --enable-static-module=all --disable-shared"
+		myconf="${myconf} --enable-static --enable-static-module=all"
 	else
 		myconf="${myconf} --disable-static"
 	fi
 
 	econf \
 		${myconf} \
+		$(use_enable pam) \
+		$(use_enable ipv6) \
 		--enable-os-string="Gentoo Linux" \
+		--with-wwwroot=/var/www/localhost/htdocs \
 		|| die "configure failed"
 
 	emake || die "emake failed"
 }
 
 src_install () {
-	dodir /var/www/localhost/htdocs
-	dodir /var/www/localhost/cgi-bin
-
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL README
+	dodoc AUTHORS ChangeLog INSTALL README TODO
+	use doc && dohtml -r doc/*
 
+	newpamd pam.d_cherokee ${PN} || die "newpamd failed"
 	newinitd ${FILESDIR}/${PN}-0.4.17-init.d ${PN} || die "newinitd failed"
+
+	# be nice and don't overwrite a user's pre-existing index.html
+	# (unless they're the same).
+	if [[ -f ${ROOT}/var/www/localhost/htdocs/index.html ]] ; then
+		diff ${ROOT}/var/www/localhost/htdocs/index.html \
+		${D}/var/www/localhost/htdocs/index.html &>/dev/null || \
+			mv ${D}/var/www/localhost/htdocs/{,cherokee-}index.html
+	fi
+}
+
+pkg_postinst() {
+	enewgroup cherokee
+	enewuser cherokee -1 -1 /var/www/localhost cherokee
 }
diff --git a/www-servers/cherokee/files/cherokee-0.4.25-fix-static.diff b/www-servers/cherokee/files/cherokee-0.4.25-fix-static.diff
new file mode 100644
index 000000000000..f4d2ab15e738
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee-0.4.25-fix-static.diff
@@ -0,0 +1,21 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN cherokee-0.4.25.orig/cherokee/Makefile.am cherokee-0.4.25/cherokee/Makefile.am
+--- cherokee-0.4.25.orig/cherokee/Makefile.am	2005-08-14 00:54:56.000000000 -0400
++++ cherokee-0.4.25/cherokee/Makefile.am	2005-08-14 03:31:45.000000000 -0400
+@@ -148,8 +148,6 @@
+ # Handler fastcgi
+ #
+ handler_fastcgi = \
+-cgi.h \
+-cgi.c \
+ fastcgi.h \
+ handler_fastcgi.c \
+ handler_fastcgi.h \
+@@ -157,7 +155,7 @@
+ fcgi_manager.c 
+ 
+ libplugin_fastcgi_la_LDFLAGS = -module -export-dynamic -avoid-version  
+-libplugin_fastcgi_la_SOURCES = $(handler_fastcgi)
++libplugin_fastcgi_la_SOURCES = $(handler_fastcgi) cgi.h cgi.c
+ 
+ if STATIC_HANDLER_FASTCGI
+ static_handler_fastcgi_src = $(handler_fastcgi)