commit: ced651e390b3ffba81059cb67a4ba946bc7a6a0d Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Fri Jun 19 15:41:06 2015 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Fri Jun 19 15:41:06 2015 +0000 URL: https://gitweb.gentoo.org/dev/robbat2.git/commit/?id=ced651e3
Merge remote-tracking branch 'bohr/master' With conflict fixes Conflicts: metadata/layout.conf profiles/repo_name x11-plugins/pidgin-extended_blist_sort/Manifest x11-plugins/pidgin-toobars/Manifest .gitignore | 2 + app-admin/euca2ools/Manifest | 2 + app-admin/euca2ools/euca2ools-1.3.1.ebuild | 71 +++ app-admin/euca2ools/euca2ools-2.1.3.ebuild | 71 +++ .../DateTime-Format-RFC3339-1.00.5.ebuild | 22 + dev-perl/DateTime-Format-RFC3339/Manifest | 3 + dev-perl/DateTime-Format-RFC3339/metadata.xml | 9 + dev-perl/Net-Google/Manifest | 1 + dev-perl/Net-Google/Net-Google-1.0.ebuild | 21 + .../WebService-SlimTimer-0.00.5.ebuild | 34 ++ dev-python/ledger-autosync/Manifest | 1 + .../ledger-autosync/ledger-autosync-0.2.3.ebuild | 23 + dev-python/pyrtm/Manifest | 1 + dev-python/pyrtm/pyrtm-0.4.2.ebuild | 23 + dev-python/rtm-cli/Manifest | 1 + dev-python/rtm-cli/rtm-cli-1.3.1.ebuild | 20 + dev-ruby/reckon/reckon-0.3.10.ebuild | 38 ++ eclass/cups-lexmark.eclass | 118 +++++ games-util/steam-installer/Manifest | 1 + games-util/steam-installer/Manifest.old | 1 + .../files/remove-ubuntu-specifics.patch | 39 ++ .../steam-installer/steam-installer-9999.ebuild | 105 ++++ media-libs/libhashab/Manifest | 1 + .../libhashab/libhashab-0_alpha20131216.ebuild | 61 +++ net-print/broken/lexmark-ppd-LMAAV/Manifest | 1 + .../lexmark-ppd-LMAAV-20130617.ebuild | 13 + net-print/lexmark-cx410/Manifest | 18 + net-print/lexmark-cx410/index.html | 546 +++++++++++++++++++++ .../lexmark-cx410/lexmark-cx410-20130612.ebuild | 81 +++ net-print/lexmark-ppd-LMAAT/Manifest | 1 + .../lexmark-ppd-LMAAT-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAAU/Manifest | 1 + .../lexmark-ppd-LMAAU-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAAW/Manifest | 1 + .../lexmark-ppd-LMAAW-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAAY/Manifest | 1 + .../lexmark-ppd-LMAAY-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAAZ/Manifest | 1 + .../lexmark-ppd-LMAAZ-20130617.ebuild | 13 + net-print/lexmark-ppd-LMABC/Manifest | 1 + .../lexmark-ppd-LMABC-20130617.ebuild | 13 + net-print/lexmark-ppd-LMABD/Manifest | 1 + .../lexmark-ppd-LMABD-20130617.ebuild | 13 + net-print/lexmark-ppd-LMABE/Manifest | 1 + .../lexmark-ppd-LMABE-20130617.ebuild | 13 + net-print/lexmark-ppd-LMABF/Manifest | 1 + .../lexmark-ppd-LMABF-20130617.ebuild | 13 + net-print/lexmark-ppd-LMABJ/Manifest | 1 + .../lexmark-ppd-LMABJ-20130617.ebuild | 13 + net-print/lexmark-ppd-LMABK/Manifest | 1 + .../lexmark-ppd-LMABK-20130617.ebuild | 13 + net-print/lexmark-ppd-LMABL/Manifest | 1 + .../lexmark-ppd-LMABL-20130617.ebuild | 13 + net-print/lexmark-ppd-LMABO/Manifest | 1 + .../lexmark-ppd-LMABO-20130617.ebuild | 13 + net-print/lexmark-ppd-LMABR/Manifest | 1 + .../lexmark-ppd-LMABR-20130617.ebuild | 13 + net-print/lexmark-ppd-LMABS/Manifest | 1 + .../lexmark-ppd-LMABS-20130617.ebuild | 13 + net-print/lexmark-ppd-LMABT/Manifest | 1 + .../lexmark-ppd-LMABT-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACA/Manifest | 1 + .../lexmark-ppd-LMACA-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACB/Manifest | 1 + .../lexmark-ppd-LMACB-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACC/Manifest | 1 + .../lexmark-ppd-LMACC-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACE/Manifest | 1 + .../lexmark-ppd-LMACE-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACG/Manifest | 1 + .../lexmark-ppd-LMACG-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACH/Manifest | 1 + .../lexmark-ppd-LMACH-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACI/Manifest | 1 + .../lexmark-ppd-LMACI-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACJ/Manifest | 1 + .../lexmark-ppd-LMACJ-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACK/Manifest | 1 + .../lexmark-ppd-LMACK-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACL/Manifest | 1 + .../lexmark-ppd-LMACL-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACM/Manifest | 1 + .../lexmark-ppd-LMACM-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACO/Manifest | 1 + .../lexmark-ppd-LMACO-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACP/Manifest | 1 + .../lexmark-ppd-LMACP-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACQ/Manifest | 1 + .../lexmark-ppd-LMACQ-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACR/Manifest | 1 + .../lexmark-ppd-LMACR-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACS/Manifest | 1 + .../lexmark-ppd-LMACS-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACV/Manifest | 1 + .../lexmark-ppd-LMACV-20130617.ebuild | 13 + net-print/lexmark-ppd-LMACW/Manifest | 1 + .../lexmark-ppd-LMACW-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAD0/Manifest | 1 + .../lexmark-ppd-LMAD0-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAD1/Manifest | 1 + .../lexmark-ppd-LMAD1-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAD2/Manifest | 1 + .../lexmark-ppd-LMAD2-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAD3/Manifest | 1 + .../lexmark-ppd-LMAD3-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAD4/Manifest | 1 + .../lexmark-ppd-LMAD4-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAD5/Manifest | 1 + .../lexmark-ppd-LMAD5-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAD6/Manifest | 1 + .../lexmark-ppd-LMAD6-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAD7/Manifest | 1 + .../lexmark-ppd-LMAD7-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADA/Manifest | 1 + .../lexmark-ppd-LMADA-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADB/Manifest | 1 + .../lexmark-ppd-LMADB-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADC/Manifest | 1 + .../lexmark-ppd-LMADC-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADD/Manifest | 1 + .../lexmark-ppd-LMADD-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADE/Manifest | 1 + .../lexmark-ppd-LMADE-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADG/Manifest | 1 + .../lexmark-ppd-LMADG-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADH/Manifest | 1 + .../lexmark-ppd-LMADH-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADI/Manifest | 1 + .../lexmark-ppd-LMADI-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADJ/Manifest | 1 + .../lexmark-ppd-LMADJ-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADK/Manifest | 1 + .../lexmark-ppd-LMADK-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADL/Manifest | 1 + .../lexmark-ppd-LMADL-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADM/Manifest | 1 + .../lexmark-ppd-LMADM-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADO/Manifest | 1 + .../lexmark-ppd-LMADO-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADP/Manifest | 1 + .../lexmark-ppd-LMADP-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADQ/Manifest | 1 + .../lexmark-ppd-LMADQ-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADR/Manifest | 1 + .../lexmark-ppd-LMADR-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADS/Manifest | 1 + .../lexmark-ppd-LMADS-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADT/Manifest | 1 + .../lexmark-ppd-LMADT-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADU/Manifest | 1 + .../lexmark-ppd-LMADU-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADV/Manifest | 1 + .../lexmark-ppd-LMADV-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADW/Manifest | 1 + .../lexmark-ppd-LMADW-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADX/Manifest | 1 + .../lexmark-ppd-LMADX-20130617.ebuild | 13 + net-print/lexmark-ppd-LMADY/Manifest | 1 + .../lexmark-ppd-LMADY-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAEB/Manifest | 1 + .../lexmark-ppd-LMAEB-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAEC/Manifest | 1 + .../lexmark-ppd-LMAEC-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAED/Manifest | 1 + .../lexmark-ppd-LMAED-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAEE/Manifest | 1 + .../lexmark-ppd-LMAEE-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAEF/Manifest | 1 + .../lexmark-ppd-LMAEF-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAEG/Manifest | 1 + .../lexmark-ppd-LMAEG-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAEH/Manifest | 1 + .../lexmark-ppd-LMAEH-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAEI/Manifest | 1 + .../lexmark-ppd-LMAEI-20130617.ebuild | 13 + net-print/lexmark-ppd-LMAEJ/Manifest | 1 + .../lexmark-ppd-LMAEJ-20130617.ebuild | 13 + net-print/lexmark-ppd-common/Manifest | 1 + .../lexmark-ppd-common/files.old/Lexmark_PPD.xml | 12 + .../lexmark-ppd-common/files.old/fax-pnh-filter | 26 + .../lexmark-ppd-common-20130617.ebuild | 27 + sys-kernel/hardened-sources/Manifest | 5 + .../hardened-sources-3.8.2-r1.ebuild | 43 ++ sys-power/uevt-9999.ebuild | 50 ++ x11-plugins/pidgin-extended_blist_sort/Manifest | 3 + ...ild => pidgin-extended_blist_sort-1.7.1.ebuild} | 10 +- x11-plugins/pidgin-toobars/Manifest | 8 + .../pidgin-toobars/files/foo.sh | 0 ...obars-1.5.ebuild => pidgin-toobars-1.11.ebuild} | 10 +- ...oobars-1.5.ebuild => pidgin-toobars-1.6.ebuild} | 4 +- ...oobars-1.5.ebuild => pidgin-toobars-1.7.ebuild} | 6 +- 191 files changed, 2556 insertions(+), 13 deletions(-) diff --cc x11-plugins/pidgin-extended_blist_sort/Manifest index 3e7a9d2,d9f19b2..deb1c79 --- a/x11-plugins/pidgin-extended_blist_sort/Manifest +++ b/x11-plugins/pidgin-extended_blist_sort/Manifest @@@ -1,2 -1,5 +1,5 @@@ DIST extended_blist_sort-1.6.tar.gz 339612 RMD160 e264128dd05abd759215f30556e8a8439b57b71e SHA1 08b2783f5f0126d99e083e6ee1b35ff72389215e SHA256 eb141c27fdedc490ea56a3a855fbcdec548a588d7d656ca44b11ac9f98cc3d00 -DIST pidgin-extended-blist-sort-1.7.1.tar.gz 311533 RMD160 9b9a81e8fa0b9b88f85b1ac3ce9f65a33b28c30a SHA1 96ef511dcc450e245d636499e18fea9eaee24a55 SHA256 39b5cbb7357551959534a66d396024f5dbc79185d4c4d3abfd662e873a0e239d EBUILD pidgin-extended_blist_sort-1.6.ebuild 793 RMD160 a5d8b426139153a94b6e2d661238913cae54cc60 SHA1 909657f79a792eda662cf17accd604b943f8d3d7 SHA256 8c7b0229ef8ea090a8bef187d424e0c98334795d7f8c8498b592ee7c382478d8 ++DIST pidgin-extended-blist-sort-1.7.1.tar.gz 311533 RMD160 9b9a81e8fa0b9b88f85b1ac3ce9f65a33b28c30a SHA1 96ef511dcc450e245d636499e18fea9eaee24a55 SHA256 39b5cbb7357551959534a66d396024f5dbc79185d4c4d3abfd662e873a0e239d + EBUILD pidgin-extended_blist_sort-1.7.1.ebuild 893 RMD160 6d877390587548e49a3b28dcabde324f4e63c6a6 SHA1 c0d3cc35d71b76f9c7836d07b6c2b22c42a56462 SHA256 efa7f062118a0fd9f5f37f842a46f38574138c40a04af6c389ff2892b56fa1b9 + MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 diff --cc x11-plugins/pidgin-toobars/Manifest index be05199,2efb0ce..c8976a1 --- a/x11-plugins/pidgin-toobars/Manifest +++ b/x11-plugins/pidgin-toobars/Manifest @@@ -1,2 -1,8 +1,10 @@@ +DIST pidgin-toobars-1.5.tar.gz 402293 RMD160 aa03f1122110d77b88c8a88c9ad597698ab8319a SHA1 615963da54e55163cce2c0c87e67449bd079eeb9 SHA256 05b79d91d7c659daabf651bb61ef6c6e5a4fd3d2c31f378293ccf593d1806426 +EBUILD pidgin-toobars-1.5.ebuild 561 RMD160 493c3cb9d8c00660930c49a5119d5403b0927418 SHA1 371c97237d7e771cf5f669fd99bd7af849c1489f SHA256 7890c2dedf23d013b367b982a11dc0a465d9cf48fad5593b4d4e3fed93f4687b + AUX foo.sh 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 + DIST pidgin-toobars-1.11.tar.gz 429258 RMD160 a6110d2ea33c88882ab2a51428761c2dc0fce311 SHA1 8f2a2bfc0349eb0af2177b2ce045386ad8e50248 SHA256 f830ad8573602202a06c2a20afe0bb6b564a3b5d62f0549ca905682b0bdb588d + DIST pidgin-toobars-1.6.tar.gz 406412 RMD160 4a386cc5c41129d95a688e230c67b315d9d0e889 SHA1 57f4564cd8dd4b1ab8fc701650cb5d6e76534495 SHA256 a8bcfe76efe6d2afc8fe2c2629e90b4ef5e06d5eb5f04689ee85b02bc4bd7e3c + DIST pidgin-toobars-1.7.tar.gz 778788 RMD160 390fc7dd4bba26428f4d93a1cebbdc8e35fd05cc SHA1 9798e07bb0bf3b68faae58dfa4077bb6a37c29da SHA256 18ddfbd6b41b5a1dc7a47528b6e2e842ea08badf990db92be880925664080a89 + EBUILD pidgin-toobars-1.11.ebuild 754 RMD160 27a3a59ea24f8e535ff352f37a61cec8b0a30b0e SHA1 c8e304ce1de5f420ada15bd506a3509adc59e09b SHA256 cbe90b9acef2a2795d92e1d9f1175f909be92d16101f0230044c185f48168c63 + EBUILD pidgin-toobars-1.6.ebuild 732 RMD160 132f3d39b64a5f5c479a1a079c36f9a3ba9fc050 SHA1 2fe784c80542cd642e29f7704ef815e5a672dad6 SHA256 5ef0a7ba6a19c4427a4d284beeadddee1c55623d5756645a31ff688f6d7b2205 + EBUILD pidgin-toobars-1.7.ebuild 748 RMD160 b4c46d5de43b44497692c2e785c6a0ab6c4c61b9 SHA1 863096cd268a7d44b0784ac6ad981d4edbf01efd SHA256 882c299010d7a891282cda2e70cddaf38686ba5bc45156629a88a57f0e51fcd2 + MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
