Add patch to allow building on SPARC, see bug #153024. Thanks to Jason Wever for reporting and Jurij Smakov for the patch.

Package-Manager: portage-2.1.2_rc1-r4

4 files changed, 38 insertions, 17 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index bbf54d0a8ab8..ce86f419df25 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.173 2006/11/06 22:44:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.174 2006/11/08 12:02:29 flameeyes Exp $
+
+  08 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.4-sparc.patch, amarok-1.4.4.ebuild:
+  Add patch to allow building on SPARC, see bug #153024. Thanks to Jason Wever
+  for reporting and Jurij Smakov for the patch.
 
   06 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.3-r1.ebuild,
   amarok-1.4.4.ebuild:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 0fe5fb1dd7d2..c3f9270266f2 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -9,20 +9,24 @@ AUX amarok-1.4.4-podcast-fix.patch 1149 RMD160 f2c7a47f36bd06788ffefa697a0b52649
 MD5 78734806316aa6acc2b742334cfdadfd files/amarok-1.4.4-podcast-fix.patch 1149
 RMD160 f2c7a47f36bd06788ffefa697a0b5264933a0b49 files/amarok-1.4.4-podcast-fix.patch 1149
 SHA256 b595d0009d7c60e1631004348b3ceadcb8539e69ef83573d02b2547b9ad4bfe4 files/amarok-1.4.4-podcast-fix.patch 1149
+AUX amarok-1.4.4-sparc.patch 403 RMD160 1b8c951dd338eefa2fbfa0b88fc508e147041eca SHA1 161baeb1308c94f4702ba61795f596ae295910ae SHA256 3aa352e11290dd9d073a26b68842e38b10763c5134fd259b06c94fb5e4b5dc02
+MD5 56cfb8af9130d2755de9942a8e9d8a55 files/amarok-1.4.4-sparc.patch 403
+RMD160 1b8c951dd338eefa2fbfa0b88fc508e147041eca files/amarok-1.4.4-sparc.patch 403
+SHA256 3aa352e11290dd9d073a26b68842e38b10763c5134fd259b06c94fb5e4b5dc02 files/amarok-1.4.4-sparc.patch 403
 DIST amarok-1.4.3.tar.bz2 17175603 RMD160 287d6652868f50023d8602941fdc99aed5296d22 SHA1 624b5f9fd74ead1c0e75f7d8f935abcaf0313e70 SHA256 e9f6d8728d1c49467a2b72232c7ce907621e8e3792aa7dd9f206985b1450a847
 DIST amarok-1.4.4.tar.bz2 17635707 RMD160 61cd2748ce0111f4ba388a71e9504abb7362b0d7 SHA1 932ab971407172a86746e473a1d1cf6871aea93c SHA256 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea
 EBUILD amarok-1.4.3-r1.ebuild 2107 RMD160 02f0cd8d6b1ea505f4a0b8af3aa2ae4da8afd1a6 SHA1 2b3fb566dc81efdb68a62598e9513d8a3710a343 SHA256 b343bf49d30783b793ffc0234b51a37bb5959dea86a6c88fbeb82ff56f782682
 MD5 34d04cc090bd2aee37db25411905a0d9 amarok-1.4.3-r1.ebuild 2107
 RMD160 02f0cd8d6b1ea505f4a0b8af3aa2ae4da8afd1a6 amarok-1.4.3-r1.ebuild 2107
 SHA256 b343bf49d30783b793ffc0234b51a37bb5959dea86a6c88fbeb82ff56f782682 amarok-1.4.3-r1.ebuild 2107
-EBUILD amarok-1.4.4.ebuild 2134 RMD160 97947df654223f6ae1e768726c6b2d55ab34bdda SHA1 e2cf03c5346b716d2aea6b404c83436b70d6e5bd SHA256 09e17dad085432d4ca0af0d003e1f208d92051a94655e60936f84b9e112bbca6
-MD5 eccea512db25b5657b68439789161bac amarok-1.4.4.ebuild 2134
-RMD160 97947df654223f6ae1e768726c6b2d55ab34bdda amarok-1.4.4.ebuild 2134
-SHA256 09e17dad085432d4ca0af0d003e1f208d92051a94655e60936f84b9e112bbca6 amarok-1.4.4.ebuild 2134
-MISC ChangeLog 28311 RMD160 4ce7fa3783a238c2b87304c090bcf1fc39401060 SHA1 0cb0c31c78d68a1c22d6e45a87d0209cc9c9850e SHA256 d5e07ed409ac0a7bfe79c146423e00dd5a7d7f71a614ed38ef7867fa715ff75f
-MD5 39d7cdb6a59cd800aeb073da7e0aae4d ChangeLog 28311
-RMD160 4ce7fa3783a238c2b87304c090bcf1fc39401060 ChangeLog 28311
-SHA256 d5e07ed409ac0a7bfe79c146423e00dd5a7d7f71a614ed38ef7867fa715ff75f ChangeLog 28311
+EBUILD amarok-1.4.4.ebuild 2170 RMD160 33b5ee771ac41f2d331001e7747dc0d62be663cc SHA1 9ca217f7e1e015e6332f151c56617d8c966b4cb2 SHA256 6f3499363afba28f6f3b46d2cd6f610b6c04b3c68d2685ceeec35727143d2594
+MD5 67aa739898334bcaeb71ffbc42ba7fae amarok-1.4.4.ebuild 2170
+RMD160 33b5ee771ac41f2d331001e7747dc0d62be663cc amarok-1.4.4.ebuild 2170
+SHA256 6f3499363afba28f6f3b46d2cd6f610b6c04b3c68d2685ceeec35727143d2594 amarok-1.4.4.ebuild 2170
+MISC ChangeLog 28548 RMD160 77844c3c048e83c3123835e240e957bb2da54b00 SHA1 4affeac464da3ceda8a1a6e1fb1c791becb03eeb SHA256 b44e2b33ea833b5f24b79246d522cc84c0b35a81c300a47969a9c09ba9a7a6c3
+MD5 c1ed30ac0bb60720c4ff84a2a258a531 ChangeLog 28548
+RMD160 77844c3c048e83c3123835e240e957bb2da54b00 ChangeLog 28548
+SHA256 b44e2b33ea833b5f24b79246d522cc84c0b35a81c300a47969a9c09ba9a7a6c3 ChangeLog 28548
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
@@ -36,7 +40,7 @@ SHA256 f64c0ac76dac35f78b85d46ff97aa000a0ccdeedac69dfc7f0259c28fb81acac files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFT7rWAiZjviIA2XgRAkfNAJ48zXaMcxvF5uzIilD+EqG5OZKpagCgqMLh
-g44/2RXL/wUnGz19EaCe348=
-=TOZr
+iD8DBQFFUcdnAiZjviIA2XgRAr1cAKCU0XEOCBhrKoVVfH7taO77/Mcq7gCfS3tT
+6xlpqM+lG10Y/1upDmBNkCA=
+=U6Yu
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4.4.ebuild b/media-sound/amarok/amarok-1.4.4.ebuild
index 46f603398f4c..0330d064a237 100644
--- a/media-sound/amarok/amarok-1.4.4.ebuild
+++ b/media-sound/amarok/amarok-1.4.4.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-sound/amarok/amarok-1.4.4.ebuild,v 1.3 2006/11/06 22:44:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.4.ebuild,v 1.4 2006/11/08 12:02:28 flameeyes Exp $
 
 LANGS="af ar az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it
 ja ka km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tg
@@ -41,17 +41,18 @@ DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 	ifp? ( media-libs/libifp )
 	real? ( media-video/realplayer )
 	njb? ( >=media-libs/libnjb-2.2.4 )
-	mtp? ( media-libs/libmtp )"
+	mtp? ( media-libs/libmtp )
+	=dev-lang/ruby-1.8*"
 
-RDEPEND="${DEPEND}
-	dev-lang/ruby"
+RDEPEND="${DEPEND}"
 
 DEPEND="${DEPEND}
 	>=dev-util/pkgconfig-0.9.0"
 
 need-kde 3.3
 
-PATCHES="${FILESDIR}/${P}-podcast-fix.patch"
+PATCHES="${FILESDIR}/${P}-podcast-fix.patch
+	${FILESDIR}/${P}-sparc.patch"
 
 src_compile() {
 	append-flags -fno-inline
diff --git a/media-sound/amarok/files/amarok-1.4.4-sparc.patch b/media-sound/amarok/files/amarok-1.4.4-sparc.patch
new file mode 100644
index 000000000000..5cb14ac3e4cb
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4.4-sparc.patch
@@ -0,0 +1,11 @@
+--- amarok/src/mediadevice/daap/mongrel/http11/Makefile.am.orig	2006-11-02 23:22:08.000000000 -0800
++++ amarok/src/mediadevice/daap/mongrel/http11/Makefile.am	2006-11-02 23:22:22.000000000 -0800
+@@ -4,7 +4,7 @@
+ 
+ amarokrubylib_DATA = http11.rb
+ 
+-INCLUDES = -I$(ruby_includes) -Dinline=__inline__
++INCLUDES = -I$(ruby_includes) -Dinline=__inline__ -Dasm=__asm__
+ 
+ libhttp11_la_LDFLAGS = \
+ 	-shared \