Revision bump. Adds patch to fix crash with no cd inserted. Thanks Andrea Grazioli...

Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686

diff --git a/kde-base/kscd/ChangeLog b/kde-base/kscd/ChangeLog
index c14612072deb6a0a848ba4af97616c6929feee72..7f650bc64005665f94bc923b2b7c366898234c22 100644 (file)
--- a/kde-base/kscd/ChangeLog
+++ b/kde-base/kscd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kscd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.199 2011/12/27 12:23:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.200 2011/12/31 15:43:51 johu Exp $
+
+*kscd-4.7.4-r1 (31 Dec 2011)
+
+  31 Dec 2011; Johannes Huber <johu@gentoo.org>
+  +files/kscd-4.7.4-fix-no-cd-crash.patch, +kscd-4.7.4-r1.ebuild,
+  -kscd-4.7.4.ebuild:
+  Revision bump. Adds patch to fix crash with no cd inserted. Thanks Andrea
+  Grazioli <grazioli_andrea@yahoo.it>. Fix bug #396573.
 
   27 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> kscd-4.7.3.ebuild,
   +files/kscd-4.7.3-underlinking.patch, kscd-4.7.4.ebuild:

diff --git a/kde-base/kscd/Manifest b/kde-base/kscd/Manifest
index 71a01f0864bc027d5642d36f5726d116026e50f3..57c7b5e4b590f6b1273736ed874d81d0f0121c19 100644 (file)
--- a/kde-base/kscd/Manifest
+++ b/kde-base/kscd/Manifest
@@ -2,28 +2,23 @@
 Hash: SHA512
 
 AUX kscd-4.7.3-underlinking.patch 434 RMD160 9f03c759f32410be149318d61b0831b33b66c55e SHA1 b7501750b60ebc82988fec6ebd829c22ac9acf5e SHA256 1641244e7a55fe163b043fd52f5a641e97cdea181bef99e3ddaa166f9caf8a8e
+AUX kscd-4.7.4-fix-no-cd-crash.patch 357 RMD160 c4b612b7f829e346d4c577deb2bc67510c70f6e4 SHA1 c491a8ec3a3312bcdd03a6b3e2fabdc92af875f6 SHA256 15c623a376196bac5440f438655c5f442ba7777bada7467c3eee8a5ef806bc38
 DIST kdemultimedia-4.6.3.tar.bz2 1611668 RMD160 8824bda18a1f1051dea366a0ff0d6191068476dd SHA1 d5bde19156b65e9b56e0e6de800efc0efe117632 SHA256 b3a6732dead0558610b4b40d3ce28c4b7b5da8869a63436180eacb3aacec533b
 DIST kdemultimedia-4.7.3.tar.bz2 1644497 RMD160 de9d9f9341d91bf0d56fa9468c0441226cb6aba2 SHA1 4db44494e6a2ef886e3513b6a2eb4e526741a6ff SHA256 ad96332218b82c4466debcb165061d87051a917e0321bdc34e4024da9c8c30b1
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 RMD160 c180dfed17735bfef4303802dd8065ed308cdd6a SHA1 e0001afac38e35e3ab7b919d79f74cd57e3c18dd SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28
 EBUILD kscd-4.6.3.ebuild 640 RMD160 16e44755e66d65bd856cb483ca84ab409e53d227 SHA1 5f942a02d633dc25828ec79a332a94733a9536c9 SHA256 218ca3f8e8f564af54e1812642701456dfab4be5feb4ac01727cc0fa33586af9
 EBUILD kscd-4.7.3.ebuild 702 RMD160 14d9053628926d72dda5faba11e0723538bca0ee SHA1 94dc05291a389e0beb11b5b9ddf780aea0a0f01c SHA256 9cece7bf6696c6cc0eec193b4068f5346a4e41430f331766358abcb3768929bf
-EBUILD kscd-4.7.4.ebuild 704 RMD160 6510bca8486991c39f19ed888b1d0cb01a44291a SHA1 cee3917a3e5185a3eef4815659aa1bdbd51b51ce SHA256 d4be28046b0412cd0d7e899f9963e001eda9df88c915f33259b4daddc41b4223
-MISC ChangeLog 23389 RMD160 5c3a920a0b3e37d5db98c000d784c22f6c913da1 SHA1 55869d3767d34bc35413d4cd0d41c5336a522d61 SHA256 24e1b4861779ab66face40281bfdd260a548581950eed7bd258ecb8c3f016af6
+EBUILD kscd-4.7.4-r1.ebuild 752 RMD160 41107be034383b4bd207a17e915d21c6c1ed1246 SHA1 adb15f3f6e05cb8ef38d2121285d74dcfc209bea SHA256 bb6fb36211f8efa77c922ae6e9bb9eee7ffa40f6da240a2685db35c4ac4067a2
+MISC ChangeLog 23683 RMD160 a0ab604664309e76da98dc0ece78b759ce7b091b SHA1 8c59099611e28ac6f1e509f245d0dc51991bf8b7 SHA256 dc0c598fbc17cd5403ae1cad27f75cad4c130be7c20b5d27a67a3c709d5c7915
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO+blbAAoJEEb+UGWnxTyHp0sP/3RI7G+u2E28Y0npfh1jaBlT
-iq6PNwMnnJWNA6XAxURfxc20AulIb3CbzOJojLGvSdJWFeE4k3hCmea7IGPmFZAd
-cN/6WWSG9Q8ROcK4IcVMOsphlx/35bpMo0WTQkN/LfK1gOyCY4YX8cg06NpARXcA
-N02lYaD+S5+bbU3PKJP2cxG1np21jV1TEOkqlcwbahQsLHUQqcxSkIMrT+VUxOIq
-K33R2wD/IUKaQdONwwvb0wfATSsc7KE5cYQIcrplAbb2UEoQ1mVMTShZtnz4B3zD
-Vu/pbbr+RssqfzoiEcle7gLcNc1PqHwwSHg1yiZqMGP6yGryI88Tq2MwjHNWCM3e
-u7Wk/MVnbXKv+Ne4YlyMoriU8zwlmuyEUaeFUS4R4AXN6EpRZmgixDFaviQCRtuE
-fLciP49jD31ecov70JA5DfEBs2R7wcKvhYyJly6YD7/3EqFf8CHKKrEA54pMpKPD
-EpOlLu/+ShD707PWz0z1YrCa96Ai6lZsWVHkRnv1dxx4QArQkAvxj2UWr53RZrjg
-aDDvksAT4HkwPLCEnDfahBXpI7arRNMuajXGn3IsRWs/Zk9ooLFQBw36RlT3cZKH
-sUs0EFDMmObpFYbSbfoNUCH3CauleDdqB4yqsWpREyj3rDFdkc0Zjdo35Kk50hgE
-6X0SLy+wk9U5g+Wkzm6y
-=ZW3q
+iQEcBAEBCgAGBQJO/y5vAAoJEO+t9ga+3I3azngH/3Wh/zP0fQ+emZZv6Z6x8reu
+vy1rz39IPwYJoIRPT8fIZ2ZXx4LETLCNf3dyBff5el3mnRrRrYQHD2LN1f+SbP5D
+XWohtMiuEhMCZ+pAvxOxwbJsu6jZ1dkeODhaqIAdsYQTVhuqdg/fC5lnRjoZkBxT
+oiEpGJ+Y40suYofMwENlAP6TX/y29WMDoPE+mYm9JGwSOBeDjhW0NxXbGoa0tp2f
+qp5mMzuoFpz6xvppcVbe0AadogSduZMVqdeN2kl2R4RhI5qS2MASK6lEoU7riPbV
+WtwRPlJcJt+QrxNXXvtAThyjhHDDkTOVu62UR6hKEZ54SnsVJjjY2RJmc0rxpZ4=
+=iNsj
 -----END PGP SIGNATURE-----

diff --git a/kde-base/kscd/files/kscd-4.7.4-fix-no-cd-crash.patch b/kde-base/kscd/files/kscd-4.7.4-fix-no-cd-crash.patch
new file mode 100644 (file)
index 0000000..789ff8f
--- /dev/null
+++ b/kde-base/kscd/files/kscd-4.7.4-fix-no-cd-crash.patch
@@ -0,0 +1,14 @@
+--- kscd/kscd.cpp      2011-12-02 00:56:20.000000000 +0100
++++ kscd/kscd.cpp      2011-12-30 22:26:26.793971589 +0100
+@@ -69,8 +69,10 @@
+ 
+       /** Music Brainz initialisation */
+       m_MBManager = new MBManager();
++      if (devices->getMedia())
++      {
+       m_MBManager->discLookup(devices->getMedia()->currentSource().deviceName());
+-
++      }
+       setupActions();
+       setupContextMenu();
+ }

diff --git a/kde-base/kscd/kscd-4.7.4.ebuild b/kde-base/kscd/kscd-4.7.4-r1.ebuild
similarity index 71%
rename from kde-base/kscd/kscd-4.7.4.ebuild
rename to kde-base/kscd/kscd-4.7.4-r1.ebuild
index 17a41ad4085292f0445359fc90f2b30091de6bb8..4301c7e9b4e259636911e899585660cb284a3f45 100644 (file)
--- a/kde-base/kscd/kscd-4.7.4.ebuild
+++ b/kde-base/kscd/kscd-4.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.4.ebuild,v 1.2 2011/12/27 12:23:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.4-r1.ebuild,v 1.1 2011/12/31 15:43:51 johu Exp $
 
 EAPI=4
 
@@ -19,7 +19,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.7.3-underlinking.patch" )
+PATCHES=(
+       "${FILESDIR}/${PN}-4.7.3-underlinking.patch"
+       "${FILESDIR}/${PN}-4.7.4-fix-no-cd-crash.patch"
+)
 
 KMEXTRACTONLY="
        libkcompactdisc/