Version bump for bug 84344; Marked 1.8 stable on x86. Tidy old crusty ebuilds. Moved replace-sparc64-flags to src_compile where it belongs; replaced naughty useradd stuff with enewuser calls.

Package-Manager: portage-2.0.51.19

1 files changed, 18 insertions, 31 deletions

diff --git a/www-servers/fnord/fnord-1.8.ebuild b/www-servers/fnord/fnord-1.8.ebuild
index a378fa1b5d7b..d2e78e3eadbd 100644
--- a/www-servers/fnord/fnord-1.8.ebuild
+++ b/www-servers/fnord/fnord-1.8.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.8.ebuild,v 1.7 2005/03/03 18:48:54 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.8.ebuild,v 1.8 2005/03/07 10:37:47 ka0ttic Exp $
 
-# flag-o-matic needed for replace-sparc64-flags
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils fixheadtails
 
 DESCRIPTION="Yet another small httpd."
-SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2
-	mirror://gentoo/${P}-gentoo.diff"
 HOMEPAGE="http://www.fefe.de/fnord/"
+SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
 
-KEYWORDS="~x86 sparc ppc"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc ppc"
 IUSE="diet"
 
 DEPEND="diet?(dev-libs/dietlibc)
@@ -20,41 +18,30 @@ DEPEND="diet?(dev-libs/dietlibc)
 
 RDEPEND="${DEPEND}
 	sys-process/daemontools
-	sys-apps/ucspi-tcp
-	"
+	sys-apps/ucspi-tcp"
 
 pkg_setup() {
-
-	if ! grep -q ^fnord: /etc/passwd ; then
-	    useradd  -g nofiles -s /bin/false -d /etc/fnord -c "fnord" fnord\
-			|| die "problem adding user fnord"
-	fi
-	if ! grep -q ^fnordlog: /etc/passwd ; then
-	    useradd  -g nofiles -s /bin/false -d /etc/fnord -c "fnordlog" fnordlog\
-			|| die "problem adding user fnordlog"
-	fi
+	enewuser fnord -1 /bin/false /etc/fnord nofiles
+	enewuser fnordlog -1 /bin/false /etc/fnord nofiles
 }
 
 src_unpack() {
-	# Fix for bug #45716
-	replace-sparc64-flags
-
-	unpack ${A} ; cd ${S}
-	sed -i "s:^CFLAGS=-O.*:CFLAGS=${CFLAGS}:" Makefile
-
-	epatch ${DISTDIR}/${PF}-gentoo.diff || die "epatch failed."
+	unpack ${A} && cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	ht_fix_all
 }
 
 src_compile() {
-	local DIET
+	local DIET=""
+	use diet && DIET="diet"
 
-	use diet && DIET=diet || DIET=""
-	emake DIET="$DIET"
+	# Fix for bug #45716
+	replace-sparc64-flags
+
+	emake DIET="${DIET}" CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install () {
-	exeinto /usr/bin
-	doexe fnord-conf fnord
-
+	dobin fnord-conf fnord || die
 	dodoc TODO README SPEED COPYING CHANGES
 }