Port wxrc link patch to 2.8, where it turns out it hasn't been applied yet

like I thought. Thanks to devurandom.
Package-Manager: portage-2.1.4_rc6

4 files changed, 35 insertions, 13 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 5d5f6a2af8e1..ea471a44a8f0 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.164 2007/11/30 00:56:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.165 2007/12/03 19:16:06 dirtyepic Exp $
+
+  03 Dec 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/wxGTK-2.8.6-wxrc_link_fix.patch, wxGTK-2.8.6.1.ebuild:
+  Port wxrc link patch to 2.8, where it turns out it hasn't been applied yet
+  like I thought. Thanks to devurandom.
 
   30 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.6.4.0-r2.ebuild,
   wxGTK-2.8.6.1.ebuild:
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 6cfe4e4000ec..4d5933417edb 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -41,6 +41,10 @@ AUX wxGTK-2.8.6-extralibs-media.patch 23622 RMD160 f2f79546544c9c15f11bf256a42e8
 MD5 950d74368d7d0b6e1909b0196b82829e files/wxGTK-2.8.6-extralibs-media.patch 23622
 RMD160 f2f79546544c9c15f11bf256a42e8dd72937458b files/wxGTK-2.8.6-extralibs-media.patch 23622
 SHA256 7fcfc20265b2b1083312c6b3d02e484bd4bd1992a2f60e4f3deea2285b13c367 files/wxGTK-2.8.6-extralibs-media.patch 23622
+AUX wxGTK-2.8.6-wxrc_link_fix.patch 989 RMD160 baf0009e0ecfe68b25df80e6b0956ef08f9e8bfd SHA1 dc8d7474647b5d8d0b9bc7c9bdf77899351808c1 SHA256 4eac080fe34870398309623cb363573b2d0242eb1dd24534efde4e7237c05fd0
+MD5 a4380d52dd58eda96d6c7809aab8ca68 files/wxGTK-2.8.6-wxrc_link_fix.patch 989
+RMD160 baf0009e0ecfe68b25df80e6b0956ef08f9e8bfd files/wxGTK-2.8.6-wxrc_link_fix.patch 989
+SHA256 4eac080fe34870398309623cb363573b2d0242eb1dd24534efde4e7237c05fd0 files/wxGTK-2.8.6-wxrc_link_fix.patch 989
 DIST wxPython-src-2.6.3.3.tar.bz2 18963104 RMD160 7feacff6808574143590a0a421ee60f3692eb783 SHA1 e55a3a8cfbd1aff394be15297ae205a8c597bed8 SHA256 fd2c4338beac644ebc509766f1e33892fc34d19280c5cbd66746625f96a55acb
 DIST wxPython-src-2.6.4.0.tar.bz2 19062795 RMD160 fe4d2cd91f83c6a8538f2f70f94d6553985f3958 SHA1 621f529e0a5c3e30d4a750046fd71179567a52f8 SHA256 124281b3f5d699eb0699022a0e00fd5359370b61748a0560b7109005d8fb06ba
 DIST wxPython-src-2.8.6.1.tar.bz2 25238701 RMD160 5a18c847e7383dc81a11c426612cc2a4610f3a79 SHA1 7a351763822a18fdb460ddf1b779dd002f80909d SHA256 92b12c96679b7c16805b7b106db62be2eb0f1c1164513935f5114b21377fabbc
@@ -59,14 +63,14 @@ EBUILD wxGTK-2.6.4.0-r2.ebuild 4911 RMD160 52a9e7a601ef3adedb66e87ae526c817ef7c6
 MD5 a4d2aaf4b7b6f861157beabcf7c1f1a9 wxGTK-2.6.4.0-r2.ebuild 4911
 RMD160 52a9e7a601ef3adedb66e87ae526c817ef7c66ea wxGTK-2.6.4.0-r2.ebuild 4911
 SHA256 d62db40083f7102548a62ad14826b6858f31287d0fbb604954ceb75540c12c24 wxGTK-2.6.4.0-r2.ebuild 4911
-EBUILD wxGTK-2.8.6.1.ebuild 3632 RMD160 8785c6ce187bba9e4f6c26640443225729a2190a SHA1 7d2639c3ff6a0748129839b92ded83be06677dc3 SHA256 72fe54c560f07a99d357cfe3aed73c99104a116ce2c53f7d92bcc313e8795646
-MD5 14a31f726dab6ffc9f438f6846caeab5 wxGTK-2.8.6.1.ebuild 3632
-RMD160 8785c6ce187bba9e4f6c26640443225729a2190a wxGTK-2.8.6.1.ebuild 3632
-SHA256 72fe54c560f07a99d357cfe3aed73c99104a116ce2c53f7d92bcc313e8795646 wxGTK-2.8.6.1.ebuild 3632
-MISC ChangeLog 25436 RMD160 1d5c4db841ffad92861f9b90ac3a380f11da8e44 SHA1 6eaa8a7b7be672b36f324f473e800d1ad3c7149f SHA256 10d6951861017fe5afc8e8d3db2275fa99e056b3af35b037f48d4390b935ba0e
-MD5 9a5b839d0218529d4e3e481c2fb5cf65 ChangeLog 25436
-RMD160 1d5c4db841ffad92861f9b90ac3a380f11da8e44 ChangeLog 25436
-SHA256 10d6951861017fe5afc8e8d3db2275fa99e056b3af35b037f48d4390b935ba0e ChangeLog 25436
+EBUILD wxGTK-2.8.6.1.ebuild 3686 RMD160 1f760247462a042ffc157d20edf0968959da86d1 SHA1 a2a2c75761759701385915e604213b6809cbdead SHA256 d7017b7dd67c5b660504bccd9ff2f68e6a7c9a7e9d06ac84c7609914348d5ff3
+MD5 a46089ee6c8bffe56afd14a15536ebbf wxGTK-2.8.6.1.ebuild 3686
+RMD160 1f760247462a042ffc157d20edf0968959da86d1 wxGTK-2.8.6.1.ebuild 3686
+SHA256 d7017b7dd67c5b660504bccd9ff2f68e6a7c9a7e9d06ac84c7609914348d5ff3 wxGTK-2.8.6.1.ebuild 3686
+MISC ChangeLog 25666 RMD160 43633ff99fd81aa5fc3dc1a962106f4722161f2a SHA1 c0d5b0a6bbe445fb0179b11d9ea94a130ac91d7c SHA256 5c4cf7bc4a1755bc6e4b9ae7852f478c6d7a01be03bea55de37616bafe2ef040
+MD5 ade20403278d3873f9fb69e45de3c701 ChangeLog 25666
+RMD160 43633ff99fd81aa5fc3dc1a962106f4722161f2a ChangeLog 25666
+SHA256 5c4cf7bc4a1755bc6e4b9ae7852f478c6d7a01be03bea55de37616bafe2ef040 ChangeLog 25666
 MISC metadata.xml 162 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 SHA1 04e3121e3f51426fec226bfdfc9df29349b754b6 SHA256 4fa9b642f4f36552d79a4d9fe18252c123d38c359f64f2f2709df866084a4b4e
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 RMD160 d85d922ef2b3dac1a137de61b5e04034d4b87808 metadata.xml 162
@@ -86,7 +90,7 @@ SHA256 9a572e2be37a5df7a8dc3c9b2cf2dc656819ab9a3392ea19e51adc98e382423e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHT1/NiqiDRvmkBmIRArNJAJ4gmHeoAY1A5oao/PY2qJJgSF53BwCgwWAx
-gTQQN+ii3efWR8c88+V5ANI=
-=/91X
+iD8DBQFHVFYCiqiDRvmkBmIRAnSGAKDIXjAOD/NOHj0zFQL3JbrY8V7vgACglOey
+pxab5oulkpGtnOXCO2DTL84=
+=ElUA
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.6-wxrc_link_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.8.6-wxrc_link_fix.patch
new file mode 100644
index 000000000000..bee51913b403
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.6-wxrc_link_fix.patch
@@ -0,0 +1,12 @@
+diff -Naur wxPython-src-2.8.6.1-orig/utils/wxrc/Makefile.in wxPython-src-2.8.6.1/utils/wxrc/Makefile.in
+--- wxPython-src-2.8.6.1-orig/utils/wxrc/Makefile.in	2007-12-03 12:59:33.000000000 -0600
++++ wxPython-src-2.8.6.1/utils/wxrc/Makefile.in	2007-12-03 13:02:01.000000000 -0600
+@@ -108,7 +108,7 @@
+ 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+ 
+ @COND_USE_XRC_1@wxrc$(EXEEXT): $(WXRC_OBJECTS)
+-@COND_USE_XRC_1@	$(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
++@COND_USE_XRC_1@	$(CXX) -o $@ $(WXRC_OBJECTS) -L$(LIBDIRNAME)   $(LIBS) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(LDFLAGS) $(EXTRALIBS_FOR_BASE)
+ @COND_USE_XRC_1@	
+ @COND_USE_XRC_1@	$(__wxrc___mac_setfilecmd)
+ 
diff --git a/x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild
index b50a32a0777c..5dbafab5a9fb 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild,v 1.2 2007/11/30 00:56:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.6.1.ebuild,v 1.3 2007/12/03 19:16:06 dirtyepic Exp $
 
 EAPI=1
 
@@ -66,6 +66,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
 	epatch "${FILESDIR}"/${PN}-2.8.4-collision.patch
+	epatch "${FILESDIR}"/${PN}-2.8.6-wxrc_link_fix.patch
 
 	# Patches specific to this Version