diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2016-12-08 09:45:36 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2016-12-08 09:45:36 +0000 |
| commit | 00691c1468d953a03fdf5b96f50f0043178ba5de (patch) | |
| tree | 0810611b71722efd4fe5e3cbf27a4d2651decb3b | |
| parent | Merge updates from master (diff) | |
| parent | app-emulation/lxc: fix bashcomp collision with app-emulation/lxd (diff) | |
| download | gentoo-00691c1468d953a03fdf5b96f50f0043178ba5de.tar.gz gentoo-00691c1468d953a03fdf5b96f50f0043178ba5de.tar.bz2 gentoo-00691c1468d953a03fdf5b96f50f0043178ba5de.zip | |
Merge updates from master
| -rw-r--r-- | app-emulation/lxc/lxc-2.0.6-r1.ebuild (renamed from app-emulation/lxc/lxc-2.0.6.ebuild) | 5 | ||||
| -rw-r--r-- | mail-mta/exim/Manifest | 4 | ||||
| -rw-r--r-- | mail-mta/exim/exim-4.88_rc6.ebuild (renamed from mail-mta/exim/exim-4.88_rc5.ebuild) | 0 | ||||
| -rw-r--r-- | media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch | 2 | ||||
| -rw-r--r-- | profiles/package.mask | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/app-emulation/lxc/lxc-2.0.6.ebuild b/app-emulation/lxc/lxc-2.0.6-r1.ebuild index 11e28397c257..b6928bc24b60 100644 --- a/app-emulation/lxc/lxc-2.0.6.ebuild +++ b/app-emulation/lxc/lxc-2.0.6-r1.ebuild @@ -158,10 +158,11 @@ src_compile() { src_install() { default + mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die # start-ephemeral is no longer a command but removing it here # generates QA warnings (still in upstream completion script) - bashcomp_alias ${PN} \ - ${PN}-{start,attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} + bashcomp_alias ${PN}-start \ + ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait} if use python; then pushd "${S}/src/python-lxc" > /dev/null diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest index 6883aac3ff4c..6a7518cf5e47 100644 --- a/mail-mta/exim/Manifest +++ b/mail-mta/exim/Manifest @@ -1,5 +1,5 @@ DIST exim-4.87.tar.bz2 1801422 SHA256 74691e0dff4d1b5d387e9c33c86f96a8f6d2adbc781c0dec9d2061a847b07dc9 SHA512 2b0d5c82133315c444e29abd182e0866482c904db1abe5ffe9a3008c2174f52eca850a433c069b4102874dc32bbe4af112beac94ffa154f1c06615c24deb47a4 WHIRLPOOL 3aede6629fbf41a71f6907e636458165258b523a3080d0b59ba6b295c1a258d8ce205a3295d4c49c2e6e88ef597b64895684fd47a3f5c3fba360d8e56be5f7f9 -DIST exim-4.88_RC5.tar.bz2 1821949 SHA256 9e014fac76b8a1100c1bef5391b5400e4464bc584fcd1d76021c10e5577550bb SHA512 6450a881cbeab4320edd836a0acb46b4df5fb45b13b0b8c52545647e78d8415cf14dc01f6a55ab4d1a89aaa5ad0f5c2453205f0072c174d571157b0c09c8e9cd WHIRLPOOL 8927f92ec905f0de500a4f29128eea37957e8d139cbc359cf142ba0b4f23d08a4368004ae6681ee7ccc9b0874904cbbc087452501cd897a1f48b165b990509bd +DIST exim-4.88_RC6.tar.bz2 1822068 SHA256 2281b38b586a3827fa2a3e147e936d4042d4392246da3a3f2c012600bdc7281e SHA512 52f5d19485955286278fbd7950562347595c8ef88145592747a14e3ed9ed0897f3ccad2dbeb34c90b056def63ba0cd6eddd1e3d5afa53a61ebd0f88ec0887d9d WHIRLPOOL 44691f5b15bba493dd3070be95565867b35853b302cb3eef2bf52658c6628a118286c7cb9f12a1b673e3c46c7210b1aaa69f4308ff9485b6eed02fddf90d8492 DIST exim-html-4.87.tar.bz2 478953 SHA256 8f87876d4a392f59d1009ba64ac461862951a3f4eed9c0b14a49be7bcbdc1f12 SHA512 224884abfd7ab9a2410dbdd24bb65545faf427f1b83a942c6c72309e7d85771f78bf7dc5ec1439de95e1038959cdfc4ab549abb98852c8b17c8310b51ad0385c WHIRLPOOL 0444f0b8d8f2e6fab66e9ec7b169eb1d175247e31c323f0a2817b60e2ce6b75057c8d38477697472b009f73fd4b285595b8ca09bac845763767e8146d6c87491 -DIST exim-pdf-4.88_RC5.tar.bz2 1921818 SHA256 fddbe252184fa3d7a7fa57a534200c6ac0bbe8be6ac0c930eb5b0cbe67790738 SHA512 7b2bf28d747f9dee4a94ac1dfd7051f8a0ed6515c5f9e045be636c89ef6e289539b7515e4ef8f20d93c9b7dc229a917c722d0eaf1aef1b399a947dfb0f745a0a WHIRLPOOL 032846a7994923bece508f9c95c09948a0bee4424f934183ad3ea47f1a94ff38a0c2e839911ea7512a15ec5ca98809236c53b115cceea2566fd1be604dd93d38 +DIST exim-pdf-4.88_RC6.tar.bz2 1922261 SHA256 befda271a6ef3e4f09bef847ec0dce1d05a2d9809fc622a1f04384577ce7e5e6 SHA512 38672ab2f243afee3cc093ad51ac591240c4cdf48470e6db13e5b7289c100ac4f79ec8c35ad0ab0ff70d4e1cb3744920d31832d6872440bbe24e406f7cf639b0 WHIRLPOOL ad489002b553841f40c14367803f8649b86b3789a68b2dffa0c235dd12cfead8fc0c6df4de6fa798dc3af4b63ab668aafb1c2bda15bc637cb84cbfb0bf8ac2dc DIST system_filter.exim.gz 3075 SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 WHIRLPOOL ce68d9c18b24eca3ef97ea810964cc1ada5f85b795a7c432ad39b5788188a16419101c92fb52b418738d760e1d658f7a41485e5561079a667d84d276c71be5a4 diff --git a/mail-mta/exim/exim-4.88_rc5.ebuild b/mail-mta/exim/exim-4.88_rc6.ebuild index dc458f1fe622..dc458f1fe622 100644 --- a/mail-mta/exim/exim-4.88_rc5.ebuild +++ b/mail-mta/exim/exim-4.88_rc6.ebuild diff --git a/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch b/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch index 32af4901dcd2..31feca0831fe 100644 --- a/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch +++ b/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch @@ -1,3 +1,5 @@ +https://git.reviewboard.kde.org/r/129626 + Index: amarok-2.8.90/src/musicbrainz/MusicDNSAudioDecoder.cpp =================================================================== --- amarok-2.8.90.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp diff --git a/profiles/package.mask b/profiles/package.mask index 93f71294776b..ba9934c3a49a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -383,7 +383,7 @@ sci-geosciences/googleearth # Fabian Groffen <grobian@gentoo.org> (25 Sep 2016) # Mask Exim RCs -=mail-mta/exim-4.88_rc5 +=mail-mta/exim-4.88_rc6 # Michael Palimaka <kensington@gentoo.org> (15 Sep 2016) # KDE PIM 5 masked for wider testing. |