Version bump and fixed bugs.

7 files changed, 80 insertions, 25 deletions

diff --git a/net-dns/mydns/ChangeLog b/net-dns/mydns/ChangeLog
index 56a694d1240d..0fb5e61b5597 100644
--- a/net-dns/mydns/ChangeLog
+++ b/net-dns/mydns/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/mydns
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/ChangeLog,v 1.6 2004/06/09 21:26:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/ChangeLog,v 1.7 2004/06/13 07:15:19 matsuu Exp $
+
+*mydns-0.11.0 (13 Jun 2004)
+
+  13 Jun 2004; <matsuu@gentoo.org> files/mydns.rc6, +files/mydns.rc6-0.11.0,
+  -mydns-0.10.4.ebuild, +mydns-0.11.0.ebuild:
+  Version bumped.
+  Fixed typo in files/mydns.rc6. Bug #53562.
+  Fixed default database problem. Bug #53449.
 
   09 Jun 2004; Aron Griffis <agriffis@gentoo.org> mydns-0.10.3.ebuild,
   mydns-0.10.4.ebuild:
diff --git a/net-dns/mydns/Manifest b/net-dns/mydns/Manifest
index d883ef1e7b0f..5790727953e2 100644
--- a/net-dns/mydns/Manifest
+++ b/net-dns/mydns/Manifest
@@ -1,7 +1,8 @@
-MD5 c50346bf0fb8b39c521dca42b145f6ee metadata.xml 230
-MD5 814c6ec8958ce5dcf983a88fc05af0dc mydns-0.10.4.ebuild 2033
 MD5 2f1282fd729c9fbd92d05b633a0874b9 ChangeLog 1030
+MD5 c50346bf0fb8b39c521dca42b145f6ee metadata.xml 230
 MD5 211c795fff04155aee8e42017b0a7c8f mydns-0.10.3.ebuild 2030
-MD5 818093378c62fc52c618c51168e19691 files/digest-mydns-0.10.4 65
-MD5 e74950e4c528e8237cfd8a881f4413b6 files/mydns.rc6 741
+MD5 4d0e49c0308426fce730da44c2382a30 mydns-0.11.0.ebuild 2067
+MD5 e40de90d140c0c0269b29fcd4dcf86f9 files/mydns.rc6-0.11.0 686
 MD5 ebba13e9f1c850faa314aed56723486d files/digest-mydns-0.10.3 65
+MD5 322717eeb270a3958847d4ea87bdcc4b files/mydns.rc6 742
+MD5 23af670a16b78f2ed91017e898efa177 files/digest-mydns-0.11.0 65
diff --git a/net-dns/mydns/files/digest-mydns-0.10.4 b/net-dns/mydns/files/digest-mydns-0.10.4
deleted file mode 100644
index 3ccdb07c1319..000000000000
--- a/net-dns/mydns/files/digest-mydns-0.10.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 781a09b068360719899c266dab1baaa2 mydns-0.10.4.tar.bz2 541502
diff --git a/net-dns/mydns/files/digest-mydns-0.11.0 b/net-dns/mydns/files/digest-mydns-0.11.0
new file mode 100644
index 000000000000..7456571324c6
--- /dev/null
+++ b/net-dns/mydns/files/digest-mydns-0.11.0
@@ -0,0 +1 @@
+MD5 16cc087d63c59bdb56f1564d92d6ab0a mydns-0.11.0.tar.bz2 545293
diff --git a/net-dns/mydns/files/mydns.rc6 b/net-dns/mydns/files/mydns.rc6
index bbba3dd925ae..968a12f8e35e 100644
--- a/net-dns/mydns/files/mydns.rc6
+++ b/net-dns/mydns/files/mydns.rc6
@@ -1,10 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/files/mydns.rc6,v 1.2 2004/03/04 19:17:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/files/mydns.rc6,v 1.3 2004/06/13 07:15:19 matsuu Exp $
 
 depend() {
-	use mysql postgres
+	use mysql postgresql
 }
 
 checkconfig() {
diff --git a/net-dns/mydns/files/mydns.rc6-0.11.0 b/net-dns/mydns/files/mydns.rc6-0.11.0
new file mode 100644
index 000000000000..7cd049d86ca6
--- /dev/null
+++ b/net-dns/mydns/files/mydns.rc6-0.11.0
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/06/13 07:15:19 matsuu Exp $
+
+depend() {
+	need net __db__
+	use logger
+	provide dns
+}
+
+checkconfig() {
+	if [ ! -f /etc/mydns.conf ] ; then
+		eerror "No /etc/mydns.conf file exists!"
+		return 1
+	fi
+}
+
+start() {
+	ebegin "Starting mydns"
+	checkconfig || return 1
+	start-stop-daemon --start --quiet --exec /usr/sbin/mydns -- -b
+	eend $?
+}
+
+stop () {
+	ebegin "Stopping mydns"
+	PIDFILE=`cat /etc/mydns.conf | grep pidfile | awk '{ print $3 }'`
+	if [ $PIDFILE == "" ]; then
+		PIDFILE=/var/run/mydns.pid
+	fi
+	start-stop-daemon --stop --quiet \
+		--pidfile=${PIDFILE}
+	eend $?
+}
diff --git a/net-dns/mydns/mydns-0.10.4.ebuild b/net-dns/mydns/mydns-0.11.0.ebuild
index 7512df96dd31..acdb0283c177 100644
--- a/net-dns/mydns/mydns-0.10.4.ebuild
+++ b/net-dns/mydns/mydns-0.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/mydns-0.10.4.ebuild,v 1.2 2004/06/09 21:26:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/mydns-0.11.0.ebuild,v 1.1 2004/06/13 07:15:19 matsuu Exp $
 
 DESCRIPTION="A DNS-Server which gets its data from mysql-databases"
 HOMEPAGE="http://mydns.bboy.net/"
@@ -12,27 +12,32 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 IUSE="nls static debug mysql postgres ssl zlib"
 
 RDEPEND="virtual/glibc
-	|| ( mysql? ( dev-db/mysql ) postgres? ( dev-db/postgresql ) )
 	openssl? ( 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
 }
@@ -41,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
+	exeinto /etc/init.d; newexe ${FILESDIR}/mydns.rc6-${PV} 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() {
@@ -53,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