Add extra multilib fix, mark stable on amd64 wrt bug 124646.

Package-Manager: portage-2.1_pre5-r1

4 files changed, 23 insertions, 17 deletions

diff --git a/media-video/codeine/ChangeLog b/media-video/codeine/ChangeLog
index 261de8323dcf..4423aa0856a1 100644
--- a/media-video/codeine/ChangeLog
+++ b/media-video/codeine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/codeine
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/ChangeLog,v 1.8 2006/03/02 15:56:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/ChangeLog,v 1.9 2006/03/03 14:51:13 herbs Exp $
+
+  03 Mar 2006; Herbie Hopkins <herbs@gentoo.org> codeine-1.0.ebuild:
+  Add extra multilib fix, mark stable on amd64 wrt bug 124646.
 
   02 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   -codeine-1.0_beta2.ebuild, -codeine-1.0_beta3.ebuild,
diff --git a/media-video/codeine/Manifest b/media-video/codeine/Manifest
index 5623530f5684..cb27189259a4 100644
--- a/media-video/codeine/Manifest
+++ b/media-video/codeine/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 aef097cd04700d080dee68e8f45bd79e ChangeLog 1851
-RMD160 862fed709b1984dd8c972f1b52bba84248850c5f ChangeLog 1851
-SHA256 5114f4f5ab519b88fe8c9fb5addaab198d406d0134ce9bd6d13b999af7a3254b ChangeLog 1851
-MD5 ed45e813b137b1d55fbc58b6e6191c21 codeine-1.0.ebuild 888
-RMD160 bea754becd19b3fa91d1333733a3627efd5eabc0 codeine-1.0.ebuild 888
-SHA256 996d843a6a2a5593ff41226f300eaaa6bdf3d16e457612a6636b2db560ae6499 codeine-1.0.ebuild 888
+MD5 dcc1d6f840ad83155590f337595ca001 ChangeLog 1980
+RMD160 0fe6254865356e05ddd357a4849dab19095ad49f ChangeLog 1980
+SHA256 3b029a36e9294a13ee71c6a3eaf8477bfc4296bbe4a9aa96860f1633a8dd055b ChangeLog 1980
+MD5 9da4514f1a62f486b98dbece0bc01e81 codeine-1.0.ebuild 920
+RMD160 bf098cde961c53d16ebc8c8f74877cd1d0ed3fe2 codeine-1.0.ebuild 920
+SHA256 b597d34a53983dea52d8d8995a486c467e3599b37277e7b1e7b03b9a4686ac6d codeine-1.0.ebuild 920
 MD5 fb6823bcf11eeb188f9c5b0876e113ce codeine-1.0_beta1.ebuild 858
 RMD160 341bbc52ea1e9f86b75f6a5d9b86155727ff918a codeine-1.0_beta1.ebuild 858
 SHA256 ab99e5cd70fac3de13746db7db84cdc40ff119cbf2a0785dd2e52b63e578332f codeine-1.0_beta1.ebuild 858
 MD5 9d838d8987e1f759ec0f4eb891d73b52 files/codeine-xine-lib-1.0.patch 455
 RMD160 6d6584eafb436109a72a887aa0347838fca94d1b files/codeine-xine-lib-1.0.patch 455
 SHA256 b3fc3437f7669883e94d7498f3b7c551d47fb825e7b99ff70974f2b2f00a1d95 files/codeine-xine-lib-1.0.patch 455
-MD5 8b19270db8b52ad5d72216e9a49a3f1f files/digest-codeine-1.0 64
-RMD160 f2e87713d1488ea8eb6b0fb580ed34e66b5dd188 files/digest-codeine-1.0 64
-SHA256 19c4a71118c69d6b726bdf8a8f479e6d6d9ea3eeacc042da92987ee849ddb3df files/digest-codeine-1.0 64
+MD5 a5276c6325c9efb7678ea0d1c1067dba files/digest-codeine-1.0 238
+RMD160 9217bea78ff25df349cc5aa19e06240e440731e4 files/digest-codeine-1.0 238
+SHA256 9e52ce0a352c5bdb5f0f74ae7881b31677963c183f2f9ec3e3857139ef7c8541 files/digest-codeine-1.0 238
 MD5 4b415d0e0a2bd3e13d00a5890479afae files/digest-codeine-1.0_beta1 69
 RMD160 7d7fc939be0e1175b4175e3d32b360278a95862e files/digest-codeine-1.0_beta1 69
 SHA256 d0289515419991471969934995e17f49234be9ccb6ce812ac4dadcce684760f2 files/digest-codeine-1.0_beta1 69
@@ -25,7 +25,7 @@ SHA256 ee81a2309bd9eae88d896b77f0d87adbb941cf18f82eea08c025eb583ac6043d metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFEBxW3AiZjviIA2XgRAhwaAKCUSP30UoWkx44OuCAbVZJWjKarwACg7PNg
-8IbcNUblfzM67FIIxmwujUo=
-=isBs
+iD8DBQFECFf/2G5bA0cA/ScRAsuiAJ9+/uYlwNSHzF/kbk7+M0yZDH3tkQCfQYdy
+AbTYwbriuZ3bWyWzXA/1ToA=
+=hW28
 -----END PGP SIGNATURE-----
diff --git a/media-video/codeine/codeine-1.0.ebuild b/media-video/codeine/codeine-1.0.ebuild
index 2fda7bfb441c..17ee6bba383f 100644
--- a/media-video/codeine/codeine-1.0.ebuild
+++ b/media-video/codeine/codeine-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0.ebuild,v 1.1 2005/09/06 02:20:56 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/codeine/codeine-1.0.ebuild,v 1.2 2006/03/03 14:51:13 herbs Exp $
 
 inherit kde multilib
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.methylblue.com/codeine/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="media-libs/xine-lib"
@@ -27,7 +27,8 @@ src_compile(){
 	local myconf="prefix=/usr"
 	use debug && myconf="${myconf} debug=full"
 	# Fix multilib issue.
-	myconf="${myconf} libdir=/usr/$(get_libdir)"
+	myconf="${myconf} libdir=/usr/$(get_libdir)
+			qtlibs=${QTDIR}/$(get_libdir)"
 
 	scons configure ${myconf} || die
 	scons || die
diff --git a/media-video/codeine/files/digest-codeine-1.0 b/media-video/codeine/files/digest-codeine-1.0
index 16e052bb5b47..6be4d1526ccb 100644
--- a/media-video/codeine/files/digest-codeine-1.0
+++ b/media-video/codeine/files/digest-codeine-1.0
@@ -1 +1,3 @@
 MD5 fd44e31af35a2699cd95dbf14470dc62 codeine-1.0.tar.bz2 165129
+RMD160 de4979ab02b0076ce39fadb48db637bd064d5046 codeine-1.0.tar.bz2 165129
+SHA256 134cd4ec526781b568e7382e8e9ed4a61fbfd1fb142602fc65cfbdf8c2737f11 codeine-1.0.tar.bz2 165129