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

Package-Manager: portage-2.1.9.47/cvs/Linux x86_64

5 files changed, 138 insertions, 24 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/Manifest b/net-dns/mydns/Manifest
index 938c2a5e4e07..6367d79d4618 100644
--- a/net-dns/mydns/Manifest
+++ b/net-dns/mydns/Manifest
@@ -1,32 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 04-update-smash-fix.dpatch 1175 RMD160 344a2360a1b746da4d612a7fc070aca5a552930a SHA1 8ecd7ab4365e9b4f42d8cd74c5daa2e86137cfbc SHA256 2f4054a5c65e59e2f41e6633b07078bbc736b8196db22c11aaae3bae2cb9f11e
 AUX mydns-1.1.0-gcc41.patch 9447 RMD160 d04c549f711f8afc405dc05e97582a7e8c994e06 SHA1 29826d1cd87935ec72e8289bad852d6334a8648a SHA256 2f1431b9c08735203351d12d3043c469bd5ec65d77c0f44bcc6ca4c3801b0a1b
 AUX mydns-1.1.0-gentoo.patch 2069 RMD160 dfe4248f3a5a7ab816f3542e0b876d7b54c2571e SHA1 aa78ac0b185940135c9aad3671420ce97175595b SHA256 6e776c52b4eaf824a0582dac84b3a15cf9a140c414eef8292b1cbf4850f41338
 AUX mydns-1.1.0-m4.patch 3055 RMD160 2a0c9843f05b713efd6d21671d960ab079766780 SHA1 aa5e2820608f8047f23d460e84dcb71bfc8d26d0 SHA256 9cf87e1dd03cd83655099eb850285f2b67893fe490cd20f053c33e9bec8046c2
+AUX mydns-1.2.8.27-gentoo.patch 1998 RMD160 981f169d165966916f97e187543b6360bfbb9300 SHA1 da6acbb59d5bf1b207f9b352033b5fdaf1df067c SHA256 3e14d2284912585aa23e0abcb2297825f8f888be8a5e0f8b7491b5b52c5a2969
+AUX mydns-1.2.8.27-m4.patch 1983 RMD160 dcc69d0d66ddeb8951e78e211672ab8ecd7ce63a SHA1 e2bdbf974014f20cdf0f07840e2ed2c00de2e8ae SHA256 ebd6a22d9af6c6fd734b0756583b116755935f4f1c6a1bd6b10dc685521cbc13
 AUX mydns.rc6 903 RMD160 bb97a7ce94249f9de78e4a5e9164f17339f873c9 SHA1 fb1477b08584cbc2e9027fe1351c3a5e34e802f6 SHA256 36dadbe2c880928a43d33049c02026df47478f79ff97768a6143db6cddc3aba4
 DIST mydns-1.1.0.tar.bz2 573261 RMD160 ffd7c5d42d5e004e06562d4fb497cc515f31fed9 SHA1 71979409bf46e38b443ee940a6ecb0e42464bc0b SHA256 ecfcc8bb8fd9f707d2e7af808317cdcc3a4d701375265840944c4e0ff0d66bf6
 DIST mydns-1.2.8.27.tar.gz 1055969 RMD160 fd3f06fee61ead3eea1c4a4cc8c325c81e576698 SHA1 69eae81fa4e8896ea4e2c5a0cb9cef54635f917c SHA256 9f9a80d2c3b47b91e15daf49aa3442b29e2f2c175ffb98358ccb9103087edc21
 EBUILD mydns-1.1.0-r1.ebuild 2182 RMD160 a64213334ec22f3b9938b64d85f8af83e8871b5b SHA1 ab1998201ecf253cde86a9e40b8fa1d5d25f60af SHA256 48acc68ddb54c61ff8bd5e52fb81d513e496995b34d2da283bed1d41ddf5669e
 EBUILD mydns-1.1.0-r2.ebuild 2330 RMD160 d4d1492ffb68adc1aad64cbeff83b45c8688cf93 SHA1 3d206dc2f8028d23237955324d5c62c39fb3b094 SHA256 dbe43eb856c68b958e4ca6ac2231b56676c05d8c2c149cf9e54bb354b179cae7
-EBUILD mydns-1.2.8.27.ebuild 2666 RMD160 4bab30446495c7f803be1fbd39ee8d3bfada875d SHA1 60c42578baf5dc33b35a3c26b0845ced9f2a8b06 SHA256 cd02150b6d9865b6493a3839f202e7aa2bfb310f42a88e82e0ae5ba448a49222
-MISC ChangeLog 4906 RMD160 5e0751608cdc5763b916d30de2010291f6ca6e06 SHA1 1dd4daa2192fbe532427d25058c55a000c20e320 SHA256 21bb4b64431ec3608caa62602557fb1866a58a1040a3cca8c4442c8d077d1116
+EBUILD mydns-1.2.8.27.ebuild 2609 RMD160 181203e04bf62a47bc34fa784a4a72efa3b90b0e SHA1 333c95c4b2c7a5c0de65f1509aa4bfae3153dcf2 SHA256 3f43e2cfc746fee2b667c4966b3fa2a3d228f4d8e0fe460b7f2815605e7d928c
+MISC ChangeLog 5139 RMD160 ed7e66ad06a275d8110aceab4c2a4d8644eb4c4d SHA1 d7cf711f2a8f63d624cf8ce5aacbfad52a443a10 SHA256 715db17b615053cd93f4dd72903cf5effaeea26813e92f523a438d69d5536c56
 MISC metadata.xml 400 RMD160 8685ff31f3024882acdc55f149bb4fac913a7e6c SHA1 843b57225742e55b1fb176fa046d90c12fa334a2 SHA256 fc65c1e07e308cb6268f49901b1858e294eefb4ce5e050c84e0a3d4bed2dd650
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJM1AK7AAoJECaGw+YFKA1pyY4P/A8MDNzu8/fNlva0ne1MFCW3
-OjOBCrve1LhIOKQk0oQ2QPk+E8u68PTfhCHfVwa6MbQqwtSUNBEpa73DzeT/ti5Z
-wiwk54qp/8co9LihpDR2hxnuIv+zZvecJVXfE5tOqAomUfpYJ0ZH8/eTii29FXWw
-o6gD0Z/b4AWAKGoFHECLlUo26us4Lk/PqEaEEeuSbGxyYsk32arzVkpb3O5O0nt7
-9Q5odSaD7sAA/lVzSeUJ2EIr4+yY+QgB5u3UlL3BenuerOoX/1f2QpTzJ+sQ/uUK
-0D4xMOzIUcmtIYFEmqz40BNfnbxi7LwKfvC05/Rdt5igFFD4+MAkS/gHkghPYxoH
-fvWYNQMSnAGvLMoBMuyb8tarFN0/YeNMyIr7RZhXPvDyjWvqR1J4wQ1DDMF74F3u
-1B0vJY36MFjyrx2MSHv70sSlaYeeV13Cm+Cw2wPwZ33/13Ts8T+1EJ370KAVXlRX
-J0GeA5HwmTreo5AtlvOkH7VLMEL/uubLFGNM/nuKIjCrqjc7uyJ/VwqHH0sumeLy
-vvqjxa3cAKs0c4MZ4snZtoadURrZH1fIugGZXPJJOvsdTlAJlz7SflXBQfxiOMgm
-Hs+5VSgrIPzCe6haeNYutweXg1ekLRlcqQ3G45vSvsUaads90HDveis50wQrUo2n
-YxOBjabyBez0rFDHkAxF
-=RBut
+iQIcBAEBCgAGBQJN0p4JAAoJEPqDWhW0r/LCUgIP/31TARcKkaqwJFA5bv6YPAwV
+PjEtnQ7GvHqUJPjW4cGmyFEJWJyrSTPdCtZLaqyDbtIiGyEvEs9hPUznIx43BxS7
+0IyH+/QSx9n+oRGK1FpIHhkzuEj4X1n9TIUzrqeRMBkoUiyk22qv6qSNduu8JYMq
+iNmDTHR17WwKhknaSz3iEcVkv4cms9OUxIcD+Xyloi0zGSNxxTjaIhuYu5TstpwH
+wS/Hl4Mh6zzTF/pTIjuBX1qWLjKFRyLNiBkE5nQyIS8FcSh6SeTIU6G8hF0bwz4w
+AGt7iqKfvLtXzf1FGPDDhd0TBhOch8iE19CHXRf+rJUFrIGZb4oL9+5q2YEOsZN8
+7pQFhRIn/1DGfO52T6gHfHaqe7+Ff9f64Eg//RZ6K7vW+igwMiRwZokcVx++kpY8
+fLH+7aDaspLqWyKya4VI9r/lxEA93rJfvB3MDK6px2zwIecikvbgEuy/w4FnCfM8
+7MN84rSJaUZFb0v6tiwGOuN4ZOo710agenI1wIVn5jJInnOSvTrWdNMKXzUxHcGw
+At3570XTkvEYPBleDzKycFMNInjcVPPFFEIpRanot7sCmY/JR+74+7Q6N8A0ivBS
+JHCSSogejC/uyQAIo/yRdqfKUmye/JDYN8adMTmWF7mgEKWB9/YTM4a9jv+gfIjs
+09RtXTuQisXNZHGjpZi0
+=sN1h
 -----END PGP SIGNATURE-----
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
 }