fixed bug 94664, as well as multilb-strict issue.

(Portage version: 2.0.51.22-r1)

4 files changed, 51 insertions, 20 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index f7ddfe4d1045..7e3ecdae34aa 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.66 2005/06/01 00:39:10 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.67 2005/06/01 11:28:11 herbs Exp $
+
+  01 Jun 2005; Herbie Hopkins <herbs@gentoo.org>
+  +files/mythtv-0.18.1-x86_64-configure.patch, mythtv-0.18.1-r2.ebuild:
+  Fixed bug 94664, support amd64 --arch options. Fixed multilib-strict issue.
 
   01 Jun 2005; Doug Goldstein <cardoe@gentoo.org> mythtv-0.18.1-r1.ebuild:
   explictly add --disable-firewire because the test fails for someone
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 664e0bdcc095..c05d53612e61 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,25 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
-MD5 8bd62fd7f8f67b5dbda1fa111cd43bdd ChangeLog 12502
 MD5 205c9b88dcccd2824f79de2465b87b6e mythtv-0.17-r1.ebuild 7323
 MD5 455cac96bf7d43f76fc1695835a15d30 mythtv-0.18.1-r1.ebuild 4493
-MD5 f444f63fe4704e6636995e151220c48c mythtv-0.18.1-r2.ebuild 4523
+MD5 3d8009e24a4158b4952f276e7b3c676f ChangeLog 12702
+MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
+MD5 f365f582d140a6801143fd22c1699581 mythtv-0.18.1-r2.ebuild 4941
+MD5 946d39e6c7d43c06d11d2bc6e09d5c21 files/0.18-mythbackend.rc 1606
+MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r1 67
+MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r2 67
 MD5 590c9a6a89442b347c3a5f52d1781351 files/digest-mythtv-0.17-r1 66
 MD5 2623cb1c902bf07fca69b846e7a0915a files/mythbackend.conf 1186
+MD5 fde2b2886b037b199cc815dbcb12617e files/mythtv-0.18.1-x86_64-configure.patch 631
+MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931
 MD5 5938ea3584383e501674bf67a7f7e2a7 files/mythbackend.rc6 1776
-MD5 3632cf0ce1fad88f806ae8801316a6fc files/mythfilldatabase.cron 73
 MD5 bcfd584bc73afea9d88c8afe7d47f5be files/mythtv-0.17-qt334-dst-fix.patch 5663
-MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r1 67
-MD5 946d39e6c7d43c06d11d2bc6e09d5c21 files/0.18-mythbackend.rc 1606
-MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931
 MD5 340e376a796fcc134e37222f01d705b3 files/mythtv-0.18.1-opengl-fix.patch 304
-MD5 b288872f9393adf2b30f40b6ee01eac5 files/digest-mythtv-0.18.1-r2 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCnQOaBtvusYtCZMsRAvsJAJ453NjxcVrfIIibi5F/JmuIxqnAZwCfZHA6
-tWbhKvuTrl0ZjIb+gF62i5A=
-=7Tg5
------END PGP SIGNATURE-----
+MD5 3632cf0ce1fad88f806ae8801316a6fc files/mythfilldatabase.cron 73
diff --git a/media-tv/mythtv/files/mythtv-0.18.1-x86_64-configure.patch b/media-tv/mythtv/files/mythtv-0.18.1-x86_64-configure.patch
new file mode 100644
index 000000000000..5ce78c7f8714
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-0.18.1-x86_64-configure.patch
@@ -0,0 +1,25 @@
+--- configure.orig	2005-05-05 08:15:43.000000000 +0100
++++ configure	2005-05-31 23:32:26.000000000 +0100
+@@ -9,6 +9,7 @@
+ x86_cpus="i386,i486,i586,i686,pentium,pentiumpro,${x86_mmx_cpus}"
+ x86_cmov_cpus="i686,pentiumpro,pentium2,pentium3,pentium3m,pentium-m,pentium4,"
+ x86_cmov_cpus="pentium4m,prescott,athlon,athlon-xp,c3-2"
++x86_64_cpus="x86-64,athlon64,k8,opteron,athlon-fx"
+ 
+ # default parameters
+ compile_type="release"
+@@ -223,6 +224,14 @@
+     cpu="x86"
+ fi
+ 
++is_x86_64_cpu() {
++    expr ",${x86_64_cpus}," : ".*,$1," > /dev/null
++}
++
++if is_x86_64_cpu "$cpu" ; then
++    cpu="x86_64"
++fi
++
+ case "$cpu" in
+   x86)
+   ;;
diff --git a/media-tv/mythtv/mythtv-0.18.1-r2.ebuild b/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
index f35fba36e22e..bd394f6f320f 100644
--- a/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
+++ b/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r2.ebuild,v 1.2 2005/05/31 13:43:20 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r2.ebuild,v 1.3 2005/06/01 11:28:11 herbs Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -62,6 +62,17 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-opengl-fix.patch
 
+	# Add support for amd64 --arch options, bug 94664
+	use amd64 && epatch ${FILESDIR}/${P}-x86_64-configure.patch
+
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e "s:\$\${PREFIX}/lib/:\$\${PREFIX}/$(get_libdir)/:g" \
+			-e "s:\$\${PREFIX}/lib$:\$\${PREFIX}/$(get_libdir):g" \
+			${S}/{filters,libs}/*/*.pro || die
+		sed -i -e "s:/lib/mythtv/:/$(get_libdir)/mythtv/:" \
+			${S}/libs/libmyth/mythcontext.cpp || die
+	fi
+
 #	# Fix bugs 40964 and 42943.
 #	filter-flags -fforce-addr -fPIC -momit-leaf-frame-pointer
 #	is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"