Use proper patches. Bug #347485. Thanks to Dries Harnie <botje.linux@gmail.com>

(Portage version: 2.1.9.47/cvs/Linux x86_64)

4 files changed, 119 insertions, 7 deletions

diff --git a/net-dns/mydns/ChangeLog b/net-dns/mydns/ChangeLog
index 8a33f2b17ca6..9b5383ec7a46 100644
--- a/net-dns/mydns/ChangeLog
+++ b/net-dns/mydns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/mydns
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/ChangeLog,v 1.35 2010/11/05 12:20:35 matsuu Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/ChangeLog,v 1.36 2011/05/17 16:09:22 hwoarang Exp $
+
+  17 May 2011; Markos Chandras <hwoarang@gentoo.org> mydns-1.2.8.27.ebuild,
+  +files/mydns-1.2.8.27-gentoo.patch, +files/mydns-1.2.8.27-m4.patch:
+  Use proper patches. Bug #347485. Thanks to Dries Harnie
+  <botje.linux@gmail.com>
 
 *mydns-1.2.8.27 (04 Nov 2010)
 
diff --git a/net-dns/mydns/files/mydns-1.2.8.27-gentoo.patch b/net-dns/mydns/files/mydns-1.2.8.27-gentoo.patch
new file mode 100644
index 000000000000..c4d9c132840c
--- /dev/null
+++ b/net-dns/mydns/files/mydns-1.2.8.27-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
+--- mydns-1.2.8/m4/mydns.m4.orig	2009-02-02 14:52:34.000000000 +0100
++++ mydns-1.2.8/m4/mydns.m4	2010-12-01 22:31:20.000000000 +0100
+@@ -357,16 +357,12 @@
+ 					AC_MSG_RESULT([no])
+ 					if test -z "$PROFILE_ENABLED"; then
+ 						AC_C_CFLAGS(-finline-functions)
+-					else
+-						LDFLAGS="$LDFLAGS -static"
+ 					fi
+ 				fi
+ 			], [
+ 				AC_MSG_RESULT([no])
+ 				if test -z "$PROFILE_ENABLED"; then
+ 					AC_C_CFLAGS(-finline-functions)
+-				else
+-					LDFLAGS="$LDFLAGS -static"
+ 				fi
+ 			]
+ 		)
diff --git a/net-dns/mydns/files/mydns-1.2.8.27-m4.patch b/net-dns/mydns/files/mydns-1.2.8.27-m4.patch
new file mode 100644
index 000000000000..c32e7613b466
--- /dev/null
+++ b/net-dns/mydns/files/mydns-1.2.8.27-m4.patch
@@ -0,0 +1,53 @@
+--- mydns-1.1.0/m4/mydns.m4.orig	2010-12-01 21:57:52.000000000 +0100
++++ mydns-1.1.0/m4/mydns.m4	2010-12-01 22:07:24.000000000 +0100
+@@ -542,46 +542,10 @@
+ ##
+ AC_DEFUN([AC_LIB_MYSQLCLIENT],
+ 	[
+-		libmysqlclient_dirs="/usr/local/mysql/lib /usr/local/lib/mysql /usr/local/lib /usr/lib/mysql /usr/lib /lib"
+-		AC_ARG_WITH(mysql-lib,
+-			AC_HELP_STRING([--with-mysql-lib=DIR], [look for the MySQL client library in DIR]),
+-			libmysqlclient_dirs="$withval $libmysqlclient_dirs")
+-		libmysqlclient_found=no, libmysqlclient_ok=no
+-		for libmysqlclient_dir in $libmysqlclient_dirs; do
+-			if test "$libmysqlclient_found" != yes; then
+-				AC_CHECK_FILE($libmysqlclient_dir/libmysqlclient_r.so, libmysqlclient_found=yes, libmysqlclient_found=no)
+-				if test "$libmysqlclient_found" != yes; then
+-					AC_CHECK_FILE($libmysqlclient_dir/libmysqlclient.so, libmysqlclient_found=yes, libmysqlclient_found=no)
+-				fi
+-				if test "$libmysqlclient_found" != yes; then
+-					AC_CHECK_FILE($libmysqlclient_dir/libmysqlclient.a, libmysqlclient_found=yes, libmysqlclient_found=no)
+-				fi
+-				if test "$libmysqlclient_found" = yes; then
+-					## libmysqlclient depends on libz
+-					if ! test -n "$LIBZ"; then
+-						AC_LIB_Z
+-					fi
+-					if ! test -n "$LIBZ"; then
+-						## No zlib
+-						AC_MSG_ERROR([
+-
+-][  ###
+-][  ###  zlib compression library (libz.a) not found.
+-][  ###
+-][  ###  Please download and install the zlib compression
+-][  ###  library from the following URL:
+-][  ###
+-][  ###       http://www.gzip.org/zlib/
+-][  ###
+-][  ###  (Error detail might be available in `config.log')
+-][  ###
+-])
+-     				fi
+-					LIBMYSQLCLIENT="-L$libmysqlclient_dir -lmysqlclient"
+-					libmysqlclient_found=yes
+-				fi
+-			fi
+-		done
++		AC_CHECK_PROG(LIBMYSQLCLIENT,mysql_config,`mysql_config --libs`)
++		if test -z "$LIBMYSQLCLIENT"; then
++			AC_MSG_ERROR([Could not find mysql_config script. Make sure the mysql client libraries are installed])
++		fi
+ 		AC_SUBST(LIBMYSQLCLIENT)
+ 	]
+ )
diff --git a/net-dns/mydns/mydns-1.2.8.27.ebuild b/net-dns/mydns/mydns-1.2.8.27.ebuild
index 510faaf9f9ea..a808a3d8515f 100644
--- a/net-dns/mydns/mydns-1.2.8.27.ebuild
+++ b/net-dns/mydns/mydns-1.2.8.27.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/mydns-1.2.8.27.ebuild,v 1.1 2010/11/05 12:20:35 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/mydns/mydns-1.2.8.27.ebuild,v 1.2 2011/05/17 16:09:22 hwoarang Exp $
 
 EAPI="3"
 inherit autotools confutils eutils
@@ -32,9 +32,8 @@ pkg_setup() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}/${PN}-1.1.0-m4.patch" \
-		"${FILESDIR}/04-update-smash-fix.dpatch" \
-		"${FILESDIR}/${PN}-1.1.0-gentoo.patch"
+		"${FILESDIR}/${P}-m4.patch" \
+		"${FILESDIR}/${P}-gentoo.patch"
 	eautoreconf
 }