Updated upnp patch so cmake can find the HUpnp include dir.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

3 files changed, 21 insertions, 17 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 9ce861450660..a851561602b2 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.400 2011/04/19 02:40:05 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.401 2011/04/20 05:05:10 jmbsvicetto Exp $
+
+  20 Apr 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  files/amarok-2.4.0.90-fix-upnp-dep.patch:
+  Updated upnp patch so cmake can find the HUpnp include dir.
 
 *amarok-2.4.0.90 (19 Apr 2011)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 965dd232eaf0..a6df578bb1ab 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -3,29 +3,29 @@ Hash: SHA256
 
 AUX amarok-2.3.2-fix-qt-regression.patch 2958 RMD160 810ddadf7fa226302b75aaaf6945a19fe57472d2 SHA1 4f5c730f989c1f5aab57af72a9540223698bd7e1 SHA256 2f2a77552a06e6ec30106d8cb1f012f3f4213ac3354e64c7fe7f6933deb6d6ab
 AUX amarok-2.3.2-flac-fix.patch 1233 RMD160 ee3f98e2ccbd14798c2b75ed6def2d1709ead21e SHA1 3a4cb3edd6dc1a14410d3f13b6c9a7c0019c1a17 SHA256 f68f3c9b4fb8be02a37ac21d535d417b8fa6167d123e6e13e98c26fb758e40f1
-AUX amarok-2.4.0.90-fix-upnp-dep.patch 1902 RMD160 b9cb4acb09fd633ec5fa3d14e8d43d7640ea3c44 SHA1 6de5be32d7c985cdc9fbd20d746fc497aca5f517 SHA256 564422c3daaaed737b551608cde8873825a0cf70a7dcd8bc20ff8d11c265d2e9
+AUX amarok-2.4.0.90-fix-upnp-dep.patch 1896 RMD160 e0542160a01bde718555ac06bf7759fdc4078cf6 SHA1 d7a4e359bb13dde781605786d1f20017c5687a7b SHA256 e88481548d77d334adb51250ee2e70186249ee51164f060382a7b1ee2c6839d6
 DIST amarok-2.3.2.tar.bz2 13948250 RMD160 3c2a7868fb7b3f74e35e124cf3a8bad5d8653390 SHA1 594d6d3ad57832fb80ba4387459356132d37ace2 SHA256 842569da06b4ebfc334f3530a77f900ea30b3b8968698bda8082b4b991488237
 DIST amarok-2.4.0.90.tar.bz2 15190982 RMD160 9243c6d1be194829fa5ef21fa970457343ebf109 SHA1 c71d7fd28d42030ca887c7f24655ac4a47956c5a SHA256 4379d9f7b960ff2045f47c14b3866ca298e98c4bad82fe84fea08e52320ccb2a
 DIST amarok-2.4.0.tar.bz2 15219572 RMD160 f32a664521b9827ef8e7d49100e39b69fa87dd29 SHA1 d37ecda0fecdba88bb239f11c6d4ff885d7ac23f SHA256 52be0e926d1362828a4bf64e2a174dc009c85f6f33da4ca589f0f09ab9b7085c
 EBUILD amarok-2.3.2-r1.ebuild 4426 RMD160 7b32dc8c05f915c95471c1bb3a1eeaf86414c523 SHA1 7fbc321428906e9dc93d6219ae5e9111d7900d7b SHA256 823d1c580baba183401e486fa9fcfa163f3d656729861f56384285c1f36d0fbf
 EBUILD amarok-2.4.0.90.ebuild 4268 RMD160 5f5d1e33255c09307cbe2d6499a0f8f26895a1ef SHA1 db1679bb5962355c5e36179f4814957871b383b6 SHA256 188e935c569a47557e742a17a790e719967d38299abbf5f4746e691f44a880fa
 EBUILD amarok-2.4.0.ebuild 4080 RMD160 8e03436954bd32ad752b02419ae20663b1d6e763 SHA1 c26bae51a88de68ddea332e32d7feb255f377e02 SHA256 1a9b0dcb08e7aef17e0096e4e1eeb0d32432f760df50d8d85a1bdc92ef70a8bd
-MISC ChangeLog 68424 RMD160 cc57db9b008fd91654a1bb6b2d6722f50e86bb43 SHA1 99b2ebf87be46e3b25a6a1c2bb30f9a520b04966 SHA256 c979e45c671126682278eb76e54def00c64eaf2da6f7cf91f508097d9397283b
+MISC ChangeLog 68598 RMD160 56d8225a6fdea752378c0165cbd16dfe325c110b SHA1 bdc3de79445c64a4be094b43e28e589ab1d1016e SHA256 07096de429c90a26558773be5ec3ad701e47f9622eeb1a19ea3187fabd778673
 MISC metadata.xml 1566 RMD160 1ba975766c2e4e1cb5b162bf97e534c78a638e6b SHA1 6e0705052a0f430b39e693a4a7d722299a4d46c7 SHA256 c034e203d562fb1ac92d0d48436f64d3a36d04a3dadd15c5f7eec73d9298bd71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNrPWOAAoJEC8ZTXQF1qEPBloQAMhD6KRfvGMXF9/BWc/+ql2Y
-ZmJ2OlT2Mj+Z4xnSHGK2cE1X24A9EiFMX2E8QMDSwyswTDtbuV6tyQXAzw3GfNZp
-+cEcOLFUAsr3kRlq5+05uZ+Y0FKG++Jgfu/5LE+cBvQkaqpuPzF3pHYwiwN0WwgE
-yzyUS/S6RQOOsRUDgvg5b+at4ICh+hmaJgLm2NCUkPv9KSoJKU5xvIO2J13wT53P
-pNzdQZ5EAiNl+l3SNljlOlhslnaGXEkiaz3h0gbRAkL19Cqo29g2Bv2U2467Ttz1
-gCaQ2nbrDOxgmax9bYGHt4zIQivHgIpL8W4bipUjdA1kVrdmwqXKd0D1Rl5hQ2Tq
-li2gvGbYoJXtNfkaDibo0wmPA13OkSwUgBzihWyMpcm88Qm/oTRCCbumyBB62OrY
-V1EAKeTSmHwkWkxX4HNtJ1SUbHe/DzjYAr9SCtCDK3yUmgGkfYnZvnYqzbZsmhs3
-DXGlinI7lvkashlsjHCUJfc1qQUUsv33KA6dOn+0pWj/W6sDcC+3HxuEbJs4yh8+
-fMVsWSw/jyBhrlvdsekonlXcmquEaEgD2YyvqxmHnLJkuIRIx/0jFFtX/N42s/Fa
-4Z7KAFlnL0a4c8jESdBFvx558V99oW0+YIKk2OVJ1b4+1EGFPntKq0Tqq5a6ku53
-tg9t6dbOZuAqtojCJjSH
-=Ehny
+iQIcBAEBCAAGBQJNrmkGAAoJEC8ZTXQF1qEPvjcP+wQ+gvnDnzJd+Z4Ap8eWlx12
+I8qQdCW1/gcrBkBbtnSoEo6jtFyBY+NNGXs8dqvY9ms3SZl9ewTVekEp5A0No8hf
+vun4zQ2YK1iL9k67lk5sPbSGjOIMfGHYwrPJ6ofqHPBTLri4BTshi3rT8lEfjKV+
+Wy+SKOecGSS0vDroPoix6qWWEX3//5ahhA+H1ZWiNUu96+Tfqvn8rPioph3/mwFp
+zJ55pkchZ0McwY0iE9WK9zPjjNQZjifh731KQPQ22sM2b3SpWQEaupUxWBYSXo48
+tR2GEd05vGJMYeLz/srDTvkgXkJoCbDgWuxm1bqnUV1VR8Ex1K4/o8kDuPOEjyVv
+PqSCinOMw9amD4kdXl0n3V5p5/AkvJWFXK7HgKRKETwoLGYkC4/0htGjmCGXViTS
+BIR23/KLBS+V6tuMryhT/sQWay0WkBmdnCZP4luZUI/LnkTrhEc4VnyTmBLixu1j
+szhFhV4Pl4+ddIKl8dR1wcgfzHmVv6aCzghUbRtvrAKjvcrgRYGp6wTKG5Ksrkwi
+lDAMJYFbioRiM3Yfz6CZW/WUZJkNUrJkUqi1vXN68mHFLpZ3/hdbu8RYv3nEb1X5
+5OGODjdVotSsAK3coQ67GUe2YaW1BOgCPZscDT+XkC3haz4QwTrkUfYOIuBeFLTQ
+EVeyxhlaVMbWNCYa6KMR
+=mOtt
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch b/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch
index d9f149b8197b..878c013fa972 100644
--- a/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch
+++ b/media-sound/amarok/files/amarok-2.4.0.90-fix-upnp-dep.patch
@@ -31,7 +31,7 @@ diff -urN amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake amarok-2.4.0.90/cma
  # HUPNP_FOUND
  
 -find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR})
-+find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} ${KDE_INCLUDE_DIR}/HUpnpCore)
++find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} /usr/include/HUpnpCore)
  
  find_library(HUPNP_LIBRARIES HUpnp PATHS ${KDE4_LIB_DIR})