Version bumped. Fixed Bug 77895.

8 files changed, 56 insertions, 36 deletions

diff --git a/net-dns/mydns/ChangeLog b/net-dns/mydns/ChangeLog
index 16de71230627..1902816441ac 100644
--- a/net-dns/mydns/ChangeLog
+++ b/net-dns/mydns/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/mydns
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/ChangeLog,v 1.9 2004/07/01 22:12:33 eradicator Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/ChangeLog,v 1.10 2005/01/15 03:31:00 matsuu Exp $
+
+*mydns-1.0.0 (15 Jan 2005)
+
+  15 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> files/mydns.rc6,
+  -mydns-0.10.3.ebuild, mydns-0.11.0.ebuild, +mydns-1.0.0.ebuild:
+  Version bumped.
+  Fixed init.d script. Bug 77895.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mydns-0.10.3.ebuild,
   mydns-0.11.0.ebuild:
diff --git a/net-dns/mydns/Manifest b/net-dns/mydns/Manifest
index ab11ff62a1e6..b09fcb700904 100644
--- a/net-dns/mydns/Manifest
+++ b/net-dns/mydns/Manifest
@@ -1,8 +1,9 @@
-MD5 18d723ed0c6503a4c74971bcbb53a109 mydns-0.11.0.ebuild 2151
-MD5 9f720b874e87fe3083e5fda03acce92e mydns-0.10.3.ebuild 2017
+MD5 45459e978550aa98b0a79727e6933e66 mydns-0.11.0.ebuild 2150
+MD5 f2d207a085ca92ac7f625ad5f2922e05 mydns-1.0.0.ebuild 2145
 MD5 ff40f0a7b30879e6360a2938f796b6ad ChangeLog 1420
 MD5 c50346bf0fb8b39c521dca42b145f6ee metadata.xml 230
 MD5 871f4b34b46c15aaf75e5c286a83a37d files/mydns.rc6-0.11.0 778
-MD5 83880130e9ae2691250f3449a0da8156 files/mydns.rc6 736
+MD5 14d986b442f7f5802c34d89331b975c0 files/mydns.rc6 912
 MD5 ebba13e9f1c850faa314aed56723486d files/digest-mydns-0.10.3 65
 MD5 23af670a16b78f2ed91017e898efa177 files/digest-mydns-0.11.0 65
+MD5 9d4a562f99499ac86ee42d360e55b4d8 files/digest-mydns-1.0.0 64
diff --git a/net-dns/mydns/files/digest-mydns-0.10.3 b/net-dns/mydns/files/digest-mydns-0.10.3
deleted file mode 100644
index e0b1245305d0..000000000000
--- a/net-dns/mydns/files/digest-mydns-0.10.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a549ec56413ac74a7601a4501cc689f mydns-0.10.3.tar.bz2 540942
diff --git a/net-dns/mydns/files/digest-mydns-1.0.0 b/net-dns/mydns/files/digest-mydns-1.0.0
new file mode 100644
index 000000000000..c38688e43810
--- /dev/null
+++ b/net-dns/mydns/files/digest-mydns-1.0.0
@@ -0,0 +1 @@
+MD5 3a0b312f53c6a8fb17cb7d2cf27fad24 mydns-1.0.0.tar.bz2 545441
diff --git a/net-dns/mydns/files/mydns.rc6 b/net-dns/mydns/files/mydns.rc6
index 6f5679361b29..f52849b258f4 100644
--- a/net-dns/mydns/files/mydns.rc6
+++ b/net-dns/mydns/files/mydns.rc6
@@ -1,29 +1,32 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/files/mydns.rc6,v 1.4 2004/07/14 23:24:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/files/mydns.rc6,v 1.5 2005/01/15 03:31:00 matsuu Exp $
 
 depend() {
-	use mysql postgresql
+	need net __db__
+	use logger
 }
 
 checkconfig() {
 	if [ ! -f /etc/mydns.conf ] ; then
 		eerror "No /etc/mydns.conf file exists!"
+		eerror "You should now run these commands:"
+		eerror "# /usr/sbin/mydns --dump-config > /etc/mydns.conf"
+		eerror "# chmod 0600 /etc/mydns.conf"
 		return 1
 	fi
 }
 
 start() {
 	checkconfig || return 1
-	ebegin "Starting mydnsd"
-	sleep 2
-	/usr/sbin/mydns -b >/dev/null 2>&1 &
+	ebegin "Starting mydns"
+	start-stop-daemon --start --quiet --exec /usr/sbin/mydns -- -b
 	eend $?
 }
 
 stop () {
-	ebegin "Stopping mydnsd"
+	ebegin "Stopping mydns"
 	PIDFILE=`cat /etc/mydns.conf | grep pidfile | awk '{ print $3 }'`
 	if [ $PIDFILE == "" ]; then
 		PIDFILE=/var/run/mydns.pid
diff --git a/net-dns/mydns/files/mydns.rc6-0.11.0 b/net-dns/mydns/files/mydns.rc6-0.11.0
index 8e7814b75e5d..17d2e9305636 100644
--- a/net-dns/mydns/files/mydns.rc6-0.11.0
+++ b/net-dns/mydns/files/mydns.rc6-0.11.0
@@ -1,12 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/files/mydns.rc6-0.11.0,v 1.2 2004/07/14 23:24:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/files/mydns.rc6-0.11.0,v 1.3 2005/01/15 03:31:00 matsuu Exp $
 
 depend() {
 	need net __db__
 	use logger
-	provide dns
 }
 
 checkconfig() {
diff --git a/net-dns/mydns/mydns-0.11.0.ebuild b/net-dns/mydns/mydns-0.11.0.ebuild
index 47e04bc1f66d..50536b5852b7 100644
--- a/net-dns/mydns/mydns-0.11.0.ebuild
+++ b/net-dns/mydns/mydns-0.11.0.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/net-dns/mydns/mydns-0.11.0.ebuild,v 1.4 2004/07/14 23:29:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/mydns-0.11.0.ebuild,v 1.5 2005/01/15 03:31:00 matsuu Exp $
 
 DESCRIPTION="A DNS-Server which gets its data from mysql-databases"
 HOMEPAGE="http://mydns.bboy.net/"
@@ -8,7 +8,7 @@ SRC_URI="http://mydns.bboy.net/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 IUSE="debug mysql nls postgres ssl static zlib"
 
 RDEPEND="virtual/libc
diff --git a/net-dns/mydns/mydns-0.10.3.ebuild b/net-dns/mydns/mydns-1.0.0.ebuild
index a99f01221c04..6832e7406182 100644
--- a/net-dns/mydns/mydns-0.10.3.ebuild
+++ b/net-dns/mydns/mydns-1.0.0.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/net-dns/mydns/mydns-0.10.3.ebuild,v 1.6 2004/07/14 23:29:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/mydns-1.0.0.ebuild,v 1.1 2005/01/15 03:31:00 matsuu Exp $
 
 DESCRIPTION="A DNS-Server which gets its data from mysql-databases"
 HOMEPAGE="http://mydns.bboy.net/"
@@ -8,32 +8,36 @@ SRC_URI="http://mydns.bboy.net/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="debug mysql nls postgres ssl static zlib"
 
 RDEPEND="virtual/libc
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )
 	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )"
+	zlib? ( sys-libs/zlib )
+	|| (
+		mysql? ( dev-db/mysql )
+		postgres? ( dev-db/postgresql )
+		!postgres? ( dev-db/mysql )
+	)"
 DEPEND="${RDEPEND}
 	sys-devel/bison"
 
 src_compile() {
-	if ! use mysql && ! use postgres; then
-		eerror "MyDNS needs either MySQL or PostgreSQL."
-		eerror "Please set USE=\"mysql\" or USE=\"postgres\", and try again."
-		die
+	local myconf
+
+	if use mysql || ! use postgres; then
+		myconf="${myconf} --with-mysql"
+	else
+		myconf="${myconf} --without-mysql --with-pgsql"
 	fi
 
 	econf --enable-alias \
 		`use_enable nls` \
 		`use_enable debug` \
 		`use_enable static static-build` \
-		`use_with postgres pgsql` \
-		`use_with mysql` \
 		`use_with ssl openssl` \
-		`use_with zlib` || die
+		`use_with zlib` \
+		${myconf} || die
 
 	emake || die
 }
@@ -42,10 +46,16 @@ src_install() {
 	make DESTDIR=${D} install || die
 
 	dodoc ABOUT-NLS AUTHORS BUGS ChangeLog INSTALL NEWS README TODO
-	use mysql && dodoc QUICKSTART.mysql
-	use postgres && dodoc QUICKSTART.postgres
 
 	exeinto /etc/init.d; newexe ${FILESDIR}/mydns.rc6 mydns || die
+
+	if use mysql || ! use postgres; then
+		sed -i -e 's/__db__/mysql/g' ${D}/etc/init.d/mydns || die
+		dodoc QUICKSTART.mysql
+	else
+		sed -i -e 's/__db__/postgresql/g' ${D}/etc/init.d/mydns || die
+		dodoc QUICKSTART.postgres
+	fi
 }
 
 pkg_postinst() {
@@ -54,13 +64,13 @@ pkg_postinst() {
 	einfo
 	einfo "# /usr/sbin/mydns --dump-config > /etc/mydns.conf"
 	einfo "# chmod 0600 /etc/mydns.conf"
-	if use mysql ; then
-		einfo "# mysqladmin -u <username> -p create mydns"
-		einfo "# /usr/sbin/mydns --create-tables | mysql -u <user> -p mydns"
+	if use mysql || ! use postgres; then
+		einfo "# mysqladmin -u <useruname> -p create mydns"
+		einfo "# /usr/sbin/mydns --create-tables | mysql -u <username> -p mydns"
 		einfo
 		einfo "to create the tables in the MySQL-Database."
 		einfo "For more info see QUICKSTART.mysql."
-	elif use postgres ; then
+	else
 		einfo "# createdb mydns"
 		einfo "# /usr/sbin/mydns --create-tables | psql mydns"
 		einfo