Fix completion filename for bash-completion-2.1-r1 (bug #477378, thanks to Alexander Tsoy).

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 25 insertions, 15 deletions

diff --git a/app-cdr/cdemu/ChangeLog b/app-cdr/cdemu/ChangeLog
index 25630f186a1a..df9a29f26fbc 100644
--- a/app-cdr/cdemu/ChangeLog
+++ b/app-cdr/cdemu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/cdemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.42 2013/07/19 13:27:37 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.43 2013/07/19 14:41:09 tetromino Exp $
+
+*cdemu-2.1.0-r2 (19 Jul 2013)
+
+  19 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +cdemu-2.1.0-r2.ebuild, -cdemu-2.1.0-r1.ebuild,
+  files/cdemu-2.1.0-bash-completion-dir.patch:
+  Fix completion filename for bash-completion-2.1-r1 (bug #477378, thanks to
+  Alexander Tsoy).
 
 *cdemu-2.1.0-r1 (19 Jul 2013)
 
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 538306ef3cca..8b42b777c12d 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA256
 
 AUX cdemu-2.0.0-bash-completion-dir.patch 392 SHA256 507efb0d806f15b398d9c9473beedf7063b3faa8a453e2eb52384d353f40ccbc SHA512 c508bc0b7a4f6af34d17907938fc769f523e2cb9f8455d038ffcc29b046f489fbff0be0ba1ab30e374f48f682647790a5a85d0bc8ca6f0348476e47cf4e8883c WHIRLPOOL 024a54cfcc10cb4b72e747164391eb4ba46da5f38cb986a3781eba19ab35d8175b634dfe26ddf0cfdc9ac23dc04c9ef9ed29d50b0f4714934cb0d3b419d90971
-AUX cdemu-2.1.0-bash-completion-dir.patch 373 SHA256 a9e1fead3983b954b788aa4c4dc2bd589d5ef945ad2a055f07d5c21884ad3769 SHA512 1930b01a60f5e39981876debf5a84b6fe81f6a071b96a32aae0ba888f2fe0c0e4835c8543bce4721338920e9bd67d8cc465badc40eb62204e6bafa2760909532 WHIRLPOOL d3489b68176bef829405c056a949c647ce54bfe4b59daa3bf52870711d3466ed7c058b2119bd25dc3fb68d36389463f1c80fa451279ca8b9cc36f9999bfbd2c7
+AUX cdemu-2.1.0-bash-completion-dir.patch 467 SHA256 992d3c5abf786c7385235424dc82dc46b3b29f25a5c0319bf30eaad0fff7d0de SHA512 3d363b34749c60dddbcd8bf3b861ca91650915cc79df194c1a00dfe309b53b2a73a62d25545d1b57b0d8d62137fb09006e03b6e5f3784fd6c925de99f7b8b9fc WHIRLPOOL e18cb21f05b243fbb5717ea7e7e4cde37a52359b5e9d45be1b0060df9fd653b7733665706b9fc030819a373b4f80dec7ceefa461766a1045b2cc4ba12d497156
 DIST cdemu-client-2.0.0.tar.bz2 28346 SHA256 a049df0d97b46bedf8604123c9ac6207f6b506855da6c379550513cb40e45603 SHA512 c510087a3c2a343beb99f4a02c9db0407ee4a27fb640af5343fac081aab10afa616ce3477fc2baf7aefbcde12b2de0c80e330be33e82ed7f60cf6eb3b03f854f WHIRLPOOL 1e3843d3ce6dab95726f563ea385e9a091055585f537b57942b2e51a547b342369c7577bf55f63a75fa378f95300c1eeaf8c00be0a42a04384654a13bff42fae
 DIST cdemu-client-2.1.0.tar.bz2 28173 SHA256 9bd0448368b5e51eb2acfe420f612f67e3b3d4aae4aa80fa36ce130fa0a10c9f SHA512 bc02e3fb6df10702ee9e710ad8a881c92b5462015d19152fe784778a9106a4c2ef03d0e2a23850a742cdf3242e1f81350ce8cdf89671681104dd4cfa85a48d3a WHIRLPOOL 0da8a25919144cd57696934fce0c42618f3d04bff315e7e55f319785e72a27fea954ebf05a7e7120919b9741f1b65a2193663bcef29982acf6b04c4a2e10f37d
 EBUILD cdemu-2.0.0.ebuild 1346 SHA256 c767aa9feed533eeb6257f31329f830310a8c83bf8d6d3084b63cb10978a6c30 SHA512 d1a02ac936561a67e70397348bee91e8e9a85810e2baa499bc63f6b7f9722a32d7068f6bbf99a9a186248d81b8fff96349f35d57a9269a46aeb8f7fbceab33de WHIRLPOOL 76498f6ac04dbb061966423c58c1672539f27e642049b37ac2a36d86a5cc7682e45542bc1f838101902961e66ae244a8dc59c0f3f5e8d4f9b93dec82db15bae7
-EBUILD cdemu-2.1.0-r1.ebuild 1463 SHA256 536f048e5c358b82820ac6d3e2be6f35997f7693d74fa37087cab5e5e49c3c6d SHA512 a09c0bd312c30c38950f72cd984f0fd7428e2837995fffa0d5f44212875f9b0e5acb59a39fd3d7b453f4fb6e8ac278cdc66f6268591b7ebc7260821dc3b797b0 WHIRLPOOL e004d2990b1f6dd260c4c5221b0f41b518c65efef1aff86df47f0166d529ce69a25ba87540e3a963376897aaa7abcf6c23ec78bc8730fb90a48372893ef3fdc8
+EBUILD cdemu-2.1.0-r2.ebuild 1463 SHA256 1cd8cb09bf5fc567f8a0c08d60c50e850edc50a9c412a43b4aaad20d61dcb748 SHA512 e34a25a6d21a6636799deae0586045a5763c9da28e83c5bccda455c0e63f385b429a92bded541a17388df3dede7b643b597ec1bd73971eb5debdacc3ee08bf89 WHIRLPOOL b46b2408252b37c279bc3dc0ea240976826435f24fabf4ba162e361a834e35c80834cc0923385be3866b2c99ac2e0dc027c3907f6a49589372ba04264505c21d
 EBUILD cdemu-2.1.0.ebuild 1394 SHA256 14ce81a0af738a49f745bc8506199b210231d6b6a6f263dd1b2f44efd1541e99 SHA512 af9b60e09fdf914f06b9b9f0d4ad196696c626f1428d80ed3628aa0e1d5860858753e253f1274ad93a067670213c90a4c21b98bcc630ee7b87119e8304bd0e13 WHIRLPOOL 772d0b369968a7b9182dd0047dcad894ddb4df68833564eeb22d49aac3314b06943decb405070998570b6a4fc3a24c4b18cc1b83e2b01f2a829cce0dc30ba113
-MISC ChangeLog 6576 SHA256 7836dd2232a02a72761dde0c7a5bda4c69dcf5f40d539452a928abdfd8f99bfb SHA512 37e24771d81fdcbbd9ea992a9e4ebb44ee97852da7c085f94c872a9618d4e15fb9c27e7d6b98d86ddf321d2f32043d40f44b41096d0153a971f28cead14d8f47 WHIRLPOOL ccd36ad99aabd8b3ff47c0acbf7899ada41db185409ef3a6994c603ade76f13f7e960510ad90619a12ba65765c3a34c138fff21aa39ad2848c9e6b34785eaa41
+MISC ChangeLog 6860 SHA256 a25b1f088da195ca2c471f0e8443bc501ae933a3c34b975c81dbc43584e63a69 SHA512 fc6157b98cd2cd79950fe8e6816a8fab3a970fc8b7be96e4b59f69f6807b788c9911b960ba03969ce0dce824fc0fa11a3aadb984bc3485c487b26e4ddcd48e67 WHIRLPOOL 881158712050c0732e76f335796a56087e4b780f8a479321a91ac297c8d9badb680f97ea942c4efd36f6b5fae51251a8ecf1cd60cb6c39bd0ef779bd0e1d3325
 MISC metadata.xml 431 SHA256 48171f5b68cda683ad7bad2680218da9430ed068dbe441d86d5639dd9c9c3c07 SHA512 c62007c25bd76a0a5673e29e1c391d48c6d6f83e84a6fa30fc6bc7fac2d1924139fbd463f0025779bec87d0359cd28dcdb4d6df2778d5f0035b7811845da2900 WHIRLPOOL d86cb4f30b390600d7eae7c82783961a1e22d33d9459a99a7afe5eb49c42797b30a19b9a054f7f0b7cb415f427c6973b73fcfbc5e571af84d07aa06e8234fe82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR6T7LAAoJEJ0WA1zPCt1hHOYIAK6cPCl8DXkADbVJvnv3CScY
-TTwIeg+XBWiFq8Lw9yfw2sssVz1isDsB47oW5g8pXlY5sos9SuEnWsCaPx7mg9TU
-4ZBIvTFZBWYpKH+8W29elnJsqBqPj0nApTQ4HDLMUgfkBPZpXc0MG4ugYnaERUoY
-kIrITq+q/3eKU9z7oF3vkHtLsab7C7RbmadI+k1ukD1EnYCgPkDsLMMtxdNpK8Ch
-klU7SNRSSlTV7wHADuWEkD+XdEw1jJlyJVAGh34Y7oFL8Wae0tKhP9OUUWxP36l7
-ZjOL/isGD45P32VkIzNhps3U8KWbKVjudxJSocutiVedorZd73Nbxr58+qWrZlY=
-=np6n
+iQEcBAEBCAAGBQJR6VAGAAoJEJ0WA1zPCt1hrqEIALA3mwUEJra3pOS7xGkqOSam
+BhMyBZc8plMaYeXt2zz3SIY+IvZnXslLLZuMIvOWyu5eYwTAWc1SABqDhHotcOim
+TeJGONqX6M2fNzHAVbv/njca4BIurbX/IybdTn6Tl2TtHhxlTQ8jibuKgMfb4wi0
+FUFBkVP6Q7EeaySBiUm0QG530HK/aU/YBIbW+LOsEwuH3EIkSdUHwXe3dg0p1FcP
+2mzHNxjye+kT4VmEQJf04ge4FkqJQPzaLgZ44UmMmObBDU/oahiRgLOeodmrVC9c
+/08qY8F7/+aTdlgR/ztwQKgkZKKVtEU6e6Wym0MdsJrYH3ID/z7i21lJ2Vj/nCM=
+=hrWu
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdemu/cdemu-2.1.0-r1.ebuild b/app-cdr/cdemu/cdemu-2.1.0-r2.ebuild
index a68ea5cc8f0c..be43a69eb57d 100644
--- a/app-cdr/cdemu/cdemu-2.1.0-r1.ebuild
+++ b/app-cdr/cdemu/cdemu-2.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/07/19 13:27:37 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.0-r2.ebuild,v 1.1 2013/07/19 14:41:09 tetromino Exp $
 
 EAPI="5"
 
diff --git a/app-cdr/cdemu/files/cdemu-2.1.0-bash-completion-dir.patch b/app-cdr/cdemu/files/cdemu-2.1.0-bash-completion-dir.patch
index 5dda0e7c0ed9..a4b26f2608c6 100644
--- a/app-cdr/cdemu/files/cdemu-2.1.0-bash-completion-dir.patch
+++ b/app-cdr/cdemu/files/cdemu-2.1.0-bash-completion-dir.patch
@@ -1,13 +1,15 @@
 diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt
-index 6f33b7c..1090c0d 100644
+index 6f33b7c..3c61daa 100644
 --- a/cdemu-client/CMakeLists.txt
 +++ b/cdemu-client/CMakeLists.txt
-@@ -41,7 +41,7 @@ install (
+@@ -41,8 +41,8 @@ install (
  
  install (
      FILES data/cdemu-bashcomp
 -    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
+-    RENAME cdemu-client
 +    DESTINATION ${GENTOO_BASHCOMPDIR}
-     RENAME cdemu-client
++    RENAME cdemu
  )
  
+ intltool_merge ("-d" po data/cdemu-client.desktop.in cdemu-client.desktop)