From 8f3194ec1244dc46216d7dd196382f67f69bb7e0 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Sat, 21 Feb 2015 22:55:43 +0000 Subject: [PATCH] =?utf8?q?Version=20bump,=20adds=20image=20writing=20(bug?= =?utf8?q?=20#518590,=20thanks=20to=20Rafa=C5=82=20Mu=C5=BCy=C5=82o).=20Ad?= =?utf8?q?d=20REQUIRED=5FUSE=20(bug=20#521834,=20thanks=20to=20Karl=20Lind?= =?utf8?q?=C3=A9n).=20Drop=20old.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D --- app-cdr/cdemu/ChangeLog | 12 +++++- app-cdr/cdemu/Manifest | 39 ++++++++++--------- app-cdr/cdemu/cdemu-2.1.1.ebuild | 5 ++- ...emu-2.1.0-r2.ebuild => cdemu-3.0.0.ebuild} | 32 ++++++++------- .../cdemu-3.0.0-bash-completion-dir.patch | 14 +++++++ 5 files changed, 67 insertions(+), 35 deletions(-) rename app-cdr/cdemu/{cdemu-2.1.0-r2.ebuild => cdemu-3.0.0.ebuild} (59%) create mode 100644 app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch diff --git a/app-cdr/cdemu/ChangeLog b/app-cdr/cdemu/ChangeLog index 85fac7d6c07d..5ea1360d3564 100644 --- a/app-cdr/cdemu/ChangeLog +++ b/app-cdr/cdemu/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-cdr/cdemu -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.48 2014/01/26 11:38:06 ago Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.49 2015/02/21 22:55:37 tetromino Exp $ + +*cdemu-3.0.0 (21 Feb 2015) + + 21 Feb 2015; Alexandre Rostovtsev + -cdemu-2.1.0-r2.ebuild, cdemu-2.1.1.ebuild, +cdemu-3.0.0.ebuild, + +files/cdemu-3.0.0-bash-completion-dir.patch: + Version bump, adds image writing (bug #518590, thanks to Rafał Mużyło). + Add REQUIRED_USE (bug #521834, thanks to Karl Lindén). Drop old. 26 Jan 2014; Agostino Sarubbo cdemu-2.1.1.ebuild: Stable for x86, wrt bug #494802 diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest index ea0539bd985f..00ba128c18da 100644 --- a/app-cdr/cdemu/Manifest +++ b/app-cdr/cdemu/Manifest @@ -2,26 +2,29 @@ Hash: SHA256 AUX cdemu-2.1.0-bash-completion-dir.patch 467 SHA256 992d3c5abf786c7385235424dc82dc46b3b29f25a5c0319bf30eaad0fff7d0de SHA512 3d363b34749c60dddbcd8bf3b861ca91650915cc79df194c1a00dfe309b53b2a73a62d25545d1b57b0d8d62137fb09006e03b6e5f3784fd6c925de99f7b8b9fc WHIRLPOOL e18cb21f05b243fbb5717ea7e7e4cde37a52359b5e9d45be1b0060df9fd653b7733665706b9fc030819a373b4f80dec7ceefa461766a1045b2cc4ba12d497156 -DIST cdemu-client-2.1.0.tar.bz2 28173 SHA256 9bd0448368b5e51eb2acfe420f612f67e3b3d4aae4aa80fa36ce130fa0a10c9f SHA512 bc02e3fb6df10702ee9e710ad8a881c92b5462015d19152fe784778a9106a4c2ef03d0e2a23850a742cdf3242e1f81350ce8cdf89671681104dd4cfa85a48d3a WHIRLPOOL 0da8a25919144cd57696934fce0c42618f3d04bff315e7e55f319785e72a27fea954ebf05a7e7120919b9741f1b65a2193663bcef29982acf6b04c4a2e10f37d +AUX cdemu-3.0.0-bash-completion-dir.patch 387 SHA256 61491ca6dfc4e2f63414174d4d0035c3da0edc25472c943e6296e270b2e0ab3e SHA512 5348f57ee7ad19a2df7d7cc67642ca9144f5c6a0bb8604d4ed565463e539d5e2560cf794da8e3f1f1d67a3165244737e866d8c1f7f7e8adb758ab09dbfbc1b1f WHIRLPOOL b45e71f8c5354c130ae13c26c5754ced33fb423e5101fa72be9315c53073ac76745263ef2b4280860ffa3859ccc6619d17e02654937e34d442934422a427bb89 DIST cdemu-client-2.1.1.tar.bz2 28474 SHA256 204e626994f61d36423f3b732e180e3b3b20624effdfe91aabffd439c76d3964 SHA512 d764000fadc66b639dd8f20d9bb8fbe3b91d3e20bd207d30a734dc1a9a7fae746e8aad317a3d78cd35b69d0a8acbf8e389598786cadabec6e512640ba5b21be5 WHIRLPOOL 93cb01c3bc16ee69e3fd9ce9080838f4eebc874afe8d6be71c22e44919909144980dd44595a0dbf6fe1add3574061bcd6f523b72644eb52774d974f226c100b9 -EBUILD cdemu-2.1.0-r2.ebuild 1455 SHA256 2b0ab524bf6aca8d4adcc5250e81e9731a1a8882a311326b2a624427324a5cfd SHA512 e5f95b4c5172c36b4c832c9feea9695507a9c0cba3df628cd1914ca5f0dcee10ce197c53d4d20b36b5e1e2f9aa7c9d16f022bdf2fec1950c9503e2bbeaff3928 WHIRLPOOL cb5d560daff9f722dd956d2c7e0b4955d91c246081ae51adecda92fa2c1e95f3d0c819977f557eaf21e1ee58f4813b73cf10ad7d1da68754bb385ba6638ec94b -EBUILD cdemu-2.1.1.ebuild 1452 SHA256 9be54d826083fdc001f015e827815fa969ed92a90a1e02aa995b51d785fc61b8 SHA512 c3000af6ab2b868234f081b19f3f633df9947ecfa590c4d2bc583398b748f783195c977c2648c8c962af31c1ef1fa892a2b5de29be5858bbb9ed456065b24d6a WHIRLPOOL 39b7c8b033c4eb8770f5e27e11746f9ecd97e986055e2e3a7a619916c6f11642aa5b40fd672fd9b0fc8e284c958a42c2a68028718c0fd41b4de6a8118cd1b593 -MISC ChangeLog 7661 SHA256 08d697ac6a728ef8a5e1af5242faeb741e70a75064ff1f15f3fc282cd6d28398 SHA512 2fe22e986ce1f508c56beb580e6dd8b89592b7d42678859ff1238214feeb8e787d73d0ecd935e6b6bc7ae520b7abe8f52761edf66fda739d3b58ef3903206cbd WHIRLPOOL dbbc1be4c9136e21541b398fb72424d961ce5a328246889dd6171c3cedf61dc68fe93b86bf252d034fe525c6c2c1cdc26e00b8d47375a5cac75fe83097dbc546 +DIST cdemu-client-3.0.0.tar.bz2 40300 SHA256 359310a57422d5c59c8f93be0da827a2437edb1e62f455f5614089c28e34ae88 SHA512 807fe98dc8743a227484d20587c9f9e06cac649d74d8fdd520dba9bb2a2f268ba977c922333fdcf91201baf4f08595044939f6d5bd4834ec26cf689b6a36f361 WHIRLPOOL bd7d5b0ebe75aad5629f8cdf9f1de04fbdf7ad37400163d69e1eb9bfe35a47bc2bca5b58a031bb022611689d7c7c480fcc98403f883643ccc3cc2049f98fb814 +EBUILD cdemu-2.1.1.ebuild 1496 SHA256 d5a46b1c5f3b45c7b997f457e2cd160295822ab6a4cbb947663bb587f9e99527 SHA512 6482af18eb2f42234a801f82999fb47f9c17e76367eb7faa225964d15ddc38588466a79528fa7629eaf9a0d9f54579984b03648931298740670984dd32bfd009 WHIRLPOOL 43a8741c9c3b46f093f5ab1e1f12415d1640eabd671736b92272ab0f3a42c260a64d8c038cbdf56cd9b5d9042b8fb72149ddcc18db1b433f882316e019efdbda +EBUILD cdemu-3.0.0.ebuild 1683 SHA256 7de464901ed7f5c759094403f3e4d6ef63eeb4c3704dd9e74b6efa13e450b352 SHA512 e1e7b9d7889e71cb731e3d96e210a0e8df5689536a34d1c3a7117a6c5b0ccbade66e674166d28f265ce3b3cab72cec22d7959af50bc16aa6791d78c98eb61d37 WHIRLPOOL 0f54422af34bb986c243521e14c43fa8ab98e8200084afb7a66d4a53d563241654be294deee4ea68a53f09f8a878265f1cf462d91b47e62d535de7793f90069c +MISC ChangeLog 8015 SHA256 98aa1df22e4e20511bba97293654299d96d576fe282a86d9de923484899620ac SHA512 6c70faddd187cb93e79d2163ed6988df2ded7ade31636c6cca310bb2aff0c74cfad211d002babff8a03e31b926f7689e86847b240bd4c41788a68e97646364df WHIRLPOOL 630ea070ccf60e44c9a929a6f553abb33cb7b16f9594cb8bf0c7b6c6e75835a868b987837d9c7628ca84384784591bd2cc630cf06ec734c01dcc674b39275788 MISC metadata.xml 431 SHA256 48171f5b68cda683ad7bad2680218da9430ed068dbe441d86d5639dd9c9c3c07 SHA512 c62007c25bd76a0a5673e29e1c391d48c6d6f83e84a6fa30fc6bc7fac2d1924139fbd463f0025779bec87d0359cd28dcdb4d6df2778d5f0035b7811845da2900 WHIRLPOOL d86cb4f30b390600d7eae7c82783961a1e22d33d9459a99a7afe5eb49c42797b30a19b9a054f7f0b7cb415f427c6973b73fcfbc5e571af84d07aa06e8234fe82 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2.0 -iQIcBAEBCAAGBQJS5POfAAoJELp701BxlEWfZ4UQAIfrUqnPfMo4FSgnxQM+JBb6 -Jy1sWwn1cR5VpvSC1y3r94YlYmpDOppOFU5sH1Vd4S7TAetRnh6QJaIQQINrTas3 -hcGcg6z3HQ8QQQq/UEcEOLdzbBk/kc11C7CGHBAswn7QxUQVfLGE3ZSbYFSsyZhR -p4pgf2uRUR6ehTt5hvNxUt1Io1mBqbrb9ji/R6ZWabSeil/maWUYV2jIDW2am/w0 -bx3iQ36GpURV/zw6kxQ56IGPD2WsZ26JUgiSMWxhjteH/iPZ5T4riez3RPpFbs5t -bPfjD0FNOnY1TPjtI+p+l1e/pJ+24v5goJgofNjYeTHdkSBNR88GtdCeXijb3QDn -CwbOFKlz+ohroaYSrVvLubn8BzkD9h4lDEWQCiaz1Su7vYzNY1/VR1ncxvmSAWJk -4ZZ2GGyMxlbCjtA7fnzL6iNcfsVo0cYwlm5xe5uvikWbQvmZ4EObrNMkStNwytvK -yIi7nEsVMJT3f/P56wwh9DDLXzAnmMTkTs7qWvS4nMSbqKGEV/nyHhVlgCRh+seo -epquONzqSHLBQgeGlYpApSJG6PaSvFIMqaRG7hDmG5Ir62LP5IGFxF7WVsYigDJI -ofVmbCm3uYmyf0mXGtHFyKN2jIN8GqPhmkbgQ/o6ZtVlrZHhWRMSteoJ18tXyZ1B -aZgpIDNaXBBgwwdMUFVI -=IiyV +iQJ8BAEBCABmBQJU6QzqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx +OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyN4mIP/jF1oJYsElDasnjoRoCNvfCW +MDKdr68Qsb0fJ6J8GloWSQ9ZyZtgS9X56QiBGtnDo3TKxfkHjbET0+M+8oNyB+s3 +UDUpJ4yvkv3+5Gy1EjLIFWLBlWGfFmkxGqromO+YZw51tOA9/HXiPxBxad3moza/ +9ru9DZC/UlcNTihJvnmFlLeQEILPgWQ5kqAnwRq+rULuNzIvk5RNnLZWtP44bKhR +2hvGfHZxD8xYeoWks2EyoX7G2mA/87X33RD9JQMg6I48BM+sr089tjzDh2uPybM2 +ASqfINEUoZFO8Jrs2QymfxX14vQxUfgP6ves3mSM7Q8ZcCqhX5CNpawtUbkANp9U +MWmyKSrHVMvANFv61/ZeaeY6mwsCE5ihquugQEQtxo8uGUi8SxrY3NKFspNgypAu +QJK+maeW8K65ZUsUzR4iLARuzzx27281CqiYcIsDZYPr1puKnNzkJjxtO380WINg +IGGF/rrKrhJy/GYNWtT2VfkD/b5jpg+LHWeKwyt77IL4zKxc6L088h5o4sS3/USv +1uWxiwq9iAqbTfQ48GTi2LzdG9MDNXmbOddvHtDQXY8PoJW9lV0Iezs2LC6q/KsS +H7owjywZRiW1gHqHZ07uYEBhuD9asMPf5DY+ii0HOttU3iwOksDhjC8K6fojVSWK +XDLCoWtAGhgrjBiySlZy +=rwHa -----END PGP SIGNATURE----- diff --git a/app-cdr/cdemu/cdemu-2.1.1.ebuild b/app-cdr/cdemu/cdemu-2.1.1.ebuild index 24546eaecd7e..4bb13a6626bb 100644 --- a/app-cdr/cdemu/cdemu-2.1.1.ebuild +++ b/app-cdr/cdemu/cdemu-2.1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.1.ebuild,v 1.3 2014/01/26 11:38:06 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.1.ebuild,v 1.4 2015/02/21 22:55:37 tetromino Exp $ EAPI="5" @@ -18,6 +18,7 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~hppa x86" IUSE="+cdemu-daemon" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/dbus-python[${PYTHON_USEDEP}] diff --git a/app-cdr/cdemu/cdemu-2.1.0-r2.ebuild b/app-cdr/cdemu/cdemu-3.0.0.ebuild similarity index 59% rename from app-cdr/cdemu/cdemu-2.1.0-r2.ebuild rename to app-cdr/cdemu/cdemu-3.0.0.ebuild index b7af325fafff..5e9aca33e8e3 100644 --- a/app-cdr/cdemu/cdemu-2.1.0-r2.ebuild +++ b/app-cdr/cdemu/cdemu-3.0.0.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.0-r2.ebuild,v 1.3 2013/07/20 11:11:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-3.0.0.ebuild,v 1.1 2015/02/21 22:55:37 tetromino Exp $ EAPI="5" CMAKE_MIN_VERSION="2.8.5" -PYTHON_COMPAT=( python2_6 python2_7 ) -PLOCALES="de fr no pl sl sv" +PYTHON_COMPAT=( python2_7 ) +PLOCALES="no sl sv" inherit bash-completion-r1 cmake-utils eutils fdo-mime l10n python-single-r1 @@ -16,12 +16,13 @@ SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~hppa x86" +KEYWORDS="~amd64 ~hppa ~x86" IUSE="+cdemu-daemon" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/dbus-python[${PYTHON_USEDEP}] - cdemu-daemon? ( app-cdr/cdemu-daemon:0/5 )" + cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )" DEPEND="${RDEPEND} dev-util/desktop-file-utils >=dev-util/intltool-0.21 @@ -35,13 +36,7 @@ pkg_setup() { src_prepare() { python_fix_shebang src/cdemu - epatch "${FILESDIR}/${PN}-2.1.0-bash-completion-dir.patch" - # build system doesn't respect LINGUAS :/ - l10n_find_plocales_changes po "" ".po" - rm_po() { - rm po/$1.po || die - } - l10n_for_each_disabled_locale_do rm_po + epatch "${FILESDIR}/${PN}-3.0.0-bash-completion-dir.patch" } src_configure() { @@ -53,6 +48,17 @@ src_configure() { cmake-utils_src_configure } +src_install() { + cmake-utils_src_install + # Build system doesn't respect LINGUAS, and changing list of installed + # translations requires error-prone editing of CMakeLists.txt + rm_po() { + rm -r "${ED}"/usr/share/locale/$1 || die + ls "${ED}"/usr/share/locale/* &> /dev/null || rmdir "${ED}"/usr/share/locale || die + } + l10n_for_each_disabled_locale_do rm_po +} + pkg_postinst() { fdo-mime_desktop_database_update } diff --git a/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch b/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch new file mode 100644 index 000000000000..54d11dab4d1b --- /dev/null +++ b/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch @@ -0,0 +1,14 @@ +diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt +index 99b595e..e4f9b6e 100644 +--- a/cdemu-client/CMakeLists.txt ++++ b/cdemu-client/CMakeLists.txt +@@ -39,7 +39,8 @@ install ( + + install ( + FILES data/cdemu-bash-completion.sh +- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d ++ DESTINATION ${GENTOO_BASHCOMPDIR} ++ RENAME cdemu + ) + + install ( -- 2.26.2