Stop patching Makefile.in. (bug #226807 by Diego)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-misc/wxdfast/ChangeLog b/net-misc/wxdfast/ChangeLog
index 4de8d3e35f10c653ade8d4820cd22bdb30688e61..08df3283da263e2b5534918fa93cde8758f4d10b 100644 (file)
--- a/net-misc/wxdfast/ChangeLog
+++ b/net-misc/wxdfast/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/wxdfast
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wxdfast/ChangeLog,v 1.7 2010/02/10 00:14:05 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wxdfast/ChangeLog,v 1.8 2010/07/04 21:17:02 dirtyepic Exp $
+
+  04 Jul 2010; Ryan Hill <dirtyepic@gentoo.org>
+  files/wxdfast-0.6.0-cflags.patch:
+  Stop patching Makefile.in. (bug #226807 by Diego)
 
   10 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> wxdfast-0.6.0-r1.ebuild:
   Touchup ebuild.

diff --git a/net-misc/wxdfast/Manifest b/net-misc/wxdfast/Manifest
index ee735197cac87944c8914b0ede8e18c3aa10f56a..70fe9908089a5ed62351a2eed8d76a2a3788e4c8 100644 (file)
--- a/net-misc/wxdfast/Manifest
+++ b/net-misc/wxdfast/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX wxdfast-0.6.0-cflags.patch 1293 RMD160 34857cd7fef646a462cdb103fb7da375301e4f30 SHA1 10f33c9894600a229d66e771087272c9cbcbf574 SHA256 612121026b41b948dc69e5347b5ea30605e8ee84df67e1407aebbdee7924798a
+AUX wxdfast-0.6.0-cflags.patch 390 RMD160 bc3971094f64ad0548c300db2d4d78840725c4d4 SHA1 2cd6f55f4e531745e2af56b64a8c2c1de312e576 SHA256 1253e07f2ea98fa5b8107f1e8a08e08f804796bd0d6bd1de03f4946c79af3f9b
 AUX wxdfast-0.6.0-wxrc-configure.patch 947 RMD160 2a09f21151b64b931a858324afe0d1f1af901c93 SHA1 718b5849ce438c6d7caa70efe3bef4b210594076 SHA256 1d77aec3cd253003b6f1c597ab8567d59d6b563a480acc6034f75eb6fc83393c
 DIST wxdfast_0.6.0.tar.gz 931335 RMD160 0f0c64aaa511682a0b18ee979f0d3a8ec0cb3e2a SHA1 09f8a13c399e6e8f40e9b0a2776acd4133f0f1f6 SHA256 3be75a054225007e10bf7de11719952e2fa9d5bb5bf10d4b47f017fe4ecd5d91
 EBUILD wxdfast-0.6.0-r1.ebuild 755 RMD160 77f4bb1dd58783630dc094fe0c9dfb45ef5a97f8 SHA1 6fdc6b818b21cc32250d4e4d87dbd32b3cc23b5b SHA256 20d6bdc56f2bd08f6dea118d9f7c80740fd8f936e008c749085cd4240c25b002
-MISC ChangeLog 1138 RMD160 37bf42158639578f765bc6068e639af49a920b7c SHA1 b350bff7a8802d938386b7d6a55b7c79ec59e480 SHA256 709783faea006a0f205e299ab6d58aa5e71b2eab00562beaa756c6565a0f730c
+MISC ChangeLog 1275 RMD160 b3ef40de7bc59305a577b4c350b85cf53319adf1 SHA1 ca59dcc05a4528cc0001ba4ce292063173b4d7bd SHA256 b2d0312ea34a256d1f2283a2c89593ad9a30b738266aabcf8c67b1de1a1fdb92
 MISC metadata.xml 163 RMD160 9a0dfd25dd8d78688f888da6873ba81236f6ed02 SHA1 a3f0779e6edd3b5eff0964b594051edd3de40978 SHA256 f80859bf7a6a4f9003e458590a617debc14e3e1766004a67b368b327f3afc535
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAktx+tsACgkQiqiDRvmkBmKAugCgkrzKYmtKH0SGTGy3Voz2Pj1l
-luwAniGGmLX4+WIthpzuyinM/7pYF/0X
-=uhNt
+iEYEARECAAYFAkww+zMACgkQiqiDRvmkBmJzZwCg7KB5qkj5U/9SJm81tiuZfX+K
+pGQAnR+U+ZDoglfrd/efZsmqmcNnvWBV
+=046x
 -----END PGP SIGNATURE-----

diff --git a/net-misc/wxdfast/files/wxdfast-0.6.0-cflags.patch b/net-misc/wxdfast/files/wxdfast-0.6.0-cflags.patch
index 084d09297f1816f6ce30c2b98ac7b4f633244eee..a1554c324a2d5ce8f403107086a08edbc5ff4780 100644 (file)
--- a/net-misc/wxdfast/files/wxdfast-0.6.0-cflags.patch
+++ b/net-misc/wxdfast/files/wxdfast-0.6.0-cflags.patch
@@ -1,40 +1,16 @@
-diff -Naur wxdfast-0.6.0-orig/src/Makefile.am wxdfast-0.6.0/src/Makefile.am
---- wxdfast-0.6.0-orig/src/Makefile.am 2007-03-11 16:45:24.000000000 -0600
-+++ wxdfast-0.6.0/src/Makefile.am      2007-12-23 20:19:08.000000000 -0600
-@@ -17,11 +17,9 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,11 +17,9 @@ if PORTABLE
  PORTABLE_FLAGS = -D WXDFAST_PORTABLE
  endif
  
 -CFLAGS =\
 -       -Wall -O2 $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
-+CFLAGS += $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
++CFLAGS += $(XRC_FLAGS) $(PORTABLE_FLAGS)
  
 -CXXFLAGS =\
 -       -Wall -O2 $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
-+CXXFLAGS += $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
++CXXFLAGS += $(XRC_FLAGS) $(PORTABLE_FLAGS)
  
  wxdfast_SOURCES = \
        BoxFind.cpp\
-diff -Naur wxdfast-0.6.0-orig/src/Makefile.in wxdfast-0.6.0/src/Makefile.in
---- wxdfast-0.6.0-orig/src/Makefile.in 2007-12-23 20:16:41.000000000 -0600
-+++ wxdfast-0.6.0/src/Makefile.in      2007-12-23 20:20:56.000000000 -0600
-@@ -95,17 +95,13 @@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = \
--       -Wall -O2 $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
--
-+CFLAGS += $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
--CXXFLAGS = \
--       -Wall -O2 $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
--
-+CXXFLAGS += $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@