fixed bug #61251, now you can choose if you want to compile it with dietlibc or something else, added some missing IUSE

7 files changed, 50 insertions, 28 deletions

diff --git a/www-servers/fnord/ChangeLog b/www-servers/fnord/ChangeLog
index 34c12ac63bbe..73ea7a0c2c08 100644
--- a/www-servers/fnord/ChangeLog
+++ b/www-servers/fnord/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/fnord
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/ChangeLog,v 1.5 2004/12/18 16:58:30 hansmi Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/ChangeLog,v 1.6 2005/01/26 23:23:54 xmerlin Exp $
+
+  27 Jan 2005; Christian Zoffoli <xmerlin@gentoo.org> fnord-1.8.ebuild:
+  fixed bug #61251, now you can choose if you want to compile it with
+  dietlibc or something else, added some missing IUSE
 
   18 Dec 2004; Michael Hanselmann <hansmi@gentoo.org> fnord-1.8.ebuild:
   Stable on sparc and added ucspi-tcp to RDEPEND.
diff --git a/www-servers/fnord/Manifest b/www-servers/fnord/Manifest
index 6b79f7b51f15..e64c3284ddc2 100644
--- a/www-servers/fnord/Manifest
+++ b/www-servers/fnord/Manifest
@@ -1,15 +1,25 @@
-MD5 214359067e7b9c3d176bfebe4c61330e fnord-1.7.ebuild 1156
-MD5 698ab2fb9375e523703dfaeca9f79a38 ChangeLog 2149
-MD5 31bdcaca20adb8619c669d562712a21c fnord-1.8.ebuild 1267
-MD5 cef3829d915749840caf1368204114d8 fnord-1.2.ebuild 796
-MD5 24262207c3cb7114a95126d35cca9281 fnord-1.5.ebuild 1131
-MD5 3ddfabedb5bd6ac8b33186bdaf797bb2 fnord-1.6.ebuild 1131
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 58ca545f200324fc57faf7a7164e30d5 fnord-1.7.ebuild 1156
+MD5 0e0ffb934fe05ab02497892485ca3efc fnord-1.2.ebuild 805
+MD5 1c73c61388514c81a9b121c0ec601175 fnord-1.6.ebuild 1140
+MD5 a5b219e49997d059cccc42fe6e60756c fnord-1.8.ebuild 1363
+MD5 f8f5d39588b97bb2da996906c840231b ChangeLog 2347
+MD5 5ffa5568f4830b40d99d7f3ce9aa1051 fnord-1.5.ebuild 1140
+MD5 cfe29c85fe244c226c7fb0447dc65f9a files/fnord-1.6-gentoo.diff 1067
+MD5 930bc8292c8284d9a03358ea9800ab5d files/fnord-1.2-gentoo.diff 566
 MD5 cfe29c85fe244c226c7fb0447dc65f9a files/fnord-1.7-gentoo.diff 1067
 MD5 b62630fa7f881f229b3e8005ecc61357 files/digest-fnord-1.2 61
-MD5 930bc8292c8284d9a03358ea9800ab5d files/fnord-1.2-gentoo.diff 566
-MD5 21beb01e04084f4563874810ede17c52 files/digest-fnord-1.7 61
-MD5 cfe29c85fe244c226c7fb0447dc65f9a files/fnord-1.6-gentoo.diff 1067
-MD5 cfe29c85fe244c226c7fb0447dc65f9a files/fnord-1.5-gentoo.diff 1067
+MD5 11565a1aba8d8158cbb63ed770acc2d1 files/digest-fnord-1.5 61
 MD5 425afc9577f40bd59da3670f501397a5 files/digest-fnord-1.6 61
+MD5 21beb01e04084f4563874810ede17c52 files/digest-fnord-1.7 61
 MD5 85428d084958af68c83cb83b276287a4 files/digest-fnord-1.8 125
-MD5 11565a1aba8d8158cbb63ed770acc2d1 files/digest-fnord-1.5 61
+MD5 cfe29c85fe244c226c7fb0447dc65f9a files/fnord-1.5-gentoo.diff 1067
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB+IMEgMUyd/cdjWsRAs3fAJ4i6wLrBgJWvUcj2GcSfCgB03DqvQCggHw6
+DLL6WYm0KXRSl12ADhclpjE=
+=tjjo
+-----END PGP SIGNATURE-----
diff --git a/www-servers/fnord/fnord-1.2.ebuild b/www-servers/fnord/fnord-1.2.ebuild
index 48ea9c59a32a..cf6a1cba480b 100644
--- a/www-servers/fnord/fnord-1.2.ebuild
+++ b/www-servers/fnord/fnord-1.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/fnord/fnord-1.2.ebuild,v 1.1 2004/08/08 11:37:29 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.2.ebuild,v 1.2 2005/01/26 23:23:54 xmerlin Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Yet another small httpd."
@@ -8,6 +8,7 @@ SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
 HOMEPAGE="http://www.fefe.de/fnord/"
 KEYWORDS="x86 sparc"
 SLOT="0"
+IUSE=""
 LICENSE="GPL-2"
 
 DEPEND="dev-libs/dietlibc"
diff --git a/www-servers/fnord/fnord-1.5.ebuild b/www-servers/fnord/fnord-1.5.ebuild
index 8f43891712c7..e21e3de4f328 100644
--- a/www-servers/fnord/fnord-1.5.ebuild
+++ b/www-servers/fnord/fnord-1.5.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/fnord/fnord-1.5.ebuild,v 1.1 2004/08/08 11:37:29 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.5.ebuild,v 1.2 2005/01/26 23:23:54 xmerlin Exp $
 
 S=${WORKDIR}/${P}
 
@@ -11,6 +11,7 @@ HOMEPAGE="http://www.fefe.de/fnord/"
 KEYWORDS="x86 sparc"
 SLOT="0"
 LICENSE="GPL-2"
+IUSE=""
 
 DEPEND="dev-libs/dietlibc"
 RDEPEND="sys-apps/daemontools"
diff --git a/www-servers/fnord/fnord-1.6.ebuild b/www-servers/fnord/fnord-1.6.ebuild
index 3b94b0cc827c..b4b2a4b33513 100644
--- a/www-servers/fnord/fnord-1.6.ebuild
+++ b/www-servers/fnord/fnord-1.6.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/fnord/fnord-1.6.ebuild,v 1.1 2004/08/08 11:37:29 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.6.ebuild,v 1.2 2005/01/26 23:23:54 xmerlin Exp $
 
 S=${WORKDIR}/${P}
 
@@ -11,6 +11,7 @@ HOMEPAGE="http://www.fefe.de/fnord/"
 KEYWORDS="x86 sparc"
 SLOT="0"
 LICENSE="GPL-2"
+IUSE=""
 
 DEPEND="dev-libs/dietlibc"
 RDEPEND="sys-apps/daemontools"
diff --git a/www-servers/fnord/fnord-1.7.ebuild b/www-servers/fnord/fnord-1.7.ebuild
index 5630c4d4cbeb..0a4fe38e7923 100644
--- a/www-servers/fnord/fnord-1.7.ebuild
+++ b/www-servers/fnord/fnord-1.7.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/fnord/fnord-1.7.ebuild,v 1.2 2004/10/02 00:00:23 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.7.ebuild,v 1.3 2005/01/26 23:23:54 xmerlin Exp $
 
 inherit eutils
 
diff --git a/www-servers/fnord/fnord-1.8.ebuild b/www-servers/fnord/fnord-1.8.ebuild
index c57cad658fcd..3d26dbb84e27 100644
--- a/www-servers/fnord/fnord-1.8.ebuild
+++ b/www-servers/fnord/fnord-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/fnord/fnord-1.8.ebuild,v 1.4 2004/12/18 16:58:30 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/fnord-1.8.ebuild,v 1.5 2005/01/26 23:23:54 xmerlin Exp $
 
 # flag-o-matic needed for replace-sparc64-flags
 inherit flag-o-matic eutils
@@ -9,15 +9,19 @@ 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/"
+IUSE="diet"
 
 KEYWORDS="~x86 sparc ppc"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
 
-DEPEND="dev-libs/dietlibc"
-RDEPEND="sys-apps/daemontools
-	sys-apps/ucspi-tcp"
+#DEPEND="diet? ( dev-libs/dietlibc )
+#	!diet? ( virtual/libc )"
+
+RDEPEND="${DEPEND}
+	sys-apps/daemontools
+	sys-apps/ucspi-tcp
+	"
 
 pkg_setup() {
 
@@ -42,7 +46,8 @@ src_unpack() {
 }
 
 src_compile() {
-	emake || die
+	use diet && DIET=diet || DIET=""
+	emake DIET="$DIET"
 }
 
 src_install () {