diff options
Diffstat (limited to 'gentoo.html')
| -rw-r--r-- | gentoo.html | 104 |
1 files changed, 61 insertions, 43 deletions
diff --git a/gentoo.html b/gentoo.html index ee4925fa4372..1fe246552452 100644 --- a/gentoo.html +++ b/gentoo.html @@ -36,91 +36,109 @@ </pre></td></tr> <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> 'status': 'official'} </pre></td></tr> - <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ pmaint sync gentoo + <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>pkgcore 0.11.2 -- extended version info unavailable </pre></td></tr> - <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>*** syncing gentoo + <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint sync gentoo </pre></td></tr> - <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>*** syncing gentoo </pre></td></tr> - <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> + <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> git config pull.rebase true # rebase + <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> + <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>invocation. + <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> + <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> 29e998c03ce..111a50a0f3f master -> origin/master + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>Updating 29e998c03ce..111a50a0f3f + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>From https://anongit.gentoo.org/git/repo/gentoo </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>Fast-forward + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> 111a50a0f3f..78fc6e62d71 master -> origin/master </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> acct-group/opendmarc/metadata.xml | 8 +++ + <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>Updating 111a50a0f3f..78fc6e62d71 </pre></td></tr> - <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> acct-group/opendmarc/opendmarc-0.ebuild | 9 +++ + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> acct-user/opendmarc/metadata.xml | 8 +++ + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> app-emulation/lxc/Manifest | 2 + </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> acct-user/opendmarc/opendmarc-0.ebuild | 16 +++++ + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> app-emulation/lxc/lxc-4.0.7.ebuild | 174 ++++++++++++++++++++++++++++++++ </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> mail-filter/opendmarc/Manifest | 1 + + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> dev-libs/dqlite/Manifest | 1 + </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> .../files/opendmarc-1.4.1-build-fix.patch | 17 ++++++ + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre> dev-libs/dqlite/dqlite-1.7.0.ebuild | 42 ++++++++ </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> mail-filter/opendmarc/opendmarc-1.4.1.ebuild | 70 ++++++++++++++++++++++ + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> dev-libs/raft/Manifest | 1 + </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> mail-mta/postfix/Manifest | 2 +- + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre> dev-libs/raft/raft-0.10.1.ebuild | 52 ++++++++++ </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> ...stfix-3.6.0_rc1.ebuild => postfix-3.6.0.ebuild} | 0 + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> sys-devel/gcc/gcc-10.2.0-r5.ebuild | 5 +- </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> profiles/package.mask | 4 -- + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> sys-devel/gcc/gcc-10.3.0.ebuild | 5 +- </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> 10 files changed, 130 insertions(+), 5 deletions(-) + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> sys-devel/gcc/gcc-10.3.1_pre9999.ebuild | 4 +- </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> create mode 100644 acct-group/opendmarc/metadata.xml + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> sys-devel/gcc/gcc-11.1.0.ebuild | 5 +- </pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> create mode 100644 acct-group/opendmarc/opendmarc-0.ebuild + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre> sys-devel/gcc/gcc-11.1.1_pre9999.ebuild | 4 +- </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> create mode 100644 acct-user/opendmarc/metadata.xml + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> sys-devel/gcc/gcc-12.0.0_pre9999.ebuild | 4 +- </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> create mode 100644 acct-user/opendmarc/opendmarc-0.ebuild + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> sys-devel/kgcc64/Manifest | 2 + </pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> create mode 100644 mail-filter/opendmarc/files/opendmarc-1.4.1-build-fix.patch + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> sys-devel/kgcc64/kgcc64-11.1.0.ebuild | 42 ++++++++ </pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> create mode 100644 mail-filter/opendmarc/opendmarc-1.4.1.ebuild + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> sys-fs/lxcfs/Manifest | 2 + </pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> rename mail-mta/postfix/{postfix-3.6.0_rc1.ebuild => postfix-3.6.0.ebuild} (100%) + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> sys-fs/lxcfs/lxcfs-4.0.8.ebuild | 56 ++++++++++ </pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre>*** synced gentoo + <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> sys-process/evisum/Manifest | 1 + </pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> * Sync succeeded + <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> sys-process/evisum/evisum-0.5.13.ebuild | 19 ++++ </pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre>$ git log --format=%ci -1 + <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> 18 files changed, 415 insertions(+), 6 deletions(-) </pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD + <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> create mode 100644 app-emulation/lxc/lxc-4.0.7.ebuild </pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo + <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> create mode 100644 dev-libs/dqlite/dqlite-1.7.0.ebuild </pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> create mode 100644 dev-libs/raft/raft-0.10.1.ebuild +</pre></td></tr> + <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> create mode 100644 sys-devel/kgcc64/kgcc64-11.1.0.ebuild +</pre></td></tr> + <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> create mode 100644 sys-fs/lxcfs/lxcfs-4.0.8.ebuild +</pre></td></tr> + <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> create mode 100644 sys-process/evisum/evisum-0.5.13.ebuild +</pre></td></tr> + <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre>*** synced gentoo +</pre></td></tr> + <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> * Sync succeeded +</pre></td></tr> + <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre>$ git log --format=%ci -1 +</pre></td></tr> + <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD +</pre></td></tr> + <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 32 gentoo +</pre></td></tr> + <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |