Backport multilib fixes and amd64 configure patch from -r2. Mark stable on amd64.

(Portage version: 2.0.51.22-r1)

3 files changed, 27 insertions, 22 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 845d6962ff9a..ec01a27fb516 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.69 2005/06/21 20:26:33 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.70 2005/06/21 21:47:08 herbs Exp $
+
+  21 Jun 2005; Herbie Hopkins <herbs@gentoo.org> mythtv-0.18.1-r1.ebuild:
+  Backport multilib fixes and amd64 configure patch from -r2. Mark stable on
+  amd64.
 
   21 Jun 2005; Doug Goldstein <cardoe@gentoo.org> mythtv-0.18.1-r2.ebuild:
   fixed firewire deps
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index d9ae7828984e..79af1161d8d7 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,26 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
-MD5 2e8076c80f574da40ecdcaeb05ee7d3c ChangeLog 12964
 MD5 205c9b88dcccd2824f79de2465b87b6e mythtv-0.17-r1.ebuild 7323
+MD5 0d299cc3793cb866dd53118775f8e333 mythtv-0.18.1-r1.ebuild 5080
+MD5 af41259ddedad61a0a5265a7e1fe121b ChangeLog 13125
+MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 MD5 8177871b1f4fca4b00c11a61242bb079 mythtv-0.18.1-r2.ebuild 5135
-MD5 8351d73450276e5d0cf4836cc4541ec3 mythtv-0.18.1-r1.ebuild 4676
+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
-MD5 fde2b2886b037b199cc815dbcb12617e files/mythtv-0.18.1-x86_64-configure.patch 631
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCuHgtBtvusYtCZMsRAtTZAJ41eghXOLLRtPaHBz4qJ+6T3CrdsgCeOp3h
-poZ09QyDEiWQTFUK0cJAAJs=
-=liDI
------END PGP SIGNATURE-----
+MD5 3632cf0ce1fad88f806ae8801316a6fc files/mythfilldatabase.cron 73
diff --git a/media-tv/mythtv/mythtv-0.18.1-r1.ebuild b/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
index dbc38e6d5cff..af2a488a5818 100644
--- a/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
+++ b/media-tv/mythtv/mythtv-0.18.1-r1.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-r1.ebuild,v 1.6 2005/06/06 10:10:00 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r1.ebuild,v 1.7 2005/06/21 21:47:08 herbs Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE="alsa altivec arts debug dvb frontendonly jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome"
 
 DEPEND=">=media-libs/freetype-2.0
@@ -67,6 +67,17 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-opengl-fix.patch
 
+	# Add support for amd64 --arch options, bug 94664
+	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"