Patch configure to get location of wxrc from wx-config.

Package-Manager: portage-2.1.3.15

4 files changed, 54 insertions, 19 deletions

diff --git a/net-misc/wxdfast/ChangeLog b/net-misc/wxdfast/ChangeLog
index 8f6eb49b55ed..dc10c97b6ade 100644
--- a/net-misc/wxdfast/ChangeLog
+++ b/net-misc/wxdfast/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/wxdfast
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wxdfast/ChangeLog,v 1.1 2007/10/19 04:53:14 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wxdfast/ChangeLog,v 1.2 2007/10/21 02:04:59 dirtyepic Exp $
+
+  21 Oct 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/wxdfast-0.6.0-wxrc-configure.patch, wxdfast-0.6.0.ebuild:
+  Patch configure to get location of wxrc from wx-config.
 
 *wxdfast-0.6.0 (19 Oct 2007)
 
diff --git a/net-misc/wxdfast/Manifest b/net-misc/wxdfast/Manifest
index b40366460afd..13b8268e61ae 100644
--- a/net-misc/wxdfast/Manifest
+++ b/net-misc/wxdfast/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX wxdfast-0.6.0-wxrc-configure.patch 947 RMD160 2a09f21151b64b931a858324afe0d1f1af901c93 SHA1 718b5849ce438c6d7caa70efe3bef4b210594076 SHA256 1d77aec3cd253003b6f1c597ab8567d59d6b563a480acc6034f75eb6fc83393c
+MD5 c7126fd1ea8b7c96db19d9c114e1c1c7 files/wxdfast-0.6.0-wxrc-configure.patch 947
+RMD160 2a09f21151b64b931a858324afe0d1f1af901c93 files/wxdfast-0.6.0-wxrc-configure.patch 947
+SHA256 1d77aec3cd253003b6f1c597ab8567d59d6b563a480acc6034f75eb6fc83393c files/wxdfast-0.6.0-wxrc-configure.patch 947
 DIST wxdfast_0.6.0.tar.gz 931335 RMD160 0f0c64aaa511682a0b18ee979f0d3a8ec0cb3e2a SHA1 09f8a13c399e6e8f40e9b0a2776acd4133f0f1f6 SHA256 3be75a054225007e10bf7de11719952e2fa9d5bb5bf10d4b47f017fe4ecd5d91
-EBUILD wxdfast-0.6.0.ebuild 889 RMD160 42fa75fa5323c15360d544fde909dc9d8c9d9ad4 SHA1 0eb4541bf428654c458b9d2d75837e2afda2364c SHA256 9aea296f6871681c17ef31c9b0f88dd7aac99d607d74944f7dec5ea8f0b61a68
-MD5 ad5685854dcf89d2786393fb6c4febf8 wxdfast-0.6.0.ebuild 889
-RMD160 42fa75fa5323c15360d544fde909dc9d8c9d9ad4 wxdfast-0.6.0.ebuild 889
-SHA256 9aea296f6871681c17ef31c9b0f88dd7aac99d607d74944f7dec5ea8f0b61a68 wxdfast-0.6.0.ebuild 889
-MISC ChangeLog 346 RMD160 58505df36c85888c77fd7199469b701c0afbb944 SHA1 484cbd6a1663a321fe8522a4ed3fde3b713f7cad SHA256 ad4f07d13b90c08ab1072fa0e39abf4510dff79cab891f26fefad35e6b4ff7f2
-MD5 0ab8ded378436894832ab17381488ea3 ChangeLog 346
-RMD160 58505df36c85888c77fd7199469b701c0afbb944 ChangeLog 346
-SHA256 ad4f07d13b90c08ab1072fa0e39abf4510dff79cab891f26fefad35e6b4ff7f2 ChangeLog 346
+EBUILD wxdfast-0.6.0.ebuild 732 RMD160 2ce8e8682a6e9dd75cdfd4b75afdb5957edf9d2e SHA1 ff599e223065d6a548ee21a42f3cf68352d7ad66 SHA256 c7e09e547fc9e643432477562d44e4631ce11397df152aa14c7b6451e1c817b6
+MD5 24496f5f04e9a38099110b36399e1348 wxdfast-0.6.0.ebuild 732
+RMD160 2ce8e8682a6e9dd75cdfd4b75afdb5957edf9d2e wxdfast-0.6.0.ebuild 732
+SHA256 c7e09e547fc9e643432477562d44e4631ce11397df152aa14c7b6451e1c817b6 wxdfast-0.6.0.ebuild 732
+MISC ChangeLog 520 RMD160 30bf697e40ef85c1c54e295821df7fea63043d26 SHA1 4d210178d4e76aa04bc2f1dac7e1a9524960e2df SHA256 29a46e9661b9a7f611b668bacb31ad8b5e9520718fdf55ef53bb49432ac0b588
+MD5 5915e029b83e995609f2355493f91084 ChangeLog 520
+RMD160 30bf697e40ef85c1c54e295821df7fea63043d26 ChangeLog 520
+SHA256 29a46e9661b9a7f611b668bacb31ad8b5e9520718fdf55ef53bb49432ac0b588 ChangeLog 520
 MISC metadata.xml 163 RMD160 f00b10701f46ce312c4e3056575ecdc7214b29b6 SHA1 8ca95681a55a91e5ed44e59ba5660d00bc9b5e0c SHA256 98e13cbe1b574224e90ac29486bdd82dfe1863029528af041f0a963cb01e8c74
 MD5 34a3c9a403196f569f63f0f608007f6e metadata.xml 163
 RMD160 f00b10701f46ce312c4e3056575ecdc7214b29b6 metadata.xml 163
@@ -20,7 +24,7 @@ SHA256 86133ed5b60b9674dca184ac3c98896c1f95c810a6462a2cb0069f851038330b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHGDhFiqiDRvmkBmIRAmbDAKCAM6GVsJhtQrvrI3cD96ajaKjs/gCgoi4M
-b+rdGTEY8TR7oy+KkR6VDGs=
-=cYhu
+iD8DBQFHGrPViqiDRvmkBmIRArLEAKDx8p2LwQgAHzm5shBNktUbRPu5TACg3MKV
+XGia4jcFBVs0yBfBxFdLOTQ=
+=+KEw
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wxdfast/files/wxdfast-0.6.0-wxrc-configure.patch b/net-misc/wxdfast/files/wxdfast-0.6.0-wxrc-configure.patch
new file mode 100644
index 000000000000..c6e535b32c8b
--- /dev/null
+++ b/net-misc/wxdfast/files/wxdfast-0.6.0-wxrc-configure.patch
@@ -0,0 +1,30 @@
+diff -Naur wxdfast-0.6.0-orig/configure.in wxdfast-0.6.0/configure.in
+--- wxdfast-0.6.0-orig/configure.in	2007-03-11 16:45:25.000000000 -0600
++++ wxdfast-0.6.0/configure.in	2007-10-20 19:35:30.000000000 -0600
+@@ -64,13 +64,19 @@
+                 ])
+ 	fi
+ 
+-AC_PATH_PROG([WXRC], [wxrc --version])
+-	if test "x$WXRC" = "x"; then
+-	AC_MSG_ERROR([
+-		wxrc could not be found. This program gets build together with wxWidgets.
+-		Please make sure wxrc is within your path.
+-		])
+-	fi
++AC_ARG_VAR(WXRC, Path to wxrc resource compiler)
++AC_MSG_CHECKING([for wxrc])
++if test "x$WXRC" = x ; then
++    WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc`
++    if test "x$WXRC" = x ; then
++        AC_MSG_RESULT([not found])
++        AC_MSG_ERROR([
++            wxrc could not be found. This program gets build together with wxWidgets.
++            Please make sure wxrc is within your path.
++            ])
++    fi
++fi
++AC_MSG_RESULT([$WXRC])
+ 
+ AC_OUTPUT([
+ Makefile
diff --git a/net-misc/wxdfast/wxdfast-0.6.0.ebuild b/net-misc/wxdfast/wxdfast-0.6.0.ebuild
index 5fe7cfacbe10..b86ac241fac7 100644
--- a/net-misc/wxdfast/wxdfast-0.6.0.ebuild
+++ b/net-misc/wxdfast/wxdfast-0.6.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wxdfast/wxdfast-0.6.0.ebuild,v 1.1 2007/10/19 04:53:14 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wxdfast/wxdfast-0.6.0.ebuild,v 1.2 2007/10/21 02:04:59 dirtyepic Exp $
 
 WX_GTK_VER="2.6"
 
-inherit wxwidgets
+inherit autotools eutils wxwidgets
 
 DESCRIPTION="A multi-treaded cross-platform download manager"
 HOMEPAGE="http://dfast.sourceforge.net"
@@ -25,11 +25,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# temporary kludge until all wxGTK versions in tree install wxrc
-	if [[ ! -e /usr/bin/wxrc ]]; then
-		sed -i -e "/wxrc --version/ s:wxrc:wxrc-${WX_GTK_VER}:" configure
-		sed -i -e "/^WXRC/ s:wxrc:wxrc-${WX_GTK_VER}:" Makefile.gcc
-	fi
+	epatch "${FILESDIR}"/${P}-wxrc-configure.patch
+	eautoreconf
 }
 
 src_install() {