The patch for parallel make wasn't enough as configure file should be removed to recreate autotools (was already if using $LINGUAS). Instead of using it, uncomment the sed line fixing it.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 21 insertions, 31 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 1de56831d322..3052d011b800 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # 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.104 2006/02/12 20:56:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.105 2006/02/13 10:50:35 flameeyes Exp $
+
+  13 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.4_beta1-parallelmake.patch, amarok-1.4_beta1.ebuild:
+  The patch for parallel make wasn't enough as configure file should be
+  removed to recreate autotools (was already if using $LINGUAS). Instead of
+  using it, uncomment the sed line fixing it.
 
   12 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/amarok-1.3.7-lyrc.patch, -amarok-1.3.7-r1.ebuild:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 9a7d5d074a55..a61dbaa66699 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bd162b008239d107d6719a4c9a6a1501 ChangeLog 16647
-RMD160 86aeec9c933bc9121af79ea62bccc75ce02582db ChangeLog 16647
-SHA256 d8d6995b618b19a55626cc4ee21f9c5f10180567efc0d67cefcf3a3b4cb410ce ChangeLog 16647
+MD5 fd5e4202e6eca8d02fa79fdf709ecbd8 ChangeLog 16966
+RMD160 f94197d648c8346a5ec311ae6b881077c7b43774 ChangeLog 16966
+SHA256 b74afd7368bf3679ef1ffb7f114dcaea78856164ba9a65d0648b2d5d8a849e5f ChangeLog 16966
 MD5 1e105a96a7b5945e07d2e2febbf464a6 amarok-1.3.6.ebuild 3206
 RMD160 5a191332318d240ec23ed6532e96542ced169856 amarok-1.3.6.ebuild 3206
 SHA256 0f0d337d50f5e51832803ef3ef5b15b1b84ef13814d0e35094392bb73b1eeb80 amarok-1.3.6.ebuild 3206
 MD5 37dd559290e679463c0aa3c07427239c amarok-1.3.8.ebuild 3854
 RMD160 3b53d286a3e1aec0ec48f8c7dce5fe1d49d3b95b amarok-1.3.8.ebuild 3854
 SHA256 b573cb7036fcf1b8cd9d1678ff204a847f80f2db57fd23bc266d4befd9d23add amarok-1.3.8.ebuild 3854
-MD5 3fc4c4719d9e81c14cbbfc77e0aad82b amarok-1.4_beta1.ebuild 3880
-RMD160 86f7090c8d45cd5dda08be329d3b8e26f830f579 amarok-1.4_beta1.ebuild 3880
-SHA256 360047690c254bf8348a367db17786584005911062d34fdbdd5e1af008e7ac06 amarok-1.4_beta1.ebuild 3880
-MD5 112f3de18e318d1898d664063f638f18 files/amarok-1.4_beta1-parallelmake.patch 570
-RMD160 0d793e30035a13278cf60baedd3a49c1ef90237b files/amarok-1.4_beta1-parallelmake.patch 570
-SHA256 8d67d8d08c6ad39a163b3ae0a41699b5b15c4fc442c40d048947a1ff7cbbcbb2 files/amarok-1.4_beta1-parallelmake.patch 570
+MD5 b128427c81dc301bfb149ebf7fdbc206 amarok-1.4_beta1.ebuild 3852
+RMD160 ba192825a7812fbd17c3e11a49df5204c72ac763 amarok-1.4_beta1.ebuild 3852
+SHA256 2fa705853db23ac8654960a43c04c34e4da84f3f665d6d2d71310e5d1336db2d amarok-1.4_beta1.ebuild 3852
 MD5 d8cfb3a78866379e2ac9b439de887551 files/digest-amarok-1.3.6 66
 RMD160 79e1a1bc29d9522e664a3f0988ef0424a89cd5fb files/digest-amarok-1.3.6 66
 SHA256 1724cb7613dce986faa95f8afd7bd13aab23c086a3a5c37b6352a706501239f0 files/digest-amarok-1.3.6 66
@@ -31,7 +28,7 @@ SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729 metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD76HiAiZjviIA2XgRAofiAKDy6BXjQeT4JRktLveht8c3L6veMQCgxrUv
-AaMQJrovsmiMX+t3dngERWs=
-=KgCe
+iD8DBQFD8GSTAiZjviIA2XgRAiyPAJ0WANYnPnSTrY7PFUL2NpB67Lz+TwCfYWU4
+06VvD2HOZELqechYdrCEx5g=
+=IOAR
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4_beta1.ebuild b/media-sound/amarok/amarok-1.4_beta1.ebuild
index 97c4c9d8565b..8d83c331f5c2 100644
--- a/media-sound/amarok/amarok-1.4_beta1.ebuild
+++ b/media-sound/amarok/amarok-1.4_beta1.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_beta1.ebuild,v 1.2 2006/02/12 21:00:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4_beta1.ebuild,v 1.3 2006/02/13 10:50:35 flameeyes Exp $
 
 LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ko lt nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz xx zh_CN zh_TW"
 LANGS_DOC="da de es et fr it nl pt pt_BR ru sv"
@@ -49,8 +49,6 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	>=dev-util/pkgconfig-0.9.0"
 
-PATCHES="${FILESDIR}/${P}-parallelmake.patch"
-
 need-kde 3.3
 
 pkg_setup() {
@@ -77,8 +75,10 @@ src_unpack() {
 	kde_src_unpack
 
 	# fix parallel make issues
-# 	sed -i -e 's:$(top_builddir)/amarok/src/libamarok.la:libamarok.la:' \
-# 		${S}/amarok/src/Makefile.am
+	sed -i -e 's:$(top_builddir)/amarok/src/libamarok.la:libamarok.la:' \
+		${S}/amarok/src/Makefile.am
+
+	rm -f ${S}/configure
 }
 
 src_compile() {
diff --git a/media-sound/amarok/files/amarok-1.4_beta1-parallelmake.patch b/media-sound/amarok/files/amarok-1.4_beta1-parallelmake.patch
deleted file mode 100644
index c079c3cfb620..000000000000
--- a/media-sound/amarok/files/amarok-1.4_beta1-parallelmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: amarok-1.4-beta1/amarok/src/Makefile.am
-===================================================================
---- amarok-1.4-beta1.orig/amarok/src/Makefile.am
-+++ amarok-1.4-beta1/amarok/src/Makefile.am
-@@ -168,7 +168,7 @@ amarokapp_SOURCES = \
- 
- amarokapp_LDADD = \
-     $(top_builddir)/amarok/src/amarokcore/libamarokcore.la \
--    $(top_builddir)/amarok/src/libamarok.la \
-+    libamarok.la \
-     $(top_builddir)/amarok/src/analyzers/libanalyzers.la \
-     $(top_builddir)/amarok/src/engine/libengine.la \
-     $(top_builddir)/amarok/src/plugin/libplugin.la \