Replace PIC conditionals with __PIC__ conditionals, as suggested by Alexandre Carsac, to try to fix bug #133375.

Package-Manager: portage-2.1.1_pre1-r2

3 files changed, 26 insertions, 15 deletions

diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index f3eafb58ba6f..eeb196da194b 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.31 2006/06/18 12:37:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.32 2006/06/23 22:42:05 flameeyes Exp $
+
+  23 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> xdtv-2.3.2-r1.ebuild:
+  Replace PIC conditionals with __PIC__ conditionals, as suggested by
+  Alexandre Carsac, to try to fix bug #133375.
 
 *xdtv-2.3.2-r1 (18 Jun 2006)
 
diff --git a/media-tv/xdtv/Manifest b/media-tv/xdtv/Manifest
index e3d783d4349c..f86e060ffd76 100644
--- a/media-tv/xdtv/Manifest
+++ b/media-tv/xdtv/Manifest
@@ -71,18 +71,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 5601 RMD160 107a6045f199b40fa98cf3aab3e539eb5d1f792d SHA1 8ddcd198ce4c964da370060a6060853ae3132c2a SHA256 78ad8c4a3c5ea4ff24954786f0f93ba406421b4aac84c3f6e0c93f68be7ffef4
-MD5 c4e3aae938082a2deffdb5f2404c90e9 xdtv-2.3.2-r1.ebuild 5601
-RMD160 107a6045f199b40fa98cf3aab3e539eb5d1f792d xdtv-2.3.2-r1.ebuild 5601
-SHA256 78ad8c4a3c5ea4ff24954786f0f93ba406421b4aac84c3f6e0c93f68be7ffef4 xdtv-2.3.2-r1.ebuild 5601
+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.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 5092 RMD160 4d1f9ad3a5acc8d12ab74a90cb7ca129aa7a794b SHA1 11c021a946506016366efe0f3b4c6f297c85395d SHA256 12705cdfd2d109432c4753c4e82c3380dceabfeb4c141533a1b3a03488599316
-MD5 3cb31f7b415322b2f594129804565c41 ChangeLog 5092
-RMD160 4d1f9ad3a5acc8d12ab74a90cb7ca129aa7a794b ChangeLog 5092
-SHA256 12705cdfd2d109432c4753c4e82c3380dceabfeb4c141533a1b3a03488599316 ChangeLog 5092
+MISC ChangeLog 5285 RMD160 6b94ce2c5ad0d6a5d65595a6fe4d43bb0600c56e SHA1 422f4046a1e738995c84a3f2f124da6a991dcd5c SHA256 25830b3df56d60d87656fc2b0a77cba7e274720d8e91989302837712f8128e1d
+MD5 581572882c39f1e03cf403e3da958041 ChangeLog 5285
+RMD160 6b94ce2c5ad0d6a5d65595a6fe4d43bb0600c56e ChangeLog 5285
+SHA256 25830b3df56d60d87656fc2b0a77cba7e274720d8e91989302837712f8128e1d ChangeLog 5285
 MISC metadata.xml 252 RMD160 9fe0fe39a9fa8f2fce26f12d0d5caada0a1593cd SHA1 40066ea1ed9d73b98efac9f1af00a78527062db6 SHA256 4c5fd4c15db1f66e645f0591edae40f860fd78c83b2edc0ae264eef1d03092f5
 MD5 0dfc4d0a0cad3dc6b761593f69ac917b metadata.xml 252
 RMD160 9fe0fe39a9fa8f2fce26f12d0d5caada0a1593cd metadata.xml 252
@@ -99,7 +99,7 @@ SHA256 6bd1ae4e62b508203fb24d9be4476ae03dbf36898b590af11fa3c1c15ffa97ce files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFElUkIAiZjviIA2XgRAuwdAJ0Xcb6gnZDsrQOMpcHDZ+SV7nPQbgCgo5jU
-MttSoNBNe4Fv4L3nH7lDVdo=
-=rbBk
+iD8DBQFEnG5RAiZjviIA2XgRAjZWAKDxVb/V9fgIIUEecBB/WEWC3KfZ9QCeMfJb
+IyIE7jDUZDkkT1EihqBX7sM=
+=Tx1a
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xdtv/xdtv-2.3.2-r1.ebuild b/media-tv/xdtv/xdtv-2.3.2-r1.ebuild
index b15fddf0e0e9..52bb7a2d9cd8 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.1 2006/06/18 12:37:22 flameeyes Exp $
+# $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 $
 
 inherit font multilib autotools flag-o-matic
 
@@ -95,7 +95,7 @@ extension_compile() {
 extension_install() {
 	einfo "Installing ${1}"
 	cd ${WORKDIR}/${1} \
-		&& make DESTDIR=${D} LIBDIR="/usr/$(get_libdir)/${PN}" install
+		&& emake DESTDIR=${D} LIBDIR="/usr/$(get_libdir)/${PN}" install
 }
 
 src_unpack() {
@@ -109,6 +109,13 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-2.3.0-setXid.patch"
 	epatch "${FILESDIR}/${P}-strict-aliasing.patch"
 
+	# ffmpeg doesn'g use libtool, so the condition for PIC code
+	# is __PIC__, not PIC.
+	sed -i -e 's/#\(\(.*def *\)\|\(.*defined *\)\|\(.*defined(*\)\)PIC/#\1__PIC__/' \
+		libavcodec/i386/dsputil_mmx{.c,_rnd.h,_avg.h} \
+		libavcodec/msmpeg4.c \
+		|| die "sed failed (__PIC__)"
+
 	eautomake
 }
 
@@ -163,7 +170,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "Installation failed."
+	emake DESTDIR=${D} install || die "Installation failed."
 
 	# .desktop file and default icon
 	domenu gentoo/xdtv.desktop