Fixed static issue, bug #183518. Replaced autoconf to eautoreconf, bug #226413. Fixed QA issue.

(Portage version: 2.1.6.3/cvs/Linux 2.6.28-gentoo x86_64)

3 files changed, 100 insertions, 35 deletions

diff --git a/net-dns/mydns/ChangeLog b/net-dns/mydns/ChangeLog
index 91864f0c6afc..0d178bd83706 100644
--- a/net-dns/mydns/ChangeLog
+++ b/net-dns/mydns/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/mydns
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/ChangeLog,v 1.31 2008/05/21 18:53:56 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/ChangeLog,v 1.32 2008/12/28 01:38:57 matsuu Exp $
+
+*mydns-1.1.0-r2 (28 Dec 2008)
+
+  28 Dec 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/mydns-1.1.0-gentoo.patch, -mydns-1.1.0.ebuild,
+  +mydns-1.1.0-r2.ebuild:
+  Fixed static issue, bug #183518. Replaced autoconf to eautoreconf, bug
+  #226413. Fixed QA issue. Removed old revision.
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org> mydns-1.1.0.ebuild,
   mydns-1.1.0-r1.ebuild:
diff --git a/net-dns/mydns/files/mydns-1.1.0-gentoo.patch b/net-dns/mydns/files/mydns-1.1.0-gentoo.patch
new file mode 100644
index 000000000000..e27acf6978d5
--- /dev/null
+++ b/net-dns/mydns/files/mydns-1.1.0-gentoo.patch
@@ -0,0 +1,55 @@
+diff -Naur mydns-1.1.0.orig/doc/Makefile.am mydns-1.1.0/doc/Makefile.am
+--- mydns-1.1.0.orig/doc/Makefile.am	2004-02-28 03:28:06.000000000 +0900
++++ mydns-1.1.0/doc/Makefile.am	2008-12-28 09:48:57.000000000 +0900
+@@ -33,25 +33,25 @@
+ 	fi
+ 
+ mydns.8: sedfile ${@:=.in}
+-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
++	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+ 
+ mydnscheck.8: sedfile ${@:=.in}
+-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
++	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+ 
+ mydns.conf.5: sedfile ${@:=.in}
+-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
++	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+ 
+ mydns-conf.8: sedfile ${@:=.in}
+-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
++	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+ 
+ mydnsexport.8: sedfile ${@:=.in}
+-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
++	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+ 
+ mydnsimport.8: sedfile ${@:=.in}
+-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
++	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+ 
+ mydnsptrconvert.8: sedfile ${@:=.in}
+-	$(SHELL) @top_srcdir@/missing --run sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
++	sed -f @SEDFILE@ ${@:=.in} | tr -s '\n' > $@
+ 
+ html:
+ 	if [ -x /usr/local/bin/mydns-texi2html ]; then /usr/local/bin/mydns-texi2html mydns.texi; fi
+diff -Naur mydns-1.1.0.orig/m4/mydns.m4 mydns-1.1.0/m4/mydns.m4
+--- mydns-1.1.0.orig/m4/mydns.m4	2006-01-19 07:08:14.000000000 +0900
++++ mydns-1.1.0/m4/mydns.m4	2008-12-28 09:29:30.000000000 +0900
+@@ -363,7 +363,6 @@
+ 						AC_C_CFLAGS(-fomit-frame-pointer)
+ 						AC_C_CFLAGS(-finline-functions)
+ 						AC_C_CFLAGS(-ffast-math)
+-						LDFLAGS="$LDFLAGS -static"
+ 					fi
+ 				fi
+ 			], [
+@@ -372,7 +371,6 @@
+ 					AC_C_CFLAGS(-fomit-frame-pointer)
+ 					AC_C_CFLAGS(-finline-functions)
+ 					AC_C_CFLAGS(-ffast-math)
+-					LDFLAGS="$LDFLAGS -static"
+ 				fi
+ 			]
+ 		)
diff --git a/net-dns/mydns/mydns-1.1.0.ebuild b/net-dns/mydns/mydns-1.1.0-r2.ebuild
index fd5c8f61322a..d1cb5a0190bc 100644
--- a/net-dns/mydns/mydns-1.1.0.ebuild
+++ b/net-dns/mydns/mydns-1.1.0-r2.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/mydns-1.1.0.ebuild,v 1.11 2008/05/21 18:53:56 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/mydns-1.1.0-r2.ebuild,v 1.1 2008/12/28 01:38:57 matsuu Exp $
 
-inherit eutils
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit autotools eutils
 
 DESCRIPTION="A DNS-Server which gets its data from mysql-databases"
 HOMEPAGE="http://mydns.bboy.net/"
@@ -10,11 +13,10 @@ SRC_URI="http://mydns.bboy.net/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ~ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="debug nls postgres ssl static zlib"
 
-RDEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )
+RDEPEND="ssl? ( dev-libs/openssl )
 	zlib? ( sys-libs/zlib )
 	postgres? ( virtual/postgresql-server )
 	!postgres? ( virtual/mysql )"
@@ -25,45 +27,45 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-m4.patch
-	#epatch "${FILESDIR}"/${P}-gcc41.patch
-	autoconf || die
+	epatch "${FILESDIR}/${P}-m4.patch"
+	epatch "${FILESDIR}/04-update-smash-fix.dpatch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	eautoreconf
 }
 
 src_compile() {
-	local myconf
+	local myconf="--enable-alias"
 
-	if ! use postgres; then
-		myconf="${myconf} --with-mysql"
-	else
+	if use postgres; then
 		myconf="${myconf} --without-mysql --with-pgsql"
+	else
+		myconf="${myconf} --with-mysql"
 	fi
 
-	econf --enable-alias \
-		`use_enable nls` \
-		`use_enable debug` \
-		`use_enable static static-build` \
-		`use_with ssl openssl` \
-		`use_with zlib` \
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		$(use_enable static) \
+		$(use_enable static static-build) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
 		${myconf} || die
-
 	emake || die
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 
 	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 
-	newinitd "${FILESDIR}"/mydns.rc6 mydns || die
-
-	if ! use postgres; then
-		sed -i -e 's/__db__/mysql/g' "${D}"/etc/init.d/mydns || die
-		dodoc QUICKSTART.mysql README.mysql
-	else
-		sed -i -e 's/__db__/postgresql/g' "${D}"/etc/init.d/mydns || die
+	if use postgres; then
+		sed -e 's/__db__/postgresql/g' "${FILESDIR}/mydns.rc6" > "${T}/mydns.rc6" || die
 		dodoc QUICKSTART.postgres
+	else
+		sed -e 's/__db__/mysql/g' "${FILESDIR}/mydns.rc6" > "${T}/mydns.rc6" || die
+		dodoc QUICKSTART.mysql README.mysql
 	fi
+	newinitd "${T}/mydns.rc6" mydns || die
 }
 
 pkg_postinst() {
@@ -72,18 +74,18 @@ pkg_postinst() {
 	elog
 	elog "# /usr/sbin/mydns --dump-config > /etc/mydns.conf"
 	elog "# chmod 0600 /etc/mydns.conf"
-	if ! use postgres; then
-		elog "# mysqladmin -u <useruname> -p create mydns"
-		elog "# /usr/sbin/mydns --create-tables | mysql -u <username> -p mydns"
-		elog
-		elog "to create the tables in the MySQL-Database."
-		elog "For more info see QUICKSTART.mysql."
-	else
+	if use postgres; then
 		elog "# createdb mydns"
 		elog "# /usr/sbin/mydns --create-tables | psql mydns"
 		elog
 		elog "to create the tables in the PostgreSQL-Database."
 		elog "For more info see QUICKSTART.postgres."
+	else
+		elog "# mysqladmin -u <useruname> -p create mydns"
+		elog "# /usr/sbin/mydns --create-tables | mysql -u <username> -p mydns"
+		elog
+		elog "to create the tables in the MySQL-Database."
+		elog "For more info see QUICKSTART.mysql."
 	fi
 	elog
 }