Add patch to fix building with libgpod and --as-needed (bug #154022). Thanks to Timot...

Package-Manager: portage-2.1.2_rc2

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index be03713fd7735a411b7847dcebcefeeef6487049..0cbd91bff79c6ae3474ed0f37da7939c88f1d591 100644 (file)
--- 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.176 2006/11/15 12:51:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.177 2006/11/19 16:04:44 flameeyes Exp $
+
+  19 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.4-asneeded.patch, amarok-1.4.4.ebuild:
+  Add patch to fix building with libgpod and --as-needed (bug #154022). Thanks
+  to Timothy (drizzt) who gave me the patch.
 
   15 Nov 2006; Markus Rothe <corsair@gentoo.org> amarok-1.4.4.ebuild:
   Added ~ppc64; bug #153024

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index ddf76546c737be136c6e41e313b8418fab0601ba..65df4d398bc633676ecf909cd2c834f0596d5fe2 100644 (file)
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amarok-1.4.3-playlist-encoding.patch 365 RMD160 5add54202bcc34ad1d695b938c075dd030bf6705 SHA1 9d2eacaf4d8f35cf88e3a2358258ca83c1d35fee SHA256 71ac78fbac11d404017ab1c9a942b0b72ac24638739498ca6f761298a906b11d
 MD5 0e211053265ad86a0f6656c07463b43a files/amarok-1.4.3-playlist-encoding.patch 365
 RMD160 5add54202bcc34ad1d695b938c075dd030bf6705 files/amarok-1.4.3-playlist-encoding.patch 365
 SHA256 71ac78fbac11d404017ab1c9a942b0b72ac24638739498ca6f761298a906b11d files/amarok-1.4.3-playlist-encoding.patch 365
+AUX amarok-1.4.4-asneeded.patch 913 RMD160 741f0922030462bc532dfc9936e6ba5feb5e5f46 SHA1 8e5dbc4ab532558fa36ac89639c6f7fb81ab72b7 SHA256 578181192829e82892ab75ae0944f8547bf35e0d203a46c8ad2a111bd33bcb30
+MD5 b62b6de4b6c4fd25c70ef2578b32d37a files/amarok-1.4.4-asneeded.patch 913
+RMD160 741f0922030462bc532dfc9936e6ba5feb5e5f46 files/amarok-1.4.4-asneeded.patch 913
+SHA256 578181192829e82892ab75ae0944f8547bf35e0d203a46c8ad2a111bd33bcb30 files/amarok-1.4.4-asneeded.patch 913
 AUX amarok-1.4.4-podcast-fix.patch 1149 RMD160 f2c7a47f36bd06788ffefa697a0b5264933a0b49 SHA1 72ab2f91b307e1bf7274b17e8ebdb35eb7a84114 SHA256 b595d0009d7c60e1631004348b3ceadcb8539e69ef83573d02b2547b9ad4bfe4
 MD5 78734806316aa6acc2b742334cfdadfd files/amarok-1.4.4-podcast-fix.patch 1149
 RMD160 f2c7a47f36bd06788ffefa697a0b5264933a0b49 files/amarok-1.4.4-podcast-fix.patch 1149
@@ -16,14 +23,14 @@ EBUILD amarok-1.4.3-r1.ebuild 2107 RMD160 02f0cd8d6b1ea505f4a0b8af3aa2ae4da8afd1
 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 2182 RMD160 2087178df395b15769feb1745b211d216cb94f96 SHA1 ed971b22032ade4aaf5974d1c979e83f39ea8506 SHA256 051e4e02d5b899058da6a3e9c082f9fa39b68c9581e4b30703ab3fe7905d4747
-MD5 4f358a374cfec90a32d4b75eb9ab47d2 amarok-1.4.4.ebuild 2182
-RMD160 2087178df395b15769feb1745b211d216cb94f96 amarok-1.4.4.ebuild 2182
-SHA256 051e4e02d5b899058da6a3e9c082f9fa39b68c9581e4b30703ab3fe7905d4747 amarok-1.4.4.ebuild 2182
-MISC ChangeLog 28755 RMD160 3fc410b05f456792f6aed8e577dd3f8fb1faba54 SHA1 de504d3eb2b6d77f1b9b7bbb820fc4701d2b3d25 SHA256 a0a1f3798610ce35353508638f5084caf0fadd99867d009c05a070e968c15683
-MD5 3f8935246886bc78cff060958c62ffd2 ChangeLog 28755
-RMD160 3fc410b05f456792f6aed8e577dd3f8fb1faba54 ChangeLog 28755
-SHA256 a0a1f3798610ce35353508638f5084caf0fadd99867d009c05a070e968c15683 ChangeLog 28755
+EBUILD amarok-1.4.4.ebuild 2217 RMD160 fd396e46acbe137c54d616f8270608df95fe9398 SHA1 ceec1b8153a8d37646dd93305675585ea0908bba SHA256 295d17bf62b7c01caff266a19d5e3445f22a7628995bdbb4d401daaba09dbf19
+MD5 fa301c29b84453c878f032197be18275 amarok-1.4.4.ebuild 2217
+RMD160 fd396e46acbe137c54d616f8270608df95fe9398 amarok-1.4.4.ebuild 2217
+SHA256 295d17bf62b7c01caff266a19d5e3445f22a7628995bdbb4d401daaba09dbf19 amarok-1.4.4.ebuild 2217
+MISC ChangeLog 28994 RMD160 f392ab090422de19e806ac52b49701be07ab534c SHA1 8956c9f62e11728e0224b1f78dd893571b53402c SHA256 061a71ae95577cb237eee27a4c96c31cbfbebd6c1d5898326ae4f14354373872
+MD5 10429ab163abe6fa9f0113269471f19f ChangeLog 28994
+RMD160 f392ab090422de19e806ac52b49701be07ab534c ChangeLog 28994
+SHA256 061a71ae95577cb237eee27a4c96c31cbfbebd6c1d5898326ae4f14354373872 ChangeLog 28994
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
@@ -34,3 +41,10 @@ SHA256 30a763884b75f16b9a733b1eeb468f2316f2b6ae1e7500459463fee5cbd94493 files/di
 MD5 9f156ab461bfba79010fb33bc4ad4fe5 files/digest-amarok-1.4.4 247
 RMD160 29ee4c16ee0ddf9601876f19a0d5da8363bc2bab files/digest-amarok-1.4.4 247
 SHA256 f64c0ac76dac35f78b85d46ff97aa000a0ccdeedac69dfc7f0259c28fb81acac files/digest-amarok-1.4.4 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFYICmAiZjviIA2XgRAnmGAJ4+NO/TmVQYcAVBV/pY+ddHc/SvIwCgspAj
+TLGtYwM6gDL2B6vAo7X0QcA=
+=gcZg
+-----END PGP SIGNATURE-----

diff --git a/media-sound/amarok/amarok-1.4.4.ebuild b/media-sound/amarok/amarok-1.4.4.ebuild
index 76ee56f8fee7e99eccec3b70d4d6c1b50fd1b5e7..8d6dfd46332211071edd65f18e0e2c13c21a2882 100644 (file)
--- 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.6 2006/11/15 12:51:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.4.ebuild,v 1.7 2006/11/19 16:04:44 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
@@ -52,7 +52,8 @@ DEPEND="${DEPEND}
 need-kde 3.3
 
 PATCHES="${FILESDIR}/${P}-podcast-fix.patch
-       ${FILESDIR}/${P}-sparc.patch"
+       ${FILESDIR}/${P}-sparc.patch
+       ${FILESDIR}/${P}-asneeded.patch"
 
 src_compile() {
        append-flags -fno-inline

diff --git a/media-sound/amarok/files/amarok-1.4.4-asneeded.patch b/media-sound/amarok/files/amarok-1.4.4-asneeded.patch
new file mode 100644 (file)
index 0000000..90eb2b9
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4.4-asneeded.patch
@@ -0,0 +1,26 @@
+Index: amarok/configure.in.in
+===================================================================
+--- amarok/configure.in.in     (revision 606189)
++++ amarok/configure.in.in     (revision 606190)
+@@ -886,10 +886,10 @@
+         if test "x$have_libgpod" = "xyes"; then
+             ac_cppflags_save=$CPPFLAGS
+             ac_cflags_save=$CFLAGS
+-            ac_ldflags_save=$LDFLAGS
++            ac_libs_save=$LIBS
+             CPPFLAGS="$CPPFLAGS $LIBGPOD_INCLUDES"
+             CFLAGS="$CFLAGS $LIBGPOD_CFLAGS"
+-            LDFLAGS="$LDFLAGS $LIBGPOD_LIBS"
++            LIBS="$LIBS $LIBGPOD_LIBS"
+ 
+             AC_CHECK_FUNCS(itdb_track_set_thumbnails, have_libgpod_artwork=yes)
+             AC_CHECK_FUNCS(itdb_get_mountpoint)
+@@ -917,7 +917,7 @@
+ 
+             CPPFLAGS=$ac_cppflags_save
+             CFLAGS=$ac_cflags_save
+-            LDFLAGS=$ac_ldflags_save
++            LIBS=$ac_libs_save
+         fi
+     fi
+ fi