diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2015-07-04 16:01:15 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2015-07-04 16:01:15 +0000 |
| commit | 85102ce4e498a11219f3df4de9d5cf033cc54aef (patch) | |
| tree | 18923dc0a42237635c13d9b1f470cddad3e6d31d /media-radio | |
| parent | Version bump (diff) | |
| download | historical-85102ce4e498a11219f3df4de9d5cf033cc54aef.tar.gz historical-85102ce4e498a11219f3df4de9d5cf033cc54aef.tar.bz2 historical-85102ce4e498a11219f3df4de9d5cf033cc54aef.zip | |
Cleanup old
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x24083D3E28343508
Diffstat (limited to 'media-radio')
18 files changed, 27 insertions, 962 deletions
diff --git a/media-radio/unixcw/ChangeLog b/media-radio/unixcw/ChangeLog index bb7aa8e6bd58..3e7019a4cd30 100644 --- a/media-radio/unixcw/ChangeLog +++ b/media-radio/unixcw/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for media-radio/unixcw # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/unixcw/ChangeLog,v 1.30 2015/07/04 15:55:31 tomjbe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/unixcw/ChangeLog,v 1.31 2015/07/04 16:01:10 tomjbe Exp $ + + 04 Jul 2015; Thomas Beierlein <tomjbe@gentoo.org> -unixcw-3.3.1.ebuild, + -files/unixcw-2.3--as-needed.patch, -files/unixcw-2.3-audio.patch, + -files/unixcw-2.3-config.patch, -files/unixcw-2.3-destdir.patch, + -files/unixcw-2.3-fPIC.patch, -files/unixcw-2.3-gcc43.patch, + -files/unixcw-2.3-ldflags.patch, -files/unixcw-2.3-parallel-make.patch, + -files/unixcw-3.0.2-config.patch, -files/unixcw-3.0.2-destdir.patch, + -files/unixcw-3.0.2-parallel-make.patch, -files/unixcw-3.0.2-qt4.patch, + -files/unixcw-3.1.1-config.patch, -files/unixcw-3.2.0-console.patch, + -files/unixcw-3.2.0-pulseaudio.patch: + Cleanup old *unixcw-3.4.2 (04 Jul 2015) diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest index 10db7b9fdc14..36c3972a4c3a 100644 --- a/media-radio/unixcw/Manifest +++ b/media-radio/unixcw/Manifest @@ -1,47 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX unixcw-2.3--as-needed.patch 527 SHA256 b72add7559a0a9df10adc0efa885377ac02ccc2fa840366c1185cbb2485c35e8 SHA512 2560285e4dc7d9924fd87e6f10916b9b822e652c4af05b7a870382819582a8ecdab80237a57edcdaa66c42fb45ced5c3e362615d57e97dbdfadfc0871b6305cb WHIRLPOOL 0bf5138ca7bb96f1160346324c54bbd65ef55b6337382bce695909953eb72877b2b78f30dc7e4d406a47658d49c5ce7664f8e46c5dee737ded24cc87b94a8f74 -AUX unixcw-2.3-audio.patch 5083 SHA256 ef07fd4fb3dddfe4f350b770996c8f612a804fbf0b0156c9fe7bef9e1c04209f SHA512 de4c3640a45396bda6b1896308c2bb8515abcc3943c9a27edbd2e34bbfd95c8e1d04c4410eff26e48cdc3a7f318ecdcfb960934d2d1ec8e8cdb14101f22edaa5 WHIRLPOOL 6af513571aebfe67af23225523e1f3196dbd59a0287d4bc1c09322e96fdf1938e7913aab91e1e7a284a7bcea6a8f0544685c6cba8700e1832b59ed4dcfd5825a -AUX unixcw-2.3-config.patch 3761 SHA256 aeb49365292721894afc7a4df61abff0e0b053e8d934951e200ec70dc8abf150 SHA512 da90069c7c8ff66076df259177fb0d661c60d5da560a7da6a8393b8c7597a05e6d658c5d138f8bdcbc7670877ca2e4d806b989be670aa7eda78e20ca4a6cf6c1 WHIRLPOOL 61c0c2bc5dfe438c12ce8811a89fc7a0dfd26fda1f69ad81dc6d18fc137cdca0ab0211887e5fb765f689c2a021d49c4f409f08ff3d32a330cd146276bb015ef7 -AUX unixcw-2.3-destdir.patch 480 SHA256 ba6c84abcaebe9c16cdac636626bbd3c74a7afc6d115985767377878c13ca64c SHA512 779c0ebea7dd7eeddd3a99ea41ddd231833ae379340b6f41d73e4b474f0ec730a9e9b51d39bf53f9ab3837b1a3edead10e795d9fdd6b786a9fd00d6ced1599cf WHIRLPOOL 9be47c89e8eb4cbc2fe89e84ff1697aadc1fd11e19000e6f57cc977adde68b90a48f914c28d95f1a14ef08d21f8735ab5c582ddaabfaea4c092da6e1957ffbf9 -AUX unixcw-2.3-fPIC.patch 1866 SHA256 2cd8aa8759df1c40742c57f5e65c2a9093c587e83345e01a26ac8f46c5953053 SHA512 938de339e4176474efde4033e9937cb69d4ce034dfe8c56dc25ae2e9676d61efb8b9e562204bd087d7d6b1434bf0e639afb928a2a146becdfd6c8df475e331db WHIRLPOOL 416f2dfaf0a00e218e9b764d3cc9b6f55427a2fef4ad9ed3b6adba7bd695db41bde41e5d7d9be3de05385d219ca94552f0c6bb76a7fb7d34d6f7d55083f20987 -AUX unixcw-2.3-gcc43.patch 609 SHA256 7ae894241793ead8b00d6ff48b3a19da61e4f344a2136d0a538e66f3dbeb1f2b SHA512 7379440d2261dcbe7e1e7b5f2b5ccf82b96bf83afe21b447286e4312fd0f52e2ced8bafefabd8e034a4a90140ae68dadc6acbb5e6a1868e0251a1cf692f568df WHIRLPOOL 7a407a0891c42d266ae3a2e752ffe0fa0c7c65bca2f44180e502d1b7c9153df08eca6c94877615481400e4ebe30f90efc511dc021b4e6abdeffbf5e3602c4cef -AUX unixcw-2.3-ldflags.patch 1440 SHA256 41d40ceb0accb8c971bbc69eb00d7c17aa2d62ed8d907d46a310f3ec3b6ff662 SHA512 b2e3a46b8a29ca70e0ff01c6251402ae78e3f3e7d766665d784d3fc9d51d222e2bdabf70d3b3dfa69792407c0dee522707618845e3b210b07309a4a7d21de1c7 WHIRLPOOL 2a444531aa4a00b1979cdeb831f5ce25e53079c9648e8b3619a7a69cfd32f24d5bc0183362ece047be1c4563e5c76665241779c3c45241243f375e8d1b47b2ac -AUX unixcw-2.3-parallel-make.patch 1200 SHA256 53b8c6e12de88ed2c915617206220350c3e08eebd83d748469bc23c801ed108c SHA512 4b733977709b11c23aa28eea49c724379954e8e4b0e8dc7a3b5f0e6dcf1a8959654f3cf0cb60ce2b07b29b8225555585be6126e2c7dc6a8f62c507ab418bdff7 WHIRLPOOL 721afb45e16dfe670caff3fae0761ab5cd2ec5f0ff7a384a98dcb86582469273022d9486952822b76d1110f874d445055b82ec9069ebb9a06fae262acf002baa -AUX unixcw-3.0.2-config.patch 5517 SHA256 8e58063b86e77b9594a494224cb199f86888c654d01cb746da0d365c71c858dc SHA512 3df93da1781e86475fa34ef9e93220eb409498a9fbdbca6b677edab6edd1ed2a89944934c8789e66519cb013f11a236aacb300004e0b19ed7a5d85b2e5034f7a WHIRLPOOL e2d0561c2300c6186bb6e8773be5d7fafe3e75b042b306412f3d1ea11fe726ca2d336eaa364c9143bcedcc1700213d2762fc29cccac705a37aea6d190a365957 -AUX unixcw-3.0.2-destdir.patch 563 SHA256 0cab9cc2f03e2d95a533438221e0b09c5a952c98e56f009fdea080ab5939a57f SHA512 2a394919067b76d1750448bd9dcb481f8c0dcb10618ae9365324b46a7b7841218a631af5083dd419f2ed01c5cf28d1588b026eec05b40aa310ba3c24d24417af WHIRLPOOL d2f8674e29fb17ae2022189670304a02611577ce22e55f8c096c6e44f8b2d47cdf4708bbb71653ed454eaa4cc693fb4d501e3174c61d1dd2c368ec2ba78de507 -AUX unixcw-3.0.2-parallel-make.patch 1506 SHA256 968bc3581b4e7c84e509c10dcb3ba7f6beba68eaea0d9ea7b7da8a7c39fd8a89 SHA512 b75edfa46075cad0ff137bf8558ba5316a38ffd6dcafeb07ed06da6acadcb62b9486825421994d95aae6c398f25853539cc0aac30bc7bd26a146469fab14c012 WHIRLPOOL 3eb1d8a97c5f4c3d6abe7ebebbb7d3e7c90d81a15f0653d1e9a6148311286dd9ce8d921f8b551e8e548b4bfcd35854a3d99fa0df3db0fc9e68f4acd722334ed1 -AUX unixcw-3.0.2-qt4.patch 615 SHA256 c7a75c70c06d4abc3e2f866eff011defa1732f110bb15a5023a9414ddf757690 SHA512 4007b60019d3f8251802cc43abdd29ea1ed467a365d224c8493725e4ba7ba65eaba705d23a9323e0956741a11f71624e8c4c1ed624118f926644ad3df9284ea9 WHIRLPOOL f49b30d0b4fc7cefc1ed34c2b16ad7d147d45a4fcc2b72ef81416c0cefed0c4357b3982485856fe69a6255abe232bf6226b5e3cda4a39086b2027def2428cc13 -AUX unixcw-3.1.1-config.patch 3092 SHA256 55d9662052abc849693ef516e3c918e46293963bf83078a56f78b14e9967cfe2 SHA512 f0e67ab739315b1853584a43f2d2e64068c77039e9dc209e46f303251486cf9cbee855833b11469f1b5db1472a9b54b190fabf91a7ab65b121daf70a08097e61 WHIRLPOOL a233f829a626186e713bcb3c20a2c1ba0992ca89dbecfdf8cea2e9ac216d171a9f9a91d92b4f9c009a663592a66d0c9d6746a88b2ba2688d4be4f064489cd028 -AUX unixcw-3.2.0-console.patch 429 SHA256 53ed8f07bae35be6f85a3ad12134a7d927495ae784c14a7620f881b40f026802 SHA512 89bf8ac230356c7c147a7cb6addb4461b2368ed1c21a03ccb95f916b8587de429fa7eb54b70566a88590f1a8b82c4461b5d985fe5c92ad6f14f609393e238f84 WHIRLPOOL 871760b33ae12ce6ee051ea7bbe82ba6879fd81fbd7681df32c6309df5332d6f3c9610a83382321e5180bbc5588a6b1b764494161f9135c931e0c7bf2b46f1de -AUX unixcw-3.2.0-pulseaudio.patch 332 SHA256 bf73f4a879265b4f936f3921e864e663c24aa2ec7fcd8cd20f38213f4c236d0e SHA512 1a283c7ea35a5e6895e6dc463528741dd6521f710288379f14741652b9448337dfcf897a60a4e3a0f2fa1c4071e86ed60fe407d63b2a79738f0ea8818cdf52a5 WHIRLPOOL 0cc117a9b94ed702117a4bbc84785817dac4796136a848ab5fd54659e6c06f75d66227e608c9262fb1050da0d774a88baa0c31ba9a009be26a5a60d1d97974a5 -DIST unixcw-3.3.1.tar.gz 677296 SHA256 ec905e3f5ef84e4d28ce1b3524c9128c5c61db9967ba213572a3be043a9928db SHA512 11dd17af3bf88a5e84aad137ed8cb130fc61ee466129f431d8d810e48d7d10e2f2bc90cec4e7a9ab6db35bd796a6f8a3b698592bfac33b9bb07862116ed3eac0 WHIRLPOOL 7346e3b83f42298db57921bdddcfe8f4067b3dfa2c6f6ad5ca41aa0fc51f4232176251b6d00b3fc25f4579c2b2cca8f83b9ba484f6ca68cedc4886180af00761 DIST unixcw-3.4.0.tar.gz 700095 SHA256 11a678ec616f8b22d319c988365750bb7e0ee7570c7dcdbbd37669d6123ea972 SHA512 9271c47c77d2240387c3d305d952f09eb1ecdb6f9191a16e03f00d2921d16e229b4ee50f05d540fd3ed3da4040c134e1e8ac414ac81d983200c630c55f4f372f WHIRLPOOL c41b132e164792b43faf1bc24cf8cc034f62c8b18cd252b42cfde348a004f0b028e91a589c4e0f6a060ebd4c7bb901b1a406bff175f0cccdb3ac9286a684736a DIST unixcw-3.4.1.tar.gz 692181 SHA256 9c0bb1fc4a2a18918fe8b73ddc72df8806181fa490e0b2ef5ea116b934ac0727 SHA512 0dd8717ef921019adfb94812f2c9ec3f0be88b94910eb3548e71383523a1f5de13f1ed60be98ab1bcd568ccabc3dfff38100f1b97fbf54b0b5ef8469dfa013e7 WHIRLPOOL 333df1c05442e5152a391a52d1af0c9fffa1e5bba65b203485df3bb78f3bafa40df43cb1b588213b5685e85d791478ce00beda131559368bed201ced67999982 DIST unixcw-3.4.2.tar.gz 730461 SHA256 ace7d16cfc8f84ffe041de6774baa0727ed0230657cf8a93cb4addf1cb4e8b2a SHA512 118e4f7fcca78713e5be5aa2faccec4e26979e95dcc300bf259534bb417eee7b21591ecb778467591b1a3b61c9ede18f229f88cd1bba2d6bc54f4d410096e0c9 WHIRLPOOL e8959ccb6eca32f4d468dbdb1add61dad6be30b453369385a1c857309ea89d052e4ef5577c4e17f101a79ee762f10ead3ec1fae72a394455ac473c4758fe0e3c -EBUILD unixcw-3.3.1.ebuild 2002 SHA256 79fbdc7b8800cd2336170552c63755b50ace16e3098b1ec1477facd1b7fce480 SHA512 21c6b41bee9d404334f954d5ce40d0e7018b6861f217f7b06725a7bc5efb5a7d5799c291d2a77ec249fb49930fd19e2bf6faa0164c564ad79898d9bd08c15914 WHIRLPOOL a77205564a1e0446134a30f996f12320cd24ef9729450f51008e1e4d1f2733f984b0fb39b251f51ba5a0d8ec4e9f3d03f75fd00a9c9c343917bec9fb4811b254 EBUILD unixcw-3.4.0.ebuild 1865 SHA256 5462b9b87462c31c28326cbbed4fd54417980cba5c6690c861729b9678d1d2d3 SHA512 b22eac172d091c4b324e0db66ba012d99b0493da9f384ef76fcc34c14121402c5758d968a9f4bd8c75168b583a43d8e34b7ec85edcc086bf0d7023b30faa5784 WHIRLPOOL 68493e80cd859a5d9f4d3cfe866c4812b45bd412462d3860bf7f3ca83e6687ef00a0a3288e6e7487f9f0e160be61866c15fdfdaf9888ae9ebc1fc5a0f240f2ba EBUILD unixcw-3.4.1.ebuild 1866 SHA256 47cd3382fa025bec1fb217764335da3b28c84e6f766f778129606c31833fe9dd SHA512 9d28f213510bac2c66f9e63489332c979d9c49050603dad44f4b09de6d0ef4b05db478c25fc78423fb37e29bf75d99d4050e351a1b2884779c2ef3234c5d80e1 WHIRLPOOL fc7115392c014650c806214c9a1ffb8e7e3cdf9299d4ad778c3741b8d8972a7cfd5828ae2696922ea01c012c85902f594abc9cb232d0775cf5224f66c4495c34 EBUILD unixcw-3.4.2.ebuild 1872 SHA256 6506946ad2461baa8856191a3589c7865684a157c2d82d620866af357c947e28 SHA512 379db6518d72012e0e32ddcc6b9b7bff633e503ef71d2291c17e979e2cf91fb75fc7051a7bd3932c70ca84c01dbb8c4e73c65eee943e6748186568a4c81931dd WHIRLPOOL 368935c22b365a047c94346ffca153acbc6023e9b69536c8b49250cb18a7a3d7e47048372363747daf639a89976780c36bc264a1883087311c11f44ffc43657d -MISC ChangeLog 4391 SHA256 b476460a695745fefb12a825323c4bd6d01f8fb41caeff5d7128441a7dbc8ec8 SHA512 777737419ebb48903d91b6422167120e3c01ad80cd9c7f79d0ca0ae15217d1ccac484d9dc3afd97fa87cf4995504880e0e2ef811339c05fb2bb76c038b5f2e91 WHIRLPOOL bf7dadcad3731c20b8f9058944cf0052c7f7a205d3f3a708bbee159c79aad5d55adb9700048fa31e85d3073fc4f3cb6ba8cc5f7d8ecfb88d56b8c2a1018a9aa1 +MISC ChangeLog 5009 SHA256 9c97b633e0af3ca45c88388d19c1c5e439a28b157e15360125657d5c7c77202a SHA512 156c39a79ed5db02a60992dd7abb53c9efd7572feec9d3f4b255c52298833af009179047dd3f522b174a3ea82ec80b921f6fd412bffcf839b55ec3544bdc17ec WHIRLPOOL 49bd096dd69f1c1e1760612bd71e1735d70e30569de08d29f82468dadc8dd2b325761ac837d91c796161e93f7692344daf3ac4f7052f83d99b520ed8e0ff25e6 MISC metadata.xml 860 SHA256 c624ff7cc52eacf5ac51d3bdb2cbfba21d2b0ca8a29287d5b3413a1f4e22a57d SHA512 ce005fc5fe5b5636ae7f35745f0b9ab10f3f8da5bcfeb97bb4265261ff3b8a1cf9dbbdbd70e09d9d8c79faf257579371ca3baf988f8a4aecb2d1de70930e79b4 WHIRLPOOL dcc251655f2ef2c89ec0dae238383c6c3924341919d8dde551fa95887e571df11ca143a71e001c454293f15d13931a4856e83ac4885377a3cb62ddcfc5130b25 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJVmAH6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVmANHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQzNDRjc2M0FCQkE3NkQ4QUE3NEY2NDNB -RjRDOENGNkI2QzQwNTcwAAoJEK9MjPa2xAVwpTIP/0n3KpOytkGJRRksKM/HEz0D -V64aNFkT2fuGwCa8rK/ZZMb3Gq4ffMFCHLilziFCUnVxiMEXxq0bcrRDZunP621O -afGptDppxC/A7VsnbprUN1H8yydn7SJV3MODoEdxi70foAWSrIuSsKSs+LTPIi9y -YZ0EsI2Nn85toC7Zt0OMopvpknTNxqpJAdph7cy/8IkajppIZEWw5EhJJEhCYtK6 -meyIXjyle4GscP8DvUNIGwNbRXb7Nyi/4Q9nwhSZRQlrbz6gKNfKhc6Z8IbVe9bo -FT+r0P9TuSH6T3JujS8b2ihGBbY1XXY5Fxs96mpd03fGlYC4u3OU/e9TRYS0lSzm -5hfER2zuQbFND/2LJlg8N3p2RFvAFDAeRc2tq2zYbqk7Pr7m+wsf80mruchvQDee -mSyXIxfHY59Tgw7fOg0x2DDLoBGoKPBcPuex7mAJJzHHenrMzIvGV3zMcaovCo8v -fUNKqSeMLr8Jc8+z3AYeqmymSPxBXsoEhMgFWsCl0Yd94PQEuQVCXCh9J5HtucUl -vL076ML5qi6wensPKytaHXNuliYvdZHfhD9HytqD9QfR9ByAzZMpmhFVWVvIk5ZW -wfZVetBK2HfQ5dioZWjPJ3mQ91Ts0e49AFLiipR6aV06CFQJpRZcR7i5S4qnhvBp -DSFJR644g19GntN380Pc -=2HD/ +RjRDOENGNkI2QzQwNTcwAAoJEK9MjPa2xAVwkmEQAJ8xyekfO1mTeD69dllqWCrn +Q7AKR61cwDA20pL0McnCqdhy5zi3jmRLoQb5aL6D9Fch8lcIrIkD327YJg0mkqKC +mUSzLh6g/v4uJxL2YHL2GUHMALMtATmIFGlP+M2vsF+zo/M565pmHzNZ5gk04WII +sxTUtrEjmId2/+BxI7XWxETPmi+vKNWyJEDBSKwp1Xq9u8WOoguPdN4br+bbs3DN +g1I6JThRBZSzqtLRGSzEdEvtO/b5qleIZQR8MqpzofmiJ8eCZMgD/3XAuHk6xjL6 +glwYkPbb5MLSywuVLlFJm4/sE0i4dL3fBQdbMw1mVaoNoCyHH6om5KIxxBcsmwLb +k52FdhgAEydCKS6eD1G1lilcenSliIalIhMmfn5ZoKQ1nS7bQyTF5s9viZussqLr +NPk9Xd/l9Mt6sAZMZZ3jrugxhyGk/5JSFVYGhPat+7EqqO8mZD/dsVMwHPSOCr5f +QFExjHHiUMngCVCyJBsRHfnkvH/kD/mjNJFcxdTeQmVvamyTUhHbMsU8eDO/J71K +pmohDOdLJ5VSVJ1YteQ2d4qg9qp3lSaswZMMXuqbU+eFj9aKDFLG5UGZqUXXZTW1 +x03huanoJHhLB9UE0qwXD65uU0+b7v5zwNYFnPV/iYNQ5WlP7ISARqZuFOskxAhh +EA/kzQ8OshslAYfRr6NC +=Hn22 -----END PGP SIGNATURE----- diff --git a/media-radio/unixcw/files/unixcw-2.3--as-needed.patch b/media-radio/unixcw/files/unixcw-2.3--as-needed.patch deleted file mode 100644 index ae96329b85e3..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3--as-needed.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/cwlib/Makefile.orig 2009-07-21 06:34:13.000000000 +0000 -+++ src/cwlib/Makefile 2009-07-21 06:34:39.000000000 +0000 -@@ -43,11 +43,11 @@ - libcw.so.0.0.0: cwlib.o - if [ "$(CC_LINKS_SO)" = "yes" ]; then \ - $(CC) -shared -Wl,-soname,libcw.so.0 \ -- -o libcw.so.0.0.0 cwlib.o; \ -+ -o libcw.so.0.0.0 cwlib.o -lm; \ - else \ - if [ "$(LD_LINKS_SO)" = "yes" ]; then \ - $(LD) -G -Wl,-soname,libcw.so.0 \ -- -o libcw.so.0.0.0 cwlib.o; \ -+ -o libcw.so.0.0.0 cwlib.o -lm; \ - fi \ - fi - diff --git a/media-radio/unixcw/files/unixcw-2.3-audio.patch b/media-radio/unixcw/files/unixcw-2.3-audio.patch deleted file mode 100644 index 944cd91ccdc6..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-audio.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff -ur unixcw-2.3.orig/src/cw/cw.c unixcw-2.3/src/cw/cw.c ---- unixcw-2.3.orig/src/cw/cw.c 2006-06-18 23:58:46.000000000 +0200 -+++ unixcw-2.3/src/cw/cw.c 2010-02-03 14:46:58.000000000 +0100 -@@ -922,5 +922,9 @@ - - /* Await final tone completion before exiting. */ - cw_wait_for_tone_queue (); -+ -+ /* Reset to ensure that the mixer volume gets restored. */ -+ cw_complete_reset(); -+ - return EXIT_SUCCESS; - } -Only in unixcw-2.3/src/cw: cw.o -Only in unixcw-2.3/src/cwcp: cwcp -diff -ur unixcw-2.3.orig/src/cwcp/cwcp.c unixcw-2.3/src/cwcp/cwcp.c ---- unixcw-2.3.orig/src/cwcp/cwcp.c 2006-06-22 05:50:05.000000000 +0200 -+++ unixcw-2.3/src/cwcp/cwcp.c 2010-02-03 14:48:31.000000000 +0100 -@@ -1625,6 +1625,9 @@ - /* Attempt to wrestle the screen back from curses. */ - interface_destroy (); - -+ /* Reset to ensure that the mixer volumes gets restored */ -+ cw_complete_reset(); -+ - /* Show the signal caught, and exit. */ - fprintf (stderr, _("\nCaught signal %d, exiting...\n"), signal_number); - exit (EXIT_SUCCESS); -@@ -1685,5 +1688,9 @@ - /* Clean up and return. */ - interface_destroy (); - cw_wait_for_tone_queue (); -+ -+ /* Reset to ensure that the mixer volumes gets restored */ -+ cw_complete_reset(); -+ - return EXIT_SUCCESS; - } -diff -ur unixcw-2.3.orig/src/cwlib/cwlib.c unixcw-2.3/src/cwlib/cwlib.c ---- unixcw-2.3.orig/src/cwlib/cwlib.c 2006-06-23 03:54:01.000000000 +0200 -+++ unixcw-2.3/src/cwlib/cwlib.c 2010-02-04 19:36:32.000000000 +0100 -@@ -2138,12 +2138,33 @@ - { - int read_volume, mixer, device_mask; - -- /* Try to use the main /dev/audio device for ioctls first. */ -- if (ioctl (cw_sound_descriptor, -- MIXER_READ (SOUND_MIXER_PCM), &read_volume) == 0) -+ /* Try to use the main /dev/audio device for ioctls first. -+ * Check the available mixer channels for the audio file. -+ */ -+ if (ioctl (cw_sound_descriptor, SOUND_MIXER_READ_DEVMASK, &device_mask) != -1) - { -- *volume = read_volume; -- return RC_SUCCESS; -+ /* Could read device_mask, so check availabel channels */ -+ if (device_mask & SOUND_MASK_PCM) -+ /* First try PCM channel, ... */ -+ { -+ if (ioctl (cw_sound_descriptor, -+ MIXER_READ (SOUND_MIXER_PCM), &read_volume) == 0) -+ { -+ *volume = read_volume; -+ return RC_SUCCESS; -+ } -+ } -+ -+ if (device_mask & SOUND_MASK_VOLUME) -+ /* then master volume */ -+ { -+ if (ioctl (cw_sound_descriptor, -+ MIXER_READ (SOUND_MIXER_VOLUME), &read_volume) == 0) -+ { -+ *volume = read_volume; -+ return RC_SUCCESS; -+ } -+ } - } - - /* Volume not found; try the mixer PCM channel volume instead. */ -@@ -2215,13 +2236,35 @@ - cw_set_sound_pcm_volume_internal (int volume) - { - int mixer, device_mask; -+ /* Try the mixer PCM channel volume instead. */ -+ /* Try to use the main /dev/audio device for ioctls first. -+ * Check the available mixer channels for the audio file. -+ */ -+ if (ioctl (cw_sound_descriptor, SOUND_MIXER_READ_DEVMASK, &device_mask) != -1) -+ { -+ /* Could read device_mask, so check availabel channels */ -+ if (device_mask & SOUND_MASK_PCM) -+ /* First try PCM channel, ... */ -+ { -+ if (ioctl (cw_sound_descriptor, -+ MIXER_WRITE (SOUND_MIXER_PCM), &volume) == 0) -+ { -+ return RC_SUCCESS; -+ } -+ } -+ -+ if (device_mask & SOUND_MASK_VOLUME) -+ /* then master volume */ -+ { -+ if (ioctl (cw_sound_descriptor, -+ MIXER_WRITE (SOUND_MIXER_VOLUME), &volume) == 0) -+ { -+ return RC_SUCCESS; -+ } -+ } -+ } - -- /* Try to use the main /dev/audio device for ioctls first. */ -- if (ioctl (cw_sound_descriptor, -- MIXER_WRITE (SOUND_MIXER_PCM), &volume) == 0) -- return RC_SUCCESS; - -- /* Try the mixer PCM channel volume instead. */ - mixer = open (cw_mixer_device, O_RDWR | O_NONBLOCK); - if (mixer == -1) - { -diff -ur unixcw-2.3.orig/src/xcwcp/application.cc unixcw-2.3/src/xcwcp/application.cc ---- unixcw-2.3.orig/src/xcwcp/application.cc 2006-06-22 08:22:36.000000000 +0200 -+++ unixcw-2.3/src/xcwcp/application.cc 2010-02-09 14:12:24.000000000 +0100 -@@ -498,6 +498,9 @@ - - // Done with the CW library sender for now. - cwlib_user_application_instance = NULL; -+ -+ /* Reset to ensure that the mixer volumes gets restored */ -+ cw_complete_reset(); - - file_menu_->setItemEnabled (file_start_id_, true); - file_menu_->setItemEnabled (file_stop_id_, false); -diff -ur unixcw-2.3.orig/src/xcwcp/main.cc unixcw-2.3/src/xcwcp/main.cc ---- unixcw-2.3.orig/src/xcwcp/main.cc 2006-06-18 23:39:34.000000000 +0200 -+++ unixcw-2.3/src/xcwcp/main.cc 2010-02-09 14:06:17.000000000 +0100 -@@ -370,6 +370,9 @@ - void - signal_handler (int signal_number) - { -+ /* Reset to ensure that the mixer volumes gets restored */ -+ cw_complete_reset(); -+ - std::clog << _("Caught signal ") << signal_number - << _(", exiting...") << std::endl; - exit (EXIT_SUCCESS); diff --git a/media-radio/unixcw/files/unixcw-2.3-config.patch b/media-radio/unixcw/files/unixcw-2.3-config.patch deleted file mode 100644 index 81dce4f082c7..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-config.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- configure.ac.orig 2010-01-27 20:00:28.000000000 +0100 -+++ configure.ac 2010-01-27 20:05:41.000000000 +0100 -@@ -46,8 +46,24 @@ - AC_SUBST(GZIP) - AC_SUBST(LDCONFIG) - -+AC_MSG_CHECKING(--enable-ncurses argument) -+AC_ARG_ENABLE(ncurses, -+ [ --enable-ncurses Include curses based Morse code Tutor], -+ [enable_ncurses=$enableval], -+ [enable_ncurses="no"]) -+AC_MSG_RESULT($enable_ncurses) -+ -+AC_MSG_CHECKING(--enable-qt4 argument) -+AC_ARG_ENABLE(qt4, -+ [ --enable-qt4 Include QT based Morse code Tutor], -+ [enable_qt=$enableval], -+ [enable_qt="no"]) -+AC_MSG_RESULT($enable_qt) -+ -+if test "$enable_ncurses" = 'yes'; then - # Checks for libraries. - AC_CHECK_LIB(curses, initscr) -+fi - - # Checks for header files, and refuse to go on if no KIOCSOUND is available. - AC_HEADER_STDC -@@ -92,49 +108,40 @@ - # Decide on which subdirectories to build; substitute into SUBDIRS. Build - # cwcp if curses is available, and xcwcp if Qt is available. - SUBDIRS="cwlib cwutils cw cwgen" -+ -+if test "$enable_ncurses" = 'yes'; then - # Simple test for curses based on prior library check. - if test $ac_cv_lib_curses_initscr = 'yes' ; then - SUBDIRS="$SUBDIRS cwcp" - else - AC_MSG_WARN([Cannot find libcurses - unable to build cwcp]) - fi -+fi - --# Look for $QTDIR. If found, then look for moc, either on $PATH, or --# in $QTDIR/bin. --MOC_EARLIEST=3 --if test -n "$QTDIR" ; then -- AC_PATH_PROG(QTMOC, moc, , $QTDIR/bin:$PATH) -- if test -n "$QTMOC" ; then -- MOC_VERSION="`$QTMOC -v 2>&1 | sed -e 's;.*(Qt ;;' -e 's;).*;;'`" -- if test -n "$MOC_VERSION" ; then -- MOC_MAJOR="`echo $MOC_VERSION | sed -e 's;\..*;;'`" -- expr "$MOC_MAJOR" + 0 >/dev/null 2>/dev/null -- status=$? -- if test -n "$MOC_MAJOR" -a $status -eq 0 ; then -- if test "$MOC_MAJOR" -ge $MOC_EARLIEST ; then -- SUBDIRS="$SUBDIRS xcwcp" -- AC_SUBST(QTDIR) -- AC_SUBST(QTMOC) -- else -- AC_MSG_WARN([Found 'moc' $MOC_VERSION - unable to build xcwcp]) -- AC_MSG_WARN([Hint: xcwcp requires 'moc' version >= $MOC_EARLIEST]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QTDIR/bin on your PATH]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QTDIR/bin on your PATH]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QTDIR/bin on your PATH]) -- fi -+if test "$enable_qt4" = 'yes'; then -+ dnl Look for Qt4 libs -+ PKG_CHECK_MODULES([QT4], ["QtCore QtGui Qt3Support"], [ -+ AC_SUBST(QT4_CFLAGS) -+ AC_SUBST(QT4_LIBS) -+ ], [ -+ AC_MSG_ERROR([Qt4 libs not found]) -+ ]) -+ dnl Look for moc, either on $PATH or in $QTDIR/bin -+ AC_PATH_PROG(QTMOC, moc, , $PATH:$QTDIR/bin) -+ if test -n "$QTMOC" ; then -+ dnl if libs and moc found -+ SUBDIRS="$SUBDIRS xcwcp" -+ AC_DEFINE([WANT_QT4], 1, [Want Qt4]) -+ echo "enabling Qt4 support" -+ else -+ AC_MSG_ERROR([Cannot find 'moc']) -+ AC_DEFINE([WANT_QT4], 0, [No Qt4]) -+ fi - else -- AC_MSG_WARN([Cannot find libqt - unable to build xcwcp]) -- AC_MSG_WARN([Hint: try setting a value for the QTDIR variable]) -+ AC_DEFINE([WANT_QT4], 0, [No Qt4]) -+ echo "disabling Qt4 support" - fi -+ - AC_SUBST(SUBDIRS) - - # Add -Wall, -W, -pedantic, and other paranoia to gcc command flags, and -Wall ---- Makefile.inc.in.orig 2010-01-27 20:11:31.000000000 +0100 -+++ Makefile.inc.in 2010-01-27 20:10:28.000000000 +0100 -@@ -37,7 +37,8 @@ - AC_LD_LINKS_SO = @LD_LINKS_SO@ - AC_LD = @LD@ - AC_LN_S = @LN_S@ -- -+AC_QT4_LIBS = @QT4_LIBS@ -+AC_QT4_CFLAGS = @QT4_CFLAGS@ - # Portability values. - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/media-radio/unixcw/files/unixcw-2.3-destdir.patch b/media-radio/unixcw/files/unixcw-2.3-destdir.patch deleted file mode 100644 index 195b66505fe5..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-destdir.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.inc.in.org 2008-05-01 09:49:18.000000000 +0200 -+++ Makefile.inc.in 2008-05-01 09:49:40.000000000 +0200 -@@ -42,9 +42,10 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ --prefix = @prefix@ -+prefix = $(DESTDIR)@prefix@ - exec_prefix = @exec_prefix@ - includedir = @includedir@ - bindir = @bindir@ --mandir = @mandir@ -+mandir = $(DESTDIR)@mandir@ --libdir = @libdir@ -+libdir = $(DESTDIR)@libdir@ -+datarootdir = @datarootdir@ diff --git a/media-radio/unixcw/files/unixcw-2.3-fPIC.patch b/media-radio/unixcw/files/unixcw-2.3-fPIC.patch deleted file mode 100644 index 67e68bfec590..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-fPIC.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- configure.ac.orig 2009-09-08 22:27:33.000000000 +0200 -+++ configure.ac 2009-09-08 22:28:14.000000000 +0200 -@@ -212,7 +212,7 @@ - cat >conftest.c <<-EOF - int so_test() { return 0; } - EOF -- $CC -c conftest.c >/dev/null 2>/dev/null -+ $CC $CFLAG_PIC -c conftest.c >/dev/null 2>/dev/null - $CC -shared -o conftest.so conftest.o >/dev/null 2>/dev/null - rm -f conftest.c conftest.o - if test -f conftest.so ; then -@@ -239,7 +239,7 @@ - cat >conftest.c <<-EOF - int so_test() { return 0; } - EOF -- $CC -c conftest.c >/dev/null 2>/dev/null -+ $CC $CFLAG_PIC -c conftest.c >/dev/null 2>/dev/null - $LD -G -o conftest.so conftest.o >/dev/null 2>/dev/null - rm -f conftest.c conftest.o - if test -f conftest.so ; then ---- src/cwlib/Makefile.orig 2009-09-08 22:53:31.000000000 +0200 -+++ src/cwlib/Makefile 2009-09-08 22:59:31.000000000 +0200 -@@ -19,7 +19,8 @@ - - include ../../Makefile.inc - CC = $(AC_CC) --CFLAGS = $(AC_CFLAGS) $(AC_CFLAG_PIC) $(AC_DEFS) -+CFLAGS = $(AC_CFLAGS) $(AC_DEFS) -+CFLAGS_SL = $(AC_CFLAGS) $(AC_CFLAG_PIC) $(AC_DEFS) - AWK = $(AC_AWK) - RANLIB = $(AC_RANLIB) - LD = $(AC_LD) -@@ -40,14 +41,14 @@ - rm -f libcw.a; ar -cr libcw.a cwlib.o - $(RANLIB) libcw.a - --libcw.so.0.0.0: cwlib.o -+libcw.so.0.0.0: cwlib_sl.o - if [ "$(CC_LINKS_SO)" = "yes" ]; then \ - $(CC) $(LDFLAGS) -shared -Wl,-soname,libcw.so.0 \ -- -o libcw.so.0.0.0 cwlib.o -lm; \ -+ -o libcw.so.0.0.0 cwlib_sl.o -lm; \ - else \ - if [ "$(LD_LINKS_SO)" = "yes" ]; then \ - $(LD) $(LDFLAGS) -G -Wl,-soname,libcw.so.0 \ -- -o libcw.so.0.0.0 cwlib.o -lm; \ -+ -o libcw.so.0.0.0 cwlib_sl.o -lm; \ - fi \ - fi - -@@ -78,6 +79,9 @@ - # Define dependencies related to header/include files. - cwlib.o: Makefile cwlib.h - -+cwlib_sl.o: Makefile cwlib.h -+ $(CC) $(CFLAGS_SL) -c -o cwlib_sl.o cwlib.c -+ - cwlibtest.o: Makefile cwlib.h - - # Install targets. diff --git a/media-radio/unixcw/files/unixcw-2.3-gcc43.patch b/media-radio/unixcw/files/unixcw-2.3-gcc43.patch deleted file mode 100644 index 85c31e08f4e9..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-gcc43.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -u src/xcwcp.orig/receiver.cc src/xcwcp/receiver.cc ---- src/xcwcp.orig/receiver.cc 2010-08-30 19:35:45.000000000 +0200 -+++ src/xcwcp/receiver.cc 2010-08-30 19:36:05.000000000 +0200 -@@ -19,6 +19,7 @@ - - #include "../config.h" - -+#include <cstdio> - #include <cstdlib> - #include <cerrno> - #include <string> -diff -u src/xcwcp.orig/sender.cc src/xcwcp/sender.cc ---- src/xcwcp.orig/sender.cc 2010-08-30 19:35:45.000000000 +0200 -+++ src/xcwcp/sender.cc 2010-08-30 19:36:22.000000000 +0200 -@@ -19,6 +19,7 @@ - - #include "../config.h" - -+#include <cstdio> - #include <cstdlib> - #include <string> - #include <deque> diff --git a/media-radio/unixcw/files/unixcw-2.3-ldflags.patch b/media-radio/unixcw/files/unixcw-2.3-ldflags.patch deleted file mode 100644 index bbd1c7402dbb..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-ldflags.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -u -r src.orig/cw/Makefile src/cw/Makefile ---- src.orig/cw/Makefile 2009-07-21 15:08:34.000000000 +0200 -+++ src/cw/Makefile 2009-07-21 15:09:16.000000000 +0200 -@@ -34,7 +34,7 @@ - cw.o: cw.c ../cwlib/cwlib.h - - cw: cw.o -- $(CC) -o $@ cw.o ../cwutils/i18n.o ../cwutils/cmdline.o \ -+ $(CC) $(LDFLAGS) -o $@ cw.o ../cwutils/i18n.o ../cwutils/cmdline.o \ - ../cwutils/memory.o $(LIBS) -lm - - # Install targets. -diff -u -r src.orig/cwgen/Makefile src/cwgen/Makefile ---- src.orig/cwgen/Makefile 2009-07-21 15:08:34.000000000 +0200 -+++ src/cwgen/Makefile 2009-07-21 15:09:34.000000000 +0200 -@@ -32,7 +32,7 @@ - cwgen.o: cwgen.c - - cwgen: cwgen.o -- $(CC) -o $@ cwgen.o ../cwutils/i18n.o ../cwutils/cmdline.o \ -+ $(CC) $(LDFLAGS) -o $@ cwgen.o ../cwutils/i18n.o ../cwutils/cmdline.o \ - ../cwutils/memory.o - - # Install targets. -diff -u -r src.orig/cwlib/Makefile src/cwlib/Makefile ---- src.orig/cwlib/Makefile 2009-07-21 15:14:58.000000000 +0200 -+++ src/cwlib/Makefile 2009-07-21 15:15:25.000000000 +0200 -@@ -42,11 +42,11 @@ - - libcw.so.0.0.0: cwlib.o - if [ "$(CC_LINKS_SO)" = "yes" ]; then \ -- $(CC) -shared -Wl,-soname,libcw.so.0 \ -+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libcw.so.0 \ - -o libcw.so.0.0.0 cwlib.o -lm; \ - else \ - if [ "$(LD_LINKS_SO)" = "yes" ]; then \ -- $(LD) -G -Wl,-soname,libcw.so.0 \ -+ $(LD) $(LDFLAGS) -G -Wl,-soname,libcw.so.0 \ - -o libcw.so.0.0.0 cwlib.o -lm; \ - fi \ - fi diff --git a/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch b/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch deleted file mode 100644 index 555c85406d58..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- Makefile.orig 2009-07-20 19:35:23.000000000 +0200 -+++ Makefile 2009-07-20 19:35:31.000000000 +0200 -@@ -35,11 +35,11 @@ - - # Targets that do nothing other than descend. - all install install-strip uninstall clean TAGS info dvi check: -- $(DESCEND) -+ +$(DESCEND) - - # Targets that do just a little more than this. - distclean mostlyclean: -- $(DESCEND) -+ +$(DESCEND) - rm -f $(DIST).tar $(DIST).tar.gz $(DIST).tgz - rm -f Makefile.inc src/config.h src/config.h.in~ - rm -f config.status config.cache config.log ---- src/Makefile.orig 2009-07-20 19:34:45.000000000 +0200 -+++ src/Makefile 2009-07-20 19:34:56.000000000 +0200 -@@ -33,7 +33,7 @@ - - # All targets do nothing other than descend. - all install install-strip uninstall clean TAGS info dvi check: -- $(DESCEND) -+ +$(DESCEND) - - distclean mostlyclean maintainer-clean: -- $(DESCEND) -+ +$(DESCEND) ---- src/cwlib/Makefile.orig 2009-09-08 14:07:37.000000000 +0200 -+++ src/cwlib/Makefile 2009-09-08 14:10:05.000000000 +0200 -@@ -65,7 +65,7 @@ - rm -f signatures functions - - # Build the unit test. --cwlibtest: cwlibtest.o -+cwlibtest: cwlibtest.o libcw.a libcw.so.0.0.0 - $(CC) -o cwlibtest cwlibtest.o -L. -lcw -lm - - # Build the pkgconfig metadata file. diff --git a/media-radio/unixcw/files/unixcw-3.0.2-config.patch b/media-radio/unixcw/files/unixcw-3.0.2-config.patch deleted file mode 100644 index 403b3d351299..000000000000 --- a/media-radio/unixcw/files/unixcw-3.0.2-config.patch +++ /dev/null @@ -1,183 +0,0 @@ ---- configure.ac.orig 2012-06-21 07:34:18.000000000 +0200 -+++ configure.ac 2012-06-21 07:34:42.000000000 +0200 -@@ -45,8 +45,24 @@ - AC_SUBST(GZIP) - AC_SUBST(LDCONFIG) - -+AC_MSG_CHECKING(--enable-ncurses argument) -+AC_ARG_ENABLE(ncurses, -+ [ --enable-ncurses Include curses based Morse code Tutor], -+ [enable_ncurses=$enableval], -+ [enable_ncurses="no"]) -+AC_MSG_RESULT($enable_ncurses) -+ -+AC_MSG_CHECKING(--enable-qt4 argument) -+AC_ARG_ENABLE(qt4, -+ [ --enable-qt4 Include QT based Morse code Tutor], -+ [enable_qt=$enableval], -+ [enable_qt="no"]) -+AC_MSG_RESULT($enable_qt) -+ -+if test "$enable_ncurses" = 'yes'; then - # Checks for libraries. - AC_CHECK_LIB(curses, initscr) -+fi - AC_CHECK_LIB(asound, snd_pcm_open) - AC_CHECK_LIB(pthread, pthread_create) - AC_CHECK_LIB(m, floor) -@@ -102,121 +118,40 @@ - # Decide on which subdirectories to build; substitute into SUBDIRS. Build - # cwcp if curses is available, and xcwcp if Qt is available. - SUBDIRS="libcw cwutils cw cwgen" -+ -+if test "$enable_ncurses" = 'yes'; then - # Simple test for curses based on prior library check. - if test $ac_cv_lib_curses_initscr = 'yes' ; then - SUBDIRS="$SUBDIRS cwcp" - else - AC_MSG_WARN([Cannot find libcurses - unable to build cwcp]) - fi -+fi - -- -- -- --# autodetection of QT4 dependencies -- --MOC_MAJOR_EARLIEST=4 -- --# possible locations of Qt4 headers --QT4HEADER_DIRS="/usr/include/qt4 \ # Debian -- /usr/include" # Arch (?) -- --# possible locations of Qt4 moc (a.k.a. moc-qt4) --QT4BIN_DIRS=$PATH # pretty standard -- --# QT4DIR="" # for testing purposes --QT4INC="" # full path to directory with QT4 QtCore + QtGui subdirs and include files, e.g. /usr/include/qt4/ --QT4MOC="" # full path to QT4 moc executable -- --if [[[ $QT4DIR = "" ]]] ; then -- -- # look for QT4 include directories -- for dir in $QT4HEADER_DIRS; do -- if test -d "$dir/QtGui" && test -d "$dir/QtCore" ; then -- QT4INC=$dir; -- fi -- done -- -- # look for QT4 moc binary -- AC_PATH_PROG(QT4MOC, moc-qt4, , $PATH) -- if test -n "$QT4MOC" ; then -- MOC_MAJOR="`$QT4MOC -v 2>&1 | sed -e 's;.\+ (Qt \([[0-9]]\).\+;\1;g'`" -- if [[[ $MOC_MAJOR != $MOC_MAJOR_EARLIEST ]]] ; then -- QT4MOC="" -- fi -- fi -- -- if [[[ "$QT4MOC" = "" ]]] ; then -- QT4MOC_2="" -- AC_PATH_PROG(QT4MOC_2, moc, , $PATH) -- if test -n "$QT4MOC_2" ; then -- MOC_MAJOR="`$QT4MOC_2 -v 2>&1 | sed -e 's;.\+ (Qt \([[0-9]]\).\+;\1;g'`" -- if [[[ $MOC_MAJOR = $MOC_MAJOR_EARLIEST ]]] ; then -- QT4MOC=$QT4MOC_2 -- fi -- fi -- fi -- -- -- if [[[ $QT4INC != "" && $QT4MOC != "" ]]] ; then -- -- # we have moc4 and path to QT4 include files, -- # so we can build xcwcp -- SUBDIRS="$SUBDIRS xcwcp" -- -- AC_SUBST(QT4INC) -- AC_SUBST(QT4MOC) -- else -- if [[[ $QT4INC = "" ]]] ; then -- AC_MSG_WARN([Can't find directory with QT4 header files - unable to build xcwcp]) -- fi -- -- if [[[ $QT4MOC = "" ]]] ; then -- AC_MSG_WARN([Can't find QT moc version == $MOC_MAJOR_EARLIEST - unable to build xcwcp]) -+if test "$enable_qt4" = 'yes'; then -+ dnl Look for Qt4 libs -+ PKG_CHECK_MODULES([QT4], ["QtCore QtGui Qt3Support"], [ -+ AC_SUBST(QT4INC,$QT4_CFLAGS) -+ AC_SUBST(QT4LIBS) -+ ], [ -+ AC_MSG_ERROR([Qt4 libs not found]) -+ ]) -+ dnl Look for moc, either on $PATH or in $QTDIR/bin -+ AC_PATH_PROG(QT4MOC, moc, , $PATH:$QTDIR/bin) -+ if test -n "$QT4MOC" ; then -+ dnl if libs and moc found -+ SUBDIRS="$SUBDIRS xcwcp" -+ AC_DEFINE([WANT_QT4], 1, [Want Qt4]) -+ echo "enabling Qt4 support" -+ else -+ AC_MSG_ERROR([Cannot find 'moc']) -+ AC_DEFINE([WANT_QT4], 0, [No Qt4]) - fi -- -- AC_MSG_WARN([Hint: try setting QT4DIR env variable per instructions in unixcw/INSTALLATION]) -- -- QT4INC="" -- QT4MOC="" -- fi -- -- - else -- -- --# Look for $QT4DIR. If found, then look for moc, either on $PATH, or --# in $QT4DIR/bin. -- -- AC_PATH_PROG(QT4MOC, moc, , $QT4DIR/bin:$PATH) -- if test -n "$QT4MOC" ; then -- MOC_VERSION="`$QT4MOC -v 2>&1 | sed -e 's;.*(Qt ;;' -e 's;).*;;'`" -- if test -n "$MOC_VERSION" ; then -- MOC_MAJOR="`echo $MOC_VERSION | sed -e 's;\..*;;'`" -- expr "$MOC_MAJOR" + 0 >/dev/null 2>/dev/null -- status=$? -- if test -n "$MOC_MAJOR" -a $status -eq 0 ; then -- if test "$MOC_MAJOR" -ge $MOC_MAJOR_EARLIEST ; then -- SUBDIRS="$SUBDIRS xcwcp" -- QT4INC="$QT4DIR/include" -- AC_SUBST(QT4INC) -- AC_SUBST(QT4MOC) -- else -- AC_MSG_WARN([Found 'moc' $MOC_VERSION - unable to build xcwcp]) -- AC_MSG_WARN([Hint: xcwcp requires 'moc' version >= $MOC_MAJOR_EARLIEST]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QT4DIR/bin on your PATH]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QT4DIR/bin on your PATH]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QT4DIR/bin on your PATH]) -- fi -+ AC_DEFINE([WANT_QT4], 0, [No Qt4]) -+ echo "disabling Qt4 support" - fi -+ - AC_SUBST(SUBDIRS) - - if [[[ $QT4INC != "" && $QT4MOC != "" ]]] ; then ---- Makefile.inc.in.orig 2012-06-21 07:59:31.000000000 +0200 -+++ Makefile.inc.in 2012-06-21 08:00:01.000000000 +0200 -@@ -31,6 +31,7 @@ - # AC_QTMOC = @QTMOC@ - AC_QT4INC = @QT4INC@ - AC_QT4MOC = @QT4MOC@ -+AC_QT4LIBS = @QT4_LIBS@ - AC_CFLAG_PIC = @CFLAG_PIC@ - AC_SUBDIRS = @SUBDIRS@ - AC_CC_LINKS_SO = @CC_LINKS_SO@ diff --git a/media-radio/unixcw/files/unixcw-3.0.2-destdir.patch b/media-radio/unixcw/files/unixcw-3.0.2-destdir.patch deleted file mode 100644 index b7c9971af992..000000000000 --- a/media-radio/unixcw/files/unixcw-3.0.2-destdir.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.inc.in.orig 2012-06-20 09:08:48.000000000 +0200 -+++ Makefile.inc.in 2012-06-20 09:10:23.000000000 +0200 -@@ -42,12 +42,12 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ --prefix = @prefix@ -+prefix = $(DESTDIR)@prefix@ - exec_prefix = @exec_prefix@ - includedir = @includedir@ - bindir = @bindir@ --mandir = @mandir@ --libdir = @libdir@ -+mandir = $(DESTDIR)@mandir@ -+libdir = $(DESTDIR)@libdir@ - - # http://www.gnu.org/s/hello/manual/autoconf/Changed-Directory-Variables.html - datarootdir = @datarootdir@ diff --git a/media-radio/unixcw/files/unixcw-3.0.2-parallel-make.patch b/media-radio/unixcw/files/unixcw-3.0.2-parallel-make.patch deleted file mode 100644 index d59798aecbca..000000000000 --- a/media-radio/unixcw/files/unixcw-3.0.2-parallel-make.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- Makefile.orig 2012-06-20 09:32:17.000000000 +0200 -+++ Makefile 2012-06-20 09:32:32.000000000 +0200 -@@ -34,15 +34,15 @@ - - # Targets that do nothing other than descend. - all install install-strip uninstall TAGS info dvi check: -- $(DESCEND) -+ +$(DESCEND) - - clean: -- $(DESCEND) -+ +$(DESCEND) - rm -f Makefile.inc - - # Targets that do just a little more than this. - distclean mostlyclean: -- $(DESCEND) -+ +$(DESCEND) - rm -f $(DIST).tar $(DIST).tar.gz $(DIST).tgz - rm -f Makefile.inc src/config.h src/config.h.in~ - rm -f config.status config.cache config.log ---- src/Makefile.orig 2012-06-20 09:32:49.000000000 +0200 -+++ src/Makefile 2012-06-20 09:33:17.000000000 +0200 -@@ -31,7 +31,7 @@ - - # All targets do nothing other than descend. - all install install-strip uninstall clean TAGS info dvi check: -- $(DESCEND) -+ +$(DESCEND) - - distclean mostlyclean maintainer-clean: -- $(DESCEND) -+ +$(DESCEND) ---- src/libcw/Makefile.orig 2012-06-20 09:33:30.000000000 +0200 -+++ src/libcw/Makefile 2012-06-20 09:34:24.000000000 +0200 -@@ -62,11 +62,11 @@ - libcw.3: libcw.3.m4 libcw.c - $(AWK) -f libdoc.awk <libcw.c | $(AWK) -f libsigs.awk >signatures - $(AWK) -f libdoc.awk <libcw.c | $(AWK) -f libfuncs.awk >functions -- $(AWK) -f include.awk <libcw.3.m4 >libcw.3 -+ $(AWK) -f include.awk <libcw.3.m4 >libcw.3 - rm -f signatures functions - - # Build the unit test. --libcwtest: libcwtest.o -+libcwtest: libcwtest.o libcw.a libcw.so.3.0.1 - $(CC) -o libcwtest libcwtest.o -L. -lcw - - # Build the pkgconfig metadata file. diff --git a/media-radio/unixcw/files/unixcw-3.0.2-qt4.patch b/media-radio/unixcw/files/unixcw-3.0.2-qt4.patch deleted file mode 100644 index e54bd54f0674..000000000000 --- a/media-radio/unixcw/files/unixcw-3.0.2-qt4.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/xcwcp/Makefile.orig 2012-06-21 07:49:59.000000000 +0200 -+++ src/xcwcp/Makefile 2012-06-21 07:56:51.000000000 +0200 -@@ -18,7 +18,7 @@ - - include ../../Makefile.inc - CXX = $(AC_CXX) --CXXFLAGS= $(AC_CXXFLAGS) $(AC_DEFS) -I../libcw -I../cwutils -I$(AC_QT4INC) -I$(AC_QT4INC)/QtCore -I$(AC_QT4INC)/QtGui -+CXXFLAGS= $(AC_CXXFLAGS) $(AC_DEFS) -I../libcw -I../cwutils -I$(AC_QT4INC) - GZIP = $(AC_GZIP) - - SHELL = /bin/sh -@@ -28,7 +28,7 @@ - moc_application.o - - # Link to the shared libcw. --LIBS = -L../libcw -lcw -lQtGui -lQtCore -+LIBS = $(AC_QT4LIBS) -L../libcw -lcw -lQtGui -lQtCore - - default: all - diff --git a/media-radio/unixcw/files/unixcw-3.1.1-config.patch b/media-radio/unixcw/files/unixcw-3.1.1-config.patch deleted file mode 100644 index 4e81e3ac75cd..000000000000 --- a/media-radio/unixcw/files/unixcw-3.1.1-config.patch +++ /dev/null @@ -1,103 +0,0 @@ -# Fix wrong conditional logic ---- configure.ac.orig 2012-08-05 18:19:57.000000000 +0200 -+++ configure.ac 2012-08-06 17:20:50.000000000 +0200 -@@ -101,11 +101,11 @@ - - # disable_alsa - 'no' by default - AC_ARG_ENABLE(alsa, -- AS_HELP_STRING([--disable-alsa], [disable support for ALSA audio output]), -- [disable_alsa=yes], -- [disable_alsa=no]) -+ AS_HELP_STRING([--enable-alsa], [enable support for ALSA audio output]), -+ [enable_alsa=$enableval], -+ [enable_alsa=yes]) - AC_MSG_CHECKING([whether to include ALSA audio support]) --if test "$disable_alsa" = "no" ; then -+if test "$enable_alsa" = "yes" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -@@ -114,11 +114,11 @@ - - # disable_pulseaudio - 'no' by default - AC_ARG_ENABLE(pulseaudio, -- AS_HELP_STRING([--disable-pulseaudio], [disable support for PulseAudio audio output]), -- [disable_pulseaudio=yes], -- [disable_pulseaudio=no]) -+ AS_HELP_STRING([--enable-pulseaudio], [enable support for PulseAudio audio output]), -+ [enable_pulseaudio=$enableval], -+ [enable_pulseaudio=yes]) - AC_MSG_CHECKING([whether to include PulseAudio audio support]) --if test "$disable_pulseaudio" = "no" ; then -+if test "$enable_pulseaudio" = "yes" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -@@ -127,11 +127,11 @@ - - # disable_cwcp - 'no' by default - AC_ARG_ENABLE(cwcp, -- AS_HELP_STRING([--disable-cwcp], [do not build cwcp (application with curses user interface)]), -- [disable_cwcp=yes], -- [disable_cwcp=no]) -+ AS_HELP_STRING([--enable-cwcp], [build cwcp (application with curses user interface)]), -+ [enable_cwcp=$enableval], -+ [enable_cwcp=yes]) - AC_MSG_CHECKING([whether to build cwcp]) --if test "$disable_cwcp" = "no" ; then -+if test "$enable_cwcp" = "yes" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -@@ -140,11 +140,11 @@ - - # disable_xcwcp - 'no' by default - AC_ARG_ENABLE(xcwcp, -- AS_HELP_STRING([--disable-xcwcp], [do not build xcwcp (application with Qt4 user interface)]), -- [disable_xcwcp=yes], -- [disable_xcwcp=no]) -+ AS_HELP_STRING([--enable-xcwcp], [build xcwcp (application with Qt4 user interface)]), -+ [disable_xcwcp=$enableval], -+ [disable_xcwcp=yes]) - AC_MSG_CHECKING([whether to build xcwcp]) --if test "$disable_xcwcp" = "no" ; then -+if test "$disable_xcwcp" = "yes" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -@@ -219,7 +219,7 @@ - - - --if test "$disable_alsa" = "yes" ; then -+if test "$enable_alsa" = "no" ; then - WITH_ALSA='no' - else - AC_CHECK_LIB(asound, snd_pcm_open) -@@ -246,7 +246,7 @@ - - - --if test "$disable_pulseaudio" = "yes" ; then -+if test "$enable_pulseaudio" = "no" ; then - WITH_PULSEAUDIO='no' - else - AC_CHECK_LIB(pulse-simple, pa_simple_new) -@@ -265,7 +265,7 @@ - - - --if test "$disable_cwcp" = "yes" ; then -+if test "$enable_cwcp" = "no" ; then - WITH_CWCP='no' - else - AC_CHECK_LIB(curses, initscr) -@@ -279,7 +279,7 @@ - - - --if test "$disable_xcwcp" = "yes" ; then -+if test "$enable_xcwcp" = "no" ; then - WITH_XCWCP='no' - else - # autodetection of Qt4 dependencies diff --git a/media-radio/unixcw/files/unixcw-3.2.0-console.patch b/media-radio/unixcw/files/unixcw-3.2.0-console.patch deleted file mode 100644 index 723e39223709..000000000000 --- a/media-radio/unixcw/files/unixcw-3.2.0-console.patch +++ /dev/null @@ -1,17 +0,0 @@ -# add missing headeers ---- src/libcw/libcw_console.c.orig 2013-02-09 17:20:01.000000000 +0000 -+++ src/libcw/libcw_console.c 2013-02-09 17:24:10.000000000 +0000 -@@ -29,6 +29,13 @@ - #include <sys/ioctl.h> - #include <stdio.h> - #include <stdbool.h> -+#include <string.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> -+#include <errno.h> -+#include <assert.h> -+#include <unistd.h> - - - #if defined(HAVE_SYS_KD_H) diff --git a/media-radio/unixcw/files/unixcw-3.2.0-pulseaudio.patch b/media-radio/unixcw/files/unixcw-3.2.0-pulseaudio.patch deleted file mode 100644 index a0dffd67de34..000000000000 --- a/media-radio/unixcw/files/unixcw-3.2.0-pulseaudio.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/libcw/libcw_pa.c.orig 2013-01-03 22:09:38.000000000 +0000 -+++ src/libcw/libcw_pa.c 2013-02-10 14:29:51.000000000 +0000 -@@ -30,7 +30,8 @@ - #include <stdlib.h> - #include <stdbool.h> - #include <dlfcn.h> /* dlopen() and related symbols */ -- -+#include <string.h> -+#include <assert.h> - - #include "libcw.h" - #include "libcw_pa.h" diff --git a/media-radio/unixcw/unixcw-3.3.1.ebuild b/media-radio/unixcw/unixcw-3.3.1.ebuild deleted file mode 100644 index 75a85f6e7018..000000000000 --- a/media-radio/unixcw/unixcw-3.3.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/unixcw/unixcw-3.3.1.ebuild,v 1.6 2014/11/02 09:07:59 ago Exp $ - -EAPI=4 - -inherit autotools eutils flag-o-matic multilib - -DESCRIPTION="A package of programs that fit together to form a morse code tutor program" -HOMEPAGE="http://unixcw.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ppc x86" -IUSE="alsa ncurses pulseaudio suid qt4" - -RDEPEND="ncurses? ( sys-libs/ncurses ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - alsa? ( media-libs/alsa-lib ) - pulseaudio? ( media-sound/pulseaudio )" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/libtool - !<=app-misc/cw-1.0.16-r1" - -src_prepare() { - append-cflags -std=gnu99 - # add path to qt4 libs - sed -i -e "s#LDADD = -L#LDADD = -L/usr/$(get_libdir)/qt4 -L#g" \ - src/xcwcp/Makefile.am - eautoreconf -} - -src_configure() { - econf --libdir=/usr/$(get_libdir) \ - $(use_enable pulseaudio ) \ - $(use_enable alsa ) \ - $(use_enable ncurses cwcp ) \ - $(use_enable qt4 xcwcp ) -} - -src_install() { - emake DESTDIR="${D}" install - prune_libtool_files - dodoc ChangeLog NEWS README - if ! use suid ; then - fperms 711 /usr/bin/cw - if use ncurses ; then - fperms 711 /usr/bin/cwcp - fi - if use qt4 ; then - fperms 711 /usr/bin/xcwcp - fi - fi -} - -pkg_postinst() { - if use suid ; then - ewarn "You have choosen to install 'cw', 'cwcp' and 'xcwcp' setuid" - ewarn "by setting USE=suid." - ewarn "Be aware that this is a security risk and not recommended." - ewarn "" - ewarn "These files do only need root access if you want to use the" - ewarn "PC speaker for morse sidetone output. You can alternativly" - ewarn "drop USE=suid and use sudo." - else - elog "Be aware that 'cw', 'cwcp' and 'xcwcp' needs root access if" - elog "you want to use the PC speaker for morse sidetone output." - elog "You can call the programs via sudo for that (see 'man sudo')." - fi -} |