bug 89593 and bug 103421

(Portage version: 2.0.51.22-r2)

5 files changed, 68 insertions, 22 deletions

diff --git a/net-misc/gofish/ChangeLog b/net-misc/gofish/ChangeLog
index 5744821176e7..d5364613c091 100644
--- a/net-misc/gofish/ChangeLog
+++ b/net-misc/gofish/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/gofish
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gofish/ChangeLog,v 1.7 2004/11/12 20:36:50 blubb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gofish/ChangeLog,v 1.8 2005/09/03 01:36:16 vanquirius Exp $
+
+*gofish-1.0 (03 Sep 2005)
+
+  03 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> gofish-0.29.ebuild,
+  +gofish-1.0.ebuild:
+  Fix enewuser for bug 103421. Version bump for bug 89593, thanks to Emil
+  Sköldberg <emil@math.su.se>.
 
   12 Nov 2004; Simon Stelling <blubb@gentoo.org> gofish-0.29.ebuild:
   added ~amd64
diff --git a/net-misc/gofish/Manifest b/net-misc/gofish/Manifest
index 9fe2bb49c66a..2c569bf394f4 100644
--- a/net-misc/gofish/Manifest
+++ b/net-misc/gofish/Manifest
@@ -1,6 +1,8 @@
+MD5 d5bc7c287c06fa98a04f3f7d7e2820d3 gofish-1.0.ebuild 1048
+MD5 c52695364aa6f1fecc48ecb26d8226f6 gofish-0.29.ebuild 1026
 MD5 f27b8af1f722462380c0f97cd1a65254 ChangeLog 914
-MD5 039a9d17051bfce742c1cd38dd333c66 gofish-0.29.ebuild 1135
 MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
-MD5 15cc76b6e0734f9cd401828b760f0a73 files/digest-gofish-0.29 63
-MD5 6af9d916a6e6222df07761444fdcdaac files/gofish.confd 429
+MD5 4b891ae1890652c839e64384309076c5 files/digest-gofish-1.0 62
 MD5 a4671e7c6f0585c6a7a9c31660facfca files/gofish.rc 606
+MD5 6af9d916a6e6222df07761444fdcdaac files/gofish.confd 429
+MD5 15cc76b6e0734f9cd401828b760f0a73 files/digest-gofish-0.29 63
diff --git a/net-misc/gofish/files/digest-gofish-1.0 b/net-misc/gofish/files/digest-gofish-1.0
new file mode 100644
index 000000000000..467905e37930
--- /dev/null
+++ b/net-misc/gofish/files/digest-gofish-1.0
@@ -0,0 +1 @@
+MD5 7fb56c1e163653d4364d2e8c7adce9bd gofish-1.0.tar.gz 141992
diff --git a/net-misc/gofish/gofish-0.29.ebuild b/net-misc/gofish/gofish-0.29.ebuild
index a21672de83b5..c6006e60c1d9 100644
--- a/net-misc/gofish/gofish-0.29.ebuild
+++ b/net-misc/gofish/gofish-0.29.ebuild
@@ -1,24 +1,25 @@
-# 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/net-misc/gofish/gofish-0.29.ebuild,v 1.7 2004/11/12 20:36:50 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gofish/gofish-0.29.ebuild,v 1.8 2005/09/03 01:36:16 vanquirius Exp $
 
 inherit eutils
 
-IUSE=""
-
-S="${WORKDIR}/gofish-${PV}"
-HOMEPAGE="http://gofish.sourceforge.net"
 DESCRIPTION="Gofish gopher server"
+HOMEPAGE="http://gofish.sourceforge.net"
 SRC_URI="mirror://sourceforge/gofish/${P}.tar.gz"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
 
 DEPEND="virtual/libc
-		>=sys-apps/sed-4"
+	>=sys-apps/sed-4"
 RDEPEND=""
 
+pkg_setup() {
+	enewgroup gopher 30
+	enewuser gopher 30 -1 -1 gopher
+}
 
 src_compile() {
 	econf --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
@@ -29,18 +30,11 @@ src_compile() {
 src_install () {
 	sed -i s/';uid = -1'/'uid = 30'/ ${S}/gofish.conf
 	sed -i s/';gid = -1'/'uid = 30'/ ${S}/gofish.conf
-	make DESTDIR=${D} install  || die
+	make DESTDIR="${D}" install || die
 	exeinto /etc/init.d ; newexe ${FILESDIR}/gofish.rc gofish
 	insinto /etc/conf.d ; newins ${FILESDIR}/gofish.confd gofish
 }
 
-
 pkg_postinst() {
-	enewgroup "gopher"  30
-	enewuser  "gopher"  30  "/bin/false" "/dev/null"  "gopher"
-
-	einfo
-	einfo "You have to edit the configuration file"
-	einfo "/etc/gofish.conf if this is a new install"
-	einfo
+	einfo "Please edit /etc/${PN}.conf before using."
 }
diff --git a/net-misc/gofish/gofish-1.0.ebuild b/net-misc/gofish/gofish-1.0.ebuild
new file mode 100644
index 000000000000..2b3049786afe
--- /dev/null
+++ b/net-misc/gofish/gofish-1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gofish/gofish-1.0.ebuild,v 1.1 2005/09/03 01:36:16 vanquirius Exp $
+
+inherit eutils
+
+DESCRIPTION="Gofish gopher server"
+HOMEPAGE="http://gofish.sourceforge.net"
+SRC_URI="mirror://sourceforge/gofish/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+DEPEND="virtual/libc
+	>=sys-apps/sed-4"
+RDEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	enewgroup gopher 30
+	enewuser gopher 30 -1 -1 gopher
+}
+
+src_compile() {
+	econf --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+		--disable-http || die "econf failed"
+	emake || die
+}
+
+src_install () {
+	sed -i s/';uid = -1'/'uid = 30'/ ${S}/gofish.conf
+	sed -i s/';gid = -1'/'uid = 30'/ ${S}/gofish.conf
+	make DESTDIR="${D}" install || die
+	exeinto /etc/init.d ; newexe ${FILESDIR}/gofish.rc gofish
+	insinto /etc/conf.d ; newins ${FILESDIR}/gofish.confd gofish
+}
+
+pkg_postinst() {
+	einfo "Please edit /etc/${PN}.conf before using."
+}