Clean up ugly ebuild and make sure we install mkpasswd as $PN-mkpasswd #6428.

3 files changed, 39 insertions, 39 deletions

diff --git a/net-irc/dancer-ircd/ChangeLog b/net-irc/dancer-ircd/ChangeLog
index 2047f87871de..4efac608a00e 100644
--- a/net-irc/dancer-ircd/ChangeLog
+++ b/net-irc/dancer-ircd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/dancer-ircd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dancer-ircd/ChangeLog,v 1.13 2004/10/15 20:07:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dancer-ircd/ChangeLog,v 1.14 2004/10/16 18:43:28 vapier Exp $
+
+  16 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  dancer-ircd-1.0.31_p8-r1.ebuild:
+  Clean up ugly ebuild and make sure we install mkpasswd as $PN-mkpasswd #6428.
 
   15 Oct 2004; Sven Wegener <swegener@gentoo.org>
   dancer-ircd-1.0.31_p8-r1.ebuild:
diff --git a/net-irc/dancer-ircd/Manifest b/net-irc/dancer-ircd/Manifest
index b9355ad2a88d..0cbb7e1a899f 100644
--- a/net-irc/dancer-ircd/Manifest
+++ b/net-irc/dancer-ircd/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 eb9a659e3080cedf4e0ecfc1df0ac973 ChangeLog 1916
-MD5 b5e970fdb139db2893a3dc2f669ed21c dancer-ircd-1.0.31_p8-r1.ebuild 2815
+MD5 96804ad802f00cdf7ab672a61bc32019 ChangeLog 2080
+MD5 e1334872349c8b9f391d2519b4d4f7a9 dancer-ircd-1.0.31_p8-r1.ebuild 2845
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 MD5 0648e0095f98ad797f8c1d0f35d1de11 files/dancer-ircd 499
 MD5 51a35efb94de113553830d9cf2d0d2be files/digest-dancer-ircd-1.0.31_p8-r1 144
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBcC35I1lqEGTUzyQRAoIzAKDLtSNQCZu93ISQI1LeVszkjsTd+QCfWZ2c
-mv6DoYcw0mPq3dsomMumyGA=
-=hXBq
+iD8DBQFBcWvfHTu7gpaalycRAjb0AKCmV1aBIkEh0+QD0RiYovJVtlFPvQCgwuJR
+JvDpJUFaHmmT1IklIph//Yg=
+=kyO7
 -----END PGP SIGNATURE-----
diff --git a/net-irc/dancer-ircd/dancer-ircd-1.0.31_p8-r1.ebuild b/net-irc/dancer-ircd/dancer-ircd-1.0.31_p8-r1.ebuild
index 0ea3f512f52e..1100e9694503 100644
--- a/net-irc/dancer-ircd/dancer-ircd-1.0.31_p8-r1.ebuild
+++ b/net-irc/dancer-ircd/dancer-ircd-1.0.31_p8-r1.ebuild
@@ -1,79 +1,76 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/dancer-ircd/dancer-ircd-1.0.31_p8-r1.ebuild,v 1.10 2004/10/15 20:07:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/dancer-ircd/dancer-ircd-1.0.31_p8-r1.ebuild,v 1.11 2004/10/16 18:43:28 vapier Exp $
 
-DESCRIPTION="A ircd with ipv6 support use by the freenode network"
+inherit eutils
+
+DESCRIPTION="An ircd used by the freenode network"
 HOMEPAGE="http://freenode.net/dancer_ircd.shtml"
 SRC_URI="http://www.doc.ic.ac.uk/~aps100/dancer/dancer-ircd/stable/releases/dancer-ircd-${PV/_p/+maint}.tar.gz
-ipv6? ( http://freenode.net/dancer-maint5+IPv6.diff )"
+	ipv6? ( http://freenode.net/dancer-maint5+IPv6.diff )"
 
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~hppa ~ppc ~sparc x86"
+IUSE="ipv6 doc"
 
 DEPEND="doc? ( app-text/openjade
 	dev-perl/SGMLSpm
 	app-text/docbook-sgml-dtd
 	app-text/docbook-sgml-utils )"
 
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~hppa ~sparc ~ppc"
-IUSE="ipv6 doc"
-#RDEPEND=""
 S=${WORKDIR}/${PN}-${PV/_p/+maint}
 
-[ -z "${SMALLNET}" ] && SMALLNET="y"
+export SMALLNET="${SMALLNET:-y}"
 
 src_unpack() {
 	unpack dancer-ircd-${PV/_p/+maint}.tar.gz
-	use ipv6 && cd ${S} && patch -p1 < ${DISTDIR}/dancer-maint5+IPv6.diff
-
+	cd ${S}
+	use ipv6 && epatch ${DISTDIR}/dancer-maint5+IPv6.diff
 
 	cp ${S}/include/config.h ${S}/include/config.h.orig
 	cat ${S}/include/config.h.orig | grep -v "#define KPATH" | grep -v "#define DLPATH" > ${S}/include/config.h
 	echo "#define KPATH   \"etc/dancer-ircd/kline.conf\"" >> ${S}/include/config.h
 	echo "#define DLPATH  \"etc/dancer-ircd/dline.conf\"" >> ${S}/include/config.h
 
-
-	if [ "${SMALLNET}" = "y" ]
-	then
+	if [ "${SMALLNET}" = "y" ] ; then
 		cp ${S}/include/config.h ${S}/include/config.h.tmp
 		sed s/"#define NO_CHANOPS_ON_SPLIT"/"\/\/#define NO_CHANOPS_ON_SPLIT"/ ${S}/include/config.h.tmp  > ${S}/include/config.h
 		rm ${S}/include/config.h.tmp
 	fi
+
+	sed -i \
+		-e "s:mkpasswd:${PN}-mkpasswd:" \
+		doc/hybrid/simple.conf \
+		tools/README || die "sed failed"
 }
 
 src_compile() {
-
-
-	old_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS}" econf --enable-optimise --disable-errors --disable-debug-syms || die "econf failed"
+	old_CFLAGS="${CFLAGS}" \
+	CFLAGS="${CFLAGS}" \
+	econf \
+		--enable-optimise \
+		--disable-errors \
+		--disable-debug-syms \
+		|| die "econf failed"
 
 	emake || die
-
-
 }
 
 src_install() {
-
-	if use doc
-	then
-		echo doc
+	if use doc ; then
 		docbook2html -u doc/sgml/dancer-oper-guide/dancer-oper-guide.sgml
 		dohtml dancer-oper-guide.html
 
 		docbook2html -u doc/sgml/dancer-user-guide/dancer-user-guide.sgml
 		dohtml dancer-user-guide.html
-	else
-		echo nodoc
 	fi
-	dodoc doc/README doc/README.TSora doc/RELNOTES.hybrid-6 doc/Tao-of-IRC.940110 doc/README.umodes \
+	dodoc doc/README doc/README.TSora doc/RELNOTES.hybrid-6 \
+		doc/Tao-of-IRC.940110 doc/README.umodes \
 		doc/rfc1459.txt doc/example.conf doc/README.small_nets
 
-	# Very outated man page
-	# doman doc/ircd.8
-
-
-	insinto /usr
 	dobin src/dancer-ircd
-	dobin tools/mkpasswd
+	newbin tools/mkpasswd ${PN}-mkpasswd
 	dobin tools/viconf
 
 	dodir /etc/dancer-ircd/
@@ -85,7 +82,6 @@ src_install() {
 	doexe ${FILESDIR}/dancer-ircd
 
 	keepdir /var/log/dancer-ircd
-
 }
 
 pkg_postinst() {