Do a better fix for the out of tree build failure, avoids eautoreconf, works with trunk builds too.

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 27 insertions, 34 deletions

diff --git a/net-libs/gtk-vnc/ChangeLog b/net-libs/gtk-vnc/ChangeLog
index 67093dc95fc0..320698b0a30a 100644
--- a/net-libs/gtk-vnc/ChangeLog
+++ b/net-libs/gtk-vnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gtk-vnc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.72 2011/10/30 17:24:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.73 2011/11/07 06:09:22 nirbheek Exp $
+
+  07 Nov 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gtk-vnc-0.4.3-r1.ebuild,
+  -files/gtk-vnc-0.4.3-outoftree-build.patch:
+  Do a better fix for the out of tree build failure, avoids eautoreconf, works
+  with trunk builds too.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org> gtk-vnc-0.4.3-r1.ebuild:
   alpha/ia64/sparc stable wrt #385699
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 973c4a4d27c0..0b9537ecfc76 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -6,18 +6,27 @@ AUX gtk-vnc-0.4.2-gnutls-crash-fix.patch 1977 RMD160 267f4da2c0fc2752367afb6496f
 AUX gtk-vnc-0.4.2-memory-leak-fix.patch 1464 RMD160 a6e0239731cda4b7e2cf67b9ed5cf7ca27a3e2f9 SHA1 60f62e3a9e8aba1418c8dbb531b2479b6c85ce1c SHA256 d5983864034c113fb148128e3061f4cc8fb80e7952a7b0e35d9ce46078bab75d
 AUX gtk-vnc-0.4.2-pre-conn-crash-fix.patch 1276 RMD160 dde15c2c910d36a1b37b75a67312598ba7202f23 SHA1 a2cb10cb9553f77184e3c5e56c9a63fc7229af7b SHA256 277c2205469e128fedacb59a5edc39c21ed5ea2bb26da1f229992488a0974dd5
 AUX gtk-vnc-0.4.2-shared-flag.patch 1085 RMD160 2bee1cf8483328edf5b05e033ab734d944e11367 SHA1 822ec5312995034d41355a3f0f1e3476d6b6f3cb SHA256 65e86adec082c3423b7f3770eed12fa55876f36b56ba9b9876b7ca7041f0bc97
-AUX gtk-vnc-0.4.3-outoftree-build.patch 909 RMD160 3bd53af3b89100ca1ff0401d00b6b20d1ac1313e SHA1 72a570bddc7fb4fd1f38a772bc8d4ca3b76a6e88 SHA256 552477557b7aa737a44bbbcf4232fb9cc41009a003cd1c1f9e64b2ce158cb79f
 DIST gtk-vnc-0.4.2.tar.bz2 438062 RMD160 ba5d81a3ef4b6d6eb0322bfdc51014df38ee6c7b SHA1 8aa76bbb6a47951d4692ebb1ac241fa7b3bda2ef SHA256 96e948b62984a1a3a32fd83793fb645c493c1bc93b303eb831ecafee01a956d2
 DIST gtk-vnc-0.4.3.tar.bz2 446486 RMD160 f7cc379b43088b83628dc92fb10ece463b1ab8fc SHA1 4e43d8fd68e5809b0769e26f7a7ac94d45315864 SHA256 b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377
 EBUILD gtk-vnc-0.4.2-r2.ebuild 1682 RMD160 00652cf00c714d064864e1615c9e599a98000033 SHA1 f923ec76064fc16ee00dc0bae12bdeefef43d854 SHA256 26fcd19f6ad468cbc71b1c7f9e502f77db55f30a6731ad312c0bfb81ba59bed9
-EBUILD gtk-vnc-0.4.3-r1.ebuild 3091 RMD160 0be37ed4903cd88fb6708de4c88d88b7034240e4 SHA1 47353567a53a8a176c17e91dd05de652d07ed253 SHA256 dc6490ca9da25dda344b9a6c59c37cbc2683d4267792b5c32a905f914bc207eb
+EBUILD gtk-vnc-0.4.3-r1.ebuild 3273 RMD160 3d36abc25b6d3c4a790837756ece16512cc8914d SHA1 ad7a42d03d693af90aa771c5de010fddf6a6c5a2 SHA256 610fb13b0964594e2f10e8689c787238bf4ba507a39f81ad2c64bb18de047112
 EBUILD gtk-vnc-0.4.3.ebuild 1472 RMD160 58954fdac0e15dcae1858d88d02555b08aa70f98 SHA1 32bf98ab4e39b0cff969036803b2897d96c5fcfb SHA256 e11f6eab603845bbccc03f41b5bf879bdd94b31f6988fd62e9303843c6da11d0
-MISC ChangeLog 10327 RMD160 5fbb89990d6a6c1e9b676b07bf77efd46a26a7b1 SHA1 1178c9040951bc4a8b0980b752c3584d27334e32 SHA256 55af4f755a6c2910ec3b8fa402321bfc081b8533ade5422962aebb4d27438238
+MISC ChangeLog 10558 RMD160 dc5ebc1f194c7da5f5bc0261865204878417a97d SHA1 39045459d332c5e210ddd73a77d6b56ee74d4e88 SHA256 27a4e4df317e16eca56c1167510c3fa907071936308ed7f79e90a0a4633be4d3
 MISC metadata.xml 351 RMD160 fb91f84774bd7557f27df3e1ec1ce48ec3185837 SHA1 f1b374f3da6b5db83461e7a5294da64b486d4ca1 SHA256 7d1e8e895138770ac0e233f67adc82aa9b25e1cc3e0164bab9f358704e495e78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6tiEUACgkQuQc30/atMkC26ACdHC6EtquJ8Nk4l2DKY6Bn4lEO
-kwUAn04zvYiBbiOqlx9loWwfxjCHSfMY
-=KcbW
+iQIcBAEBAgAGBQJOt3YYAAoJEO/kOhxWD91kQPMQAKRw2n/EDLK0nNjJwYfTTzI1
+xTpSQAlhO0mU9gqGzDbdQkcWvAl8WAEHwd6zbqRyHxoSHGap5MV086DBWbQpcwfi
+gxfC3Y7oxgY2QJKJcfEs06Uo/bXVfFyxmGkliRJM5lVI++0r/6P2PoIXVVWNZgOp
+cSiGFHkb5+3STnGI0C+HZh5y0kY4+S0bSmV+mnVI89fD88ZIsub8ahiRoZmDJZqA
+Uxt2eRipMW6v9ptiIMxtBk6GXBkzicqNWlKffazeXxCmbCxNk6VpJCh0MkI4Ab5r
+vNQ2ANBbE0uFXbWl+QWgWqE7ITAfnvAiMEB+RH+fk0gFkQ+r/BX1rA/xihNgaACk
+qOLMV68/fPpArYh0uTTI6a1KriJnidFwJltdYYORl2sJ/3f0gGIEM4d7zw+JuUQU
+Z9rUSnjMTX9YsKPGNtPIfDzvDuzblbUXPfeO2ywUOKh5+YxK47aChhYfj2QvJ95q
+Vi7ouGNNBxZWMt8ltCS+VtJYFlBgWfegFZUo4KTKwX6ZWbzTgSeTLtnH0Y0iSCRk
+zFT2b1opIpM+TYSNBjMw7x87U1zZ9u3ESoW2p5OyguT9BTaUulVNfBSUL9RBP6eo
+ZPqOwGEr8pDRnJU3MgEJnANBwRxuc2Xzl7SSSlABNcpsw1EmJkSK54Qujv4dU644
+5lWBytfCX2zc5FPwslKb
+=ZzA6
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-0.4.3-outoftree-build.patch b/net-libs/gtk-vnc/files/gtk-vnc-0.4.3-outoftree-build.patch
deleted file mode 100644
index 36a3a3a9e158..000000000000
--- a/net-libs/gtk-vnc/files/gtk-vnc-0.4.3-outoftree-build.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 37f8444..2f72fa6 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -279,14 +279,14 @@ GVNC_INTROSPECTION_SRCS = \
- 			$(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
- 			$(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
- 			$(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
--			$(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \
-+			$(srcdir)/vncconnectionenums.h $(srcdir)/vncconnectionenums.c \
- 			$(srcdir)/vncutil.h $(srcdir)/vncutil.c
- 
- GTK_VNC_INTROSPECTION_SRCS = \
- 			$(srcdir)/vnccairoframebuffer.h $(srcdir)/vnccairoframebuffer.c \
- 			$(srcdir)/vncdisplay.h $(srcdir)/vncdisplay.c \
- 			$(srcdir)/vncgrabsequence.h $(srcdir)/vncgrabsequence.c \
--			$(builddir)/vncdisplayenums.h $(builddir)/vncdisplayenums.c
-+			$(srcdir)/vncdisplayenums.h $(srcdir)/vncdisplayenums.c
- 
- if HAVE_GTK_2
- GTK_VNC_INTROSPECTION_SRCS += \
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild
index 726f8a7ebedc..5a2dbe67ea2b 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild,v 1.6 2011/10/30 17:24:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild,v 1.7 2011/11/07 06:09:22 nirbheek Exp $
 
 EAPI="3"
 
@@ -45,15 +45,15 @@ src_prepare() {
 	mkdir "${GTK2_BUILDDIR}" || die
 	mkdir "${GTK3_BUILDDIR}" || die
 
-	# Fix incorrect rules for out of tree build
-	epatch "${FILESDIR}/${PN}-0.4.3-outoftree-build.patch"
+	# Remove a few files that were autogenerated during distcheck.
+	# Having these around in srcdir breaks out of tree build since they're
+	# expected to be in builddir, which is correct for trunk builds since
+	# they're generated files, not source files. Funny false dichotomy.
+	rm -vf "${S}"/src/{vncconnectionenums.[ch],vncdisplayenums.[ch]}
 
 	# Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk
 	sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \
 		-i src/Makefile.* || die
-
-	intltoolize --force --copy --automake || die
-	eautoreconf
 }
 
 src_configure() {