Add patch to fix installation when using parallel make.

Package-Manager: portage-2.1.1_pre1-r2

4 files changed, 32 insertions, 20 deletions

diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index eeb196da194b..e29ad6be309c 100644
--- a/media-tv/xdtv/ChangeLog
+++ b/media-tv/xdtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xdtv
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.32 2006/06/23 22:42:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.33 2006/06/26 08:39:54 flameeyes Exp $
+
+  26 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xdtv-2.3.2-parallel-install.patch, xdtv-2.3.2-r1.ebuild:
+  Add patch to fix installation when using parallel make.
 
   23 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> xdtv-2.3.2-r1.ebuild:
   Replace PIC conditionals with __PIC__ conditionals, as suggested by
diff --git a/media-tv/xdtv/Manifest b/media-tv/xdtv/Manifest
index f86e060ffd76..d86fc33c4c33 100644
--- a/media-tv/xdtv/Manifest
+++ b/media-tv/xdtv/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libxdtv-i18n-all-1.3.0-ldflags.patch 551 RMD160 91e4d23410d0da27c330f84aeacc388bc723b83f SHA1 b203ad1d6db5b684ef354adf606c62c2955d874e SHA256 97028239e4386ec033d5e4cb392142a2c18fd2ce34f1476b95b0b5f6bfbb0df8
 MD5 7d0c59969eb23101640e6c3881ff62e8 files/libxdtv-i18n-all-1.3.0-ldflags.patch 551
 RMD160 91e4d23410d0da27c330f84aeacc388bc723b83f files/libxdtv-i18n-all-1.3.0-ldflags.patch 551
@@ -9,6 +6,10 @@ AUX xdtv-2.3.0-setXid.patch 470 RMD160 b117b1f8c453b99fe97887f9c126bcf57fd56bed
 MD5 109eefe229d78684737dd214b4ccde82 files/xdtv-2.3.0-setXid.patch 470
 RMD160 b117b1f8c453b99fe97887f9c126bcf57fd56bed files/xdtv-2.3.0-setXid.patch 470
 SHA256 1ca929d9d908592bc7374d430dd4cb1d850d55634a37334be0764ff66d2a1c70 files/xdtv-2.3.0-setXid.patch 470
+AUX xdtv-2.3.2-parallel-install.patch 530 RMD160 e54135e57272375929472e8fb546c24c6514ea92 SHA1 c738125f7644f6cd2aa4934fbf1f1a0a1a4861d5 SHA256 cddbfc5ebd38c7cb23c48e49ea21012195b8b9283f55eb67fc1c94b11117ce1f
+MD5 52a4439be675564f1330d95a47e4f9fc files/xdtv-2.3.2-parallel-install.patch 530
+RMD160 e54135e57272375929472e8fb546c24c6514ea92 files/xdtv-2.3.2-parallel-install.patch 530
+SHA256 cddbfc5ebd38c7cb23c48e49ea21012195b8b9283f55eb67fc1c94b11117ce1f files/xdtv-2.3.2-parallel-install.patch 530
 AUX xdtv-2.3.2-strict-aliasing.patch 10825 RMD160 ac48bee07abfd373f5dc0bbbfbd7f534ac42e7da SHA1 9c1418c9a5ca182146013f6363aa30057efc16ea SHA256 246d3cf61722e9c5cbb4e5f413d526efdd278dd849b6cf38ca01b265e9c337b6
 MD5 10a7a6732d2aaafd04d01afbbd685776 files/xdtv-2.3.2-strict-aliasing.patch 10825
 RMD160 ac48bee07abfd373f5dc0bbbfbd7f534ac42e7da files/xdtv-2.3.2-strict-aliasing.patch 10825
@@ -71,18 +72,18 @@ EBUILD xdtv-2.2.0-r1.ebuild 6897 RMD160 b7d2942fa795fbc1999eb4981e254eb689bbb8b1
 MD5 1e7b8cb859e5e3037e187ea552c65192 xdtv-2.2.0-r1.ebuild 6897
 RMD160 b7d2942fa795fbc1999eb4981e254eb689bbb8b1 xdtv-2.2.0-r1.ebuild 6897
 SHA256 4bf031ffb19e696fe12f05bf093fe16b0ab74a8b3c33bb8663b34883ea6aff8c xdtv-2.2.0-r1.ebuild 6897
-EBUILD xdtv-2.3.2-r1.ebuild 5879 RMD160 8677b428b71b6a4a1cd2d9c391adabcec2be3b1b SHA1 b538cac203a5863270f0a338b923479b150a1807 SHA256 59de8c121fcc69ffd038b83218889f600118bbc80e414f3796cb15f44f5419f9
-MD5 5078d58d1543d4bb4cd058df7593b742 xdtv-2.3.2-r1.ebuild 5879
-RMD160 8677b428b71b6a4a1cd2d9c391adabcec2be3b1b xdtv-2.3.2-r1.ebuild 5879
-SHA256 59de8c121fcc69ffd038b83218889f600118bbc80e414f3796cb15f44f5419f9 xdtv-2.3.2-r1.ebuild 5879
+EBUILD xdtv-2.3.2-r1.ebuild 5929 RMD160 ca641718c50fd20a66d13a797f37abd059616317 SHA1 65dbd13646cb72f68fe9ef611437b14a31cd98c4 SHA256 4171656e53ddbad3146a79867518b420640c22c01f4e04d1359458cab625dafe
+MD5 161ef74f2656f2efe6c7c75d48587b12 xdtv-2.3.2-r1.ebuild 5929
+RMD160 ca641718c50fd20a66d13a797f37abd059616317 xdtv-2.3.2-r1.ebuild 5929
+SHA256 4171656e53ddbad3146a79867518b420640c22c01f4e04d1359458cab625dafe xdtv-2.3.2-r1.ebuild 5929
 EBUILD xdtv-2.3.2.ebuild 5619 RMD160 6c137844fa13be58d7ebaec7f4e94c3d41def9a9 SHA1 adb9823a2bf667e0dc8ba703154d171a084710f9 SHA256 f156045d6b2492271176580bb633d1377e879b1d40509e90c170d7af05efa556
 MD5 a94c77905dbee978edbd2e10e883cb0b xdtv-2.3.2.ebuild 5619
 RMD160 6c137844fa13be58d7ebaec7f4e94c3d41def9a9 xdtv-2.3.2.ebuild 5619
 SHA256 f156045d6b2492271176580bb633d1377e879b1d40509e90c170d7af05efa556 xdtv-2.3.2.ebuild 5619
-MISC ChangeLog 5285 RMD160 6b94ce2c5ad0d6a5d65595a6fe4d43bb0600c56e SHA1 422f4046a1e738995c84a3f2f124da6a991dcd5c SHA256 25830b3df56d60d87656fc2b0a77cba7e274720d8e91989302837712f8128e1d
-MD5 581572882c39f1e03cf403e3da958041 ChangeLog 5285
-RMD160 6b94ce2c5ad0d6a5d65595a6fe4d43bb0600c56e ChangeLog 5285
-SHA256 25830b3df56d60d87656fc2b0a77cba7e274720d8e91989302837712f8128e1d ChangeLog 5285
+MISC ChangeLog 5463 RMD160 58757331654e1c3adcb28f9ef3eb0cfb10fd8b4d SHA1 6e527cb63a02185831e0deecaa6d1587a42f0e7a SHA256 559039246728a306d9517989d5779b65db1aacd170ad90650b19278dbd97e02e
+MD5 c21a7344bf27c3388669cb6b1ecea9ee ChangeLog 5463
+RMD160 58757331654e1c3adcb28f9ef3eb0cfb10fd8b4d ChangeLog 5463
+SHA256 559039246728a306d9517989d5779b65db1aacd170ad90650b19278dbd97e02e ChangeLog 5463
 MISC metadata.xml 252 RMD160 9fe0fe39a9fa8f2fce26f12d0d5caada0a1593cd SHA1 40066ea1ed9d73b98efac9f1af00a78527062db6 SHA256 4c5fd4c15db1f66e645f0591edae40f860fd78c83b2edc0ae264eef1d03092f5
 MD5 0dfc4d0a0cad3dc6b761593f69ac917b metadata.xml 252
 RMD160 9fe0fe39a9fa8f2fce26f12d0d5caada0a1593cd metadata.xml 252
@@ -96,10 +97,3 @@ SHA256 6bd1ae4e62b508203fb24d9be4476ae03dbf36898b590af11fa3c1c15ffa97ce files/di
 MD5 8bd839880e4d651a737351e5b29e8078 files/digest-xdtv-2.3.2-r1 8635
 RMD160 aa38de29bbff946df828c40a88a30be0fd5aefae files/digest-xdtv-2.3.2-r1 8635
 SHA256 6bd1ae4e62b508203fb24d9be4476ae03dbf36898b590af11fa3c1c15ffa97ce files/digest-xdtv-2.3.2-r1 8635
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEnG5RAiZjviIA2XgRAjZWAKDxVb/V9fgIIUEecBB/WEWC3KfZ9QCeMfJb
-IyIE7jDUZDkkT1EihqBX7sM=
-=Tx1a
------END PGP SIGNATURE-----
diff --git a/media-tv/xdtv/files/xdtv-2.3.2-parallel-install.patch b/media-tv/xdtv/files/xdtv-2.3.2-parallel-install.patch
new file mode 100644
index 000000000000..00f9332d424d
--- /dev/null
+++ b/media-tv/xdtv/files/xdtv-2.3.2-parallel-install.patch
@@ -0,0 +1,13 @@
+Index: xdtv-2.3.2/src/Makefile.am
+===================================================================
+--- xdtv-2.3.2.orig/src/Makefile.am
++++ xdtv-2.3.2/src/Makefile.am
+@@ -149,7 +149,7 @@ xdtv_v4l_conf_LDADD = @X_LIBS@ -lX11 @LI
+ xdtv_wizard_SOURCES = xdtv_wizard.c translation.c 
+ xdtv_wizard_LDADD = @X_LIBS@ @LIBXAW@ @LIBXMU@ @LIBXT@ @LIBXPM@ @LIBXEXT@ -lX11
+ 
+-install-exec-local:
++install-exec-local: install-binPROGRAMS
+ 	chmod u+s $(DESTDIR)$(prefix)/bin/xdtv_v4l-conf
+ 
+ xdtv_scantv_LDADD = @LIBZVBI@ @LIBM@ @LIBPTHREAD@
diff --git a/media-tv/xdtv/xdtv-2.3.2-r1.ebuild b/media-tv/xdtv/xdtv-2.3.2-r1.ebuild
index 52bb7a2d9cd8..3112fe98f74a 100644
--- a/media-tv/xdtv/xdtv-2.3.2-r1.ebuild
+++ b/media-tv/xdtv/xdtv-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.3.2-r1.ebuild,v 1.2 2006/06/23 22:42:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.3.2-r1.ebuild,v 1.3 2006/06/26 08:39:54 flameeyes Exp $
 
 inherit font multilib autotools flag-o-matic
 
@@ -108,6 +108,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-2.3.0-setXid.patch"
 	epatch "${FILESDIR}/${P}-strict-aliasing.patch"
+	epatch "${FILESDIR}/${P}-parallel-install.patch"
 
 	# ffmpeg doesn'g use libtool, so the condition for PIC code
 	# is __PIC__, not PIC.